Avoid wrong server type detection / Owncast added

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index a6be93ff78f44aecea01896af1b2eaf96f5f6f3c..c0e4899923d86cb375109e9b2240675d166cc5eb 100644 (file)
--- 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';
+                               }
                        }
                }
 

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 1927bace3c38edd588d9b7670fa91b8228c6ecad..b882903ccc8f151ea7129ce219e449f25e77215b 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -51,6 +51,7 @@ class Federation extends BaseAdmin
                        'mobilizon'    => ['name' => 'Mobilizon', 'color' => '#ffd599'], // Background color of parts of the homepage
                        'nextcloud'    => ['name' => 'Nextcloud', 'color' => '#1cafff'], // Logo color
                        'mistpark'     => ['name' => 'Nomad projects (Mistpark, Osada, Roadhouse, Zap)', 'color' => '#348a4a'], // Green like the Mistpark green
+                       'owncast'      => ['name' => 'Owncast', 'color' => '#007bff'], // Font color of the homepage
                        'peertube'     => ['name' => 'Peertube', 'color' => '#ffad5c'], // One of the logo colors
                        'pixelfed'     => ['name' => 'Pixelfed', 'color' => '#11da47'], // One of the logo colors
                        'pleroma'      => ['name' => 'Pleroma', 'color' => '#E46F0F'], // Orange from the text that is used on Pleroma instances