Add search types

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

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 72df3420e804fe9555aa8286af89ef0cc483eff5..e8f5055c8642a95db7748acc23246ac28172c704 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -15,6 +15,7 @@ use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 class DiscoverPoCo
 {
@@ -80,7 +81,7 @@ class DiscoverPoCo
                                return;
                        }
                        $server_url = filter_var($server_url, FILTER_SANITIZE_URL);
-                       if (substr(normalise_link($server_url), 0, 7) != "http://") {
+                       if (substr(Strings::normaliseLink($server_url), 0, 7) != "http://") {
                                return;
                        }
                        $result = "Checking server ".$server_url." - ";
@@ -98,7 +99,7 @@ class DiscoverPoCo
                } elseif (($mode == 1) && ($search != "") && Config::get('system', 'poco_local_search')) {
                        self::discoverDirectory($search);
                        self::gsSearchUser($search);
-               } elseif (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') > 0)) {
+               } elseif (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') != PortableContact::DISABLED)) {
                        // Query Friendica and Hubzilla servers for their users
                        PortableContact::discover();
 
@@ -162,7 +163,7 @@ class DiscoverPoCo
                        $urlparts = parse_url($user["url"]);
                        if (!isset($urlparts["scheme"])) {
                                DBA::update('gcontact', ['network' => Protocol::PHANTOM],
-                                       ['nurl' => normalise_link($user["url"])]);
+                                       ['nurl' => Strings::normaliseLink($user["url"])]);
                                continue;
                         }
 
@@ -170,7 +171,7 @@ class DiscoverPoCo
                                $networks = ["twitter.com" => Protocol::TWITTER, "identi.ca" => Protocol::PUMPIO];
 
                                DBA::update('gcontact', ['network' => $networks[$urlparts["host"]]],
-                                       ['nurl' => normalise_link($user["url"])]);
+                                       ['nurl' => Strings::normaliseLink($user["url"])]);
                                continue;
                        }
 
@@ -179,7 +180,7 @@ class DiscoverPoCo
 
                        if ($user["server_url"] != "") {
 
-                               $force_update = (normalise_link($user["server_url"]) != normalise_link($server_url));
+                               $force_update = (Strings::normaliseLink($user["server_url"]) != Strings::normaliseLink($server_url));
 
                                $server_url = $user["server_url"];
                        }
@@ -193,7 +194,7 @@ class DiscoverPoCo
                                }
                        } else {
                                DBA::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
-                                       ['nurl' => normalise_link($user["url"])]);
+                                       ['nurl' => Strings::normaliseLink($user["url"])]);
                        }
 
                        // Quit the loop after 3 minutes
@@ -220,7 +221,7 @@ class DiscoverPoCo
                if (!empty($j->results)) {
                        foreach ($j->results as $jj) {
                                // Check if the contact already exists
-                               $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
+                               $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", Strings::normaliseLink($jj->url));
                                if (DBA::isResult($exists)) {
                                        Logger::log("Profile ".$jj->url." already exists (".$search.")", Logger::DEBUG);
 
@@ -266,6 +267,9 @@ class DiscoverPoCo
         * @brief Search for GNU Social user with gstools.org
         *
         * @param string $search User name
+        * @return bool
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function gsSearchUser($search) {