Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup

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

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 508914b48ff5d86d5345509c57d8bda5719bbfc5..29b5d4f65764b29c1f1b02ccb7e3ce3eff00ccc6 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -4,108 +4,25 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
 use Friendica\Model\GContact;
-use Friendica\Model\Contact;
-use Friendica\Model\GServer;
-use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
-use Friendica\Util\Strings;
 
 class DiscoverPoCo
 {
-       /// @todo Clean up this mess of a parameter hell and split it in several classes
-       public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
+       public static function execute()
        {
-               /*
-               This function can be called in these ways:
-               - checkcontact: Updates gcontact entries
-               - server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
-               - update_server: Frequently check the first 250 servers for vitality.
-               - PortableContact::load: Load POCO data from a given POCO address
-               */
-
-               $search = "";
-               $mode = 0;
-               if ($command == "server") {
-                       $server_url = $param1;
-                       if ($server_url == "") {
-                               return;
-                       }
-                       $server_url = filter_var($server_url, FILTER_SANITIZE_URL);
-                       if (substr(Strings::normaliseLink($server_url), 0, 7) != "http://") {
-                               return;
-                       }
-                       $result = "Checking server ".$server_url." - ";
-                       $ret = GServer::check($server_url);
-                       if ($ret) {
-                               $result .= "success";
-                       } else {
-                               $result .= "failed";
-                       }
-                       Logger::log($result, Logger::DEBUG);
-               } elseif ($command == "update_server") {
-                       self::updateServer();
-               } elseif ($command == "load") {
-                       if (!empty($param4)) {
-                               $url = $param4;
-                       } else {
-                               $url = '';
-                       }
-                       PortableContact::load(intval($param1), intval($param2), intval($param3), $url);
-               } elseif ($command !== "") {
-                       Logger::log("Unknown or missing parameter ".$command."\n");
-                       return;
-               }
-
-               Logger::log('start '.$search);
-
-               if (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') != PortableContact::DISABLED)) {
-                       // Query Friendica and Hubzilla servers for their users
-                       PortableContact::discover();
-
-                       // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
-                       if (!Config::get('system', 'ostatus_disabled')) {
-                               GContact::discoverGsUsers();
-                       }
-               }
-
-               Logger::log('end '.$search);
-
-               return;
-       }
-
-       /**
-        * @brief Updates the first 250 servers
-        *
-        */
-       private static function updateServer() {
-               $r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
-
-               if (!DBA::isResult($r)) {
+               if (Config::get('system', 'poco_discovery') == PortableContact::DISABLED) {
                        return;
                }
 
-               $updated = 0;
-
-               foreach ($r AS $server) {
-                       if (!PortableContact::updateNeeded($server["created"], "", $server["last_failure"], $server["last_contact"])) {
-                               continue;
-                       }
-                       Logger::log('Update server status for server '.$server["url"], Logger::DEBUG);
-
-                       Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server["url"]);
+               // Query Friendica and Hubzilla servers for their users
+               PortableContact::discover();
 
-                       if (++$updated > 250) {
-                               return;
-                       }
+               // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
+               if (!Config::get('system', 'ostatus_disabled')) {
+                       GContact::discoverGsUsers();
                }
        }
 }