Merge pull request #10116 from mexon/mat/addon-console-command

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 7f5c7ab87b049098ce8915561a2d26846489c44b..e0050f405cd4fb873bedf3949c6a6cc509972552 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -35,6 +35,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
+use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Module\BaseSearch;
 use Friendica\Network\HTTPException;
@@ -155,28 +156,37 @@ class Index extends BaseSearch
                                DI::config()->get('system', 'itemspage_network'));
                }
 
+               $last_uriid = isset($_GET['last_uriid']) ? intval($_GET['last_uriid']) : 0;
+
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
                if ($tag) {
                        Logger::info('Start tag search.', ['q' => $search]);
-                       $uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
+                       $uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
                        $count = Tag::countByTag($search, local_user());
                } else {
                        Logger::info('Start fulltext search.', ['q' => $search]);
-                       $uriids = ItemContent::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
-                       $count = ItemContent::countBySearch($search, local_user());
+                       $uriids = Post\Content::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
+                       $count = Post\Content::countBySearch($search, local_user());
                }
 
                if (!empty($uriids)) {
                        $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
-                       $items = Item::inArray(Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params));
+                       $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, ['uri-id' => $uriids], $params));
                }
 
                if (empty($items)) {
-                       notice(DI::l10n()->t('No results.'));
+                       if (empty($last_uriid)) {
+                               notice(DI::l10n()->t('No results.'));
+                       }
                        return $o;
                }
 
+               if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+                       $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+                       $o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+               }
+
                if ($tag) {
                        $title = DI::l10n()->t('Items tagged with: %s', $search);
                } else {
@@ -191,7 +201,12 @@ class Index extends BaseSearch
 
                $o .= conversation(DI::app(), $items, 'search', false, false, 'commented', local_user());
 
-               $o .= $pager->renderMinimal($count);
+               if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+                       $o .= HTML::scrollLoader();
+               } else {
+                       $o .= $pager->renderMinimal($count);
+               }
+
 
                return $o;
        }
@@ -274,7 +289,7 @@ class Index extends BaseSearch
                }
 
                if (!empty($item_id)) {
-                       $item = Item::selectFirst(['guid'], ['id' => $item_id]);
+                       $item = Post::selectFirst(['guid'], ['id' => $item_id]);
                        if (DBA::isResult($item)) {
                                DI::baseUrl()->redirect('display/' . $item['guid']);
                        }