X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=731175ea50c18e14f6d51431da8a5fb106a53ef3;hb=72a3ab6382551811f22391b7e82e7398628b235b;hp=f750ed99ea778b31034135c02850e3ad941c2622;hpb=62f3c1f4b8b63bba6117ac50a49387fafd71a90a;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index f750ed99ea..731175ea50 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,20 +23,23 @@ namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
+use Exception;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
-use Friendica\Network\CurlResult;
-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;
-use Friendica\Protocol\PortableContact;
-use Friendica\Protocol\Diaspora;
-use Friendica\Network\Probe;
 
 /**
  * This class handles GServer related functions
@@ -47,6 +50,102 @@ class GServer
 	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
 	 *
@@ -60,7 +159,10 @@ class GServer
 	public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false)
 	{
 		if ($server == '') {
-			$server = GContact::getBasepath($profile);
+			$contact = Contact::getByURL($profile, null, ['baseurl']);
+			if (!empty($contact['baseurl'])) {
+				$server = $contact['baseurl'];
+			}
 		}
 
 		if ($server == '') {
@@ -70,76 +172,68 @@ class GServer
 		return self::check($server, $network, $force);
 	}
 
-	/**
-	 * Decides if a server needs to be updated, based upon several date fields
-	 *
-	 * @param date $created      Creation date of that server entry
-	 * @param date $updated      When had the server entry be updated
-	 * @param date $last_failure Last failure when contacting that server
-	 * @param date $last_contact Last time the server had been contacted
-	 *
-	 * @return boolean Does the server record needs an update?
-	 */
-	public static function updateNeeded($created, $updated, $last_failure, $last_contact)
+	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 ($updated > $last_contact) {
-			$contact_time = strtotime($updated);
+		if ($created > $last_contact) {
+			$contact_time = strtotime($created);
 		} else {
 			$contact_time = strtotime($last_contact);
 		}
 
-		$failure_time = strtotime($last_failure);
-		$created_time = strtotime($created);
+		// 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 there is no "created" time then use the current time
-		if ($created_time <= 0) {
-			$created_time = $now;
+		// 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 then don't update
+		// If the last contact was less than 24 hours before then try tomorrow again
 		if (($now - $contact_time) < (60 * 60 * 24)) {
-			return false;
+			return DateTimeFormat::utc('now +1 day');
 		}
 
-		// If the last failure was less than 24 hours then don't update
-		if (($now - $failure_time) < (60 * 60 * 24)) {
-			return false;
+		// 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 a week ago and the last failure is older than a week then don't update
-		//if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
-		//	return false;
-
-		// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
-		if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) {
-			return false;
+		// 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 time was more than a month ago and the contact was created more than a month ago, then only try once a month
-		if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) {
-			return false;
+		// 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');
 		}
 
-		return true;
+		// 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 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)
+	public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false)
 	{
-		// Unify the server address
-		$server_url = trim($server_url, '/');
-		$server_url = str_replace('/index.php', '', $server_url);
-
+		$server_url = self::cleanURL($server_url);
 		if ($server_url == '') {
 			return false;
 		}
@@ -152,69 +246,127 @@ class GServer
 				DBA::update('gserver', $fields, $condition);
 			}
 
-			$last_contact = $gserver['last_contact'];
-			$last_failure = $gserver['last_failure'];
-
-			// See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
-			// It can happen that a zero date is in the database, but storing it again is forbidden.
-			if ($last_contact < DBA::NULL_DATETIME) {
-				$last_contact = DBA::NULL_DATETIME;
-			}
-
-			if ($last_failure < DBA::NULL_DATETIME) {
-				$last_failure = DBA::NULL_DATETIME;
-			}
-
-			if (!$force && !self::updateNeeded($gserver['created'], '', $last_failure, $last_contact)) {
+			if (!$force && (strtotime($gserver['next_contact']) > time())) {
 				Logger::info('No update needed', ['server' => $server_url]);
-				return ($last_contact >= $last_failure);
+				return (!$gserver['failed']);
 			}
-			Logger::info('Server is outdated. Start discovery.', ['Server' => $server_url, 'Force' => $force, 'Created' => $gserver['created'], 'Failure' => $last_failure, 'Contact' => $last_contact]);
+			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);
+		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     URL of the given server
-	 * @param string  $network Network value that is used, when detection failed
+	 * @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(string $url, string $network = '')
+	public static function detect(string $url, string $network = '', bool $only_nodeinfo = false)
 	{
 		Logger::info('Detect server type', ['server' => $url]);
-		$serverdata = [];
+		$serverdata = ['detection-method' => self::DETECT_MANUAL];
 
 		$original_url = $url;
 
 		// Remove URL content that is not supposed to exist for a server url
-		$urlparts = parse_url($url);
-		unset($urlparts['user']);
-		unset($urlparts['pass']);
-		unset($urlparts['query']);
-		unset($urlparts['fragment']);
-		$url = Network::unparseURL($urlparts);
+		$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) {
-			DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($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 = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $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)) {
@@ -224,18 +376,66 @@ class GServer
 		// If that didn't work out well, we use some protocol specific endpoints
 		// For Friendica and Zot based networks we have to dive deeper to reveal more details
 		if (empty($nodeinfo['network']) || in_array($nodeinfo['network'], [Protocol::DFRN, Protocol::ZOT])) {
+			if (!empty($nodeinfo['detection-method'])) {
+				$serverdata['detection-method'] = $nodeinfo['detection-method'];
+
+				foreach (['registered-users', 'active_users_monthly', 'active-halfyear-users', 'local-posts'] as $field) {
+					if (!empty($nodeinfo[$field])) {
+						$serverdata[$field] = $nodeinfo[$field];
+					}
+				}
+			}
+
 			// Fetch the landing page, possibly it reveals some data
 			if (empty($nodeinfo['network'])) {
-				$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout]);
+				if ($baseurl == $url) {
+					$basedata = $serverdata;
+				} else {
+					$basedata = ['detection-method' => self::DETECT_MANUAL];
+				}
+
+				$curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_HTML]);
 				if ($curlResult->isSuccess()) {
-					$serverdata = self::analyseRootHeader($curlResult, $serverdata);
-					$serverdata = self::analyseRootBody($curlResult, $serverdata, $url);
+					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())) {
-					DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
+					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)) {
@@ -245,8 +445,14 @@ class GServer
 			// 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.
-			if (empty($serverdata['network']) && !self::validHostMeta($url)) {
-				DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
+			$validHostMeta = self::validHostMeta($url);
+
+			if (empty($serverdata['network']) && !$validHostMeta) {
+				$serverdata = self::detectFromContacts($url, $serverdata);
+			}
+
+			if (empty($serverdata['network']) && !$validHostMeta) {
+				self::setFailure($url);
 				return false;
 			}
 
@@ -264,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);
 			}
@@ -271,6 +481,12 @@ 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;
 		}
@@ -293,42 +509,71 @@ class GServer
 		$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);
+		}
 
-		// On an active server there has to be at least a single user
-		if (($serverdata['network'] != Protocol::PHANTOM) && ($registeredUsers == 0)) {
-			$registeredUsers = 1;
+		if ($serverdata['network'] == Protocol::ACTIVITYPUB) {
+			$serverdata = self::fetchWeeklyUsage($url, $serverdata);
 		}
 
-		if ($serverdata['network'] != Protocol::PHANTOM) {
-			$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);
-		} else {
-			$serverdata['registered-users'] = $registeredUsers;
-			$serverdata = self::detectNetworkViaContacts($url, $serverdata);
+		$serverdata['registered-users'] = $serverdata['registered-users'] ?? 0;
+
+		// On an active server there has to be at least a single user
+		if (!in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) && ($serverdata['registered-users'] == 0)) {
+			$serverdata['registered-users'] = 1;
+		} elseif (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
+			$serverdata['registered-users'] = 0;
 		}
 
+		$serverdata['next_contact'] = self::getNextUpdateDate(true);
+
 		$serverdata['last_contact'] = DateTimeFormat::utcNow();
+		$serverdata['failed'] = false;
 
 		$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 {
-			// Don't override the network with 'unknown' when there had been a valid entry before
-			if (($serverdata['network'] == Protocol::PHANTOM) && !empty($gserver['network'])) {
-				unset($serverdata['network']);
+			$ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]);
+			$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]);
+			if (DBA::isResult($gserver)) {
+				$id = $gserver['id'];
+			}
+		}
+
+		// 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]);
 			}
 
-			$ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]);
+			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);
-                }
+			self::discoverRelay($url);
+		}
 
 		return $ret;
 	}
@@ -343,7 +588,7 @@ class GServer
 	{
 		Logger::info('Discover relay data', ['server' => $server_url]);
 
-		$curlResult = Network::curl($server_url . '/.well-known/x-social-relay');
+		$curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess()) {
 			return;
 		}
@@ -362,7 +607,7 @@ class GServer
 			$data['tags'] = [];
 		}
 
-		$gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
+		$gserver = DBA::selectFirst('gserver', ['id', 'url', 'network', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
 		if (!DBA::isResult($gserver)) {
 			return;
 		}
@@ -385,7 +630,7 @@ class GServer
 			}
 
 			foreach ($tags as $tag) {
-				DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+				DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], Database::INSERT_IGNORE);
 			}
 		}
 
@@ -411,8 +656,22 @@ class GServer
 					$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'];
+				}
+			}
 		}
-		Diaspora::setRelayContact($server_url, $fields);
+
+		Logger::info('Discovery ended', ['server' => $server_url, 'data' => $fields]);
+
+		Relay::updateContact($gserver, $fields);
 	}
 
 	/**
@@ -424,7 +683,7 @@ class GServer
 	 */
 	private static function fetchStatistics(string $url)
 	{
-		$curlResult = Network::curl($url . '/statistics.json');
+		$curlResult = DI::httpClient()->get($url . '/statistics.json', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess()) {
 			return [];
 		}
@@ -434,7 +693,7 @@ class GServer
 			return [];
 		}
 
-		$serverdata = [];
+		$serverdata = ['detection-method' => self::DETECT_STATISTICS_JSON];
 
 		if (!empty($data['version'])) {
 			$serverdata['version'] = $data['version'];
@@ -461,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;
@@ -474,14 +748,19 @@ class GServer
 	/**
 	 * Detect server type by using the nodeinfo data
 	 *
-	 * @param string     $url        address of the server
-	 * @param CurlResult $curlResult
+	 * @param string                  $url        address of the server
+	 * @param ICanHandleHttpResponses $httpResult
+	 *
 	 * @return array Server data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function fetchNodeinfo(string $url, CurlResult $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 [];
@@ -530,8 +809,7 @@ class GServer
 	 */
 	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 [];
 		}
@@ -542,9 +820,8 @@ class GServer
 			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;
@@ -568,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'])) {
@@ -602,13 +895,14 @@ class GServer
 	/**
 	 * Parses Nodeinfo 2
 	 *
+	 * @see https://git.feneas.org/jaywink/nodeinfo2
 	 * @param string $nodeinfo_url address of the nodeinfo path
 	 * @return array Server data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function parseNodeinfo2(string $nodeinfo_url)
 	{
-		$curlResult = Network::curl($nodeinfo_url);
+		$curlResult = DI::httpClient()->get($nodeinfo_url, [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess()) {
 			return [];
 		}
@@ -619,9 +913,8 @@ class GServer
 			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;
@@ -645,13 +938,31 @@ 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['dfrn'])) {
@@ -686,7 +997,7 @@ class GServer
 	 */
 	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;
 		}
@@ -696,6 +1007,10 @@ 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'] = strtolower($data['platform']);
 			$serverdata['version'] = $data['version'];
@@ -718,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'])) {
@@ -751,7 +1082,7 @@ class GServer
 	private static function validHostMeta(string $url)
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = Network::curl($url . '/.well-known/host-meta', false, ['timeout' => $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;
 		}
@@ -798,12 +1129,6 @@ class GServer
 	{
 		$contacts = [];
 
-		$gcontacts = DBA::select('gcontact', ['url', 'nurl'], ['server_url' => [$url, $serverdata['nurl']]]);
-		while ($gcontact = DBA::fetch($gcontacts)) {
-			$contacts[$gcontact['nurl']] = $gcontact['url'];
-		}
-		DBA::close($gcontacts);
-
 		$apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
 		while ($apcontact = DBA::fetch($apcontacts)) {
 			$contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
@@ -820,16 +1145,18 @@ class GServer
 			return $serverdata;
 		}
 
+		$time = time();
 		foreach ($contacts as $contact) {
-			$probed = Probe::uri($contact);
-			if (in_array($probed['network'], Protocol::FEDERATED)) {
+			$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;
 			}
 		}
 
-		$serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts));
-
 		return $serverdata;
 	}
 
@@ -847,7 +1174,7 @@ class GServer
 	{
 		$serverdata['poco'] = '';
 
-		$curlResult = Network::curl($url. '/poco');
+		$curlResult = DI::httpClient()->get($url . '/poco', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess()) {
 			return $serverdata;
 		}
@@ -859,7 +1186,7 @@ class GServer
 
 		if (!empty($data['totalResults'])) {
 			$registeredUsers = $serverdata['registered-users'] ?? 0;
-			$serverdata['registered-users'] = max($data['totalResults'], $registeredUsers);
+			$serverdata['registered-users'] = max($data['totalResults'], $registeredUsers, 1);
 			$serverdata['directory-type'] = self::DT_POCO;
 			$serverdata['poco'] = $url . '/poco';
 		}
@@ -877,7 +1204,7 @@ class GServer
 	 */
 	public static function checkMastodonDirectory(string $url, array $serverdata)
 	{
-		$curlResult = Network::curl($url . '/api/v1/directory?limit=1');
+		$curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess()) {
 			return $serverdata;
 		}
@@ -894,6 +1221,53 @@ class GServer
 		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;
+		}
+
+		if (!empty($data['instance']) && !empty($data['serverVersion'])) {
+			$serverdata['platform'] = 'peertube';
+			$serverdata['version'] = $data['serverVersion'];
+			$serverdata['network'] = Protocol::ACTIVITYPUB;
+
+			if (!empty($data['instance']['name'])) {
+				$serverdata['site_name'] = $data['instance']['name'];
+			}
+
+			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 $serverdata;
+	}
+
 	/**
 	 * Detects the version number of a given server when it was a NextCloud installation
 	 *
@@ -904,8 +1278,7 @@ class GServer
 	 */
 	private static function detectNextcloud(string $url, array $serverdata)
 	{
-		$curlResult = Network::curl($url . '/status.php');
-
+		$curlResult = DI::httpClient()->get($url . '/status.php', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
 		}
@@ -919,6 +1292,69 @@ class GServer
 			$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 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;
+		}
+
+		$data = json_decode($curlResult->getBody(), true);
+		if (empty($data)) {
+			return $serverdata;
+		}
+
+		$current_week = [];
+		foreach ($data as $week) {
+			// Use only data from a full week
+			if (empty($week['week']) || (time() - $week['week']) < 7 * 24 * 60 * 60) {
+				continue;
+			}
+
+			// Most likely the data is sorted correctly. But we better are safe than sorry
+			if (empty($current_week['week']) || ($current_week['week'] < $week['week'])) {
+				$current_week = $week;
+			} 
+		}
+
+		if (!empty($current_week['logins'])) {
+			$serverdata['active-week-users'] = max($current_week['logins'], 0);
+		}
+
+		return $serverdata;
+	}
+	
+	/**
+	 * Detects 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)
+	{
+		$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;
@@ -934,8 +1370,7 @@ class GServer
 	 */
 	private static function detectMastodonAlikes(string $url, array $serverdata)
 	{
-		$curlResult = Network::curl($url . '/api/v1/instance');
-
+		$curlResult = DI::httpClient()->get($url . '/api/v1/instance', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_JSON]);
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
 		}
@@ -945,6 +1380,10 @@ 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'] = $data['version'] ?? '';
@@ -965,7 +1404,7 @@ class GServer
 		}
 
 		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)) {
@@ -996,13 +1435,13 @@ class GServer
 	 */
 	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;
 		}
 
@@ -1050,11 +1489,16 @@ class GServer
 		}
 
 		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;
@@ -1076,7 +1520,57 @@ class GServer
 		}
 
 		return $val;
-        }
+	}
+
+	/**
+	 * Detect if the URL belongs to a pump.io server
+	 *
+	 * @param string $url        URL of the given server
+	 * @param array  $serverdata array with server data
+	 *
+	 * @return array server data
+	 */
+	private static function detectPumpIO(string $url, array $serverdata)
+	{
+		$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta.json', [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
@@ -1089,7 +1583,7 @@ class GServer
 	private static function detectGNUSocial(string $url, array $serverdata)
 	{
 		// Test for GNU Social
-		$curlResult = Network::curl($url . '/api/gnusocial/version.json');
+		$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'] = 'gnusocial';
@@ -1098,11 +1592,16 @@ class GServer
 			$serverdata['version'] = str_replace(["\r", "\n", "\t"], '', $serverdata['version']);
 			$serverdata['version'] = trim($serverdata['version'], '"');
 			$serverdata['network'] = Protocol::OSTATUS;
+
+			if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+				$serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
+			}
+
 			return $serverdata;
 		}
 
 		// Test for Statusnet
-		$curlResult = Network::curl($url . '/api/statusnet/version.json');
+		$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)) {
 
@@ -1119,6 +1618,10 @@ class GServer
 				$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;
@@ -1134,9 +1637,16 @@ class GServer
 	 */
 	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()) {
@@ -1148,6 +1658,10 @@ class GServer
 			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'];
 
@@ -1183,7 +1697,7 @@ class GServer
 				break;
 		}
 
-		$serverdata['platform'] = strtolower($data['platform'] ?? '');
+		$serverdata['platform'] = strtolower($data['platform'] ?? $platform);
 
 		return $serverdata;
 	}
@@ -1199,6 +1713,14 @@ class GServer
 	 */
 	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);
@@ -1231,7 +1753,8 @@ class GServer
 				$serverdata['info'] = $attr['content'];
 			}
 
-			if ($attr['name'] == 'application-name') {
+			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;
@@ -1243,14 +1766,15 @@ class GServer
 
 				if (count($version_part) == 2) {
 					if (in_array($version_part[0], ['WordPress'])) {
-						$serverdata['platform'] = strtolower($version_part[0]);
+						$serverdata['platform'] = 'wordpress';
 						$serverdata['version'] = $version_part[1];
 
 						// We still do need a reliable test if some AP plugin is activated
-						if (DBA::exists('apcontact', ['baseurl' => $url])) {
-							$serverdata['network'] = Protocol::ACTIVITYPUB;
-						} else {
-							$serverdata['network'] = Protocol::FEED;
+						// 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'])) {
@@ -1307,6 +1831,14 @@ class GServer
 			}
 		}
 
+		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;
 	}
 
@@ -1322,16 +1854,23 @@ class GServer
 	{
 		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 {
+			return $serverdata;
+		}
+
+		if ($serverdata['detection-method'] == self::DETECT_MANUAL) {
+			$serverdata['detection-method'] = self::DETECT_HEADER;
 		}
+
 		return $serverdata;
 	}
 
@@ -1348,20 +1887,6 @@ class GServer
 		return !strpos($body, '>');
 	}
 
-	/**
-	 * Update the user directory of a given gserver record
-	 *
-	 * @param array $gserver gserver record
-	 */
-	public static function updateDirectory(array $gserver)
-	{
-		/// @todo Add Mastodon API directory
-
-		if (!empty($gserver['poco'])) {
-			PortableContact::discoverSingleServer($gserver['id']);
-		}
-	}
-
 	/**
 	 * Update GServer entries
 	 */
@@ -1380,25 +1905,20 @@ class GServer
 
 		$last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
 
-		$gservers = DBA::p("SELECT `id`, `url`, `nurl`, `network`, `poco`
-			FROM `gserver`
-			WHERE `last_contact` >= `last_failure`
-			AND `poco` != ''
-			AND `last_poco_query` < ?
-			ORDER BY RAND()", $last_update
-		);
+		$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)) {
-			if (!GServer::check($gserver['url'], $gserver['network'])) {
-				// The server is not reachable? Okay, then we will try it later
-				$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
-				DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
-				continue;
-			}
+			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;
 			}
@@ -1423,14 +1943,17 @@ class GServer
 		}
 
 		// Discover federated servers
-		$curlResult = Network::fetchUrl("http://the-federation.info/pods.json");
-
-		if (!empty($curlResult)) {
-			$servers = json_decode($curlResult, true);
-
-			if (!empty($servers['pods'])) {
-				foreach ($servers['pods'] as $server) {
-					Worker::add(PRIORITY_LOW, 'UpdateGServer', 'https://' . $server['host']);
+		$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);
+					}
 				}
 			}
 		}
@@ -1440,19 +1963,99 @@ class GServer
 
 		if (!empty($accesstoken)) {
 			$api = 'https://instances.social/api/1.0/instances/list?count=0';
-			$header = ['Authorization: Bearer '.$accesstoken];
-			$curlResult = Network::curl($api, false, ['headers' => $header]);
-
+			$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'];
-					Worker::add(PRIORITY_LOW, 'UpdateGServer', $url);
+					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;
+	}
 }