X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FSearchDirectory.php;h=546c369b2c5569952deaed0a663e3f5aa281a789;hb=76ae210527487bea129411e8ed02ac4997d0d89b;hp=4503f21ca6006968da6e5d37c4d113091745c9de;hpb=0c9fcdde699a898df0f10d8191ad662b6c8504d6;p=friendica.git

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 4503f21ca6..546c369b2c 100644
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -1,19 +1,35 @@
 <?php
 /**
- * @file src/Worker/SearchDirectory.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+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\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
-use Friendica\Network\Probe;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 class SearchDirectory
@@ -21,12 +37,12 @@ class SearchDirectory
 	// <search pattern>: Searches for "search pattern" in the directory.
 	public static function execute($search)
 	{
-		if (!Config::get('system', 'poco_local_search')) {
+		if (!DI::config()->get('system', 'poco_local_search')) {
 			Logger::info('Local search is not enabled');
 			return;
 		}
 
-		$data = Cache::get('SearchDirectory:' . $search);
+		$data = DI::cache()->get('SearchDirectory:' . $search);
 		if (!is_null($data)) {
 			// Only search for the same item every 24 hours
 			if (time() < $data + (60 * 60 * 24)) {
@@ -35,18 +51,17 @@ 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)]);
+				$gcontact = DBA::selectFirst('gcontact', ['failed'], ['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'])) {
+					if ($gcontact['failed']) {
 						continue;
 					}
 
@@ -64,7 +79,7 @@ class SearchDirectory
 					Logger::info('Friendica server seems to be okay.', ['server' => $server_url]);
 				}
 
-				$data = Probe::uri($jj->url);
+				$data = Contact::getByURL($jj->url);
 				if ($data['network'] == Protocol::DFRN) {
 					Logger::info('Add profile to local directory', ['profile' => $jj->url]);
 
@@ -80,6 +95,6 @@ class SearchDirectory
 				}
 			}
 		}
-		Cache::set('SearchDirectory:' . $search, time(), Cache::DAY);
+		DI::cache()->set('SearchDirectory:' . $search, time(), Duration::DAY);
 	}
 }