]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/GServer.php
doc/themes.md,FAQ-admin: point to live friendica-themes.com mirror
[friendica.git] / src / Model / GServer.php
index 9a224aecd80a878c3866be81c21f44cae929ea37..731175ea50c18e14f6d51431da8a5fb106a53ef3 100644 (file)
 <?php
-
 /**
- * @file src/Model/GServer.php
- * @brief This file includes the GServer class to handle with servers
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
-use Friendica\Core\Config;
+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\Util\Network;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\HTTPClient\Client\HttpClient;
+use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
-use Friendica\Core\Logger;
 
 /**
- * @brief This class handles GServer related functions
+ * This class handles GServer related functions
  */
 class GServer
 {
+       // Directory types
+       const DT_NONE = 0;
+       const DT_POCO = 1;
+       const DT_MASTODON = 2;
+
+       // Methods to detect server types
+
+       // Non endpoint specific methods
+       const DETECT_MANUAL = 0;
+       const DETECT_HEADER = 1;
+       const DETECT_BODY = 2;
+
+       // Implementation specific endpoints
+       const DETECT_FRIENDIKA = 10;
+       const DETECT_FRIENDICA = 11;
+       const DETECT_STATUSNET = 12;
+       const DETECT_GNUSOCIAL = 13;
+       const DETECT_CONFIG_JSON = 14; // Statusnet, GNU Social, Older Hubzilla/Redmatrix
+       const DETECT_SITEINFO_JSON = 15; // Newer Hubzilla
+       const DETECT_MASTODON_API = 16;
+       const DETECT_STATUS_PHP = 17; // Nextcloud
+       const DETECT_V1_CONFIG = 18;
+       const DETECT_PUMPIO = 19;
+
+       // Standardized endpoints
+       const DETECT_STATISTICS_JSON = 100;
+       const DETECT_NODEINFO_1 = 101;
+       const DETECT_NODEINFO_2 = 102;
+
+       /**
+        * Check for the existance 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)) {
+                       return;
+               }
+
+               Worker::add(PRIORITY_LOW, 'UpdateGServer', $url, $only_nodeinfo);
+       }
+
+       /**
+        * Get the ID for the given server URL
+        *
+        * @param string $url
+        * @param boolean $no_check Don't check if the server hadn't been found
+        * @return int gserver id
+        */
+       public static function getID(string $url, bool $no_check = false)
+       {
+               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)]);
+                       return $gserver['id'];
+               }
+
+               if ($no_check || !self::check($url)) {
+                       return null;
+               }
+
+               return self::getID($url, true);
+       }
+
+       /**
+        * Retrieves all the servers which base domain are matching the provided domain pattern
+        *
+        * The pattern is a simple fnmatch() pattern with ? for single wildcard and * for multiple wildcard
+        *
+        * @param string $pattern
+        * @return array
+        * @throws Exception
+        */
+       public static function listByDomainPattern(string $pattern): array
+       {
+               $likePattern = 'http://' . strtr($pattern, ['_' => '\_', '%' => '\%', '?' => '_', '*' => '%']);
+
+               // The SUBSTRING_INDEX returns everything before the eventual third /, which effectively trims an
+               // eventual server path and keep only the server domain which we're matching against the pattern.
+               $sql = "SELECT `gserver`.*, COUNT(*) AS `contacts`
+                       FROM `gserver`
+                       LEFT JOIN `contact` ON `gserver`.`id` = `contact`.`gsid`
+                       WHERE SUBSTRING_INDEX(`gserver`.`nurl`, '/', 3) LIKE ?
+                       AND NOT `gserver`.`failed`
+                       GROUP BY `gserver`.`id`";
+
+               $stmt = DI::dba()->p($sql, $likePattern);
+
+               return DI::dba()->toArray($stmt);
+       }
+
+       /**
+        * Checks if the given server is reachable
+        *
+        * @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.
+        *
+        * @return boolean 'true' if server seems vital
+        */
+       public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false)
+       {
+               if ($server == '') {
+                       $contact = Contact::getByURL($profile, null, ['baseurl']);
+                       if (!empty($contact['baseurl'])) {
+                               $server = $contact['baseurl'];
+                       }
+               }
+
+               if ($server == '') {
+                       return true;
+               }
+
+               return self::check($server, $network, $force);
+       }
+
+       public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '')
+       {
+               // On successful contact process check again next week
+               if ($success) {
+                       return DateTimeFormat::utc('now +7 day');
+               }
+
+               $now = strtotime(DateTimeFormat::utcNow());
+
+               if ($created > $last_contact) {
+                       $contact_time = strtotime($created);
+               } else {
+                       $contact_time = strtotime($last_contact);
+               }
+
+               // If the last contact was less than 6 hours before then try again in 6 hours
+               if (($now - $contact_time) < (60 * 60 * 6)) {
+                       return DateTimeFormat::utc('now +6 hour');
+               }
+
+               // If the last contact was less than 12 hours before then try again in 12 hours
+               if (($now - $contact_time) < (60 * 60 * 12)) {
+                       return DateTimeFormat::utc('now +12 hour');
+               }
+
+               // If the last contact was less than 24 hours before then try tomorrow again
+               if (($now - $contact_time) < (60 * 60 * 24)) {
+                       return DateTimeFormat::utc('now +1 day');
+               }
+
+               // If the last contact was less than a week before then try again in a week
+               if (($now - $contact_time) < (60 * 60 * 24 * 7)) {
+                       return DateTimeFormat::utc('now +1 week');
+               }
+
+               // If the last contact was less than two weeks before then try again in two week
+               if (($now - $contact_time) < (60 * 60 * 24 * 14)) {
+                       return DateTimeFormat::utc('now +2 week');
+               }
+
+               // If the last contact was less than a month before then try again in a month
+               if (($now - $contact_time) < (60 * 60 * 24 * 30)) {
+                       return DateTimeFormat::utc('now +1 month');
+               }
+
+               // The system hadn't been successul contacted for more than a month, so try again in three months
+               return DateTimeFormat::utc('now +3 month');
+       }
+
+       /**
+        * Checks the state of the given server.
+        *
+        * @param string  $server_url    URL of the given server
+        * @param string  $network       Network value that is used, when detection failed
+        * @param boolean $force         Force an update.
+        * @param boolean $only_nodeinfo Only use nodeinfo for server detection
+        *
+        * @return boolean 'true' if server seems vital
+        */
+       public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false)
+       {
+               $server_url = self::cleanURL($server_url);
+               if ($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);
+                       }
+
+                       if (!$force && (strtotime($gserver['next_contact']) > time())) {
+                               Logger::info('No update needed', ['server' => $server_url]);
+                               return (!$gserver['failed']);
+                       }
+                       Logger::info('Server is outdated. Start discovery.', ['Server' => $server_url, 'Force' => $force]);
+               } else {
+                       Logger::info('Server is unknown. Start discovery.', ['Server' => $server_url]);
+               }
+
+               return self::detect($server_url, $network, $only_nodeinfo);
+       }
+
+       /**
+        * Set failed server status
+        *
+        * @param string $url
+        */
+       public static function setFailure(string $url)
+       {
+               $gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($url)]);
+               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)]);
+                       Logger::info('Set failed status for existing server', ['url' => $url]);
+                       return;
+               }
+               DBA::insert('gserver', ['url' => $url, 'nurl' => Strings::normaliseLink($url),
+                       'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(),
+                       'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]);
+               Logger::info('Set failed status for new server', ['url' => $url]);
+       }
+
+       /**
+        * Remove unwanted content from the given URL
+        *
+        * @param string $url
+        * @return string cleaned URL
+        */
+       public static function cleanURL(string $url)
+       {
+               $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);
+       }
+
+       /**
+        * Return the base URL
+        *
+        * @param string $url
+        * @return string base URL
+        */
+       private static function getBaseURL(string $url)
+       {
+               $urlparts = parse_url(self::cleanURL($url));
+               unset($urlparts['path']);
+               return Network::unparseURL($urlparts);
+       }
+
        /**
         * Detect server data (type, protocol, version number, ...)
         * The detected data is then updated or inserted in the gserver table.
         *
-        * @param string $url Server url
+        * @param string  $url           URL of the given server
+        * @param string  $network       Network value that is used, when detection failed
+        * @param boolean $only_nodeinfo Only use nodeinfo for server detection
         *
         * @return boolean 'true' if server could be detected
         */
-       public static function detect($url)
+       public static function detect(string $url, string $network = '', bool $only_nodeinfo = false)
        {
-               /// @Todo:
-               // - Pleroma version number
+               Logger::info('Detect server type', ['server' => $url]);
+               $serverdata = ['detection-method' => self::DETECT_MANUAL];
 
-               $serverdata = [];
+               $original_url = $url;
+
+               // Remove URL content that is not supposed to exist for a server url
+               $url = self::cleanURL($url);
+
+               // Get base URL
+               $baseurl = self::getBaseURL($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)]);
+               }
 
                // When a nodeinfo is present, we don't need to dig further
-               $xrd_timeout = Config::get('system', 'xrd_timeout');
-               $curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
+               $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
+               $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if ($curlResult->isTimeout()) {
-                       DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
+                       self::setFailure($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, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_HTML]);
+                       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;
+                       }
+               }
+
                $nodeinfo = self::fetchNodeinfo($url, $curlResult);
+               if ($only_nodeinfo && empty($nodeinfo)) {
+                       Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]);
+                       self::setFailure($url);
+                       return false;
+               }
 
                // When nodeinfo isn't present, we use the older 'statistics.json' endpoint
                if (empty($nodeinfo)) {
@@ -54,27 +374,92 @@ class GServer
                }
 
                // If that didn't work out well, we use some protocol specific endpoints
-               if (empty($nodeinfo) || empty($nodeinfo['network']) || ($nodeinfo['network'] == Protocol::DFRN)) {
-                       // Fetch the landing page, possibly it reveals some data
-                       $curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout]);
-                       if ($curlResult->isSuccess()) {
-                               $serverdata = self::analyseRootHeader($curlResult, $serverdata);
-                               $serverdata = self::analyseRootBody($curlResult, $serverdata);
+               // 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'];
+
+                               foreach (['registered-users', 'active_users_monthly', 'active-halfyear-users', 'local-posts'] as $field) {
+                                       if (!empty($nodeinfo[$field])) {
+                                               $serverdata[$field] = $nodeinfo[$field];
+                                       }
+                               }
                        }
 
-                       if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                               DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
-                               return false;
-                       }
+                       // Fetch the landing page, possibly it reveals some data
+                       if (empty($nodeinfo['network'])) {
+                               if ($baseurl == $url) {
+                                       $basedata = $serverdata;
+                               } else {
+                                       $basedata = ['detection-method' => self::DETECT_MANUAL];
+                               }
 
-                       if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::DFRN)) {
-                               $serverdata = self::detectFriendica($url, $serverdata);
+                               $curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_HTML]);
+                               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;
+                                       }
+
+                                       $basedata = self::analyseRootHeader($curlResult, $basedata);
+                                       $basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
+                               }
+
+                               if (!$curlResult->isSuccess() || empty($curlResult->getBody()) || self::invalidBody($curlResult->getBody())) {
+                                       self::setFailure($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, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_HTML]);
+                                       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 (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB)) {
                                $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.
+                       // Also this hopefully prevents us from receiving abuse messages.
+                       $validHostMeta = self::validHostMeta($url);
+
+                       if (empty($serverdata['network']) && !$validHostMeta) {
+                               $serverdata = self::detectFromContacts($url, $serverdata);
+                       }
+
+                       if (empty($serverdata['network']) && !$validHostMeta) {
+                               self::setFailure($url);
+                               return false;
+                       }
+
+                       if (empty($serverdata['network']) || in_array($serverdata['network'], [Protocol::DFRN, Protocol::ACTIVITYPUB])) {
+                               $serverdata = self::detectFriendica($url, $serverdata);
+                       }
+
                        // the 'siteinfo.json' is some specific endpoint of Hubzilla and Red
                        if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ZOT)) {
                                $serverdata = self::fetchSiteinfo($url, $serverdata);
@@ -85,6 +470,10 @@ class GServer
                                $serverdata = self::detectHubzilla($url, $serverdata);
                        }
 
+                       if (empty($serverdata['network']) || in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) {
+                               $serverdata = self::detectPeertube($url, $serverdata);
+                       }
+
                        if (empty($serverdata['network'])) {
                                $serverdata = self::detectNextcloud($url, $serverdata);
                        }
@@ -92,58 +481,209 @@ class GServer
                        if (empty($serverdata['network'])) {
                                $serverdata = self::detectGNUSocial($url, $serverdata);
                        }
+
+                       if (empty($serverdata['network'])) {
+                               $serverdata = self::detectPumpIO($url, $serverdata);
+                       }
+
+                       $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;
                }
 
-               // Check host-meta for phantom networks.
-               // Although this is not needed, it is a good indicator for a living system,
-               // since most systems had implemented it.
-               if (($serverdata['network'] == Protocol::PHANTOM) && !self::validHostMeta($url)) {
-                       DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
-                       return false;
+               // When we hadn't been able to detect the network type, we use the hint from the parameter
+               if (($serverdata['network'] == Protocol::PHANTOM) && !empty($network)) {
+                       $serverdata['network'] = $network;
                }
 
                $serverdata['url'] = $url;
                $serverdata['nurl'] = Strings::normaliseLink($url);
 
-               // We take the highest number that we do find
-               $registeredUsers = $serverdata['registered-users'] ?? 0;
+               if (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
+                       $serverdata = self::detectNetworkViaContacts($url, $serverdata);
+               }
+
+               if ($serverdata['network'] == Protocol::ACTIVITYPUB) {
+                       $serverdata = self::fetchWeeklyUsage($url, $serverdata);
+               }
+
+               $serverdata['registered-users'] = $serverdata['registered-users'] ?? 0;
 
                // On an active server there has to be at least a single user
-               if (($serverdata['network'] != Protocol::PHANTOM) && ($registeredUsers == 0)) {
-                       $registeredUsers = 1;
+               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;
                }
 
-               $gcontacts = DBA::count('gcontact', ['server_url' => [$url, $serverdata['nurl']]]);
-               $apcontacts = DBA::count('apcontact', ['baseurl' => [$url, $serverdata['nurl']]]);
-               $contacts = DBA::count('contact', ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
-               $serverdata['registered-users'] = max($gcontacts, $apcontacts, $contacts, $registeredUsers);
+               $serverdata['next_contact'] = self::getNextUpdateDate(true);
 
                $serverdata['last_contact'] = DateTimeFormat::utcNow();
+               $serverdata['failed'] = false;
 
-               if (!DBA::exists('gserver', ['nurl' => Strings::normaliseLink($url)])) {
+               $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]);
+               if (!DBA::isResult($gserver)) {
                        $serverdata['created'] = DateTimeFormat::utcNow();
                        $ret = DBA::insert('gserver', $serverdata);
+                       $id = DBA::lastInsertId();
                } else {
                        $ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]);
+                       $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]);
+                       if (DBA::isResult($gserver)) {
+                               $id = $gserver['id'];
+                       }
                }
 
-               print_r($serverdata);
+               // 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, '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]);
+                       }
+
+                       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]);
+                                       DBA::update('gserver', ['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]);
+                                       DBA::update('gserver', ['active-halfyear-users' => $contacts], ['id' => $id]);
+                               }
+                       }
+               }
+
+               if (!empty($serverdata['network']) && in_array($serverdata['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
+                       self::discoverRelay($url);
+               }
 
                return $ret;
        }
 
-       private static function fetchStatistics($url)
+       /**
+        * Fetch relay data from a given server url
+        *
+        * @param string $server_url address of the server
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function discoverRelay(string $server_url)
        {
-               $curlResult = Network::curl($url . '/statistics.json');
+               Logger::info('Discover relay data', ['server' => $server_url]);
+
+               $curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+               if (!$curlResult->isSuccess()) {
+                       return;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (!is_array($data)) {
+                       return;
+               }
+
+               // Sanitize incoming data, see https://github.com/friendica/friendica/issues/8565
+               $data['subscribe'] = (bool)$data['subscribe'] ?? false;
+
+               if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) {
+                       $data['scope'] = '';
+                       $data['subscribe'] = false;
+                       $data['tags'] = [];
+               }
+
+               $gserver = DBA::selectFirst('gserver', ['id', 'url', 'network', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
+               if (!DBA::isResult($gserver)) {
+                       return;
+               }
+
+               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']]);
+               }
+
+               DBA::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
+
+               if ($data['scope'] == 'tags') {
+                       // Avoid duplicates
+                       $tags = [];
+                       foreach ($data['tags'] as $tag) {
+                               $tag = mb_strtolower($tag);
+                               if (strlen($tag) < 100) {
+                                       $tags[$tag] = $tag;
+                               }
+                       }
+
+                       foreach ($tags as $tag) {
+                               DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], Database::INSERT_IGNORE);
+                       }
+               }
+
+               // Create or update the relay contact
+               $fields = [];
+               if (isset($data['protocols'])) {
+                       if (isset($data['protocols']['diaspora'])) {
+                               $fields['network'] = Protocol::DIASPORA;
+
+                               if (isset($data['protocols']['diaspora']['receive'])) {
+                                       $fields['batch'] = $data['protocols']['diaspora']['receive'];
+                               } elseif (is_string($data['protocols']['diaspora'])) {
+                                       $fields['batch'] = $data['protocols']['diaspora'];
+                               }
+                       }
+
+                       if (isset($data['protocols']['dfrn'])) {
+                               $fields['network'] = Protocol::DFRN;
+
+                               if (isset($data['protocols']['dfrn']['receive'])) {
+                                       $fields['batch'] = $data['protocols']['dfrn']['receive'];
+                               } elseif (is_string($data['protocols']['dfrn'])) {
+                                       $fields['batch'] = $data['protocols']['dfrn'];
+                               }
+                       }
+
+                       if (isset($data['protocols']['activitypub'])) {
+                               $fields['network'] = Protocol::ACTIVITYPUB;
+
+                               if (!empty($data['protocols']['activitypub']['actor'])) {
+                                       $fields['url'] = $data['protocols']['activitypub']['actor'];
+                               }
+                               if (!empty($data['protocols']['activitypub']['receive'])) {
+                                       $fields['batch'] = $data['protocols']['activitypub']['receive'];
+                               }
+                       }
+               }
+
+               Logger::info('Discovery ended', ['server' => $server_url, 'data' => $fields]);
+
+               Relay::updateContact($gserver, $fields);
+       }
+
+       /**
+        * Fetch server data from '/statistics.json' on the given server
+        *
+        * @param string $url URL of the given server
+        *
+        * @return array server data
+        */
+       private static function fetchStatistics(string $url)
+       {
+               $curlResult = DI::httpClient()->get($url . '/statistics.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -153,7 +693,7 @@ class GServer
                        return [];
                }
 
-               $serverdata = [];
+               $serverdata = ['detection-method' => self::DETECT_STATISTICS_JSON];
 
                if (!empty($data['version'])) {
                        $serverdata['version'] = $data['version'];
@@ -167,11 +707,11 @@ class GServer
                }
 
                if (!empty($data['network'])) {
-                       $serverdata['platform'] = $data['network'];
+                       $serverdata['platform'] = strtolower($data['network']);
 
-                       if ($serverdata['platform'] == 'Diaspora') {
+                       if ($serverdata['platform'] == 'diaspora') {
                                $serverdata['network'] = Protocol::DIASPORA;
-                       } elseif ($serverdata['platform'] == 'Friendica') {
+                       } elseif ($serverdata['platform'] == 'friendica') {
                                $serverdata['network'] = Protocol::DFRN;
                        } elseif ($serverdata['platform'] == 'hubzilla') {
                                $serverdata['network'] = Protocol::ZOT;
@@ -180,6 +720,21 @@ class GServer
                        }
                }
 
+               if (!empty($data['total_users'])) {
+                       $serverdata['registered-users'] = max($data['total_users'], 1);
+               }
+
+               if (!empty($data['active_users_monthly'])) {
+                       $serverdata['active-month-users'] = max($data['active_users_monthly'], 0);
+               }
+
+               if (!empty($data['active_users_halfyear'])) {
+                       $serverdata['active-halfyear-users'] = max($data['active_users_halfyear'], 0);
+               }
+
+               if (!empty($data['local_posts'])) {
+                       $serverdata['local-posts'] = max($data['local_posts'], 0);
+               }
 
                if (!empty($data['registrations_open'])) {
                        $serverdata['register_policy'] = Register::OPEN;
@@ -191,15 +746,21 @@ class GServer
        }
 
        /**
-        * @brief Detect server type by using the nodeinfo data
+        * Detect server type by using the nodeinfo data
+        *
+        * @param string                  $url        address of the server
+        * @param ICanHandleHttpResponses $httpResult
         *
-        * @param string $url address of the server
         * @return array Server data
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function fetchNodeinfo($url, $curlResult)
+       private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
        {
-               $nodeinfo = json_decode($curlResult->getBody(), true);
+               if (!$httpResult->isSuccess()) {
+                       return [];
+               }
+
+               $nodeinfo = json_decode($httpResult->getBody(), true);
 
                if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
                        return [];
@@ -240,29 +801,27 @@ class GServer
        }
 
        /**
-        * @brief Parses Nodeinfo 1
+        * 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($nodeinfo_url)
+       private static function parseNodeinfo1(string $nodeinfo_url)
        {
-               $curlResult = Network::curl($nodeinfo_url);
-
+               $curlResult = DI::httpClient()->get($nodeinfo_url, [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess()) {
-                       return false;
+                       return [];
                }
 
                $nodeinfo = json_decode($curlResult->getBody(), true);
 
                if (!is_array($nodeinfo)) {
-                       return false;
+                       return [];
                }
 
-               $server = [];
-
-               $server['register_policy'] = Register::CLOSED;
+               $server = ['detection-method' => self::DETECT_NODEINFO_1,
+                       'register_policy' => Register::CLOSED];
 
                if (!empty($nodeinfo['openRegistrations'])) {
                        $server['register_policy'] = Register::OPEN;
@@ -270,7 +829,7 @@ class GServer
 
                if (is_array($nodeinfo['software'])) {
                        if (!empty($nodeinfo['software']['name'])) {
-                               $server['platform'] = $nodeinfo['software']['name'];
+                               $server['platform'] = strtolower($nodeinfo['software']['name']);
                        }
 
                        if (!empty($nodeinfo['software']['version'])) {
@@ -286,7 +845,23 @@ class GServer
                }
 
                if (!empty($nodeinfo['usage']['users']['total'])) {
-                       $server['registered-users'] = $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']['inbound']) && is_array($nodeinfo['protocols']['inbound'])) {
@@ -310,36 +885,36 @@ class GServer
                        }
                }
 
-               if (!$server) {
-                       return false;
+               if (empty($server)) {
+                       return [];
                }
 
                return $server;
        }
 
        /**
-        * @brief Parses Nodeinfo 2
+        * 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($nodeinfo_url)
+       private static function parseNodeinfo2(string $nodeinfo_url)
        {
-               $curlResult = Network::curl($nodeinfo_url);
+               $curlResult = DI::httpClient()->get($nodeinfo_url, [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess()) {
-                       return false;
+                       return [];
                }
 
                $nodeinfo = json_decode($curlResult->getBody(), true);
 
                if (!is_array($nodeinfo)) {
-                       return false;
+                       return [];
                }
 
-               $server = [];
-
-               $server['register_policy'] = Register::CLOSED;
+               $server = ['detection-method' => self::DETECT_NODEINFO_2,
+                       'register_policy' => Register::CLOSED];
 
                if (!empty($nodeinfo['openRegistrations'])) {
                        $server['register_policy'] = Register::OPEN;
@@ -347,7 +922,7 @@ class GServer
 
                if (is_array($nodeinfo['software'])) {
                        if (!empty($nodeinfo['software']['name'])) {
-                               $server['platform'] = $nodeinfo['software']['name'];
+                               $server['platform'] = strtolower($nodeinfo['software']['name']);
                        }
 
                        if (!empty($nodeinfo['software']['version'])) {
@@ -363,16 +938,34 @@ class GServer
                }
 
                if (!empty($nodeinfo['usage']['users']['total'])) {
-                       $server['registered-users'] = $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) {
-                               $protocols[$protocol] = true;
+                               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;
@@ -388,15 +981,23 @@ class GServer
                }
 
                if (empty($server)) {
-                       return false;
+                       return [];
                }
 
                return $server;
        }
 
-       private static function fetchSiteinfo($url, $serverdata)
+       /**
+        * Fetch server information from a 'siteinfo.json' file on the given server
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function fetchSiteinfo(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/siteinfo.json');
+               $curlResult = DI::httpClient()->get($url . '/siteinfo.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -406,8 +1007,12 @@ class GServer
                        return $serverdata;
                }
 
+               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       $serverdata['detection-method'] = self::DETECT_SITEINFO_JSON;
+               }
+
                if (!empty($data['url'])) {
-                       $serverdata['platform'] = $data['platform'];
+                       $serverdata['platform'] = strtolower($data['platform']);
                        $serverdata['version'] = $data['version'];
                }
 
@@ -428,7 +1033,23 @@ class GServer
                }
 
                if (!empty($data['channels_total'])) {
-                       $serverdata['registered-users'] = $data['channels_total'];
+                       $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'])) {
@@ -451,43 +1072,214 @@ class GServer
                return $serverdata;
        }
 
-       private static function validHostMeta($url)
+       /**
+        * Checks if the server contains a valid host meta file
+        *
+        * @param string $url URL of the given server
+        *
+        * @return boolean 'true' if the server seems to be vital
+        */
+       private static function validHostMeta(string $url)
        {
-               $xrd_timeout = Config::get('system', 'xrd_timeout');
-               $curlResult = Network::curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
+               $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
+               $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_XRD_XML]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
 
-               $xrd = XML::parseString($curlResult->getBody(), false);
-               if (!is_object($xrd)) {
-                       return false;
+               $xrd = XML::parseString($curlResult->getBody());
+               if (!is_object($xrd)) {
+                       return false;
+               }
+
+               $elements = XML::elementToArray($xrd);
+               if (empty($elements) || empty($elements['xrd']) || empty($elements['xrd']['link'])) {
+                       return false;
+               }
+
+               $valid = false;
+               foreach ($elements['xrd']['link'] as $link) {
+                       // When there is more than a single "link" element, the array looks slightly different
+                       if (!empty($link['@attributes'])) {
+                               $link = $link['@attributes'];
+                       }
+
+                       if (empty($link['rel']) || empty($link['template'])) {
+                               continue;
+                       }
+
+                       if ($link['rel'] == 'lrdd') {
+                               // When the webfinger host is the same like the system host, it should be ok.
+                               $valid = (parse_url($url, PHP_URL_HOST) == parse_url($link['template'], PHP_URL_HOST));
+                       }
+               }
+
+               return $valid;
+       }
+
+       /**
+        * Detect the network of the given server via their known contacts
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectNetworkViaContacts(string $url, array $serverdata)
+       {
+               $contacts = [];
+
+               $apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['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']]]);
+               while ($pcontact = DBA::fetch($pcontacts)) {
+                       $contacts[$pcontact['nurl']] = $pcontact['url'];
+               }
+               DBA::close($pcontacts);
+
+               if (empty($contacts)) {
+                       return $serverdata;
+               }
+
+               $time = time();
+               foreach ($contacts as $contact) {
+                       $probed = Contact::getByURL($contact, true);
+                       if (!empty($probed) && !$probed['failed'] && in_array($probed['network'], Protocol::FEDERATED)) {
+                               $serverdata['network'] = $probed['network'];
+                               break;
+                       } elseif ((time() - $time) > 10) {
+                               // To reduce the stress on remote systems we probe a maximum of 10 seconds
+                               break;
+                       }
+               }
+
+               return $serverdata;
+       }
+
+       /**
+        * Checks if the given server does have a '/poco' endpoint.
+        * This is used for the 'PortableContact' functionality,
+        * which is used by both Friendica and Hubzilla.
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function checkPoCo(string $url, array $serverdata)
+       {
+               $serverdata['poco'] = '';
+
+               $curlResult = DI::httpClient()->get($url . '/poco', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+               if (!$curlResult->isSuccess()) {
+                       return $serverdata;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (empty($data)) {
+                       return $serverdata;
+               }
+
+               if (!empty($data['totalResults'])) {
+                       $registeredUsers = $serverdata['registered-users'] ?? 0;
+                       $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers, 1);
+                       $serverdata['directory-type'] = self::DT_POCO;
+                       $serverdata['poco'] = $url . '/poco';
+               }
+
+               return $serverdata;
+       }
+
+       /**
+        * Checks if the given server does have a Mastodon style directory endpoint.
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       public static function checkMastodonDirectory(string $url, array $serverdata)
+       {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+               if (!$curlResult->isSuccess()) {
+                       return $serverdata;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (empty($data)) {
+                       return $serverdata;
+               }
+
+               if (count($data) == 1) {
+                       $serverdata['directory-type'] = self::DT_MASTODON;
+               }
+
+               return $serverdata;
+       }
+
+       /**
+        * Detects Peertube via their known endpoint
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectPeertube(string $url, array $serverdata)
+       {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/config', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+                       return $serverdata;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (empty($data)) {
+                       return $serverdata;
                }
 
-               $elements = XML::elementToArray($xrd);
-               if (empty($elements) || empty($elements['xrd']) || empty($elements['xrd']['link'])) {
-                       return false;
-               }
+               if (!empty($data['instance']) && !empty($data['serverVersion'])) {
+                       $serverdata['platform'] = 'peertube';
+                       $serverdata['version'] = $data['serverVersion'];
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
 
-               $valid = false;
-               foreach ($elements['xrd']['link'] as $link) {
-                       if (empty($link['rel']) || empty($link['type']) || empty($link['template'])) {
-                               continue;
+                       if (!empty($data['instance']['name'])) {
+                               $serverdata['site_name'] = $data['instance']['name'];
                        }
 
-                       if ($link['type'] == 'application/xrd+xml') {
-                               // When the webfinger host is the same like the system host, it should be ok.
-                               $valid = (parse_url($url, PHP_URL_HOST) == parse_url($link['template'], PHP_URL_HOST));
+                       if (!empty($data['instance']['shortDescription'])) {
+                               $serverdata['info'] = $data['instance']['shortDescription'];
+                       }
+
+                       if (!empty($data['signup'])) {
+                               if (!empty($data['signup']['allowed'])) {
+                                       $serverdata['register_policy'] = Register::OPEN;
+                               }
+                       }
+
+                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                               $serverdata['detection-method'] = self::DETECT_V1_CONFIG;
                        }
                }
 
-               return $valid;
+               return $serverdata;
        }
 
-       private static function checkPoCo($url, $serverdata)
+       /**
+        * Detects the version number of a given server when it was a NextCloud installation
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectNextcloud(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url. '/poco');
-               if (!$curlResult->isSuccess()) {
+               $curlResult = DI::httpClient()->get($url . '/status.php', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
 
@@ -496,21 +1288,21 @@ class GServer
                        return $serverdata;
                }
 
-               if (!empty($data['totalResults'])) {
-                       $registeredUsers = $serverdata['registered-users'] ?? 0;
-                       $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers);
-                       $serverdata['poco'] = $url . '/poco';
-               } else {
-                       $serverdata['poco'] = '';
+               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])) {
+                               $serverdata['detection-method'] = self::DETECT_STATUS_PHP;
+                       }
                }
 
                return $serverdata;
        }
 
-       private static function detectNextcloud($url, $serverdata)
-       {
-               $curlResult = Network::curl($url . '/status.php');
-
+       private static function fetchWeeklyUsage(string $url, array $serverdata) {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/instance/activity', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -520,19 +1312,65 @@ class GServer
                        return $serverdata;
                }
 
-               if (!empty($data['version'])) {
-                       $serverdata['platform'] = 'nextcloud';
-                       $serverdata['version'] = $data['version'];
-                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+               $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;
        }
-
-       private static function detectMastodonAlikes($url, $serverdata)
+       
+       /**
+        * Detects the server network type from contacts of that server
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectFromContacts(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/api/v1/instance');
+               $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
+               if (empty($gserver)) {
+                       return $serverdata;     
+               }
 
+               $contact = Contact::selectFirst(['id'], ['uid' => 0, 'failed' => false, 'gsid' => $gserver['id']]);
+
+               // Via probing we can be sure that the server is responding
+               if (Contact::updateFromProbe($contact['id'])) {
+                       $contact = Contact::selectFirst(['network', 'failed'], ['id' => $contact['id']]);
+                       if (!$contact['failed'] && in_array($contact['network'], Protocol::FEDERATED)) {
+                               $serverdata['network'] = $contact['network'];
+                       }
+               }
+
+               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)
+       {
+               $curlResult = DI::httpClient()->get($url . '/api/v1/instance', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -542,9 +1380,13 @@ class GServer
                        return $serverdata;
                }
 
+               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       $serverdata['detection-method'] = self::DETECT_MASTODON_API;
+               }
+
                if (!empty($data['version'])) {
                        $serverdata['platform'] = 'mastodon';
-                       $serverdata['version'] = defaults($data, 'version', '');
+                       $serverdata['version'] = $data['version'] ?? '';
                        $serverdata['network'] = Protocol::ACTIVITYPUB;
                }
 
@@ -552,37 +1394,54 @@ class GServer
                        $serverdata['site_name'] = $data['title'];
                }
 
+               if (!empty($data['title']) && empty($serverdata['platform']) && empty($serverdata['network'])) {
+                       $serverdata['platform'] = 'mastodon';
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
+               }
+
                if (!empty($data['description'])) {
                        $serverdata['info'] = trim($data['description']);
                }
 
                if (!empty($data['stats']['user_count'])) {
-                       $serverdata['registered-users'] = $data['stats']['user_count'];
+                       $serverdata['registered-users'] = max($data['stats']['user_count'], 1);
                }
 
                if (!empty($serverdata['version']) && preg_match('/.*?\(compatible;\s(.*)\s(.*)\)/ism', $serverdata['version'], $matches)) {
-                       $serverdata['platform'] = $matches[1];
+                       $serverdata['platform'] = strtolower($matches[1]);
                        $serverdata['version'] = $matches[2];
-print_r($serverdata);
                }
 
-               if (!empty($serverdata['version']) && strstr($serverdata['version'], 'Pleroma')) {
+               if (!empty($serverdata['version']) && strstr(strtolower($serverdata['version']), 'pleroma')) {
+                       $serverdata['platform'] = 'pleroma';
+                       $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version']));
+               }
+
+               if (!empty($serverdata['platform']) && strstr($serverdata['platform'], 'pleroma')) {
+                       $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform']));
                        $serverdata['platform'] = 'pleroma';
-                       $serverdata['version'] = trim(str_replace('Pleroma', '', $serverdata['version']));
                }
 
                return $serverdata;
        }
 
-       private static function detectHubzilla($url, $serverdata)
+       /**
+        * Detects data from typical Hubzilla endpoints
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectHubzilla(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/api/statusnet/config.json');
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
 
                $data = json_decode($curlResult->getBody(), true);
-               if (empty($data)) {
+               if (empty($data) || empty($data['site'])) {
                        return $serverdata;
                }
 
@@ -591,22 +1450,22 @@ print_r($serverdata);
                }
 
                if (!empty($data['site']['platform'])) {
-                       $serverdata['platform'] = $data['site']['platform']['PLATFORM_NAME'];
+                       $serverdata['platform'] = strtolower($data['site']['platform']['PLATFORM_NAME']);
                        $serverdata['version'] = $data['site']['platform']['STD_VERSION'];
                        $serverdata['network'] = Protocol::ZOT;
                }
 
                if (!empty($data['site']['hubzilla'])) {
-                       $serverdata['platform'] = $data['site']['hubzilla']['PLATFORM_NAME'];
+                       $serverdata['platform'] = strtolower($data['site']['hubzilla']['PLATFORM_NAME']);
                        $serverdata['version'] = $data['site']['hubzilla']['RED_VERSION'];
                        $serverdata['network'] = Protocol::ZOT;
                }
 
                if (!empty($data['site']['redmatrix'])) {
                        if (!empty($data['site']['redmatrix']['PLATFORM_NAME'])) {
-                               $serverdata['platform'] = $data['site']['redmatrix']['PLATFORM_NAME'];
+                               $serverdata['platform'] = strtolower($data['site']['redmatrix']['PLATFORM_NAME']);
                        } elseif (!empty($data['site']['redmatrix']['RED_PLATFORM'])) {
-                               $serverdata['platform'] = $data['site']['redmatrix']['RED_PLATFORM'];
+                               $serverdata['platform'] = strtolower($data['site']['redmatrix']['RED_PLATFORM']);
                        }
 
                        $serverdata['version'] = $data['site']['redmatrix']['RED_VERSION'];
@@ -630,16 +1489,28 @@ print_r($serverdata);
                }
 
                if (!$closed && !$private and $inviteonly) {
-                       $register_policy = Register::APPROVE;
+                       $serverdata['register_policy'] = Register::APPROVE;
                } elseif (!$closed && !$private) {
-                       $register_policy = Register::OPEN;
+                       $serverdata['register_policy'] = Register::OPEN;
                } else {
-                       $register_policy = Register::CLOSED;
+                       $serverdata['register_policy'] = Register::CLOSED;
+               }
+
+               if (!empty($serverdata['network']) && in_array($serverdata['detection-method'],
+                       [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       $serverdata['detection-method'] = self::DETECT_CONFIG_JSON;
                }
 
                return $serverdata;
        }
 
+       /**
+        * Converts input value to a boolean value
+        *
+        * @param string|integer $val
+        *
+        * @return boolean
+        */
        private static function toBoolean($val)
        {
                if (($val == 'true') || ($val == 1)) {
@@ -649,41 +1520,133 @@ print_r($serverdata);
                }
 
                return $val;
-        }
+       }
 
-       private static function detectGNUSocial($url, $serverdata)
+       /**
+        * 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 = Network::curl($url . '/api/statusnet/version.json');
+               $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_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
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectGNUSocial(string $url, array $serverdata)
+       {
+               // Test for GNU Social
+               $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
-                       $serverdata['platform'] = 'StatusNet';
+                       $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->getBody());
+                       $serverdata['version'] = str_replace(["\r", "\n", "\t"], '', $serverdata['version']);
                        $serverdata['version'] = trim($serverdata['version'], '"');
                        $serverdata['network'] = Protocol::OSTATUS;
-               }
 
-               // Test for GNU Social
-               $curlResult = Network::curl($url . '/api/gnusocial/version.json');
+                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                               $serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
+                       }
 
+                       return $serverdata;
+               }
+
+               // Test for Statusnet
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
-                       $serverdata['platform'] = 'GNU Social';
+
                        // 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->getBody());
+                       $serverdata['version'] = str_replace(["\r", "\n", "\t"], '', $serverdata['version']);
                        $serverdata['version'] = trim($serverdata['version'], '"');
-                       $serverdata['network'] = Protocol::OSTATUS;
+
+                       if (!empty($serverdata['version']) && strtolower(substr($serverdata['version'], 0, 7)) == 'pleroma') {
+                               $serverdata['platform'] = 'pleroma';
+                               $serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version']));
+                               $serverdata['network'] = Protocol::ACTIVITYPUB;
+                       } else {
+                               $serverdata['platform'] = 'statusnet';
+                               $serverdata['network'] = Protocol::OSTATUS;
+                       }
+
+                       if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                               $serverdata['detection-method'] = self::DETECT_STATUSNET;
+                       }
                }
 
                return $serverdata;
        }
 
-       private static function detectFriendica($url, $serverdata)
+       /**
+        * Detect if the URL belongs to a Friendica server
+        *
+        * @param string $url        URL of the given server
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function detectFriendica(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/friendica/json');
+               // 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', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_DEFAULT]);
                if (!$curlResult->isSuccess()) {
-                       $curlResult = Network::curl($url . '/friendika/json');
+                       $curlResult = DI::httpClient()->get($url . '/friendika/json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_DEFAULT]);
+                       $friendika = true;
+                       $platform = 'Friendika';
+               } else {
+                       $friendika = false;
+                       $platform = 'Friendica';
                }
 
                if (!$curlResult->isSuccess()) {
@@ -695,6 +1658,10 @@ print_r($serverdata);
                        return $serverdata;
                }
 
+               if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+                       $serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA;
+               }
+
                $serverdata['network'] = Protocol::DFRN;
                $serverdata['version'] = $data['version'];
 
@@ -710,7 +1677,7 @@ print_r($serverdata);
                        $serverdata['info'] = trim($data['info']);
                }
 
-               $register_policy = defaults($data, 'register_policy', 'REGISTER_CLOSED');
+               $register_policy = ($data['register_policy'] ?? '') ?: 'REGISTER_CLOSED';
                switch ($register_policy) {
                        case 'REGISTER_OPEN':
                                $serverdata['register_policy'] = Register::OPEN;
@@ -730,13 +1697,30 @@ print_r($serverdata);
                                break;
                }
 
-               $serverdata['platform'] = defaults($data, 'platform', '');
+               $serverdata['platform'] = strtolower($data['platform'] ?? $platform);
 
                return $serverdata;
        }
 
-       private static function analyseRootBody($curlResult, $serverdata)
+       /**
+        * Analyses the landing page of a given server for hints about type and system of that server
+        *
+        * @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)
        {
+               if (empty($curlResult->getBody())) {
+                       return $serverdata;
+               }
+
+               // Using only body information we cannot safely detect a lot of systems.
+               // So we define a list of platforms that we can detect safely.
+               $valid_platforms = ['friendica', 'friendika', 'diaspora', 'mastodon', 'hubzilla', 'misskey', 'peertube', 'wordpress', 'write.as'];
+
                $doc = new DOMDocument();
                @$doc->loadHTML($curlResult->getBody());
                $xpath = new DOMXPath($doc);
@@ -752,43 +1736,49 @@ print_r($serverdata);
                        $attr = [];
                        if ($node->attributes->length) {
                                foreach ($node->attributes as $attribute) {
-                                       $attribute->value = trim($attribute->value);
-                                       if (empty($attribute->value)) {
+                                       $value = trim($attribute->value);
+                                       if (empty($value)) {
                                                continue;
                                        }
 
-                                       $attr[$attribute->name] = $attribute->value;
+                                       $attr[$attribute->name] = $value;
                                }
 
                                if (empty($attr['name']) || empty($attr['content'])) {
                                        continue;
                                }
                        }
-//print_r($attr);
+
                        if ($attr['name'] == 'description') {
                                $serverdata['info'] = $attr['content'];
                        }
 
-                       if ($attr['name'] == 'application-name') {
-                               $serverdata['platform'] = $attr['content'];
+                       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'])) {
                                        $serverdata['network'] = Protocol::ACTIVITYPUB;
                                }
                        }
-
-                       if ($attr['name'] == 'generator') {
-                               $serverdata['platform'] = $attr['content'];
-
+                       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'] = $version_part[0];
+                                               $serverdata['platform'] = 'wordpress';
                                                $serverdata['version'] = $version_part[1];
-                                               $serverdata['network'] = Protocol::ACTIVITYPUB;
+
+                                               // We still do need a reliable test if some AP plugin is activated
+                                               // By now we just check in a later process for some known contacts
+                                               $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'] = $version_part[0];
+                                               $serverdata['platform'] = strtolower($version_part[0]);
                                                $serverdata['version'] = $version_part[1];
                                                $serverdata['network'] = Protocol::DFRN;
                                        }
@@ -802,19 +1792,18 @@ print_r($serverdata);
                        $attr = [];
                        if ($node->attributes->length) {
                                foreach ($node->attributes as $attribute) {
-                                       $attribute->value = trim($attribute->value);
-                                       if (empty($attribute->value)) {
+                                       $value = trim($attribute->value);
+                                       if (empty($value)) {
                                                continue;
                                        }
 
-                                       $attr[$attribute->name] = $attribute->value;
+                                       $attr[$attribute->name] = $value;
                                }
 
                                if (empty($attr['property']) || empty($attr['content'])) {
                                        continue;
                                }
                        }
-//print_r($attr);
 
                        if ($attr['property'] == 'og:site_name') {
                                $serverdata['site_name'] = $attr['content'];
@@ -825,7 +1814,7 @@ print_r($serverdata);
                        }
 
                        if ($attr['property'] == 'og:platform') {
-                               $serverdata['platform'] = $attr['content'];
+                               $serverdata['platform'] = strtolower($attr['content']);
 
                                if (in_array($attr['content'], ['PeerTube'])) {
                                        $serverdata['network'] = Protocol::ACTIVITYPUB;
@@ -833,7 +1822,7 @@ print_r($serverdata);
                        }
 
                        if ($attr['property'] == 'generator') {
-                               $serverdata['platform'] = $attr['content'];
+                               $serverdata['platform'] = strtolower($attr['content']);
 
                                if (in_array($attr['content'], ['hubzilla'])) {
                                        // We later check which compatible protocol modules are loaded.
@@ -842,27 +1831,231 @@ print_r($serverdata);
                        }
                }
 
+               if (!empty($serverdata['platform']) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY]) && !in_array($serverdata['platform'], $valid_platforms)) {
+                       $serverdata['network'] = Protocol::PHANTOM;
+                       $serverdata['version'] = '';
+                       $serverdata['detection-method'] = self::DETECT_MANUAL;
+               } elseif (!empty($serverdata['network']) && ($serverdata['detection-method'] == self::DETECT_MANUAL)) {
+                       $serverdata['detection-method'] = self::DETECT_BODY;
+               }
+
                return $serverdata;
        }
 
-       private static function analyseRootHeader($curlResult, $serverdata)
+       /**
+        * Analyses the header data of a given server for hints about type and system of that server
+        *
+        * @param object $curlResult result of curl execution
+        * @param array  $serverdata array with server data
+        *
+        * @return array server data
+        */
+       private static function analyseRootHeader($curlResult, array $serverdata)
        {
                if ($curlResult->getHeader('server') == 'Mastodon') {
                        $serverdata['platform'] = 'mastodon';
-                       $serverdata['network'] = $network = Protocol::ACTIVITYPUB;
+                       $serverdata['network'] = Protocol::ACTIVITYPUB;
                } elseif ($curlResult->inHeader('x-diaspora-version')) {
                        $serverdata['platform'] = 'diaspora';
-                       $serverdata['network'] = $network = Protocol::DIASPORA;
-                       $serverdata['version'] = $curlResult->getHeader('x-diaspora-version');
-
+                       $serverdata['network'] = Protocol::DIASPORA;
+                       $serverdata['version'] = $curlResult->getHeader('x-diaspora-version')[0] ?? '';
                } elseif ($curlResult->inHeader('x-friendica-version')) {
                        $serverdata['platform'] = 'friendica';
-                       $serverdata['network'] = $network = Protocol::DFRN;
-                       $serverdata['version'] = $curlResult->getHeader('x-friendica-version');
-
+                       $serverdata['network'] = Protocol::DFRN;
+                       $serverdata['version'] = $curlResult->getHeader('x-friendica-version')[0] ?? '';
                } else {
-//print_r($curlResult->getHeaderArray());
+                       return $serverdata;
+               }
+
+               if ($serverdata['detection-method'] == self::DETECT_MANUAL) {
+                       $serverdata['detection-method'] = self::DETECT_HEADER;
                }
+
                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()
+       {
+               // Update the server list
+               self::discoverFederation();
+
+               $no_of_queries = 5;
+
+               $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],
+                       ['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']);
+
+                       Logger::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]);
+                       Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver);
+
+                       $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
+                       DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
+
+                       if (--$no_of_queries == 0) {
+                               break;
+                       }
+               }
+
+               DBA::close($gservers);
+       }
+
+       /**
+        * Discover federated servers
+        */
+       private static function discoverFederation()
+       {
+               $last = DI::config()->get('poco', 'last_federation_discovery');
+
+               if ($last) {
+                       $next = $last + (24 * 60 * 60);
+
+                       if ($next > time()) {
+                               return;
+                       }
+               }
+
+               // Discover federated servers
+               $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), 0, HttpClient::ACCEPT_JSON);
+                       if (!empty($curlResult)) {
+                               $data = json_decode($curlResult, true);
+                               if (!empty($data['data']['nodes'])) {
+                                       foreach ($data['data']['nodes'] as $server) {
+                                               // Using "only_nodeinfo" since servers that are listed on that page should always have it.
+                                               self::add('https://' . $server['host'], true);
+                                       }
+                               }
+                       }
+               }
+
+               // Disvover 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]], HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
+                       if ($curlResult->isSuccess()) {
+                               $servers = json_decode($curlResult->getBody(), true);
+
+                               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());
+       }
+
+       /**
+        * Set the protocol for the given server
+        *
+        * @param int $gsid     Server id
+        * @param int $protocol Protocol id
+        * @return void
+        * @throws Exception
+        */
+       public static function setProtocol(int $gsid, int $protocol)
+       {
+               if (empty($gsid)) {
+                       return;
+               }
+
+               $gserver = DBA::selectFirst('gserver', ['protocol', 'url'], ['id' => $gsid]);
+               if (!DBA::isResult($gserver)) {
+                       return;
+               }
+
+               $old = $gserver['protocol'];
+
+               if (!is_null($old)) {
+                       /*
+                       The priority for the protocols is:
+                               1. ActivityPub
+                               2. DFRN via Diaspora
+                               3. Legacy DFRN
+                               4. Diaspora
+                               5. OStatus
+                       */
+
+                       // We don't need to change it when nothing is to be changed
+                       if ($old == $protocol) {
+                               return;
+                       }
+
+                       // We don't want to mark a server as OStatus when it had been marked with any other protocol before
+                       if ($protocol == Post\DeliveryData::OSTATUS) {
+                               return;
+                       }
+
+                       // If the server is marked as ActivityPub then we won't change it to anything different
+                       if ($old == Post\DeliveryData::ACTIVITYPUB) {
+                               return;
+                       }
+
+                       // Don't change it to anything lower than DFRN if the new one wasn't ActivityPub
+                       if (($old == Post\DeliveryData::DFRN) && ($protocol != Post\DeliveryData::ACTIVITYPUB)) {
+                               return;
+                       }
+
+                       // Don't change it to Diaspora when it is a legacy DFRN server
+                       if (($old == Post\DeliveryData::LEGACY_DFRN) && ($protocol == Post\DeliveryData::DIASPORA)) {
+                               return;
+                       }
+               }
+
+               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]);
+       }
+
+       /**
+        * Fetch the protocol of the given server
+        *
+        * @param int $gsid Server id
+        * @return int
+        * @throws Exception
+        */
+       public static function getProtocol(int $gsid)
+       {
+               if (empty($gsid)) {
+                       return null;
+               }
+
+               $gserver = DBA::selectFirst('gserver', ['protocol'], ['id' => $gsid]);
+               if (DBA::isResult($gserver)) {
+                       return $gserver['protocol'];
+               }
+
+               return null;
+       }
 }