Merge pull request #11520 from annando/display-polls

[friendica.git] / src / Core / Search.php

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 7f9ffeec5da0943397050ae4f99e8e5df8c7b793..41c75ad32b2b463c47af5d3c89bd5f69c7c9ecbf 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,9 +21,9 @@
 
 namespace Friendica\Core;
 
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
@@ -104,7 +104,7 @@ class Search
         */
        public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
        {
-               $server = DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
+               $server = self::getGlobalDirectory();
 
                $searchUrl = $server . '/search';
 
@@ -122,7 +122,7 @@ class Search
                        $searchUrl .= '&page=' . $page;
                }
 
-               $resultJson = DI::httpRequest()->fetch($searchUrl, false, 0, 'application/json');
+               $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
 
                $results = json_decode($resultJson, true);
 
@@ -135,7 +135,7 @@ class Search
                $profiles = $results['profiles'] ?? [];
 
                foreach ($profiles as $profile) {
-                       $profile_url = $profile['url'] ?? '';
+                       $profile_url = $profile['profile_url'] ?? '';
                        $contactDetails = Contact::getByURLForUser($profile_url, local_user());
 
                        $result = new ContactResult(
@@ -171,45 +171,11 @@ class Search
        {
                Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]);
 
-               $config = DI::config();
+               $contacts = Contact::searchByName($search, $type == self::TYPE_FORUM ? 'community' : '');
 
-               $diaspora = $config->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::DFRN;
-               $ostatus  = !$config->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::DFRN;
+               $resultList = new ResultList($start, $itemPage, count($contacts));
 
-               $wildcard = Strings::escapeHtml('%' . $search . '%');
-
-               $condition = [
-                       'NOT `unsearchable`
-                       AND `network` IN (?, ?, ?, ?)
-                       AND NOT `failed` AND `uid` = ?
-                       AND (`url` LIKE ? OR `name` LIKE ? OR `location` LIKE ? 
-                               OR `addr` LIKE ? OR `about` LIKE ? OR `keywords` LIKE ?)
-                       AND `forum` = ?',
-                       Protocol::ACTIVITYPUB, Protocol::DFRN, $ostatus, $diaspora, 0,
-                       $wildcard, $wildcard, $wildcard,
-                       $wildcard, $wildcard, $wildcard,
-                       ($type === self::TYPE_FORUM),
-               ];
-
-               $count = DBA::count('contact', $condition);
-
-               $resultList = new ResultList($start, $itemPage, $count);
-
-               if (empty($count)) {
-                       return $resultList;
-               }
-
-               $data = DBA::select('contact', [], $condition, [
-                       'group_by' => ['nurl', 'updated'],
-                       'limit'    => [$start, $itemPage],
-                       'order'    => ['updated' => 'DESC']
-               ]);
-
-               if (!DBA::isResult($data)) {
-                       return $resultList;
-               }
-
-               while ($contact = DBA::fetch($data)) {
+               foreach ($contacts as $contact) {
                        $result = new ContactResult(
                                $contact["name"],
                                $contact["addr"],
@@ -225,8 +191,6 @@ class Search
                        $resultList->addResult($result);
                }
 
-               DBA::close($data);
-
                // Add found profiles from the global directory to the local directory
                Worker::add(PRIORITY_LOW, 'SearchDirectory', $search);
 
@@ -264,7 +228,7 @@ class Search
                        $return = Contact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpRequest()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
+                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), HttpClientAccept::JSON);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {