X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSearch.php;h=98517361ea34c48a373fcc50380719800a88d9c6;hb=f23ecaff6af1982112469f90d6bcdf0408b0f22e;hp=7c00e6224c2a473688b62819e9ee0d87ff34fe00;hpb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;p=friendica.git diff --git a/src/Core/Search.php b/src/Core/Search.php index 7c00e6224c..98517361ea 100644 --- a/src/Core/Search.php +++ b/src/Core/Search.php @@ -1,18 +1,35 @@ . + * + */ namespace Friendica\Core; -use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\GContact; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\HTTPException; -use Friendica\Network\Probe; use Friendica\Object\Search\ContactResult; use Friendica\Object\Search\ResultList; -use Friendica\Protocol\PortableContact; use Friendica\Util\Network; use Friendica\Util\Strings; +use GuzzleHttp\Psr7\Uri; /** * Specific class to perform searches for different systems. Currently: @@ -25,7 +42,7 @@ class Search const DEFAULT_DIRECTORY = 'https://dir.friendica.social'; const TYPE_PEOPLE = 0; - const TYPE_FORUM = 1; + const TYPE_GROUP = 1; const TYPE_ALL = 2; /** @@ -38,50 +55,48 @@ class Search * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function getContactsFromProbe($user) + public static function getContactsFromProbe(string $user, $only_group = false): ResultList { - $emptyResultList = new ResultList(1, 0, 1); - - if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) || - (substr(Strings::normaliseLink($user), 0, 7) == "http://")) { + $emptyResultList = new ResultList(); - /// @todo Possibly use "getIdForURL" instead? - $user_data = Probe::uri($user); - if (empty($user_data)) { - return $emptyResultList; - } - - if (!in_array($user_data["network"], Protocol::FEDERATED)) { - return $emptyResultList; - } - - // Ensure that we do have a contact entry - Contact::getIdForURL($user_data['url'] ?? ''); + if (empty(parse_url($user, PHP_URL_SCHEME)) && !(filter_var($user, FILTER_VALIDATE_EMAIL) || Network::isEmailDomainValid($user))) { + return $emptyResultList; + } - $contactDetails = Contact::getDetailsByURL($user_data['url'] ?? '', local_user()); + $user_data = Contact::getByURL($user); + if (empty($user_data)) { + return $emptyResultList; + } - $result = new ContactResult( - $user_data['name'] ?? '', - $user_data['addr'] ?? '', - ($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''), - $user_data['url'] ?? '', - $user_data['photo'] ?? '', - $user_data['network'] ?? '', - $contactDetails['id'] ?? 0, - 0, - $user_data['tags'] ?? '' - ); + if ($only_group && ($user_data['contact-type'] != Contact::TYPE_COMMUNITY)) { + return $emptyResultList; + } - return new ResultList(1, 1, 1, [$result]); - } else { + if (!Protocol::supportsProbe($user_data['network'])) { return $emptyResultList; } + + $contactDetails = Contact::getByURLForUser($user_data['url'], DI::userSession()->getLocalUserId()); + + $result = new ContactResult( + $user_data['name'], + $user_data['addr'], + $user_data['addr'] ?: $user_data['url'], + new Uri($user_data['url']), + $user_data['photo'], + $user_data['network'], + $contactDetails['cid'] ?? 0, + $user_data['id'], + $user_data['keywords'] + ); + + return new ResultList(1, 1, 1, [$result]); } /** * Search in the global directory for occurrences of the search string * - * @see https://github.com/friendica/friendica-directory/blob/master/docs/Protocol.md#search + * @see https://github.com/friendica/friendica-directory/blob/stable/docs/Protocol.md#search * * @param string $search * @param int $type specific type of searching @@ -90,15 +105,15 @@ 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'; switch ($type) { - case self::TYPE_FORUM: - $searchUrl .= '/forum'; + case self::TYPE_GROUP: + $searchUrl .= '/group'; break; case self::TYPE_PEOPLE: $searchUrl .= '/people'; @@ -110,13 +125,13 @@ class Search $searchUrl .= '&page=' . $page; } - $resultJson = Network::fetchUrl($searchUrl, false, 0, 'application/json'); + $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON); $results = json_decode($resultJson, true); $resultList = new ResultList( ($results['page'] ?? 0) ?: 1, - $results['count'] ?? 0, + $results['count'] ?? 0, ($results['itemsperpage'] ?? 0) ?: 30 ); @@ -124,17 +139,17 @@ class Search foreach ($profiles as $profile) { $profile_url = $profile['profile_url'] ?? ''; - $contactDetails = Contact::getDetailsByURL($profile_url, local_user()); + $contactDetails = Contact::getByURLForUser($profile_url, DI::userSession()->getLocalUserId()); $result = new ContactResult( $profile['name'] ?? '', $profile['addr'] ?? '', ($contactDetails['addr'] ?? '') ?: $profile_url, - $profile_url, + new Uri($profile_url), $profile['photo'] ?? '', Protocol::DFRN, $contactDetails['cid'] ?? 0, - 0, + $contactDetails['zid'] ?? 0, $profile['tags'] ?? '' ); @@ -155,105 +170,51 @@ 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 { - $config = DI::config(); - - $diaspora = $config->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::DFRN; - $ostatus = !$config->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::DFRN; - - $wildcard = Strings::escapeHtml('%' . $search . '%'); - - $count = DBA::count('gcontact', [ - 'NOT `hide` - AND `network` IN (?, ?, ?, ?) - AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) - AND (`url` LIKE ? OR `name` LIKE ? OR `location` LIKE ? - OR `addr` LIKE ? OR `about` LIKE ? OR `keywords` LIKE ?) - AND `community` = ?', - Protocol::ACTIVITYPUB, Protocol::DFRN, $ostatus, $diaspora, - $wildcard, $wildcard, $wildcard, - $wildcard, $wildcard, $wildcard, - ($type === self::TYPE_FORUM), - ]); - - $resultList = new ResultList($start, $itemPage, $count); - - if (empty($count)) { - return $resultList; - } - - $data = DBA::select('gcontact', ['nurl'], [ - 'NOT `hide` - AND `network` IN (?, ?, ?, ?) - AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) - AND (`url` LIKE ? OR `name` LIKE ? OR `location` LIKE ? - OR `addr` LIKE ? OR `about` LIKE ? OR `keywords` LIKE ?) - AND `community` = ?', - Protocol::ACTIVITYPUB, Protocol::DFRN, $ostatus, $diaspora, - $wildcard, $wildcard, $wildcard, - $wildcard, $wildcard, $wildcard, - ($type === self::TYPE_FORUM), - ], [ - 'group_by' => ['nurl', 'updated'], - 'limit' => [$start, $itemPage], - 'order' => ['updated' => 'DESC'] - ]); - - if (!DBA::isResult($data)) { - return $resultList; - } + Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]); - while ($row = DBA::fetch($data)) { - $urlParts = parse_url($row["nurl"]); + $contacts = Contact::searchByName($search, $type == self::TYPE_GROUP ? 'community' : '', true); - // Ignore results that look strange. - // For historic reasons the gcontact table does contain some garbage. - if (!empty($urlParts['query']) || !empty($urlParts['fragment'])) { - continue; - } - - $contact = Contact::getDetailsByURL($row["nurl"], local_user()); - - if ($contact["name"] == "") { - $contact["name"] = end(explode("/", $urlParts["path"])); - } + $resultList = new ResultList($start, count($contacts), $itemPage); + foreach ($contacts as $contact) { $result = new ContactResult( - $contact["name"], - $contact["addr"], - $contact["addr"], - $contact["url"], - $contact["photo"], - $contact["network"], - $contact["cid"], - $contact["zid"], - $contact["keywords"] + $contact['name'], + $contact['addr'], + $contact['addr'] ?: $contact['url'], + new Uri($contact['url']), + $contact['photo'], + $contact['network'], + 0, + $contact['pid'], + $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; } /** - * Searching for global contacts for autocompletion + * Searching for contacts for autocompletion * * @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 searchGlobalContact($search, $mode, int $page = 1) + public static function searchContact(string $search, string $mode, int $page = 1): array { - if (Config::get('system', 'block_public') && !Session::isAuthenticated()) { + Logger::info('Searching', ['search' => $search, 'mode' => $mode, 'page' => $page]); + + if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) { return []; } @@ -267,15 +228,34 @@ class Search } // check if searching in the local global contact table is enabled - if (Config::get('system', 'poco_local_search')) { - $return = GContact::searchByName($search, $mode); + if (DI::config()->get('system', 'poco_local_search')) { + $return = Contact::searchByName($search, $mode, true); } else { $p = $page > 1 ? 'p=' . $page : ''; - $curlResult = Network::curl(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'])) { - $return = $searchResult['profiles']; + // Converting Directory Search results into contact-looking records + $return = array_map(function ($result) { + static $contactType = [ + 'People' => Contact::TYPE_PERSON, + // Kept for backward compatibility + 'Forum' => Contact::TYPE_COMMUNITY, + 'Group' => 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']); } } } @@ -288,8 +268,24 @@ class Search * * @return string */ - public static function getGlobalDirectory() + public static function getGlobalDirectory(): string { - return Config::get('system', 'directory', self::DEFAULT_DIRECTORY); + return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY); + } + + /** + * Return the search path (either fulltext search or tag search) + * + * @param string $search + * + * @return string search path + */ + public static function getSearchPath(string $search): string + { + if (substr($search, 0, 1) == '#') { + return 'search?tag=' . urlencode(substr($search, 1)); + } else { + return 'search?q=' . urlencode($search); + } } }