Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-02-24 13:18:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce cyclomatic complexity in GServer::detect()

Browse source
This commit is contained in:
Art4 2024-12-25 18:33:04 +00:00
parent 6684f0d5c7
commit d55830902b
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Model/GServer.php
View file

@ -815,6 +815,25 @@ class GServer
} }
// Count the number of known contacts from this server // Count the number of known contacts from this server
self::countNumberOfKnownContacts((int) $id, $serverdata);
if (in_array($serverdata['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
self::discoverRelay($url);
}
if (!empty($systemactor)) {
$contact = Contact::getByURL($systemactor, true, ['gsid', 'baseurl', 'id', 'network', 'url', 'name']);
Logger::debug('Fetched system actor', ['url' => $url, 'gsid' => $id, 'contact' => $contact]);
}
return $ret;
}
/**
* Count the number of known contacts from this server
*/
private static function countNumberOfKnownContacts(int $id, array $serverdata): void
{
if (!empty($id) && !in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) { if (!empty($id) && !in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
$apcontacts = DBA::count('apcontact', ['gsid' => $id]); $apcontacts = DBA::count('apcontact', ['gsid' => $id]);
$contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]); $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]);
@ -840,17 +859,6 @@ class GServer
} }
} }
} }
if (in_array($serverdata['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
self::discoverRelay($url);
}
if (!empty($systemactor)) {
$contact = Contact::getByURL($systemactor, true, ['gsid', 'baseurl', 'id', 'network', 'url', 'name']);
Logger::debug('Fetched system actor', ['url' => $url, 'gsid' => $id, 'contact' => $contact]);
}
return $ret;
} }
/** /**