keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use first word as platform / improvements for registered users

Browse source
This commit is contained in:
Michael 2022-02-06 05:59:47 +00:00
parent 585af09b7d
commit ea2faa28fe
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Model/GServer.php
View file

@ -496,17 +496,17 @@ class GServer
$serverdata['url'] = $url; $serverdata['url'] = $url;
$serverdata['nurl'] = Strings::normaliseLink($url); $serverdata['nurl'] = Strings::normaliseLink($url);
// We take the highest number that we do find if ($serverdata['network'] == Protocol::PHANTOM) {
$registeredUsers = $serverdata['registered-users'] ?? 0; $serverdata = self::detectNetworkViaContacts($url, $serverdata);
// On an active server there has to be at least a single user
if (($serverdata['network'] != Protocol::PHANTOM) && ($registeredUsers == 0)) {
$registeredUsers = 1;
} }
if ($serverdata['network'] == Protocol::PHANTOM) { $serverdata['registered-users'] = $serverdata['registered-users'] ?? 0;
$serverdata['registered-users'] = max($registeredUsers, 1);
$serverdata = self::detectNetworkViaContacts($url, $serverdata); // On an active server there has to be at least a single user
if (!in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) && ($serverdata['registered-users'] == 0)) {
$serverdata['registered-users'] = 1;
} elseif (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) {
$serverdata['registered-users'] = 0;
} }
$serverdata['next_contact'] = self::getNextUpdateDate(true); $serverdata['next_contact'] = self::getNextUpdateDate(true);
@ -520,11 +520,6 @@ class GServer
$ret = DBA::insert('gserver', $serverdata); $ret = DBA::insert('gserver', $serverdata);
$id = DBA::lastInsertId(); $id = DBA::lastInsertId();
} else { } else {
// Don't override the network with 'unknown' when there had been a valid entry before
if (($serverdata['network'] == Protocol::PHANTOM) && !empty($gserver['network'])) {
unset($serverdata['network']);
}
$ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]); $ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]);
$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]);
if (DBA::isResult($gserver)) { if (DBA::isResult($gserver)) {
@ -532,11 +527,12 @@ class GServer
} }
} }
if (!empty($serverdata['network']) && !empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) { // Count the number of known contacts from this server
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]); $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]);
$max_users = max($apcontacts, $contacts, $registeredUsers, 1); $max_users = max($apcontacts, $contacts);
if ($max_users > $registeredUsers) { if ($max_users > $serverdata['registered-users']) {
Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]); Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]);
DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]); DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]);
} }
@ -1056,14 +1052,12 @@ class GServer
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$probed = Contact::getByURL($contact); $probed = Contact::getByURL($contact);
if (!empty($probed) && in_array($probed['network'], Protocol::FEDERATED)) { if (!empty($probed) && !$probed['failed'] && in_array($probed['network'], Protocol::FEDERATED)) {
$serverdata['network'] = $probed['network']; $serverdata['network'] = $probed['network'];
break; break;
} }
} }
$serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts), 1);
return $serverdata; return $serverdata;
} }
@ -1598,7 +1592,8 @@ class GServer
} }
} }
if (!in_array(strtolower($attr['content']), $valid_platforms)) { $platform = explode(' ', strtolower($attr['content']));
if (!in_array($platform[0], $valid_platforms)) {
continue; continue;
} }
@ -1661,7 +1656,8 @@ class GServer
} }
} }
if (!in_array(strtolower($attr['content']), $valid_platforms)) { $platform = explode(' ', strtolower($attr['content']));
if (!in_array($platform[0], $valid_platforms)) {
continue; continue;
} }