Merge pull request #8957 from annando/server-peers

[friendica.git] / src / Worker / SearchDirectory.php

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 0f5782db5584629f46ef6dda86a4abd5701995ff..546c369b2c5569952deaed0a663e3f5aa281a789 100644 (file)
--- 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\Model\GContact;
+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,18 +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;
                }
 
-               self::discoverDirectory($search);
-               return;
-       }
-
-       private static function discoverDirectory($search)
-       {
-               $data = Cache::get('discoverDirectory' . $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)) {
@@ -41,18 +51,17 @@ class SearchDirectory
                        }
                }
 
-               $x = Network::fetchUrl(get_server() . '/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;
                                        }
 
@@ -61,18 +70,18 @@ class SearchDirectory
                                        continue;
                                }
 
-                               $server_url = Contact::getBasepath($jj->url);
+                               $server_url = GContact::getBasepath($jj->url, true);
                                if ($server_url != '') {
                                        if (!GServer::check($server_url)) {
-                                               Logger::log("Friendica server doesn't answer.", ['server' => $server_url]);
+                                               Logger::info("Friendica server doesn't answer.", ['server' => $server_url]);
                                                continue;
                                        }
-                                       Logger::log('Friendica server seems to be okay.', ['server' => $server_url]);
+                                       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::log('Add profile to local directory', ['profile' => $jj->url]);
+                                       Logger::info('Add profile to local directory', ['profile' => $jj->url]);
 
                                        if ($jj->tags != '') {
                                                $data['keywords'] = $jj->tags;
@@ -82,10 +91,10 @@ class SearchDirectory
 
                                        GContact::update($data);
                                } else {
-                                       Logger::log('Profile is not responding or no Friendica contact', ['profile' => $jj->url, 'network' => $data['network']]);
+                                       Logger::info('Profile is not responding or no Friendica contact', ['profile' => $jj->url, 'network' => $data['network']]);
                                }
                        }
                }
-               Cache::set('discoverDirectory' . $search, time(), Cache::DAY);
+               DI::cache()->set('SearchDirectory:' . $search, time(), Duration::DAY);
        }
 }