Merge pull request #8272 from MrPetovan/bug/8254-regex-url-img

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

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 63bc4e0d84e56ea6b4eaa8f46937035b17505163..c099a5e28a3dad0f0b1b1e6057a5f86d9521ec6f 100644 (file)
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -1,16 +1,33 @@
 <?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\GContact;
-use Friendica\Model\Contact;
 use Friendica\Model\GServer;
 use Friendica\Network\Probe;
 use Friendica\Util\Network;
@@ -21,18 +38,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,7 +52,7 @@ class SearchDirectory
                        }
                }
 
-               $x = Network::fetchUrl(get_server() . '/lsearch?p=1&n=500&search=' . urlencode($search));
+               $x = Network::fetchUrl(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
                $j = json_decode($x);
 
                if (!empty($j->results)) {
@@ -61,7 +72,7 @@ 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::info("Friendica server doesn't answer.", ['server' => $server_url]);
@@ -86,6 +97,6 @@ class SearchDirectory
                                }
                        }
                }
-               Cache::set('discoverDirectory' . $search, time(), Cache::DAY);
+               DI::cache()->set('SearchDirectory:' . $search, time(), Duration::DAY);
        }
 }