X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSearch.php;h=3c0ace3db5468d62486f7cfc2d1236a75b9b87c1;hb=16e1c8f893e74b644a0f5f2abe6e98f5f2d8abdc;hp=aedad2f0e15f28fd470efccd67c67f5e88a373dc;hpb=335cd76baf1cf4352e56f779c898118eb9f36ff1;p=friendica.git diff --git a/src/Core/Search.php b/src/Core/Search.php index aedad2f0e1..3c0ace3db5 100644 --- a/src/Core/Search.php +++ b/src/Core/Search.php @@ -1,6 +1,6 @@ getLocalUserId()); $result = new ContactResult( $user_data['name'] ?? '', @@ -102,9 +102,9 @@ class Search * @return ResultList * @throws HTTPException\InternalServerErrorException */ - public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1) + public static function getContactsFromGlobalDirectory(string $search, int $type = self::TYPE_ALL, int $page = 1): ResultList { - $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, 0, 'application/json'); + $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON); $results = json_decode($resultJson, true); @@ -135,8 +135,8 @@ class Search $profiles = $results['profiles'] ?? []; foreach ($profiles as $profile) { - $profile_url = $profile['url'] ?? ''; - $contactDetails = Contact::getByURLForUser($profile_url, local_user()); + $profile_url = $profile['profile_url'] ?? ''; + $contactDetails = Contact::getByURLForUser($profile_url, DI::userSession()->getLocalUserId()); $result = new ContactResult( $profile['name'] ?? '', @@ -167,68 +167,32 @@ class Search * @return ResultList * @throws HTTPException\InternalServerErrorException */ - public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80) + public static function getContactsFromLocalDirectory(string $search, int $type = self::TYPE_ALL, int $start = 0, int $itemPage = 80): ResultList { 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"], - $contact["addr"], - $contact["url"], - $contact["photo"], - $contact["network"], - $contact["cid"] ?? 0, - $contact["zid"] ?? 0, - $contact["keywords"] + $contact['name'], + $contact['addr'], + $contact['addr'], + $contact['url'], + $contact['photo'], + $contact['network'], + $contact['cid'] ?? 0, + $contact['zid'] ?? 0, + $contact['keywords'] ); $resultList->addResult($result); } - DBA::close($data); - // Add found profiles from the global directory to the local directory - Worker::add(PRIORITY_LOW, 'SearchDirectory', $search); + Worker::add(Worker::PRIORITY_LOW, 'SearchDirectory', $search); return $resultList; } @@ -239,14 +203,15 @@ class Search * @param string $search Name or part of a name or nick * @param string $mode Search mode (e.g. "community") * @param int $page Page number (starts at 1) - * @return array with the search results + * + * @return array with the search results or empty if error or nothing found * @throws HTTPException\InternalServerErrorException */ - public static function searchContact($search, $mode, int $page = 1) + public static function searchContact(string $search, string $mode, int $page = 1): array { Logger::info('Searching', ['search' => $search, 'mode' => $mode, 'page' => $page]); - if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { + if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) { return []; } @@ -264,11 +229,28 @@ 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), ['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'])) { - $return = $searchResult['profiles']; + // Converting Directory Search results into contact-looking records + $return = array_map(function ($result) { + static $contactType = [ + 'People' => Contact::TYPE_PERSON, + 'Forum' => Contact::TYPE_COMMUNITY, + 'Organization' => Contact::TYPE_ORGANISATION, + 'News' => Contact::TYPE_NEWS, + ]; + + return [ + 'name' => $result['name'], + 'addr' => $result['addr'], + 'url' => $result['profile_url'], + 'network' => Protocol::DFRN, + 'micro' => $result['photo'], + 'contact-type' => $contactType[$result['account_type']], + ]; + }, $searchResult['profiles']); } } } @@ -281,7 +263,7 @@ class Search * * @return string */ - public static function getGlobalDirectory() + public static function getGlobalDirectory(): string { return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY); } @@ -290,9 +272,10 @@ class Search * Return the search path (either fulltext search or tag search) * * @param string $search + * * @return string search path */ - public static function getSearchPath(string $search) + public static function getSearchPath(string $search): string { if (substr($search, 0, 1) == '#') { return 'search?tag=' . urlencode(substr($search, 1));