clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify gserver entry creation for non native networks

This commit is contained in:
Michael 2023-11-19 19:11:45 +00:00
parent 80796a87c7
commit ba3dacdbde
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Model/GServer.php
View File

@ -81,7 +81,6 @@ class GServer
const DETECT_MASTODON_API = 16; const DETECT_MASTODON_API = 16;
const DETECT_STATUS_PHP = 17; // Nextcloud const DETECT_STATUS_PHP = 17; // Nextcloud
const DETECT_V1_CONFIG = 18; const DETECT_V1_CONFIG = 18;
const DETECT_PUMPIO = 19; // Deprecated
const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap const DETECT_SYSTEM_ACTOR = 20; // Mistpark, Osada, Roadhouse, Zap
// Standardized endpoints // Standardized endpoints
@ -617,11 +616,15 @@ class GServer
return false; return false;
} }
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); $serverdata = self::parseNodeinfo210($curlResult);
if (empty($serverdata)) { if (empty($serverdata)) {
$curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', HttpClientAccept::JSON); $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', HttpClientAccept::JSON);
$serverdata = self::fetchNodeinfo($url, $curlResult); $serverdata = self::fetchNodeinfo($url, $curlResult);
} }
}
if ($only_nodeinfo && empty($serverdata)) { if ($only_nodeinfo && empty($serverdata)) {
Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]); Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]);