]> git.mxchange.org Git - friendica.git/commitdiff
Simplify gserver entry creation for non native networks
authorMichael <heluecht@pirati.ca>
Sun, 19 Nov 2023 19:11:45 +0000 (19:11 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 19 Nov 2023 19:11:45 +0000 (19:11 +0000)
src/Model/GServer.php

index 84d8dad8b6ce5661a82262c739e25e620f3b008f..aac3ccd9a44e13edb49835d2bc62705dce3bb2e2 100644 (file)
@@ -81,7 +81,6 @@ class GServer
        const DETECT_MASTODON_API = 16;
        const DETECT_STATUS_PHP = 17; // Nextcloud
        const DETECT_V1_CONFIG = 18;
-       const DETECT_PUMPIO = 19; // Deprecated
        const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap
 
        // Standardized endpoints
@@ -617,10 +616,14 @@ class GServer
                        return false;
                }
 
-               $serverdata = self::parseNodeinfo210($curlResult);
-               if (empty($serverdata)) {
-                       $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', HttpClientAccept::JSON);
-                       $serverdata = self::fetchNodeinfo($url, $curlResult);
+               if (!empty($network) && !in_array($network, Protocol::NATIVE_SUPPORT)) {
+                       $serverdata = ['detection-method' => self::DETECT_MANUAL, 'network' => $network, 'platform' => '', 'version' => '', 'site_name' => '', 'info' => ''];
+               } else {
+                       $serverdata = self::parseNodeinfo210($curlResult);
+                       if (empty($serverdata)) {
+                               $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', HttpClientAccept::JSON);
+                               $serverdata = self::fetchNodeinfo($url, $curlResult);
+                       }
                }
 
                if ($only_nodeinfo && empty($serverdata)) {