X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSearch.php;h=41c75ad32b2b463c47af5d3c89bd5f69c7c9ecbf;hb=69984ac6bcf08a1c3ce8967ad3ec4ca954039b75;hp=edc88ffd7d4fa004c2ae8034b99d77ac5c8dafa7;hpb=31d2a74b0b385eaea556ee45101147197683b8a3;p=friendica.git

diff --git a/src/Core/Search.php b/src/Core/Search.php
index edc88ffd7d..41c75ad32b 100644
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,10 +21,9 @@
 
 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\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
@@ -105,7 +104,7 @@ class Search
 	 */
 	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';
 
@@ -123,7 +122,7 @@ 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);
 
@@ -136,7 +135,7 @@ class Search
 		$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(
@@ -170,68 +169,13 @@ class Search
 	 */
 	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 NOT `failed`
-			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', 'name', 'addr', 'url', 'photo', 'network', 'keywords'], [
-			'NOT `hide`
-			AND `network` IN (?, ?, ?, ?)
-			AND NOT `failed`
-			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"]);
-
-			// Ignore results that look strange.
-			// For historic reasons the gcontact table does contain some garbage.
-			if (!empty($urlParts['query']) || !empty($urlParts['fragment'])) {
-				continue;
-			}
+		$contacts = Contact::searchByName($search, $type == self::TYPE_FORUM ? 'community' : '');
 
-			$contact = Contact::getByURLForUser($row["nurl"], local_user()) ?: $row;
-
-			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"],
@@ -247,8 +191,6 @@ class Search
 			$resultList->addResult($result);
 		}
 
-		DBA::close($data);
-
 		// Add found profiles from the global directory to the local directory
 		Worker::add(PRIORITY_LOW, 'SearchDirectory', $search);
 
@@ -256,7 +198,7 @@ class 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")
@@ -264,8 +206,10 @@ class Search
 	 * @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 [];
 		}
@@ -281,10 +225,10 @@ class Search
 
 		// 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'])) {