X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=c0e4899923d86cb375109e9b2240675d166cc5eb;hb=624e4c192c7f837ac0587a50da6e1409081eb519;hp=a6be93ff78f44aecea01896af1b2eaf96f5f6f3c;hpb=8720561e49d2d5889fa4f4fd611efc790258ad1c;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index a6be93ff78..c0e4899923 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -438,7 +438,7 @@ class GServer
 				}
 			}
 
-			if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB)) {
+			if (empty($nodeinfo['network']) && (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB))) {
 				$serverdata = self::detectMastodonAlikes($url, $serverdata);
 			}
 
@@ -478,7 +478,7 @@ class GServer
 				$serverdata = self::detectNextcloud($url, $serverdata);
 			}
 
-			if (empty($serverdata['network'])) {
+			if (empty($nodeinfo['network']) && empty($serverdata['network'])) {
 				$serverdata = self::detectGNUSocial($url, $serverdata);
 			}
 
@@ -934,6 +934,11 @@ class GServer
 				// Version numbers on Nodeinfo are presented with additional info, e.g.:
 				// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
 				$server['version'] = preg_replace('=(.+)-(.{4,})=ism', '$1', $server['version']);
+
+				// qoto advertises itself as Mastodon
+				if (($server['platform'] == 'mastodon') && substr($nodeinfo['software']['version'], -5) == '-qoto') {
+					$server['platform'] = 'qoto';
+				}
 			}
 		}