<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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;
use Friendica\Util\Network;
use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Uri;
/**
* Specific class to perform searches for different systems. Currently:
const DEFAULT_DIRECTORY = 'https://dir.friendica.social';
const TYPE_PEOPLE = 0;
- const TYPE_FORUM = 1;
+ const TYPE_GROUP = 1;
const TYPE_ALL = 2;
/**
* @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);
+ $emptyResultList = new ResultList();
- if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
- (substr(Strings::normaliseLink($user), 0, 7) == "http://")) {
-
- $user_data = Contact::getByURL($user);
- if (empty($user_data)) {
- return $emptyResultList;
- }
-
- if (!in_array($user_data["network"], Protocol::FEDERATED)) {
- return $emptyResultList;
- }
+ if (empty(parse_url($user, PHP_URL_SCHEME)) && !(filter_var($user, FILTER_VALIDATE_EMAIL) || Network::isEmailDomainValid($user))) {
+ return $emptyResultList;
+ }
- $contactDetails = Contact::getByURLForUser($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,
- $user_data['id'] ?? 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]);
}
/**
* @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';
$searchUrl .= '&page=' . $page;
}
- $resultJson = DI::httpRequest()->fetch($searchUrl, 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
);
foreach ($profiles as $profile) {
$profile_url = $profile['profile_url'] ?? '';
- $contactDetails = Contact::getByURLForUser($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'] ?? ''
);
* @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]);
- $contacts = Contact::searchByName($search, $type == self::TYPE_FORUM ? 'community' : '');
+ $contacts = Contact::searchByName($search, $type == self::TYPE_GROUP ? 'community' : '', true);
- $resultList = new ResultList($start, $itemPage, count($contacts));
+ $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"] ?? 0,
- $contact["zid"] ?? 0,
- $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);
}
// 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;
}
* @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 [];
}
// check if searching in the local global contact table is enabled
if (DI::config()->get('system', 'poco_local_search')) {
- $return = Contact::searchByName($search, $mode);
+ $return = Contact::searchByName($search, $mode, true);
} 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,
+ // 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']);
}
}
}
*
* @return string
*/
- public static function getGlobalDirectory()
+ public static function getGlobalDirectory(): string
{
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)
+ public static function getSearchPath(string $search): string
{
if (substr($search, 0, 1) == '#') {
return 'search?tag=' . urlencode(substr($search, 1));
projects / friendica.git / blobdiff