Fixings

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

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 63bc4e0d84e56ea6b4eaa8f46937035b17505163..4503f21ca6006968da6e5d37c4d113091745c9de 100644 (file)
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -8,9 +8,9 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\Model\GContact;
-use Friendica\Model\Contact;
 use Friendica\Model\GServer;
 use Friendica\Network\Probe;
 use Friendica\Util\Network;
@@ -26,13 +26,7 @@ class SearchDirectory
                        return;
                }
 
-               self::discoverDirectory($search);
-               return;
-       }
-
-       private static function discoverDirectory($search)
-       {
-               $data = Cache::get('discoverDirectory' . $search);
+               $data = 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 +35,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 +55,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 +80,6 @@ class SearchDirectory
                                }
                        }
                }
-               Cache::set('discoverDirectory' . $search, time(), Cache::DAY);
+               Cache::set('SearchDirectory:' . $search, time(), Cache::DAY);
        }
 }