Merge pull request #8900 from tobiasd/20200718-serverblocklistcsv

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

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 2b7bb5c8a1be35fa639b14daf860db212559779b..bf3ae2585b19de398b99ef90f2f9163aa8c35b4c 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -28,12 +28,13 @@ use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Module\BaseSearch;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
@@ -80,7 +81,7 @@ class Index extends BaseSearch
                }
 
                if (local_user()) {
-                       DI::page()['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
+                       DI::page()['aside'] .= Widget\SavedSearches::getHTML(Search::getSearchPath($search), $search);
                }
 
                Nav::setSelected('search');
@@ -137,32 +138,23 @@ class Index extends BaseSearch
                // OR your own posts if you are a logged in member
                // No items will be shown if the member has a blocked profile wall.
 
-               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
+               if (DI::mode()->isMobile()) {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                               DI::config()->get('system', 'itemspage_network_mobile'));
+               } else {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                               DI::config()->get('system', 'itemspage_network'));
+               }
+
+               $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());
 
-                       $condition = [
-                               "(`uid` = 0 OR (`uid` = ? AND NOT `global`))
-                               AND `otype` = ? AND `type` = ? AND `term` = ?",
-                               local_user(), Term::OBJECT_TYPE_POST, Term::HASHTAG, $search
-                       ];
-                       $params = [
-                               'order' => ['received' => true],
-                               'limit' => [$pager->getStart(), $pager->getItemsPerPage()]
-                       ];
-                       $terms = DBA::select('term', ['oid'], $condition, $params);
-
-                       $itemids = [];
-                       while ($term = DBA::fetch($terms)) {
-                               $itemids[] = $term['oid'];
-                       }
-
-                       DBA::close($terms);
-
-                       if (!empty($itemids)) {
-                               $params = ['order' => ['id' => true]];
-                               $items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
+                       if (!empty($uriids)) {
+                               $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
+                               $items = Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params);
                                $r = Item::inArray($items);
                        } else {
                                $r = [];
@@ -184,7 +176,7 @@ class Index extends BaseSearch
                }
 
                if (!DBA::isResult($r)) {
-                       info(DI::l10n()->t('No results.'));
+                       notice(DI::l10n()->t('No results.'));
                        return $o;
                }
 
@@ -245,13 +237,13 @@ class Index extends BaseSearch
                } else {
                        // Cheaper local lookup for anonymous users, no probe
                        if ($isAddr) {
-                               $contact = Contact::selectFirst(['id' => 'cid'], ['addr' => $search, 'uid' => 0]);
+                               $contact = Contact::selectFirst(['id'], ['addr' => $search, 'uid' => 0]);
                        } else {
-                               $contact = Contact::getDetailsByURL($search, 0, ['cid' => 0]);
+                               $contact = Contact::getByURL($search, null, ['id']) ?: ['id' => 0];
                        }
 
                        if (DBA::isResult($contact)) {
-                               $contact_id = $contact['cid'];
+                               $contact_id = $contact['id'];
                        }
                }