X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSearch.php;h=3c0ace3db5468d62486f7cfc2d1236a75b9b87c1;hb=16e1c8f893e74b644a0f5f2abe6e98f5f2d8abdc;hp=82c0ea3d36c3b0cb159ff2febb0465e76098fbca;hpb=516018861e011865a902587876d484d6f0f42a66;p=friendica.git

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 82c0ea3d36..3c0ace3db5 100644
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -23,8 +23,8 @@ namespace Friendica\Core;
 
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -54,23 +54,23 @@ class Search
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getContactsFromProbe($user)
+	public static function getContactsFromProbe(string $user): ResultList
 	{
 		$emptyResultList = new ResultList(1, 0, 1);
 
 		if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
-		    (substr(Strings::normaliseLink($user), 0, 7) == "http://")) {
+		    (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)) {
+			if (!in_array($user_data['network'], Protocol::FEDERATED)) {
 				return $emptyResultList;
 			}
 
-			$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user());
+			$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', DI::userSession()->getLocalUserId());
 
 			$result = new ContactResult(
 				$user_data['name'] ?? '',
@@ -102,9 +102,9 @@ 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';
 
@@ -122,7 +122,7 @@ class Search
 			$searchUrl .= '&page=' . $page;
 		}
 
-		$resultJson = DI::httpClient()->fetch($searchUrl, 0, 'application/json');
+		$resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
 
 		$results = json_decode($resultJson, true);
 
@@ -136,7 +136,7 @@ class Search
 
 		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'] ?? '',
@@ -167,7 +167,7 @@ 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
 	{
 		Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]);
 
@@ -177,22 +177,22 @@ class Search
 
 		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'],
+				$contact['photo'],
+				$contact['network'],
+				$contact['cid'] ?? 0,
+				$contact['zid'] ?? 0,
+				$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;
 	}
@@ -203,14 +203,15 @@ class Search
 	 * @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 [];
 		}
 
@@ -228,11 +229,28 @@ class Search
 			$return = Contact::searchByName($search, $mode);
 		} else {
 			$p = $page > 1 ? 'p=' . $page : '';
-			$curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HttpClientOptions::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,
+							'Forum'        => 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']);
 				}
 			}
 		}
@@ -245,7 +263,7 @@ class Search
 	 *
 	 * @return string
 	 */
-	public static function getGlobalDirectory()
+	public static function getGlobalDirectory(): string
 	{
 		return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
 	}
@@ -254,9 +272,10 @@ class Search
 	 * 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));