]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/GServer.php
Changes:
[friendica.git] / src / Model / GServer.php
index 8cc1b5d016bfc8783e1601dac4926cdfe4155195..a3f0c26077ecfd5718dc655f751d428988aa0ed6 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,19 +26,26 @@ use DOMXPath;
 use Exception;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
+use Friendica\Network\HTTPException;
+use Friendica\Worker\UpdateGServer;
+use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Message\UriInterface;
 
 /**
  * This class handles GServer related functions
@@ -56,8 +63,15 @@ class GServer
        const DETECT_MANUAL = 0;
        const DETECT_HEADER = 1;
        const DETECT_BODY = 2;
+       const DETECT_HOST_META = 3;
+       const DETECT_CONTACTS = 4;
+       const DETECT_AP_ACTOR = 5;
+       const DETECT_AP_COLLECTION = 6;
+
+       const DETECT_UNSPECIFIC = [self::DETECT_MANUAL, self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_HOST_META, self::DETECT_CONTACTS, self::DETECT_AP_ACTOR];
 
        // Implementation specific endpoints
+       // @todo Possibly add Lemmy detection via the endpoint /api/v3/site
        const DETECT_FRIENDIKA = 10;
        const DETECT_FRIENDICA = 11;
        const DETECT_STATUSNET = 12;
@@ -67,27 +81,30 @@ class GServer
        const DETECT_MASTODON_API = 16;
        const DETECT_STATUS_PHP = 17; // Nextcloud
        const DETECT_V1_CONFIG = 18;
-       const DETECT_PUMPIO = 19;
+       const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap
+       const DETECT_THREADS = 21;
 
        // Standardized endpoints
        const DETECT_STATISTICS_JSON = 100;
        const DETECT_NODEINFO_1 = 101;
        const DETECT_NODEINFO_2 = 102;
+       const DETECT_NODEINFO_210 = 103;
 
        /**
-        * Check for the existance of a server and adds it in the background if not existant
+        * Check for the existence of a server and adds it in the background if not existant
         *
         * @param string $url
         * @param boolean $only_nodeinfo
+        *
         * @return void
         */
        public static function add(string $url, bool $only_nodeinfo = false)
        {
-               if (self::getID($url, false)) {
+               if (self::getID($url)) {
                        return;
                }
 
-               Worker::add(PRIORITY_LOW, 'UpdateGServer', $url, $only_nodeinfo);
+               UpdateGServer::add(Worker::PRIORITY_LOW, $url, $only_nodeinfo);
        }
 
        /**
@@ -95,19 +112,27 @@ class GServer
         *
         * @param string $url
         * @param boolean $no_check Don't check if the server hadn't been found
-        * @return int gserver id
+        *
+        * @return int|null gserver id or NULL on empty URL or failed check
         */
-       public static function getID(string $url, bool $no_check = false)
+       public static function getID(string $url, bool $no_check = false): ?int
        {
+               $url = self::cleanURL($url);
+
                if (empty($url)) {
                        return null;
                }
 
-               $url = self::cleanURL($url);
-
                $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
                if (DBA::isResult($gserver)) {
-                       Logger::info('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]);
+                       Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url]);
+
+                       if (Network::isUrlBlocked($url)) {
+                               self::setBlockedById($gserver['id']);
+                       } else {
+                               self::setUnblockedById($gserver['id']);
+                       }
+
                        return $gserver['id'];
                }
 
@@ -124,6 +149,7 @@ class GServer
         * The pattern is a simple fnmatch() pattern with ? for single wildcard and * for multiple wildcard
         *
         * @param string $pattern
+        *
         * @return array
         * @throws Exception
         */
@@ -146,36 +172,118 @@ class GServer
        }
 
        /**
-        * Checks if the given server is reachable
+        * Checks if the given server array is unreachable for a long time now
         *
-        * @param string  $profile URL of the given profile
-        * @param string  $server  URL of the given server (If empty, taken from profile)
-        * @param string  $network Network value that is used, when detection failed
-        * @param boolean $force   Force an update.
+        * @param integer $gsid
+        * @return boolean
+        */
+       private static function isDefunct(array $gserver): bool
+       {
+               return ($gserver['failed'] || in_array($gserver['network'], Protocol::FEDERATED)) &&
+                       ($gserver['last_contact'] >= $gserver['created']) &&
+                       ($gserver['last_contact'] < $gserver['last_failure']) &&
+                       ($gserver['last_contact'] < DateTimeFormat::utc('now - 90 days'));
+       }
+
+       /**
+        * Checks if the given server id is unreachable for a long time now
         *
-        * @return boolean 'true' if server seems vital
+        * @param integer $gsid
+        * @return boolean
+        */
+       public static function isDefunctById(int $gsid): bool
+       {
+               $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'last_contact', 'last_failure', 'created', 'failed', 'network'], ['id' => $gsid]);
+               if (empty($gserver)) {
+                       return false;
+               } else {
+                       if (strtotime($gserver['next_contact']) < time()) {
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
+                       }
+
+                       return self::isDefunct($gserver);
+               }
+       }
+
+       /**
+        * Checks if the given server id is reachable
+        *
+        * @param integer $gsid
+        * @return boolean
         */
-       public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false)
+       public static function isReachableById(int $gsid): bool
        {
-               if ($server == '') {
-                       $contact = Contact::getByURL($profile, null, ['baseurl']);
-                       if (!empty($contact['baseurl'])) {
-                               $server = $contact['baseurl'];
+               $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], ['id' => $gsid]);
+               if (empty($gserver)) {
+                       return true;
+               } else {
+                       if (strtotime($gserver['next_contact']) < time()) {
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
                        }
+
+                       return !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
                }
+       }
 
-               if ($server == '') {
+       /**
+        * Checks if the given server is reachable
+        *
+        * @param array $contact Contact that should be checked
+        *
+        * @return boolean 'true' if server seems vital
+        */
+       public static function reachable(array $contact): bool
+       {
+               if (!empty($contact['gsid'])) {
+                       $gsid = $contact['gsid'];
+               } elseif (!empty($contact['baseurl'])) {
+                       $server = $contact['baseurl'];
+               } elseif ($contact['network'] == Protocol::DIASPORA) {
+                       $parts = (array)parse_url($contact['url']);
+                       unset($parts['path']);
+                       $server = (string)Uri::fromParts($parts);
+               } else {
                        return true;
                }
 
-               return self::check($server, $network, $force);
+               if (!empty($gsid)) {
+                       $condition = ['id' => $gsid];
+               } else {
+                       $condition = ['nurl' => Strings::normaliseLink($server)];
+               }
+
+               $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], $condition);
+               if (empty($gserver)) {
+                       $reachable = true;
+               } else {
+                       $reachable = !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
+                       $server    = $gserver['url'];
+               }
+
+               if (!empty($server) && (empty($gserver) || strtotime($gserver['next_contact']) < time())) {
+                       UpdateGServer::add(Worker::PRIORITY_LOW, $server);
+               }
+
+               return $reachable;
        }
 
-       public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '')
+       /**
+        * Calculate the next update day
+        *
+        * @param bool $success
+        * @param string $created
+        * @param string $last_contact
+        * @param bool $undetected
+        *
+        * @return string
+        * @throws Exception
+        */
+       public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '', bool $undetected = false): string
        {
-               // On successful contact process check again next week
+               // On successful contact process check again next week when it is a detected system.
+               // When we haven't detected the system, it could be a static website or a really old system.
                if ($success) {
-                       return DateTimeFormat::utc('now +7 day');
+                       return DateTimeFormat::utc($undetected ? 'now +1 month' : 'now +7 day');
                }
 
                $now = strtotime(DateTimeFormat::utcNow());
@@ -216,7 +324,7 @@ class GServer
                        return DateTimeFormat::utc('now +1 month');
                }
 
-               // The system hadn't been successul contacted for more than a month, so try again in three months
+               // The system hadn't been successful contacted for more than a month, so try again in three months
                return DateTimeFormat::utc('now +3 month');
        }
 
@@ -230,19 +338,25 @@ class GServer
         *
         * @return boolean 'true' if server seems vital
         */
-       public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false)
+       public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false): bool
        {
                $server_url = self::cleanURL($server_url);
                if ($server_url == '') {
                        return false;
                }
 
+               if (Network::isUrlBlocked($server_url)) {
+                       Logger::info('Server is blocked', ['url' => $server_url]);
+                       self::setBlockedByUrl($server_url);
+                       return false;
+               }
+
                $gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($server_url)]);
                if (DBA::isResult($gserver)) {
                        if ($gserver['created'] <= DBA::NULL_DATETIME) {
                                $fields = ['created' => DateTimeFormat::utcNow()];
                                $condition = ['nurl' => Strings::normaliseLink($server_url)];
-                               DBA::update('gserver', $fields, $condition);
+                               self::update($fields, $condition);
                        }
 
                        if (!$force && (strtotime($gserver['next_contact']) > time())) {
@@ -257,58 +371,164 @@ class GServer
                return self::detect($server_url, $network, $only_nodeinfo);
        }
 
+       /**
+        * Reset failed server status by gserver id
+        *
+        * @param int    $gsid
+        * @param string $network
+        */
+       public static function setReachableById(int $gsid, string $network)
+       {
+               $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact', 'network'], ['id' => $gsid]);
+               if (!DBA::isResult($gserver)) {
+                       return;
+               }
+
+               $blocked = Network::isUrlBlocked($gserver['url']);
+               if ($gserver['failed']) {
+                       $fields = ['failed' => false, 'blocked' => $blocked, 'last_contact' => DateTimeFormat::utcNow()];
+                       if (!empty($network) && !in_array($gserver['network'], Protocol::FEDERATED)) {
+                               $fields['network'] = $network;
+                       }
+                       self::update($fields, ['id' => $gsid]);
+                       Logger::info('Reset failed status for server', ['url' => $gserver['url']]);
+
+                       if (strtotime($gserver['next_contact']) < time()) {
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
+                       }
+               } elseif ($blocked) {
+                       self::setBlockedById($gsid);
+               } else {
+                       self::setUnblockedById($gsid);
+               }
+       }
+
+       /**
+        * Set failed server status by gserver id
+        *
+        * @param int $gsid
+        */
+       public static function setFailureById(int $gsid)
+       {
+               $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact'], ['id' => $gsid]);
+               if (DBA::isResult($gserver) && !$gserver['failed']) {
+                       self::update(['failed' => true, 'blocked' => Network::isUrlBlocked($gserver['url']), 'last_failure' => DateTimeFormat::utcNow()], ['id' => $gsid]);
+                       Logger::info('Set failed status for server', ['url' => $gserver['url']]);
+
+                       if (strtotime($gserver['next_contact']) < time()) {
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
+                       }
+               }
+       }
+
+       public static function setUnblockedById(int $gsid)
+       {
+               $gserver = DBA::selectFirst('gserver', ['url'], ["(`blocked` OR `blocked` IS NULL) AND `id` = ?", $gsid]);
+               if (DBA::isResult($gserver)) {
+                       self::update(['blocked' => false], ['id' => $gsid]);
+                       Logger::info('Set unblocked status for server', ['url' => $gserver['url']]);
+               }
+       }
+
+       public static function setBlockedById(int $gsid)
+       {
+               $gserver = DBA::selectFirst('gserver', ['url'], ["(NOT `blocked` OR `blocked` IS NULL) AND `id` = ?", $gsid]);
+               if (DBA::isResult($gserver)) {
+                       self::update(['blocked' => true, 'failed' => true], ['id' => $gsid]);
+                       Logger::info('Set blocked status for server', ['url' => $gserver['url']]);
+               }
+       }
+
+       public static function setBlockedByUrl(string $url)
+       {
+               $gserver = DBA::selectFirst('gserver', ['url', 'id'], ["(NOT `blocked` OR `blocked` IS NULL) AND `nurl` = ?", Strings::normaliseLink($url)]);
+               if (DBA::isResult($gserver)) {
+                       self::update(['blocked' => true, 'failed' => true], ['id' => $gserver['id']]);
+                       Logger::info('Set blocked status for server', ['url' => $gserver['url']]);
+               }
+       }
+
        /**
         * Set failed server status
         *
         * @param string $url
+        * @return void
         */
-       public static function setFailure(string $url)
+       public static function setFailureByUrl(string $url)
        {
-               $gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($url)]);
+               $nurl = Strings::normaliseLink($url);
+
+               $gserver = DBA::selectFirst('gserver', [], ['nurl' => $nurl]);
                if (DBA::isResult($gserver)) {
                        $next_update = self::getNextUpdateDate(false, $gserver['created'], $gserver['last_contact']);
-                       DBA::update('gserver', ['failed' => true, 'last_failure' => DateTimeFormat::utcNow(),
-                       'next_contact' => $next_update, 'detection-method' => null],
-                       ['nurl' => Strings::normaliseLink($url)]);
+                       self::update(['url' => $url, 'failed' => true, 'blocked' => Network::isUrlBlocked($url), 'last_failure' => DateTimeFormat::utcNow(),
+                       'next_contact' => $next_update, 'network' => Protocol::PHANTOM, 'detection-method' => null],
+                       ['nurl' => $nurl]);
                        Logger::info('Set failed status for existing server', ['url' => $url]);
+                       if (self::isDefunct($gserver)) {
+                               self::archiveContacts($gserver['id']);
+                       }
                        return;
                }
-               DBA::insert('gserver', ['url' => $url, 'nurl' => Strings::normaliseLink($url),
+
+               self::insert(['url' => $url, 'nurl' => $nurl,
                        'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(),
                        'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]);
                Logger::info('Set failed status for new server', ['url' => $url]);
        }
 
+       /**
+        * Archive server related contacts and inboxes
+        *
+        * @param integer $gsid
+        * @return void
+        */
+       private static function archiveContacts(int $gsid)
+       {
+               Contact::update(['archive' => true], ['gsid' => $gsid]);
+               DBA::update('inbox-status', ['archive' => true], ['gsid' => $gsid]);
+       }
+
        /**
         * Remove unwanted content from the given URL
         *
-        * @param string $url
+        * @param string $dirtyUrl
+        *
         * @return string cleaned URL
+        * @throws Exception
+        * @deprecated since 2023.03 Use cleanUri instead
         */
-       public static function cleanURL(string $url)
+       public static function cleanURL(string $dirtyUrl): string
        {
-               $url = trim($url, '/');
-               $url = str_replace('/index.php', '', $url);
-
-               $urlparts = parse_url($url);
-               unset($urlparts['user']);
-               unset($urlparts['pass']);
-               unset($urlparts['query']);
-               unset($urlparts['fragment']);
-               return Network::unparseURL($urlparts);
+               try {
+                       return (string)self::cleanUri(new Uri($dirtyUrl));
+               } catch (\Throwable $e) {
+                       Logger::warning('Invalid URL', ['dirtyUrl' => $dirtyUrl]);
+                       return '';
+               }
        }
 
        /**
-        * Return the base URL
+        * Remove unwanted content from the given URI
         *
-        * @param string $url
-        * @return string base URL
+        * @param UriInterface $dirtyUri
+        *
+        * @return UriInterface cleaned URI
+        * @throws Exception
         */
-       private static function getBaseURL(string $url)
+       public static function cleanUri(UriInterface $dirtyUri): string
        {
-               $urlparts = parse_url(self::cleanURL($url));
-               unset($urlparts['path']);
-               return Network::unparseURL($urlparts);
+               return $dirtyUri
+                       ->withUserInfo('')
+                       ->withQuery('')
+                       ->withFragment('')
+                       ->withPath(
+                               preg_replace(
+                                       '#(?:^|/)index\.php#',
+                                       '',
+                                       rtrim($dirtyUri->getPath(), '/')
+                               )
+                       );
        }
 
        /**
@@ -321,171 +541,197 @@ class GServer
         *
         * @return boolean 'true' if server could be detected
         */
-       public static function detect(string $url, string $network = '', bool $only_nodeinfo = false)
+       private static function detect(string $url, string $network = '', bool $only_nodeinfo = false): bool
        {
                Logger::info('Detect server type', ['server' => $url]);
-               $serverdata = ['detection-method' => self::DETECT_MANUAL];
 
                $original_url = $url;
 
                // Remove URL content that is not supposed to exist for a server url
-               $url = self::cleanURL($url);
+               $url = rtrim(self::cleanURL($url), '/');
+               if (empty($url)) {
+                       Logger::notice('Empty URL.');
+                       return false;
+               }
+
+               // If the URL mismatches, then we mark the old entry as failure
+               if (!Strings::compareLink($url, $original_url)) {
+                       self::setFailureByUrl($original_url);
+                       if (!self::getID($url, true) && !Network::isUrlBlocked($url)) {
+                               self::detect($url, $network, $only_nodeinfo);
+                       }
+                       return false;
+               }
+
+               $valid_url = Network::isUrlValid($url);
+               if (!$valid_url) {
+                       self::setFailureByUrl($url);
+                       return false;
+               } else {
+                       $valid_url = rtrim($valid_url, '/');
+               }
+
+               if (!Strings::compareLink($url, $valid_url)) {
+                       // We only follow redirects when the path stays the same or the target url has no path.
+                       // Some systems have got redirects on their landing page to a single account page. This check handles it.
+                       if (((parse_url($url, PHP_URL_HOST) != parse_url($valid_url, PHP_URL_HOST)) && (parse_url($url, PHP_URL_PATH) == parse_url($valid_url, PHP_URL_PATH))) ||
+                               (((parse_url($url, PHP_URL_HOST) != parse_url($valid_url, PHP_URL_HOST)) || (parse_url($url, PHP_URL_PATH) != parse_url($valid_url, PHP_URL_PATH))) && empty(parse_url($valid_url, PHP_URL_PATH)))) {
+                               Logger::debug('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $valid_url]);
+                               self::setFailureByUrl($url);
+                               if (!self::getID($valid_url, true) && !Network::isUrlBlocked($valid_url)) {
+                                       self::detect($valid_url, $network, $only_nodeinfo);
+                               }
+                               return false;
+                       }
+
+                       if ((parse_url($url, PHP_URL_HOST) != parse_url($valid_url, PHP_URL_HOST)) && (parse_url($url, PHP_URL_PATH) != parse_url($valid_url, PHP_URL_PATH)) &&
+                               (parse_url($url, PHP_URL_PATH) == '')) {
+                               Logger::debug('Found redirect. Mark old entry as failure and redirect to the basepath.', ['old' => $url, 'new' => $valid_url]);
+                               $parts = (array)parse_url($valid_url);
+                               unset($parts['path']);
+                               $valid_url = (string)Uri::fromParts($parts);
 
-               // Get base URL
-               $baseurl = self::getBaseURL($url);
+                               self::setFailureByUrl($url);
+                               if (!self::getID($valid_url, true) && !Network::isUrlBlocked($valid_url)) {
+                                       self::detect($valid_url, $network, $only_nodeinfo);
+                               }
+                               return false;
+                       }
+                       Logger::debug('Found redirect, but ignore it.', ['old' => $url, 'new' => $valid_url]);
+               }
 
-               // If the URL missmatches, then we mark the old entry as failure
-               if ($url != $original_url) {
-                       /// @todo What to do with "next_contact" here?
-                       DBA::update('gserver', ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()],
-                               ['nurl' => Strings::normaliseLink($original_url)]);
+               if ((parse_url($url, PHP_URL_HOST) == parse_url($valid_url, PHP_URL_HOST)) &&
+                       (parse_url($url, PHP_URL_PATH) == parse_url($valid_url, PHP_URL_PATH)) &&
+                       (parse_url($url, PHP_URL_SCHEME) != parse_url($valid_url, PHP_URL_SCHEME))) {
+                       $url = $valid_url;
                }
 
+               $in_webroot = empty(parse_url($url, PHP_URL_PATH));
+
                // When a nodeinfo is present, we don't need to dig further
-               $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpClient()->get($url . '/.well-known/x-nodeinfo2', HttpClientAccept::JSON);
                if ($curlResult->isTimeout()) {
-                       self::setFailure($url);
+                       self::setFailureByUrl($url);
                        return false;
                }
 
-               // On a redirect follow the new host but mark the old one as failure
-               if ($curlResult->isSuccess() && !empty($curlResult->getRedirectUrl()) && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-                       $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
-                       if (!empty($curlResult->getRedirectUrl()) && parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
-                               Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
-                               self::setFailure($url);
-                               self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
-                               return false;
+               if (!empty($network) && !in_array($network, Protocol::NATIVE_SUPPORT)) {
+                       $serverdata = ['detection-method' => self::DETECT_MANUAL, 'network' => $network, 'platform' => '', 'version' => '', 'site_name' => '', 'info' => ''];
+               } else {
+                       $serverdata = self::parseNodeinfo210($curlResult);
+                       if (empty($serverdata)) {
+                               $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', HttpClientAccept::JSON);
+                               $serverdata = self::fetchNodeinfo($url, $curlResult);
                        }
                }
 
-               $nodeinfo = self::fetchNodeinfo($url, $curlResult);
-               if ($only_nodeinfo && empty($nodeinfo)) {
+               if ($only_nodeinfo && empty($serverdata)) {
                        Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]);
-                       self::setFailure($url);
+                       self::setFailureByUrl($url);
                        return false;
+               } elseif (empty($serverdata)) {
+                       $serverdata = ['detection-method' => self::DETECT_MANUAL, 'network' => Protocol::PHANTOM, 'platform' => '', 'version' => '', 'site_name' => '', 'info' => ''];
                }
 
-               // When nodeinfo isn't present, we use the older 'statistics.json' endpoint
-               if (empty($nodeinfo)) {
-                       $nodeinfo = self::fetchStatistics($url);
-               }
-
-               // If that didn't work out well, we use some protocol specific endpoints
-               // For Friendica and Zot based networks we have to dive deeper to reveal more details
-               if (empty($nodeinfo['network']) || in_array($nodeinfo['network'], [Protocol::DFRN, Protocol::ZOT])) {
-                       if (!empty($nodeinfo['detection-method'])) {
-                               $serverdata['detection-method'] = $nodeinfo['detection-method'];
-                       }
-
-                       // Fetch the landing page, possibly it reveals some data
-                       if (empty($nodeinfo['network'])) {
-                               if ($baseurl == $url) {
-                                       $basedata = $serverdata;
+               // When there is no Nodeinfo, then use some protocol specific endpoints
+               if ($serverdata['network'] == Protocol::PHANTOM) {
+                       if ($in_webroot) {
+                               // Fetch the landing page, possibly it reveals some data
+                               $accept = 'application/activity+json,application/ld+json,application/json,*/*;q=0.9';
+                               $curlResult = DI::httpClient()->get($url, $accept);
+                               if (!$curlResult->isSuccess() && $curlResult->getReturnCode() == '406') {
+                                       $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML);
+                                       $html_fetched = true;
                                } else {
-                                       $basedata = ['detection-method' => self::DETECT_MANUAL];
+                                       $html_fetched = false;
                                }
 
-                               $curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
-                                       if (!empty($curlResult->getRedirectUrl()) && (parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-                                               Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
-                                               self::setFailure($url);
-                                               self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
-                                               return false;
+                                       $json = json_decode($curlResult->getBodyString(), true);
+                                       if (!empty($json) && is_array($json)) {
+                                               $data = self::fetchDataFromSystemActor($json, $serverdata);
+                                               $serverdata = $data['server'];
+                                               $systemactor = $data['actor'];
+                                               if (!$html_fetched && !in_array($serverdata['detection-method'], [self::DETECT_SYSTEM_ACTOR, self::DETECT_AP_COLLECTION])) {
+                                                       $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML);
+                                               }
+                                       } elseif (!$html_fetched && (strlen($curlResult->getBodyString()) < 1000)) {
+                                               $curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML);
                                        }
 
-                                       $basedata = self::analyseRootHeader($curlResult, $basedata);
-                                       $basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
+                                       if ($serverdata['detection-method'] != self::DETECT_SYSTEM_ACTOR) {
+                                               $serverdata = self::analyseRootHeader($curlResult, $serverdata);
+                                               $serverdata = self::analyseRootBody($curlResult, $serverdata);
+                                       }
                                }
 
-                               if (!$curlResult->isSuccess() || empty($curlResult->getBody()) || self::invalidBody($curlResult->getBody())) {
-                                       self::setFailure($url);
+                               if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
+                                       self::setFailureByUrl($url);
                                        return false;
                                }
 
-                               if ($baseurl == $url) {
-                                       $serverdata = $basedata;
-                               } else {
-                                       // When the base path doesn't seem to contain a social network we try the complete path.
-                                       // Most detectable system have to be installed in the root directory.
-                                       // We checked the base to avoid false positives.
-                                       $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
-                                       if ($curlResult->isSuccess()) {
-                                               $urldata = self::analyseRootHeader($curlResult, $serverdata);
-                                               $urldata = self::analyseRootBody($curlResult, $urldata, $url);
-
-                                               $comparebase = $basedata;
-                                               unset($comparebase['info']);
-                                               unset($comparebase['site_name']);
-                                               $compareurl = $urldata;
-                                               unset($compareurl['info']);
-                                               unset($compareurl['site_name']);
-
-                                               // We assume that no one will install the identical system in the root and a subfolder
-                                               if (!empty(array_diff($comparebase, $compareurl))) {
-                                                       $serverdata = $urldata;
-                                               }
-                                       }
+                               if (in_array($url, ['https://www.threads.net', 'https://threads.net'])) {
+                                       $serverdata['detection-method'] = self::DETECT_THREADS;
+                                       $serverdata['network']          = Protocol::ACTIVITYPUB;
+                                       $serverdata['platform']         = 'threads';
                                }
-                       }
 
-                       if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB)) {
-                               $serverdata = self::detectMastodonAlikes($url, $serverdata);
+                               if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                       $serverdata = self::detectMastodonAlikes($url, $serverdata);
+                               }
                        }
 
                        // All following checks are done for systems that always have got a "host-meta" endpoint.
-                       // With this check we don't have to waste time and ressources for dead systems.
+                       // With this check we don't have to waste time and resources for dead systems.
                        // Also this hopefully prevents us from receiving abuse messages.
-                       if (empty($serverdata['network']) && !self::validHostMeta($url)) {
-                               self::setFailure($url);
-                               return false;
+                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                               $validHostMeta = self::validHostMeta($url);
+                       } else {
+                               $validHostMeta = false;
                        }
 
-                       if (empty($serverdata['network']) || in_array($serverdata['network'], [Protocol::DFRN, Protocol::ACTIVITYPUB])) {
-                               $serverdata = self::detectFriendica($url, $serverdata);
-                       }
+                       if ($validHostMeta) {
+                               if (in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_HEADER, self::DETECT_BODY])) {
+                                       $serverdata['detection-method'] = self::DETECT_HOST_META;
+                               }
 
-                       // the 'siteinfo.json' is some specific endpoint of Hubzilla and Red
-                       if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ZOT)) {
-                               $serverdata = self::fetchSiteinfo($url, $serverdata);
-                       }
+                               if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                       $serverdata = self::detectFriendica($url, $serverdata);
+                               }
 
-                       // The 'siteinfo.json' doesn't seem to be present on older Hubzilla installations
-                       if (empty($serverdata['network'])) {
-                               $serverdata = self::detectHubzilla($url, $serverdata);
-                       }
+                               // The following systems have to be installed in the root directory.
+                               if ($in_webroot) {
+                                       // the 'siteinfo.json' is some specific endpoint of Hubzilla and Red
+                                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                               $serverdata = self::fetchSiteinfo($url, $serverdata);
+                                       }
 
-                       if (empty($serverdata['network']) || in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) {
-                               $serverdata = self::detectPeertube($url, $serverdata);
-                       }
+                                       // The 'siteinfo.json' doesn't seem to be present on older Hubzilla installations, so we check other endpoints as well
+                                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                               $serverdata = self::detectHubzilla($url, $serverdata);
+                                       }
 
-                       if (empty($serverdata['network'])) {
-                               $serverdata = self::detectNextcloud($url, $serverdata);
-                       }
+                                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                               $serverdata = self::detectPeertube($url, $serverdata);
+                                       }
 
-                       if (empty($serverdata['network'])) {
-                               $serverdata = self::detectGNUSocial($url, $serverdata);
+                                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                               $serverdata = self::detectGNUSocial($url, $serverdata);
+                                       }
+                               }
+                       } elseif (in_array($serverdata['platform'], ['friendica', 'friendika']) && in_array($serverdata['detection-method'], array_merge(self::DETECT_UNSPECIFIC, [self::DETECT_SYSTEM_ACTOR]))) {
+                               $serverdata = self::detectFriendica($url, $serverdata);
                        }
 
-                       if (empty($serverdata['network'])) {
-                               $serverdata = self::detectPumpIO($url, $serverdata);
+                       if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                               $serverdata = self::detectNextcloud($url, $serverdata, $validHostMeta);
                        }
 
-                       $serverdata = array_merge($nodeinfo, $serverdata);
-               } else {
-                       $serverdata = $nodeinfo;
-               }
-
-               // Detect the directory type
-               $serverdata['directory-type'] = self::DT_NONE;
-               $serverdata = self::checkPoCo($url, $serverdata);
-               $serverdata = self::checkMastodonDirectory($url, $serverdata);
-
-               // We can't detect the network type. Possibly it is some system that we don't know yet
-               if (empty($serverdata['network'])) {
-                       $serverdata['network'] = Protocol::PHANTOM;
+                       // When nodeinfo isn't present, we use the older 'statistics.json' endpoint
+                       // Since this endpoint is only rarely used, we query it at a later time
+                       if (in_array($serverdata['detection-method'], array_merge(self::DETECT_UNSPECIFIC, [self::DETECT_FRIENDICA, self::DETECT_CONFIG_JSON]))) {
+                               $serverdata = self::fetchStatistics($url, $serverdata);
+                       }
                }
 
                // When we hadn't been able to detect the network type, we use the hint from the parameter
@@ -493,59 +739,119 @@ class GServer
                        $serverdata['network'] = $network;
                }
 
+               // Most servers aren't installed in a subdirectory, so we declare this entry as failed
+               if (($serverdata['network'] == Protocol::PHANTOM) && !empty(parse_url($url, PHP_URL_PATH)) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL])) {
+                       self::setFailureByUrl($url);
+                       return false;
+               }
+
                $serverdata['url'] = $url;
                $serverdata['nurl'] = Strings::normaliseLink($url);
 
-               // We take the highest number that we do find
-               $registeredUsers = $serverdata['registered-users'] ?? 0;
+               // We have to prevent an endless loop here.
+               // When a server is new, then there is no gserver entry yet.
+               // But in "detectNetworkViaContacts" it could happen that a contact is updated,
+               // and this can call this function here as well.
+               if (self::getID($url, true) && (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) ||
+                       in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_HOST_META]))) {
+                       $serverdata = self::detectNetworkViaContacts($url, $serverdata);
+               }
+
+               if (($serverdata['network'] == Protocol::PHANTOM) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) {
+                       self::setFailureByUrl($url);
+                       return false;
+               }
 
-               // On an active server there has to be at least a single user
-               if (($serverdata['network'] != Protocol::PHANTOM) && ($registeredUsers == 0)) {
-                       $registeredUsers = 1;
+               if (empty($serverdata['version']) && in_array($serverdata['platform'], ['osada']) && in_array($serverdata['detection-method'], [self::DETECT_CONTACTS, self::DETECT_BODY])) {
+                       $serverdata['version'] = self::getNomadVersion($url);
                }
 
-               if ($serverdata['network'] == Protocol::PHANTOM) {
-                       $serverdata['registered-users'] = max($registeredUsers, 1);
-                       $serverdata = self::detectNetworkViaContacts($url, $serverdata);
+               // Detect the directory type
+               $serverdata['directory-type'] = self::DT_NONE;
+
+               if (in_array($serverdata['network'], Protocol::FEDERATED)) {
+                       $serverdata = self::checkMastodonDirectory($url, $serverdata);
+
+                       if ($serverdata['directory-type'] == self::DT_NONE) {
+                               $serverdata = self::checkPoCo($url, $serverdata);
+                       }
                }
 
-               $serverdata['next_contact'] = self::getNextUpdateDate(true);
+               if ($serverdata['network'] == Protocol::ACTIVITYPUB) {
+                       $serverdata = self::fetchWeeklyUsage($url, $serverdata);
+               }
 
+               $serverdata['registered-users'] = $serverdata['registered-users'] ?? 0;
+               $serverdata['next_contact'] = self::getNextUpdateDate(true, '', '', in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]));
                $serverdata['last_contact'] = DateTimeFormat::utcNow();
                $serverdata['failed'] = false;
 
+               // Numbers above a reasonable value (10 millions) are ignored
+               if ($serverdata['registered-users'] > 10000000) {
+                       $serverdata['registered-users'] = 0;
+               }
+
+               // On an active server there has to be at least a single user
+               if (!in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) && ($serverdata['registered-users'] <= 0)) {
+                       $serverdata['registered-users'] = 1;
+               } elseif (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
+                       $serverdata['registered-users'] = 0;
+               }
+
+               $serverdata['next_contact'] = self::getNextUpdateDate(true, '', '', in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]));
+               $serverdata['last_contact'] = DateTimeFormat::utcNow();
+               $serverdata['failed']       = false;
+               $serverdata['blocked']      = false;
+
                $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]);
                if (!DBA::isResult($gserver)) {
                        $serverdata['created'] = DateTimeFormat::utcNow();
-                       $ret = DBA::insert('gserver', $serverdata);
+                       $ret = self::insert($serverdata);
                        $id = DBA::lastInsertId();
                } else {
-                       // Don't override the network with 'unknown' when there had been a valid entry before
-                       if (($serverdata['network'] == Protocol::PHANTOM) && !empty($gserver['network'])) {
-                               unset($serverdata['network']);
-                       }
-
-                       $ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]);
+                       $ret = self::update($serverdata, ['nurl' => $serverdata['nurl']]);
                        $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]);
                        if (DBA::isResult($gserver)) {
                                $id = $gserver['id'];
                        }
                }
 
-               if (!empty($serverdata['network']) && !empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) {
+               // Count the number of known contacts from this server
+               if (!empty($id) && !in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
                        $apcontacts = DBA::count('apcontact', ['gsid' => $id]);
-                       $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id]);
-                       $max_users = max($apcontacts, $contacts, $registeredUsers, 1);
-                       if ($max_users > $registeredUsers) {
+                       $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]);
+                       $max_users = max($apcontacts, $contacts);
+                       if ($max_users > $serverdata['registered-users']) {
                                Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]);
-                               DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]);
+                               self::update(['registered-users' => $max_users], ['id' => $id]);
+                       }
+
+                       if (empty($serverdata['active-month-users'])) {
+                               $contacts = DBA::count('contact', ["`uid` = ? AND `gsid` = ? AND NOT `failed` AND `last-item` > ?", 0, $id, DateTimeFormat::utc('now - 30 days')]);
+                               if ($contacts > 0) {
+                                       Logger::info('Update monthly users', ['id' => $id, 'url' => $serverdata['nurl'], 'monthly-users' => $contacts]);
+                                       self::update(['active-month-users' => $contacts], ['id' => $id]);
+                               }
+                       }
+
+                       if (empty($serverdata['active-halfyear-users'])) {
+                               $contacts = DBA::count('contact', ["`uid` = ? AND `gsid` = ? AND NOT `failed` AND `last-item` > ?", 0, $id, DateTimeFormat::utc('now - 180 days')]);
+                               if ($contacts > 0) {
+                                       Logger::info('Update halfyear users', ['id' => $id, 'url' => $serverdata['nurl'], 'halfyear-users' => $contacts]);
+                                       self::update(['active-halfyear-users' => $contacts], ['id' => $id]);
+                               }
                        }
                }
 
-               if (!empty($serverdata['network']) && in_array($serverdata['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
+               if (in_array($serverdata['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
                        self::discoverRelay($url);
                }
 
+               if (!empty($systemactor)) {
+                       $contact = Contact::getByURL($systemactor, true, ['gsid', 'baseurl', 'id', 'network', 'url', 'name']);
+                       Logger::debug('Fetched system actor',  ['url' => $url, 'gsid' => $id, 'contact' => $contact]);
+               }
+
                return $ret;
        }
 
@@ -553,24 +859,26 @@ class GServer
         * Fetch relay data from a given server url
         *
         * @param string $server_url address of the server
+        *
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function discoverRelay(string $server_url)
        {
                Logger::info('Discover relay data', ['server' => $server_url]);
 
-               $curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay');
+               $curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay', HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
                        return;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (!is_array($data)) {
                        return;
                }
 
                // Sanitize incoming data, see https://github.com/friendica/friendica/issues/8565
-               $data['subscribe'] = (bool)$data['subscribe'] ?? false;
+               $data['subscribe'] = (bool)($data['subscribe'] ?? false);
 
                if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) {
                        $data['scope'] = '';
@@ -585,7 +893,7 @@ class GServer
 
                if (($gserver['relay-subscribe'] != $data['subscribe']) || ($gserver['relay-scope'] != $data['scope'])) {
                        $fields = ['relay-subscribe' => $data['subscribe'], 'relay-scope' => $data['scope']];
-                       DBA::update('gserver', $fields, ['id' => $gserver['id']]);
+                       self::update($fields, ['id' => $gserver['id']]);
                }
 
                DBA::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
@@ -652,21 +960,30 @@ class GServer
         *
         * @return array server data
         */
-       private static function fetchStatistics(string $url)
+       private static function fetchStatistics(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/statistics.json');
+               $curlResult = DI::httpClient()->get($url . '/statistics.json', HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
-                       return [];
+                       return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
-                       return [];
+                       return $serverdata;
                }
 
-               $serverdata = ['detection-method' => self::DETECT_STATISTICS_JSON];
+               // Some AP enabled systems return activity data that we don't expect here.
+               if (strpos($curlResult->getContentType(), 'application/activity+json') !== false) {
+                       return $serverdata;
+               }
+
+               $valid = false;
+               $old_serverdata = $serverdata;
+
+               $serverdata['detection-method'] = self::DETECT_STATISTICS_JSON;
 
                if (!empty($data['version'])) {
+                       $valid = true;
                        $serverdata['version'] = $data['version'];
                        // Version numbers on statistics.json are presented with additional info, e.g.:
                        // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
@@ -674,10 +991,12 @@ class GServer
                }
 
                if (!empty($data['name'])) {
+                       $valid = true;
                        $serverdata['site_name'] = $data['name'];
                }
 
                if (!empty($data['network'])) {
+                       $valid = true;
                        $serverdata['platform'] = strtolower($data['network']);
 
                        if ($serverdata['platform'] == 'diaspora') {
@@ -691,6 +1010,25 @@ class GServer
                        }
                }
 
+               if (!empty($data['total_users'])) {
+                       $valid = true;
+                       $serverdata['registered-users'] = max($data['total_users'], 1);
+               }
+
+               if (!empty($data['active_users_monthly'])) {
+                       $valid = true;
+                       $serverdata['active-month-users'] = max($data['active_users_monthly'], 0);
+               }
+
+               if (!empty($data['active_users_halfyear'])) {
+                       $valid = true;
+                       $serverdata['active-halfyear-users'] = max($data['active_users_halfyear'], 0);
+               }
+
+               if (!empty($data['local_posts'])) {
+                       $valid = true;
+                       $serverdata['local-posts'] = max($data['local_posts'], 0);
+               }
 
                if (!empty($data['registrations_open'])) {
                        $serverdata['register_policy'] = Register::OPEN;
@@ -698,6 +1036,10 @@ class GServer
                        $serverdata['register_policy'] = Register::CLOSED;
                }
 
+               if (!$valid) {
+                       return $old_serverdata;
+               }
+
                return $serverdata;
        }
 
@@ -708,15 +1050,16 @@ class GServer
         * @param ICanHandleHttpResponses $httpResult
         *
         * @return array Server data
+        *
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
+       private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult): array
        {
                if (!$httpResult->isSuccess()) {
                        return [];
                }
 
-               $nodeinfo = json_decode($httpResult->getBody(), true);
+               $nodeinfo = json_decode($httpResult->getBodyString(), true);
 
                if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
                        return [];
@@ -730,10 +1073,11 @@ class GServer
                                Logger::info('Invalid nodeinfo format', ['url' => $url]);
                                continue;
                        }
+
                        if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
-                               $nodeinfo1_url = $link['href'];
+                               $nodeinfo1_url = Network::addBasePath($link['href'], $httpResult->getUrl());
                        } elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
-                               $nodeinfo2_url = $link['href'];
+                               $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl());
                        }
                }
 
@@ -743,13 +1087,11 @@ class GServer
 
                $server = [];
 
-               // When the nodeinfo url isn't on the same host, then there is obviously something wrong
-               if (!empty($nodeinfo2_url) && (parse_url($url, PHP_URL_HOST) == parse_url($nodeinfo2_url, PHP_URL_HOST))) {
+               if (!empty($nodeinfo2_url)) {
                        $server = self::parseNodeinfo2($nodeinfo2_url);
                }
 
-               // When the nodeinfo url isn't on the same host, then there is obviously something wrong
-               if (empty($server) && !empty($nodeinfo1_url) && (parse_url($url, PHP_URL_HOST) == parse_url($nodeinfo1_url, PHP_URL_HOST))) {
+               if (empty($server) && !empty($nodeinfo1_url)) {
                        $server = self::parseNodeinfo1($nodeinfo1_url);
                }
 
@@ -760,18 +1102,19 @@ class GServer
         * Parses Nodeinfo 1
         *
         * @param string $nodeinfo_url address of the nodeinfo path
+        *
         * @return array Server data
+        *
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function parseNodeinfo1(string $nodeinfo_url)
+       private static function parseNodeinfo1(string $nodeinfo_url): array
        {
-               $curlResult = DI::httpClient()->get($nodeinfo_url);
-
+               $curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
 
-               $nodeinfo = json_decode($curlResult->getBody(), true);
+               $nodeinfo = json_decode($curlResult->getBodyString(), true);
 
                if (!is_array($nodeinfo)) {
                        return [];
@@ -805,13 +1148,147 @@ class GServer
                        $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1);
                }
 
-               if (!empty($nodeinfo['protocols']['inbound']) && is_array($nodeinfo['protocols']['inbound'])) {
+               if (!empty($nodeinfo['usage']['users']['activeMonth'])) {
+                       $server['active-month-users'] = max($nodeinfo['usage']['users']['activeMonth'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['users']['activeHalfyear'])) {
+                       $server['active-halfyear-users'] = max($nodeinfo['usage']['users']['activeHalfyear'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localPosts'])) {
+                       $server['local-posts'] = max($nodeinfo['usage']['localPosts'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localComments'])) {
+                       $server['local-comments'] = max($nodeinfo['usage']['localComments'], 0);
+               }
+
+               if (!empty($nodeinfo['protocols']['inbound']) && is_array($nodeinfo['protocols']['inbound'])) {
+                       $protocols = [];
+                       foreach ($nodeinfo['protocols']['inbound'] as $protocol) {
+                               $protocols[$protocol] = true;
+                       }
+
+                       if (!empty($protocols['friendica'])) {
+                               $server['network'] = Protocol::DFRN;
+                       } elseif (!empty($protocols['activitypub'])) {
+                               $server['network'] = Protocol::ACTIVITYPUB;
+                       } elseif (!empty($protocols['diaspora'])) {
+                               $server['network'] = Protocol::DIASPORA;
+                       } elseif (!empty($protocols['ostatus'])) {
+                               $server['network'] = Protocol::OSTATUS;
+                       } elseif (!empty($protocols['gnusocial'])) {
+                               $server['network'] = Protocol::OSTATUS;
+                       } elseif (!empty($protocols['zot'])) {
+                               $server['network'] = Protocol::ZOT;
+                       }
+               }
+
+               if (empty($server)) {
+                       return [];
+               }
+
+               if (empty($server['network'])) {
+                       $server['network'] = Protocol::PHANTOM;
+               }
+
+               return $server;
+       }
+
+       /**
+        * Parses Nodeinfo 2
+        *
+        * @see https://git.feneas.org/jaywink/nodeinfo2
+        *
+        * @param string $nodeinfo_url address of the nodeinfo path
+        *
+        * @return array Server data
+        *
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function parseNodeinfo2(string $nodeinfo_url): array
+       {
+               $curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess()) {
+                       return [];
+               }
+
+               $nodeinfo = json_decode($curlResult->getBodyString(), true);
+               if (!is_array($nodeinfo)) {
+                       return [];
+               }
+
+               $server = [
+                       'detection-method' => self::DETECT_NODEINFO_2,
+                       'register_policy' => Register::CLOSED,
+                       'platform' => 'unknown',
+               ];
+
+               if (!empty($nodeinfo['openRegistrations'])) {
+                       $server['register_policy'] = Register::OPEN;
+               }
+
+               if (!empty($nodeinfo['software'])) {
+                       if (isset($nodeinfo['software']['name'])) {
+                               $server['platform'] = strtolower($nodeinfo['software']['name']);
+                       }
+
+                       if (!empty($nodeinfo['software']['version']) && isset($server['platform'])) {
+                               $server['version'] = $nodeinfo['software']['version'];
+                               // Version numbers on Nodeinfo are presented with additional info, e.g.:
+                               // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
+                               $server['version'] = preg_replace('=(.+)-(.{4,})=ism', '$1', $server['version']);
+
+                               // qoto advertises itself as Mastodon
+                               if (($server['platform'] == 'mastodon') && substr($nodeinfo['software']['version'], -5) == '-qoto') {
+                                       $server['platform'] = 'qoto';
+                               }
+                       }
+               }
+
+               // Special treatment for NextCloud, since there you can freely define your software name
+               if (!empty($nodeinfo['rootUrl']) && in_array(parse_url($nodeinfo['rootUrl'], PHP_URL_PATH), ['/index.php/apps/social', '/apps/social'])) {
+                       $server['platform'] = 'nextcloud';
+               }
+
+               if (!empty($nodeinfo['metadata']['nodeName'])) {
+                       $server['site_name'] = $nodeinfo['metadata']['nodeName'];
+               }
+
+               if (!empty($nodeinfo['usage']['users']['total'])) {
+                       $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1);
+               }
+
+               if (!empty($nodeinfo['usage']['users']['activeMonth'])) {
+                       $server['active-month-users'] = max($nodeinfo['usage']['users']['activeMonth'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['users']['activeHalfyear'])) {
+                       $server['active-halfyear-users'] = max($nodeinfo['usage']['users']['activeHalfyear'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localPosts'])) {
+                       $server['local-posts'] = max($nodeinfo['usage']['localPosts'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localComments'])) {
+                       $server['local-comments'] = max($nodeinfo['usage']['localComments'], 0);
+               }
+
+               if (!empty($nodeinfo['protocols'])) {
                        $protocols = [];
-                       foreach ($nodeinfo['protocols']['inbound'] as $protocol) {
-                               $protocols[$protocol] = true;
+                       if (is_string($nodeinfo['protocols'])) {
+                               $protocols[$nodeinfo['protocols']] = true;
+                       } else {
+                               foreach ($nodeinfo['protocols'] as $protocol) {
+                                       if (is_string($protocol)) {
+                                               $protocols[$protocol] = true;
+                                       }
+                               }
                        }
 
-                       if (!empty($protocols['friendica'])) {
+                       if (!empty($protocols['dfrn'])) {
                                $server['network'] = Protocol::DFRN;
                        } elseif (!empty($protocols['activitypub'])) {
                                $server['network'] = Protocol::ACTIVITYPUB;
@@ -830,63 +1307,87 @@ class GServer
                        return [];
                }
 
+               if (empty($server['network'])) {
+                       $server['network'] = Protocol::PHANTOM;
+               }
+
                return $server;
        }
 
        /**
-        * Parses Nodeinfo 2
+        * Parses NodeInfo2 protocol 1.0
+        *
+        * @param ICanHandleHttpResponses $httpResult
         *
-        * @see https://git.feneas.org/jaywink/nodeinfo2
-        * @param string $nodeinfo_url address of the nodeinfo path
         * @return array Server data
+        * @see https://github.com/jaywink/nodeinfo2/blob/master/PROTOCOL.md
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function parseNodeinfo2(string $nodeinfo_url)
+       private static function parseNodeinfo210(ICanHandleHttpResponses $httpResult): array
        {
-               $curlResult = DI::httpClient()->get($nodeinfo_url);
-               if (!$curlResult->isSuccess()) {
+               if (!$httpResult->isSuccess()) {
                        return [];
                }
 
-               $nodeinfo = json_decode($curlResult->getBody(), true);
+               $nodeinfo = json_decode($httpResult->getBodyString(), true);
 
                if (!is_array($nodeinfo)) {
                        return [];
                }
 
-               $server = ['detection-method' => self::DETECT_NODEINFO_2,
+               $server = ['detection-method' => self::DETECT_NODEINFO_210,
                        'register_policy' => Register::CLOSED];
 
                if (!empty($nodeinfo['openRegistrations'])) {
                        $server['register_policy'] = Register::OPEN;
                }
 
-               if (is_array($nodeinfo['software'])) {
-                       if (!empty($nodeinfo['software']['name'])) {
-                               $server['platform'] = strtolower($nodeinfo['software']['name']);
+               if (!empty($nodeinfo['server'])) {
+                       if (!empty($nodeinfo['server']['software'])) {
+                               $server['platform'] = strtolower($nodeinfo['server']['software']);
                        }
 
-                       if (!empty($nodeinfo['software']['version'])) {
-                               $server['version'] = $nodeinfo['software']['version'];
+                       if (!empty($nodeinfo['server']['version'])) {
+                               $server['version'] = $nodeinfo['server']['version'];
                                // Version numbers on Nodeinfo are presented with additional info, e.g.:
                                // 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
                                $server['version'] = preg_replace('=(.+)-(.{4,})=ism', '$1', $server['version']);
                        }
-               }
 
-               if (!empty($nodeinfo['metadata']['nodeName'])) {
-                       $server['site_name'] = $nodeinfo['metadata']['nodeName'];
+                       if (!empty($nodeinfo['server']['name'])) {
+                               $server['site_name'] = $nodeinfo['server']['name'];
+                       }
                }
 
                if (!empty($nodeinfo['usage']['users']['total'])) {
                        $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1);
                }
 
+               if (!empty($nodeinfo['usage']['users']['activeMonth'])) {
+                       $server['active-month-users'] = max($nodeinfo['usage']['users']['activeMonth'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['users']['activeHalfyear'])) {
+                       $server['active-halfyear-users'] = max($nodeinfo['usage']['users']['activeHalfyear'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localPosts'])) {
+                       $server['local-posts'] = max($nodeinfo['usage']['localPosts'], 0);
+               }
+
+               if (!empty($nodeinfo['usage']['localComments'])) {
+                       $server['local-comments'] = max($nodeinfo['usage']['localComments'], 0);
+               }
+
                if (!empty($nodeinfo['protocols'])) {
                        $protocols = [];
-                       foreach ($nodeinfo['protocols'] as $protocol) {
-                               if (is_string($protocol)) {
-                                       $protocols[$protocol] = true;
+                       if (is_string($nodeinfo['protocols'])) {
+                               $protocols[$nodeinfo['protocols']] = true;
+                       } else {
+                               foreach ($nodeinfo['protocols'] as $protocol) {
+                                       if (is_string($protocol)) {
+                                               $protocols[$protocol] = true;
+                                       }
                                }
                        }
 
@@ -905,10 +1406,14 @@ class GServer
                        }
                }
 
-               if (empty($server)) {
+               if (empty($server) || empty($server['platform'])) {
                        return [];
                }
 
+               if (empty($server['network'])) {
+                       $server['network'] = Protocol::PHANTOM;
+               }
+
                return $server;
        }
 
@@ -920,25 +1425,25 @@ class GServer
         *
         * @return array server data
         */
-       private static function fetchSiteinfo(string $url, array $serverdata)
+       private static function fetchSiteinfo(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/siteinfo.json');
+               $curlResult = DI::httpClient()->get($url . '/siteinfo.json', HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
 
-               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+               if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                        $serverdata['detection-method'] = self::DETECT_SITEINFO_JSON;
                }
 
-               if (!empty($data['url'])) {
+               if (!empty($data['platform'])) {
                        $serverdata['platform'] = strtolower($data['platform']);
-                       $serverdata['version'] = $data['version'];
+                       $serverdata['version'] = $data['version'] ?? 'N/A';
                }
 
                if (!empty($data['plugins'])) {
@@ -961,6 +1466,22 @@ class GServer
                        $serverdata['registered-users'] = max($data['channels_total'], 1);
                }
 
+               if (!empty($data['channels_active_monthly'])) {
+                       $serverdata['active-month-users'] = max($data['channels_active_monthly'], 0);
+               }
+
+               if (!empty($data['channels_active_halfyear'])) {
+                       $serverdata['active-halfyear-users'] = max($data['channels_active_halfyear'], 0);
+               }
+
+               if (!empty($data['local_posts'])) {
+                       $serverdata['local-posts'] = max($data['local_posts'], 0);
+               }
+
+               if (!empty($data['local_comments'])) {
+                       $serverdata['local-comments'] = max($data['local_comments'], 0);
+               }
+
                if (!empty($data['register_policy'])) {
                        switch ($data['register_policy']) {
                                case 'REGISTER_OPEN':
@@ -981,6 +1502,121 @@ class GServer
                return $serverdata;
        }
 
+       /**
+        * Fetches server data via an ActivityPub account with url of that server
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        *
+        * @throws Exception
+        */
+       private static function fetchDataFromSystemActor(array $data, array $serverdata): array
+       {
+               if (empty($data)) {
+                       return ['server' => $serverdata, 'actor' => ''];
+               }
+
+               $actor = JsonLD::compact($data, false);
+               if (in_array(JsonLD::fetchElement($actor, '@type'), ActivityPub\Receiver::ACCOUNT_TYPES)) {
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       $serverdata['site_name'] = JsonLD::fetchElement($actor, 'as:name', '@value');
+                       $serverdata['info'] = JsonLD::fetchElement($actor, 'as:summary', '@value');
+                       if (self::isNomad($actor)) {
+                               $serverdata['platform'] = self::getNomadName($actor['@id']);
+                               $serverdata['version'] = self::getNomadVersion($actor['@id']);
+                               $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+                       } elseif (!empty($actor['as:generator'])) {
+                               $generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value'));
+                               $serverdata['platform'] = strtolower(array_shift($generator));
+                               $serverdata['version'] = self::getNomadVersion($actor['@id']);
+                               $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+                       } else {
+                               $serverdata['detection-method'] = self::DETECT_AP_ACTOR;
+                       }
+                       return ['server' => $serverdata, 'actor' => $actor['@id']];
+               } elseif ((JsonLD::fetchElement($actor, '@type') == 'as:Collection')) {
+                       // By now only Ktistec seems to provide collections this way
+                       $serverdata['platform'] = 'ktistec';
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       $serverdata['detection-method'] = self::DETECT_AP_COLLECTION;
+
+                       $actors = JsonLD::fetchElementArray($actor, 'as:items');
+                       if (!empty($actors) && !empty($actors[0]['@id'])) {
+                               $actor_url = $actor['@id'] . $actors[0]['@id'];
+                       } else {
+                               $actor_url = '';
+                       }
+
+                       return ['server' => $serverdata, 'actor' => $actor_url];
+               }
+               return ['server' => $serverdata, 'actor' => ''];
+       }
+
+       /**
+        * Detect if the given actor is a nomad account
+        *
+        * @param array $actor
+        * @return boolean
+        */
+       private static function isNomad(array $actor): bool
+       {
+               $tags = JsonLD::fetchElementArray($actor, 'as:tag');
+               if (empty($tags)) {
+                       return false;
+               }
+
+               foreach ($tags as $tag) {
+                       if ((($tag['as:name'] ?? '') == 'Protocol') && in_array('nomad', [$tag['sc:value'] ?? '', $tag['as:content'] ?? ''])) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       /**
+        * Fetch the name of Nomad implementation
+        *
+        * @param string $url
+        * @return string
+        */
+       private static function getNomadName(string $url): string
+       {
+               $name = 'nomad';
+               $curlResult = DI::httpClient()->get($url . '/manifest', 'application/manifest+json');
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
+                       return $name;
+               }
+
+               $data = json_decode($curlResult->getBodyString(), true);
+               if (empty($data)) {
+                       return $name;
+               }
+
+               return $data['name'] ?? $name;
+       }
+
+       /**
+        * Fetch the version of the Nomad installation
+        *
+        * @param string $url
+        * @return string
+        */
+       private static function getNomadVersion(string $url): string
+       {
+               $curlResult = DI::httpClient()->get($url . '/api/z/1.0/version', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
+                       return '';
+               }
+
+               $data = json_decode($curlResult->getBodyString(), true);
+               if (empty($data)) {
+                       return '';
+               }
+               return $data ?? '';
+       }
+
        /**
         * Checks if the server contains a valid host meta file
         *
@@ -988,15 +1624,15 @@ class GServer
         *
         * @return boolean 'true' if the server seems to be vital
         */
-       private static function validHostMeta(string $url)
+       private static function validHostMeta(string $url): bool
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpClient()->get($url . Probe::HOST_META, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
 
-               $xrd = XML::parseString($curlResult->getBody());
+               $xrd = XML::parseString($curlResult->getBodyString(), true);
                if (!is_object($xrd)) {
                        return false;
                }
@@ -1034,17 +1670,19 @@ class GServer
         *
         * @return array server data
         */
-       private static function detectNetworkViaContacts(string $url, array $serverdata)
+       private static function detectNetworkViaContacts(string $url, array $serverdata): array
        {
                $contacts = [];
 
-               $apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
+               $nurl = Strings::normaliseLink($url);
+
+               $apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $nurl]]);
                while ($apcontact = DBA::fetch($apcontacts)) {
                        $contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
                }
                DBA::close($apcontacts);
 
-               $pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
+               $pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $nurl]]);
                while ($pcontact = DBA::fetch($pcontacts)) {
                        $contacts[$pcontact['nurl']] = $pcontact['url'];
                }
@@ -1054,16 +1692,23 @@ class GServer
                        return $serverdata;
                }
 
+               $time = time();
                foreach ($contacts as $contact) {
-                       $probed = Contact::getByURL($contact);
-                       if (!empty($probed) && in_array($probed['network'], Protocol::FEDERATED)) {
-                               $serverdata['network'] = $probed['network'];
+                       // Endlosschleife verhindern wegen gsid!
+                       $data = Probe::uri($contact);
+                       if (in_array($data['network'], Protocol::FEDERATED)) {
+                               $serverdata['network'] = $data['network'];
+
+                               if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                                       $serverdata['detection-method'] = self::DETECT_CONTACTS;
+                               }
+                               break;
+                       } elseif ((time() - $time) > 10) {
+                               // To reduce the stress on remote systems we probe a maximum of 10 seconds
                                break;
                        }
                }
 
-               $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts), 1);
-
                return $serverdata;
        }
 
@@ -1077,16 +1722,16 @@ class GServer
         *
         * @return array server data
         */
-       private static function checkPoCo(string $url, array $serverdata)
+       private static function checkPoCo(string $url, array $serverdata): array
        {
                $serverdata['poco'] = '';
 
-               $curlResult = DI::httpClient()->get($url . '/poco');
+               $curlResult = DI::httpClient()->get($url . '/poco', HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
@@ -1109,14 +1754,14 @@ class GServer
         *
         * @return array server data
         */
-       public static function checkMastodonDirectory(string $url, array $serverdata)
+       public static function checkMastodonDirectory(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1');
+               $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1', HttpClientAccept::JSON);
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
@@ -1136,15 +1781,14 @@ class GServer
         *
         * @return array server data
         */
-       private static function detectPeertube(string $url, array $serverdata)
+       private static function detectPeertube(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/api/v1/config');
-
-               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/config', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
@@ -1168,7 +1812,7 @@ class GServer
                                }
                        }
 
-                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                                $serverdata['detection-method'] = self::DETECT_V1_CONFIG;
                        }
                }
@@ -1181,18 +1825,18 @@ class GServer
         *
         * @param string $url        URL of the given server
         * @param array  $serverdata array with server data
+        * @param bool   $validHostMeta
         *
         * @return array server data
         */
-       private static function detectNextcloud(string $url, array $serverdata)
+       private static function detectNextcloud(string $url, array $serverdata, bool $validHostMeta): array
        {
-               $curlResult = DI::httpClient()->get($url . '/status.php');
-
-               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+               $curlResult = DI::httpClient()->get($url . '/status.php', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
@@ -1200,9 +1844,12 @@ class GServer
                if (!empty($data['version'])) {
                        $serverdata['platform'] = 'nextcloud';
                        $serverdata['version'] = $data['version'];
-                       $serverdata['network'] = Protocol::ACTIVITYPUB;
 
-                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       if ($validHostMeta) {
+                               $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       }
+
+                       if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                                $serverdata['detection-method'] = self::DETECT_STATUS_PHP;
                        }
                }
@@ -1211,43 +1858,82 @@ class GServer
        }
 
        /**
-        * Detects data from a given server url if it was a mastodon alike system
+        * Fetches weekly usage data
         *
         * @param string $url        URL of the given server
         * @param array  $serverdata array with server data
         *
         * @return array server data
         */
-       private static function detectMastodonAlikes(string $url, array $serverdata)
+       private static function fetchWeeklyUsage(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/api/v1/instance');
-
-               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/instance/activity', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data)) {
                        return $serverdata;
                }
 
-               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
-                       $serverdata['detection-method'] = self::DETECT_MASTODON_API;
+               $current_week = [];
+               foreach ($data as $week) {
+                       // Use only data from a full week
+                       if (empty($week['week']) || (time() - $week['week']) < 7 * 24 * 60 * 60) {
+                               continue;
+                       }
+
+                       // Most likely the data is sorted correctly. But we better are safe than sorry
+                       if (empty($current_week['week']) || ($current_week['week'] < $week['week'])) {
+                               $current_week = $week;
+                       }
+               }
+
+               if (!empty($current_week['logins'])) {
+                       $serverdata['active-week-users'] = max($current_week['logins'], 0);
+               }
+
+               return $serverdata;
+       }
+
+       /**
+        * Detects data from a given server url if it was a mastodon alike system
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectMastodonAlikes(string $url, array $serverdata): array
+       {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/instance', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
+                       return $serverdata;
+               }
+
+               $data = json_decode($curlResult->getBodyString(), true);
+               if (empty($data)) {
+                       return $serverdata;
                }
 
+               $valid = false;
+
                if (!empty($data['version'])) {
                        $serverdata['platform'] = 'mastodon';
                        $serverdata['version'] = $data['version'] ?? '';
                        $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       $valid = true;
                }
 
                if (!empty($data['title'])) {
                        $serverdata['site_name'] = $data['title'];
                }
 
-               if (!empty($data['title']) && empty($serverdata['platform']) && empty($serverdata['network'])) {
+               if (!empty($data['title']) && empty($serverdata['platform']) && ($serverdata['network'] == Protocol::PHANTOM)) {
                        $serverdata['platform'] = 'mastodon';
                        $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       $valid = true;
                }
 
                if (!empty($data['description'])) {
@@ -1261,16 +1947,23 @@ class GServer
                if (!empty($serverdata['version']) && preg_match('/.*?\(compatible;\s(.*)\s(.*)\)/ism', $serverdata['version'], $matches)) {
                        $serverdata['platform'] = strtolower($matches[1]);
                        $serverdata['version'] = $matches[2];
+                       $valid = true;
                }
 
                if (!empty($serverdata['version']) && strstr(strtolower($serverdata['version']), 'pleroma')) {
                        $serverdata['platform'] = 'pleroma';
                        $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version']));
+                       $valid = true;
                }
 
                if (!empty($serverdata['platform']) && strstr($serverdata['platform'], 'pleroma')) {
                        $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform']));
                        $serverdata['platform'] = 'pleroma';
+                       $valid = true;
+               }
+
+               if ($valid && in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
+                       $serverdata['detection-method'] = self::DETECT_MASTODON_API;
                }
 
                return $serverdata;
@@ -1284,14 +1977,14 @@ class GServer
         *
         * @return array server data
         */
-       private static function detectHubzilla(string $url, array $serverdata)
+       private static function detectHubzilla(string $url, array $serverdata): array
        {
-               $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json');
-               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBodyString() == '')) {
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data) || empty($data['site'])) {
                        return $serverdata;
                }
@@ -1347,8 +2040,7 @@ class GServer
                        $serverdata['register_policy'] = Register::CLOSED;
                }
 
-               if (!empty($serverdata['network']) && in_array($serverdata['detection-method'],
-                       [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+               if (($serverdata['network'] != Protocol::PHANTOM) && in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                        $serverdata['detection-method'] = self::DETECT_CONFIG_JSON;
                }
 
@@ -1362,7 +2054,7 @@ class GServer
         *
         * @return boolean
         */
-       private static function toBoolean($val)
+       private static function toBoolean($val): bool
        {
                if (($val == 'true') || ($val == 1)) {
                        return true;
@@ -1373,56 +2065,6 @@ class GServer
                return $val;
        }
 
-       /**
-        * Detect if the URL belongs to a pump.io server
-        *
-        * @param string $url        URL of the given server
-        * @param array  $serverdata array with server data
-        *
-        * @return array server data
-        */
-       private static function detectPumpIO(string $url, array $serverdata)
-       {
-               $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta.json');
-               if (!$curlResult->isSuccess()) {
-                       return $serverdata;
-               }
-
-               $data = json_decode($curlResult->getBody(), true);
-               if (empty($data['links'])) {
-                       return $serverdata;
-
-               }
-
-               // We are looking for some endpoints that are typical for pump.io
-               $trust = 0;
-               foreach ($data['links'] as $link) {
-                       if (empty($link['rel'])) {
-                               continue;
-                       }
-                       if (in_array($link['rel'], ['registration_endpoint', 'dialback', 'http://apinamespace.org/activitypub/whoami'])) {
-                               ++$trust;
-                       }
-               }
-
-               if ($trust == 3) {
-                       $serverdata['detection-method'] = self::DETECT_PUMPIO;
-
-                       $serverdata['platform'] = 'pumpio';
-                       $serverdata['version']  = '';
-                       $serverdata['network']  = Protocol::PUMPIO;
-
-                       $servers = $curlResult->getHeader('Server');
-                       foreach ($servers as $server) {
-                               if (preg_match("#pump.io/(.*)\s#U", $server, $matches)) {
-                                       $serverdata['version']  = $matches[1];
-                               }
-                       }
-               }
-
-               return $serverdata;
-       }
-
        /**
         * Detect if the URL belongs to a GNU Social server
         *
@@ -1431,20 +2073,20 @@ class GServer
         *
         * @return array server data
         */
-       private static function detectGNUSocial(string $url, array $serverdata)
+       private static function detectGNUSocial(string $url, array $serverdata): array
        {
                // Test for GNU Social
-               $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json');
-               if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
-                       ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
+               $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json', HttpClientAccept::JSON);
+               if ($curlResult->isSuccess() && ($curlResult->getBodyString() != '{"error":"not implemented"}') &&
+                       ($curlResult->getBodyString() != '') && (strlen($curlResult->getBodyString()) < 30)) {
                        $serverdata['platform'] = 'gnusocial';
                        // Remove junk that some GNU Social servers return
-                       $serverdata['version'] = str_replace(chr(239) . chr(187) . chr(191), '', $curlResult->getBody());
+                       $serverdata['version'] = str_replace(chr(239) . chr(187) . chr(191), '', $curlResult->getBodyString());
                        $serverdata['version'] = str_replace(["\r", "\n", "\t"], '', $serverdata['version']);
                        $serverdata['version'] = trim($serverdata['version'], '"');
                        $serverdata['network'] = Protocol::OSTATUS;
 
-                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                                $serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
                        }
 
@@ -1452,12 +2094,12 @@ class GServer
                }
 
                // Test for Statusnet
-               $curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json');
-               if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
-                       ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json', HttpClientAccept::JSON);
+               if ($curlResult->isSuccess() && ($curlResult->getBodyString() != '{"error":"not implemented"}') &&
+                       ($curlResult->getBodyString() != '') && (strlen($curlResult->getBodyString()) < 30)) {
 
                        // Remove junk that some GNU Social servers return
-                       $serverdata['version'] = str_replace(chr(239).chr(187).chr(191), '', $curlResult->getBody());
+                       $serverdata['version'] = str_replace(chr(239).chr(187).chr(191), '', $curlResult->getBodyString());
                        $serverdata['version'] = str_replace(["\r", "\n", "\t"], '', $serverdata['version']);
                        $serverdata['version'] = trim($serverdata['version'], '"');
 
@@ -1470,7 +2112,7 @@ class GServer
                                $serverdata['network'] = Protocol::OSTATUS;
                        }
 
-                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                                $serverdata['detection-method'] = self::DETECT_STATUSNET;
                        }
                }
@@ -1486,8 +2128,10 @@ class GServer
         *
         * @return array server data
         */
-       private static function detectFriendica(string $url, array $serverdata)
+       private static function detectFriendica(string $url, array $serverdata): array
        {
+               // There is a bug in some versions of Friendica that will return an ActivityStream actor when the content type "application/json" is requested.
+               // Because of this me must not use ACCEPT_JSON here.
                $curlResult = DI::httpClient()->get($url . '/friendica/json');
                if (!$curlResult->isSuccess()) {
                        $curlResult = DI::httpClient()->get($url . '/friendika/json');
@@ -1502,12 +2146,12 @@ class GServer
                        return $serverdata;
                }
 
-               $data = json_decode($curlResult->getBody(), true);
+               $data = json_decode($curlResult->getBodyString(), true);
                if (empty($data) || empty($data['version'])) {
                        return $serverdata;
                }
 
-               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+               if (in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
                        $serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA;
                }
 
@@ -1556,19 +2200,34 @@ class GServer
         *
         * @param object $curlResult result of curl execution
         * @param array  $serverdata array with server data
-        * @param string $url        Server URL
         *
         * @return array server data
         */
-       private static function analyseRootBody($curlResult, array $serverdata, string $url)
+       private static function analyseRootBody($curlResult, array $serverdata): array
        {
                if (empty($curlResult->getBody())) {
                        return $serverdata;
                }
 
+               if (file_exists(__DIR__ . '/../../static/platforms.config.php')) {
+                       require __DIR__ . '/../../static/platforms.config.php';
+               } else {
+                       throw new HTTPException\InternalServerErrorException('Invalid platform file');
+               }
+
+               $platforms = array_merge($ap_platforms, $dfrn_platforms, $zap_platforms, $platforms);
+
                $doc = new DOMDocument();
                @$doc->loadHTML($curlResult->getBody());
                $xpath = new DOMXPath($doc);
+               $assigned = false;
+
+               // We can only detect honk via some HTML element on their page
+               if ($xpath->query('//div[@id="honksonpage"]')->count() == 1) {
+                       $serverdata['platform'] = 'honk';
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       $assigned = true;
+               }
 
                $title = trim(XML::getFirstNodeValue($xpath, '//head/title/text()'));
                if (!empty($title)) {
@@ -1599,37 +2258,24 @@ class GServer
                        }
 
                        if (in_array($attr['name'], ['application-name', 'al:android:app_name', 'al:ios:app_name',
-                               'twitter:app:name:googleplay', 'twitter:app:name:iphone', 'twitter:app:name:ipad'])) {
-                               $serverdata['platform'] = strtolower($attr['content']);
-                               if (in_array($attr['content'], ['Misskey', 'Write.as'])) {
+                               'twitter:app:name:googleplay', 'twitter:app:name:iphone', 'twitter:app:name:ipad', 'generator'])) {
+                               $platform = str_ireplace(array_keys($platforms), array_values($platforms), $attr['content']);
+                               $platform = str_replace('/', ' ', $platform);
+                               $platform_parts = explode(' ', $platform);
+                               if ((count($platform_parts) >= 2) && in_array(strtolower($platform_parts[0]), array_values($platforms))) {
+                                       $platform = $platform_parts[0];
+                                       $serverdata['version'] = $platform_parts[1];
+                               }
+                               if (in_array($platform, array_values($dfrn_platforms))) {
+                                       $serverdata['network'] = Protocol::DFRN;
+                               } elseif (in_array($platform, array_values($ap_platforms))) {
                                        $serverdata['network'] = Protocol::ACTIVITYPUB;
+                               } elseif (in_array($platform, array_values($zap_platforms))) {
+                                       $serverdata['network'] = Protocol::ZOT;
                                }
-                       }
-                       if (($attr['name'] == 'generator') && (empty($serverdata['platform']) || (substr(strtolower($attr['content']), 0, 9) == 'wordpress'))) {
-                               $serverdata['platform'] = strtolower($attr['content']);
-                               $version_part = explode(' ', $attr['content']);
-
-                               if (count($version_part) == 2) {
-                                       if (in_array($version_part[0], ['WordPress'])) {
-                                               $serverdata['platform'] = 'wordpress';
-                                               $serverdata['version'] = $version_part[1];
-
-                                               // We still do need a reliable test if some AP plugin is activated
-                                               if (DBA::exists('apcontact', ['baseurl' => $url])) {
-                                                       $serverdata['network'] = Protocol::ACTIVITYPUB;
-                                               } else {
-                                                       $serverdata['network'] = Protocol::FEED;
-                                               }
-
-                                               if ($serverdata['detection-method'] == self::DETECT_MANUAL) {
-                                                       $serverdata['detection-method'] = self::DETECT_BODY;
-                                               }
-                                       }
-                                       if (in_array($version_part[0], ['Friendika', 'Friendica'])) {
-                                               $serverdata['platform'] = strtolower($version_part[0]);
-                                               $serverdata['version'] = $version_part[1];
-                                               $serverdata['network'] = Protocol::DFRN;
-                                       }
+                               if (in_array($platform, array_values($platforms))) {
+                                       $serverdata['platform'] = $platform;
+                                       $assigned = true;
                                }
                        }
                }
@@ -1661,25 +2307,47 @@ class GServer
                                $serverdata['info'] = $attr['content'];
                        }
 
-                       if ($attr['property'] == 'og:platform') {
-                               $serverdata['platform'] = strtolower($attr['content']);
+                       if (in_array($attr['property'], ['og:platform', 'generator'])) {
+                               if (in_array($attr['content'], array_keys($platforms))) {
+                                       $serverdata['platform'] = $platforms[$attr['content']];
+                                       $assigned = true;
+                               }
 
-                               if (in_array($attr['content'], ['PeerTube'])) {
+                               if (in_array($attr['content'], array_keys($ap_platforms))) {
                                        $serverdata['network'] = Protocol::ACTIVITYPUB;
+                               } elseif (in_array($attr['content'], array_values($zap_platforms))) {
+                                       $serverdata['network'] = Protocol::ZOT;
                                }
                        }
+               }
 
-                       if ($attr['property'] == 'generator') {
-                               $serverdata['platform'] = strtolower($attr['content']);
+               $list = $xpath->query('//link[@rel="me"]');
+               foreach ($list as $node) {
+                       foreach ($node->attributes as $attribute) {
+                               if (parse_url(trim($attribute->value), PHP_URL_HOST) == 'micro.blog') {
+                                       $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']);
+                                       $serverdata['platform'] = 'microblog';
+                                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+                                       $assigned = true;
+                               }
+                       }
+               }
 
-                               if (in_array($attr['content'], ['hubzilla'])) {
-                                       // We later check which compatible protocol modules are loaded.
-                                       $serverdata['network'] = Protocol::ZOT;
+               if ($serverdata['platform'] != 'microblog') {
+                       $list = $xpath->query('//link[@rel="micropub"]');
+                       foreach ($list as $node) {
+                               foreach ($node->attributes as $attribute) {
+                                       if (trim($attribute->value) == 'https://micro.blog/micropub') {
+                                               $serverdata['version'] = trim($serverdata['platform'] . ' ' . $serverdata['version']);
+                                               $serverdata['platform'] = 'microblog';
+                                               $serverdata['network'] = Protocol::ACTIVITYPUB;
+                                               $assigned = true;
+                                       }
                                }
                        }
                }
 
-               if (!empty($serverdata['network']) && ($serverdata['detection-method'] == self::DETECT_MANUAL)) {
+               if ($assigned && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_HEADER])) {
                        $serverdata['detection-method'] = self::DETECT_BODY;
                }
 
@@ -1694,7 +2362,7 @@ class GServer
         *
         * @return array server data
         */
-       private static function analyseRootHeader($curlResult, array $serverdata)
+       private static function analyseRootHeader($curlResult, array $serverdata): array
        {
                if ($curlResult->getHeader('server') == 'Mastodon') {
                        $serverdata['platform'] = 'mastodon';
@@ -1718,24 +2386,15 @@ class GServer
                return $serverdata;
        }
 
-       /**
-        * Test if the body contains valid content
-        *
-        * @param string $body
-        * @return boolean
-        */
-       private static function invalidBody(string $body)
-       {
-               // Currently we only test for a HTML element.
-               // Possibly we enhance this in the future.
-               return !strpos($body, '>');
-       }
-
        /**
         * Update GServer entries
         */
        public static function discover()
        {
+               if (!DI::config('system', 'discover_servers')) {
+                       return;
+               }
+
                // Update the server list
                self::discoverFederation();
 
@@ -1743,25 +2402,21 @@ class GServer
 
                $requery_days = intval(DI::config()->get('system', 'poco_requery_days'));
 
-               if ($requery_days == 0) {
-                       $requery_days = 7;
-               }
-
                $last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
 
                $gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'],
-                       ["NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
+                       ["NOT `blocked` AND NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
                        ['order' => ['RAND()']]);
 
                while ($gserver = DBA::fetch($gservers)) {
                        Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]);
-                       Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']);
+                       Worker::add(Worker::PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']);
 
                        Logger::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]);
-                       Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver);
+                       Worker::add(Worker::PRIORITY_LOW, 'UpdateServerDirectory', $gserver);
 
                        $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
-                       DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
+                       self::update($fields, ['nurl' => $gserver['nurl']]);
 
                        if (--$no_of_queries == 0) {
                                break;
@@ -1776,7 +2431,7 @@ class GServer
         */
        private static function discoverFederation()
        {
-               $last = DI::config()->get('poco', 'last_federation_discovery');
+               $last = DI::keyValue()->get('poco_last_federation_discovery');
 
                if ($last) {
                        $next = $last + (24 * 60 * 60);
@@ -1790,7 +2445,7 @@ class GServer
                $protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus'];
                foreach ($protocols as $protocol) {
                        $query = '{nodes(protocol:"' . $protocol . '"){host}}';
-                       $curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
+                       $curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query), HttpClientAccept::JSON);
                        if (!empty($curlResult)) {
                                $data = json_decode($curlResult, true);
                                if (!empty($data['data']['nodes'])) {
@@ -1802,24 +2457,25 @@ class GServer
                        }
                }
 
-               // Disvover Mastodon servers
+               // Discover Mastodon servers
                $accesstoken = DI::config()->get('system', 'instances_social_key');
 
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
-                       $curlResult = DI::httpClient()->get($api, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
-
+                       $curlResult = DI::httpClient()->get($api, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
                        if ($curlResult->isSuccess()) {
-                               $servers = json_decode($curlResult->getBody(), true);
+                               $servers = json_decode($curlResult->getBodyString(), true);
 
-                               foreach ($servers['instances'] as $server) {
-                                       $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
-                                       self::add($url);
+                               if (!empty($servers['instances'])) {
+                                       foreach ($servers['instances'] as $server) {
+                                               $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
+                                               self::add($url);
+                                       }
                                }
                        }
                }
 
-               DI::config()->set('poco', 'last_federation_discovery', time());
+               DI::keyValue()->set('poco_last_federation_discovery', time());
        }
 
        /**
@@ -1827,7 +2483,7 @@ class GServer
         *
         * @param int $gsid     Server id
         * @param int $protocol Protocol id
-        * @return void
+        *
         * @throws Exception
         */
        public static function setProtocol(int $gsid, int $protocol)
@@ -1879,18 +2535,20 @@ class GServer
                        }
                }
 
-               Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url'], 'callstack' => System::callstack(20)]);
-               DBA::update('gserver', ['protocol' => $protocol], ['id' => $gsid]);
+               Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url']]);
+               self::update(['protocol' => $protocol], ['id' => $gsid]);
        }
 
        /**
         * Fetch the protocol of the given server
         *
         * @param int $gsid Server id
-        * @return int
+        *
+        * @return ?int One of Post\DeliveryData protocol constants or null if unknown or gserver is missing
+        *
         * @throws Exception
         */
-       public static function getProtocol(int $gsid)
+       public static function getProtocol(int $gsid): ?int
        {
                if (empty($gsid)) {
                        return null;
@@ -1903,4 +2561,40 @@ class GServer
 
                return null;
        }
+
+       /**
+        * Update rows in the gserver table.
+        * Enforces gserver table field maximum sizes to avoid "Data too long" database errors
+        *
+        * @param array $fields
+        * @param array $condition
+        *
+        * @return bool
+        *
+        * @throws Exception
+        */
+       public static function update(array $fields, array $condition): bool
+       {
+               $fields = DI::dbaDefinition()->truncateFieldsForTable('gserver', $fields);
+
+               return DBA::update('gserver', $fields, $condition);
+       }
+
+       /**
+        * Insert a row into the gserver table.
+        * Enforces gserver table field maximum sizes to avoid "Data too long" database errors
+        *
+        * @param array $fields
+        * @param int   $duplicate_mode What to do on a duplicated entry
+        *
+        * @return bool
+        *
+        * @throws Exception
+        */
+       public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT): bool
+       {
+               $fields = DI::dbaDefinition()->truncateFieldsForTable('gserver', $fields);
+
+               return DBA::insert('gserver', $fields, $duplicate_mode);
+       }
 }