X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FSearchDirectory.php;h=6dd7f79e1585af856637713b37a3d20b6e483855;hb=2647514603852fe5fb9f47f0bf153dd20c124ce6;hp=c099a5e28a3dad0f0b1b1e6057a5f86d9521ec6f;hpb=85dc9bb96b30819fcf544c9aa1013a8f380d6981;p=friendica.git

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index c099a5e28a..6dd7f79e15 100644
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,15 +23,9 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Search;
-use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\GContact;
-use Friendica\Model\GServer;
-use Friendica\Network\Probe;
-use Friendica\Util\Network;
-use Friendica\Util\Strings;
+use Friendica\Model\Contact;
 
 class SearchDirectory
 {
@@ -52,49 +46,12 @@ class SearchDirectory
 			}
 		}
 
-		$x = Network::fetchUrl(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
+		$x = DI::httpRequest()->fetch(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
 		$j = json_decode($x);
 
 		if (!empty($j->results)) {
 			foreach ($j->results as $jj) {
-				// Check if the contact already exists
-				$gcontact = DBA::selectFirst('gcontact', ['id', 'last_contact', 'last_failure', 'updated'], ['nurl' => Strings::normaliseLink($jj->url)]);
-				if (DBA::isResult($gcontact)) {
-					Logger::info('Profile already exists', ['profile' => $jj->url, 'search' => $search]);
-
-					if (($gcontact['last_contact'] < $gcontact['last_failure']) &&
-						($gcontact['updated'] < $gcontact['last_failure'])) {
-						continue;
-					}
-
-					// Update the contact
-					GContact::updateFromProbe($jj->url);
-					continue;
-				}
-
-				$server_url = GContact::getBasepath($jj->url, true);
-				if ($server_url != '') {
-					if (!GServer::check($server_url)) {
-						Logger::info("Friendica server doesn't answer.", ['server' => $server_url]);
-						continue;
-					}
-					Logger::info('Friendica server seems to be okay.', ['server' => $server_url]);
-				}
-
-				$data = Probe::uri($jj->url);
-				if ($data['network'] == Protocol::DFRN) {
-					Logger::info('Add profile to local directory', ['profile' => $jj->url]);
-
-					if ($jj->tags != '') {
-						$data['keywords'] = $jj->tags;
-					}
-
-					$data['server_url'] = $data['baseurl'];
-
-					GContact::update($data);
-				} else {
-					Logger::info('Profile is not responding or no Friendica contact', ['profile' => $jj->url, 'network' => $data['network']]);
-				}
+				Contact::getByURL($jj->url);
 			}
 		}
 		DI::cache()->set('SearchDirectory:' . $search, time(), Duration::DAY);