strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Count known users, check for empty attribute values

Browse source
This commit is contained in:
Michael 2019-10-03 10:44:29 +00:00
parent 9cbe5c5e0e
commit 25f93cb03a
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/Model/GServer.php
View file

@ -80,7 +80,7 @@ class GServer
} }
// the "siteinfo.json" is some specific endpoint of Hubzilla and Red // the "siteinfo.json" is some specific endpoint of Hubzilla and Red
if (empty($serverdata['network']) || (($serverdata['network'] == Protocol::DIASPORA) && ($serverdata['platform'] != 'diaspora'))) { if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ZOT)) {
$serverdata = self::fetchSiteinfo($url, $serverdata); $serverdata = self::fetchSiteinfo($url, $serverdata);
} }
@ -103,6 +103,14 @@ class GServer
$serverdata['url'] = $url; $serverdata['url'] = $url;
$serverdata['nurl'] = Strings::normaliseLink($url); $serverdata['nurl'] = Strings::normaliseLink($url);
// When we don't have the registered users, we simply count what we know
if (empty($serverdata['registered-users'])) {
$gcontacts = DBA::count('gcontact', ['server_url' => [$url, $serverdata['nurl']]]);
$apcontacts = DBA::count('apcontact', ['baseurl' => [$url, $serverdata['nurl']]]);
$contacts = DBA::count('contact', ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
$serverdata['registered-users'] = max($gcontacts, $apcontacts, $contacts);
}
$fields = array_keys($serverdata); $fields = array_keys($serverdata);
$old_data = DBA::selectFirst('gserver', $fields, ['nurl' => Strings::normaliseLink($url)]); $old_data = DBA::selectFirst('gserver', $fields, ['nurl' => Strings::normaliseLink($url)]);
if (!DBA::isResult($old_data)) { if (!DBA::isResult($old_data)) {
@ -554,6 +562,10 @@ die('Möööp');
$attr[$attribute->name] = $attribute->value; $attr[$attribute->name] = $attribute->value;
} }
if (empty($attr['name']) || empty($attr['content'])) {
continue;
}
} }
//print_r($attr); //print_r($attr);
if ($attr['name'] == 'description') { if ($attr['name'] == 'description') {
@ -610,6 +622,10 @@ die('as');
$attr[$attribute->name] = $attribute->value; $attr[$attribute->name] = $attribute->value;
} }
if (empty($attr['property']) || empty($attr['content'])) {
continue;
}
} }
//print_r($attr); //print_r($attr);
@ -627,15 +643,21 @@ die('as');
// $serverdata['network'] = Protocol::ACTIVITYPUB; // $serverdata['network'] = Protocol::ACTIVITYPUB;
// } // }
if (($attr['property'] == 'og:platform') && in_array($attr['content'], ['PeerTube'])) { if ($attr['property'] == 'og:platform') {
die('Peertube'); $serverdata['platform'] = $attr['content'];
// $serverdata['platform'] = $attr['content'];
// $serverdata['network'] = Protocol::ACTIVITYPUB; if (in_array($attr['content'], ['PeerTube'])) {
$serverdata['network'] = Protocol::ACTIVITYPUB;
}
} }
if (($attr['property'] == 'generator') && in_array($attr['content'], ['hubzilla'])) { if ($attr['property'] == 'generator') {
$serverdata['platform'] = $attr['content']; $serverdata['platform'] = $attr['content'];
$serverdata['network'] = Protocol::DIASPORA;
if (in_array($attr['content'], ['hubzilla'])) {
// We later check which compatible protocol modules are loaded.
$serverdata['network'] = Protocol::ZOT;
}
} }
} }