Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index f83195ff1ccdb1e1a16f75375d8df20bd1b27ad9..6ecc819240ff67d817f27dc9ee91c7aa540d61ec 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -5,9 +5,9 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 
@@ -34,9 +34,6 @@ function notes_content(App $a, $update = false)
                return;
        }
 
-       require_once 'include/security.php';
-       require_once 'include/conversation.php';
-
        $o = Profile::getTabs($a, true);
 
        if (!$update) {
@@ -60,30 +57,25 @@ function notes_content(App $a, $update = false)
        }
 
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-               'wall' => false, 'allow_cid' => '<' . $a->contact['id'] . '>', 'contact-id'=> $a->contact['id']];
+               'contact-id'=> $a->contact['id']];
 
-       $a->set_pager_itemspage(40);
+       $pager = new Pager($a->query_string, 40);
 
        $params = ['order' => ['created' => true],
-               'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-       $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
-
-       if (DBM::is_result($r)) {
-               $parents_arr = [];
-
-               while ($rr = Item::fetch($r)) {
-                       $parents_arr[] = $rr['id'];
-               }
-               DBA::close($r);
-
-               $condition = ['uid' => local_user(), 'parent' => $parents_arr];
-               $result = Item::selectForUser(local_user(), [], $condition);
-               if (DBM::is_result($result)) {
-                       $items = conv_sort(Item::inArray($result), 'commented');
-                       $o .= conversation($a, $items, 'notes', $update);
-               }
+               'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+       $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+       $count = 0;
+
+       if (DBA::isResult($r)) {
+               $notes = Item::inArray($r);
+
+               $count = count($notes);
+
+               $o .= conversation($a, $notes, $pager, 'notes', $update);
        }
 
-       $o .= alt_pager($a, count($r));
+       $o .= $pager->renderMinimal($count);
+
        return $o;
 }