<?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\Network\HTTPException;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Object\Search\ContactResult;
use Friendica\Object\Search\ResultList;
use Friendica\Util\Network;
$searchUrl .= '&page=' . $page;
}
- $resultJson = DI::httpRequest()->fetch($searchUrl, false, 0, 'application/json');
+ $resultJson = DI::httpClient()->fetch($searchUrl, 0, 'application/json');
$results = json_decode($resultJson, true);
$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(
{
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"],
$resultList->addResult($result);
}
- DBA::close($data);
-
// Add found profiles from the global directory to the local directory
Worker::add(PRIORITY_LOW, 'SearchDirectory', $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), [HttpClientOptions::ACCEPT_CONTENT => ['application/json']]);
if ($curlResult->isSuccess()) {
$searchResult = json_decode($curlResult->getBody(), true);
if (!empty($searchResult['profiles'])) {