<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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;
if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
(substr(Strings::normaliseLink($user), 0, 7) == "http://")) {
- /// @todo Possibly use "getIdForURL" instead?
- $user_data = Probe::uri($user);
+ $user_data = Contact::getByURL($user);
if (empty($user_data)) {
return $emptyResultList;
}
return $emptyResultList;
}
- // Ensure that we do have a contact entry
- Contact::getIdForURL($user_data['url'] ?? '');
-
- $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), false);
+ $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user());
$result = new ContactResult(
$user_data['name'] ?? '',
$user_data['photo'] ?? '',
$user_data['network'] ?? '',
$contactDetails['id'] ?? 0,
- 0,
+ $user_data['id'] ?? 0,
$user_data['tags'] ?? ''
);
*/
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';
$searchUrl .= '&page=' . $page;
}
- $resultJson = Network::fetchUrl($searchUrl, false, 0, 'application/json');
+ $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
$results = json_decode($resultJson, true);
$profiles = $results['profiles'] ?? [];
foreach ($profiles as $profile) {
- $profile_url = $profile['url'] ?? '';
- $contactDetails = Contact::getByURLForUser($profile_url, local_user(), false);
+ $profile_url = $profile['profile_url'] ?? '';
+ $contactDetails = Contact::getByURLForUser($profile_url, local_user());
$result = new ContactResult(
$profile['name'] ?? '',
*/
public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80)
{
- $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;
- }
+ Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]);
- $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;
- }
-
- while ($row = DBA::fetch($data)) {
- $urlParts = parse_url($row["nurl"]);
+ $contacts = Contact::searchByName($search, $type == self::TYPE_FORUM ? 'community' : '');
- // 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::getByURLForUser($row["nurl"], local_user(), false);
-
- if ($contact["name"] == "") {
- $contact["name"] = end(explode("/", $urlParts["path"]));
- }
+ $resultList = new ResultList($start, $itemPage, count($contacts));
+ foreach ($contacts as $contact) {
$result = new ContactResult(
$contact["name"],
$contact["addr"],
$contact["url"],
$contact["photo"],
$contact["network"],
- $contact["cid"],
- $contact["zid"],
+ $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);
}
/**
- * 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")
* @return array with the search results
* @throws HTTPException\InternalServerErrorException
*/
- public static function searchGlobalContact($search, $mode, int $page = 1)
+ public static function searchContact($search, $mode, int $page = 1)
{
+ Logger::info('Searching', ['search' => $search, 'mode' => $mode, 'page' => $page]);
+
if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
return [];
}
// check if searching in the local global contact table is enabled
if (DI::config()->get('system', 'poco_local_search')) {
- $return = GContact::searchByName($search, $mode);
+ $return = Contact::searchByName($search, $mode);
} 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'])) {
projects / friendica.git / blobdiff