X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FSearch.php;h=41c75ad32b2b463c47af5d3c89bd5f69c7c9ecbf;hb=44291a465bb9b9c54b8781d6d6f13e1c3f317c1b;hp=d3bf0b5ba52afde51db4a6c913d40e1d75cf3f93;hpb=505100bdd7336f9ec9e7c25157fe3cb6b43bf140;p=friendica.git

diff --git a/src/Core/Search.php b/src/Core/Search.php
index d3bf0b5ba5..41c75ad32b 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-2022, 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\HTTPClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -104,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';
 
@@ -122,7 +122,7 @@ class Search
 			$searchUrl .= '&page=' . $page;
 		}
 
-		$resultJson = DI::httpRequest()->fetch($searchUrl, 0, 'application/json');
+		$resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
 
 		$results = json_decode($resultJson, true);
 
@@ -228,7 +228,7 @@ class Search
 			$return = Contact::searchByName($search, $mode);
 		} else {
 			$p = $page > 1 ? 'p=' . $page : '';
-			$curlResult = DI::httpRequest()->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'])) {