Takahē and Wildebeest added, Nomad detection improved

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 0a3590419b59f499890f259ed0ccf741ba4a950e..04b07889cad31db21384d970414abc6653e66b9b 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -1503,6 +1503,10 @@ class GServer
                                $generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value'));
                                $serverdata['platform'] = strtolower(array_shift($generator));
                                $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+                               if (self::isNomad($actor['@id'])) {
+                                       $serverdata['version']  = $serverdata['platform'];
+                                       $serverdata['platform'] = 'nomad';
+                               }
                        } else {
                                $serverdata['detection-method'] = self::DETECT_AP_ACTOR;
                        }
@@ -1525,6 +1529,22 @@ class GServer
                return ['server' => $serverdata, 'actor' => ''];
        }
 
+       /**
+        * Detect if the given url belongs to a nomad account
+        *
+        * @param string $url
+        * @return boolean
+        */
+       private static function isNomad(string $url): bool
+       {
+               foreach (Probe::lrdd($url) as $attribute) {
+                       if ((($attribute['@attributes']['rel'] ?? '') == 'http://purl.org/nomad') && (($attribute['@attributes']['type'] ?? '') == 'application/x-nomad+json')) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
        /**
         * Checks if the server contains a valid host meta file
         *

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index cf53a784d621731dcc77aeb77d4e4b748d4425c8..9548c3ce1d13ad220ca3b7e3a22ca1c2c7562f8b 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -59,7 +59,7 @@ class Federation extends BaseAdmin
                        'misskey'      => ['name' => 'Misskey', 'color' => '#ccfefd'], // Font color of the homepage
                        '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
+                       'nomad'        => ['name' => 'Nomad projects (Mistpark, Osada, Roadhouse, Streams. 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
@@ -67,6 +67,8 @@ class Federation extends BaseAdmin
                        'plume'        => ['name' => 'Plume', 'color' => '#7765e3'], // From the homepage
                        'relay'        => ['name' => 'ActivityPub Relay', 'color' => '#888888'], // Grey like the second color of the ActivityPub logo
                        'socialhome'   => ['name' => 'SocialHome', 'color' => '#52056b'], // lilac from the Django Image used at the Socialhome homepage
+                       'takahe'       => ['name' => 'Takahē', 'color' => '#26323c'], // Background color of the homepage
+                       'wildebeest'   => ['name' => 'Wildebeest', 'color' => '#0055dc'], // Color of the mascot
                        'wordpress'    => ['name' => 'WordPress', 'color' => '#016087'], // Background color of the homepage
                        'write.as'     => ['name' => 'Write.as', 'color' => '#00ace3'], // Border color of the homepage
                        'writefreely'  => ['name' => 'WriteFreely', 'color' => '#292929'], // Font color of the homepage
@@ -125,8 +127,8 @@ class Federation extends BaseAdmin
                                $platform = 'friendica';
                        } elseif (in_array($platform, ['red matrix', 'redmatrix', 'red'])) {
                                $platform = 'hubzilla';
-                       } elseif (in_array($platform, ['osada', 'mistpark', 'roadhouse', 'zap', 'macgirvin', 'mkultra'])) {
-                               $platform = 'mistpark';
+                       } elseif (in_array($platform, ['nomad', 'osada', 'mistpark', 'roadhouse', 'zap', 'macgirvin', 'mkultra'])) {
+                               $platform = 'nomad';
                        } elseif(stristr($platform, 'pleroma')) {
                                $platform = 'pleroma';
                        } elseif(stristr($platform, 'statusnet')) {