Merge pull request #12909 from annando/server-detection

[friendica.git] / src / Model / GServer.php

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 7e3f0f480238f8754efe32058744e58d7ea0a49c..13dd13af446efc85752ef12b0e5f28648096865d 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -1060,10 +1060,11 @@ class GServer
                                Logger::info('Invalid nodeinfo format', ['url' => $url]);
                                continue;
                        }
+
                        if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
-                               $nodeinfo1_url = $link['href'];
+                               $nodeinfo1_url = Network::addBasePath($link['href'], $httpResult->getUrl());
                        } elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
-                               $nodeinfo2_url = $link['href'];
+                               $nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl());
                        }
                }
 
@@ -1416,7 +1417,7 @@ class GServer
                        $serverdata['detection-method'] = self::DETECT_SITEINFO_JSON;
                }
 
-               if (!empty($data['url'])) {
+               if (!empty($data['platform'])) {
                        $serverdata['platform'] = strtolower($data['platform']);
                        $serverdata['version'] = $data['version'] ?? 'N/A';
                }
@@ -1502,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)) {
+                                       $serverdata['version']  = $serverdata['platform'];
+                                       $serverdata['platform'] = 'nomad';
+                               }
                        } else {
                                $serverdata['detection-method'] = self::DETECT_AP_ACTOR;
                        }
@@ -1524,6 +1529,27 @@ class GServer
                return ['server' => $serverdata, 'actor' => ''];
        }
 
+       /**
+        * Detect if the given actor is a nomad account
+        *
+        * @param array $actor
+        * @return boolean
+        */
+       private static function isNomad(array $actor): bool
+       {
+               $tags = JsonLD::fetchElementArray($actor, 'as:tag');
+               if (empty($tags)) {
+                       return false;
+               }
+
+               foreach ($tags as $tag) {
+                       if ((($tag['as:name'] ?? '') == 'Protocol') && (($tag['sc:value'] ?? '') == 'nomad')) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
        /**
         * Checks if the server contains a valid host meta file
         *