Fetch platform and version of nomad implementations

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 13dd13af446efc85752ef12b0e5f28648096865d..635dcfc09ed6712ed439d3efa079a25e069aa70c 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -755,6 +755,10 @@ class GServer
                        return false;
                }
 
+               if (empty($serverdata['version']) && in_array($serverdata['platform'], ['osada']) && in_array($serverdata['detection-method'], [self::DETECT_CONTACTS, self::DETECT_BODY])) {
+                       $serverdata['version'] = self::getNomadVersion($url);
+               }
+
                // Detect the directory type
                $serverdata['directory-type'] = self::DT_NONE;
 
@@ -1499,14 +1503,15 @@ class GServer
                        $serverdata['network'] = Protocol::ACTIVITYPUB;
                        $serverdata['site_name'] = JsonLD::fetchElement($actor, 'as:name', '@value');
                        $serverdata['info'] = JsonLD::fetchElement($actor, 'as:summary', '@value');
-                       if (!empty($actor['as:generator'])) {
+                       if (self::isNomad($actor)) {
+                               $serverdata['platform'] = self::getNomadName($actor['@id']);
+                               $serverdata['version'] = self::getNomadVersion($actor['@id']);
+                               $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+                       } elseif (!empty($actor['as:generator'])) {
                                $generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value'));
                                $serverdata['platform'] = strtolower(array_shift($generator));
+                               $serverdata['version'] = self::getNomadVersion($actor['@id']);
                                $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
-                               if (self::isNomad($actor)) {
-                                       $serverdata['version']  = $serverdata['platform'];
-                                       $serverdata['platform'] = 'nomad';
-                               }
                        } else {
                                $serverdata['detection-method'] = self::DETECT_AP_ACTOR;
                        }
@@ -1550,6 +1555,49 @@ class GServer
                return false;
        }
 
+       /**
+        * Fetch the name of Nomad implementation
+        *
+        * @param string $url
+        * @return string
+        */
+       private static function getNomadName(string $url): string
+       {
+               $name = 'nomad';
+               $curlResult = DI::httpClient()->get($url . '/manifest', 'application/manifest+json');
+               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+                       return $name;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (empty($data)) {
+                       return $name;
+               }
+
+               return $data['name'] ?? $name;
+       }
+
+       /**
+        * Fetch the version of the Nomad installation
+        *
+        * @param string $url
+        * @return string
+        */
+       private static function getNomadVersion(string $url): string
+       {
+               $version = '';
+               $curlResult = DI::httpClient()->get($url . '/api/z/1.0/version', HttpClientAccept::JSON);
+               if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+                       return $version;
+               }
+
+               $data = json_decode($curlResult->getBody(), true);
+               if (empty($data)) {
+                       return $version;
+               }
+               return $data ?? $version;
+       }
+
        /**
         * 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 9548c3ce1d13ad220ca3b7e3a22ca1c2c7562f8b..59399e639ca814d8612c374f04083a107a20dd53 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -111,7 +111,7 @@ class Federation extends BaseAdmin
 
                                if (in_array($gserver['platform'], ['Red Matrix', 'redmatrix', 'red'])) {
                                        $version['version'] = 'Red ' . $version['version'];
-                               } elseif (in_array($gserver['platform'], ['osada', 'mistpark', 'roadhouse', 'zap', 'macgirvin', 'mkultra'])) {
+                               } elseif (in_array($gserver['platform'], ['osada', 'mistpark', 'roadhouse', 'streams', 'zap'])) {
                                        $version['version'] = $gserver['platform'] . ' ' . $version['version'];
                                } elseif (in_array($gserver['platform'], ['activityrelay', 'pub-relay', 'selective-relay', 'aoderelay'])) {
                                        $version['version'] = $gserver['platform'] . '-' . $version['version'];
@@ -127,7 +127,7 @@ class Federation extends BaseAdmin
                                $platform = 'friendica';
                        } elseif (in_array($platform, ['red matrix', 'redmatrix', 'red'])) {
                                $platform = 'hubzilla';
-                       } elseif (in_array($platform, ['nomad', 'osada', 'mistpark', 'roadhouse', 'zap', 'macgirvin', 'mkultra'])) {
+                       } elseif (in_array($platform, ['osada', 'mistpark', 'roadhouse', 'streams', 'zap'])) {
                                $platform = 'nomad';
                        } elseif(stristr($platform, 'pleroma')) {
                                $platform = 'pleroma';