Merge pull request #8099 from annando/statistics
The federation statistics now contain all systems
This commit is contained in:
GitHub
commit
3c1f127e3c
1 changed files with 222 additions and 152 deletions
|
|
@ -14,71 +14,191 @@ class Federation extends BaseAdminModule
|
||||||
{
|
{
|
||||||
parent::content($parameters);
|
parent::content($parameters);
|
||||||
|
|
||||||
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
|
// get counts on active federation systems this node is knowing
|
||||||
// social and statusnet nodes this node is knowing
|
// We list the more common systems by name. The rest is counted as "other"
|
||||||
//
|
$systems = [
|
||||||
// We are looking for the following platforms in the DB, "Red" should find
|
'Friendica' => ['name' => 'Friendica', 'color' => '#ffc018'], // orange from the logo
|
||||||
// all variants of that platform ID string as the q() function is stripping
|
'diaspora' => ['name' => 'Diaspora', 'color' => '#a1a1a1'], // logo is black and white, makes a gray
|
||||||
// off one % two of them are needed in the query
|
'funkwhale' => ['name' => 'Funkwhale', 'color' => '#4082B4'], // From the homepage
|
||||||
// Add more platforms if you like, when one returns 0 known nodes it is not
|
'gnusocial' => ['name' => 'GNU Social', 'color' => '#a22430'], // dark red from the logo
|
||||||
// displayed on the stats page.
|
'hubzilla' => ['name' => 'Hubzilla', 'color' => '#43488a'], // blue from the logo
|
||||||
$platforms = ['Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma', 'socialhome', 'ganggo'];
|
'mastodon' => ['name' => 'Mastodon', 'color' => '#1a9df9'], // blue from the Mastodon logo
|
||||||
$colors = [
|
'misskey' => ['name' => 'Misskey', 'color' => '#ccfefd'], // Font color of the homepage
|
||||||
'Friendi%%a' => '#ffc018', // orange from the logo
|
'peertube' => ['name' => 'Peertube', 'color' => '#ffad5c'], // One of the logo colors
|
||||||
'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray
|
'pixelfed' => ['name' => 'Pixelfed', 'color' => '#11da47'], // One of the logo colors
|
||||||
'%%red%%' => '#c50001', // fire red from the logo
|
'pleroma' => ['name' => 'Pleroma', 'color' => '#E46F0F'], // Orange from the text that is used on Pleroma instances
|
||||||
'Hubzilla' => '#43488a', // blue from the logo
|
'plume' => ['name' => 'Plume', 'color' => '#7765e3'], // From the homepage
|
||||||
'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com
|
'red' => ['name' => 'Red Matrix', 'color' => '#c50001'], // fire red from the logo
|
||||||
'GNU Social' => '#a22430', // dark red from the logo
|
'socialhome' => ['name' => 'SocialHome', 'color' => '#52056b'], // lilac from the Django Image used at the Socialhome homepage
|
||||||
'StatusNet' => '#789240', // the green from the logo (red and blue have already others
|
'statusnet' => ['name' => 'StatusNet', 'color' => '#789240'], // the green from the logo (red and blue have already others
|
||||||
'Mastodon' => '#1a9df9', // blue from the Mastodon logo
|
'wordpress' => ['name' => 'WordPress', 'color' => '#016087'], // Background color of the homepage
|
||||||
'Pleroma' => '#E46F0F', // Orange from the text that is used on Pleroma instances
|
'writefreely' => ['name' => 'WriteFreely', 'color' => '#292929'], // Font color of the homepage
|
||||||
'socialhome' => '#52056b', // lilac from the Django Image used at the Socialhome homepage
|
'other' => ['name' => L10n::t('Other'), 'color' => '#F1007E'], // ActivityPub main color
|
||||||
'ganggo' => '#69d7e2', // from the favicon
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$platforms = array_keys($systems);
|
||||||
|
|
||||||
$counts = [];
|
$counts = [];
|
||||||
|
foreach ($platforms as $platform) {
|
||||||
|
$counts[$platform] = [];
|
||||||
|
}
|
||||||
|
|
||||||
$total = 0;
|
$total = 0;
|
||||||
$users = 0;
|
$users = 0;
|
||||||
|
|
||||||
foreach ($platforms as $platform) {
|
$gservers = DBA::p("SELECT COUNT(*) AS `total`, SUM(`registered-users`) AS `users`, `platform`,
|
||||||
// get a total count for the platform, the name and version of the
|
ANY_VALUE(`network`) AS `network`, MAX(`version`) AS `version`
|
||||||
// highest version and the protocol tpe
|
FROM `gserver` WHERE `last_contact` >= `last_failure` GROUP BY `platform`");
|
||||||
$platformCount = DBA::fetchFirst('SELECT
|
while ($gserver = DBA::fetch($gservers)) {
|
||||||
COUNT(*) AS `total`,
|
$total += $gserver['total'];
|
||||||
SUM(`registered-users`) AS `users`,
|
$users += $gserver['users'];
|
||||||
ANY_VALUE(`platform`) AS `platform`,
|
|
||||||
ANY_VALUE(`network`) AS `network`,
|
|
||||||
MAX(`version`) AS `version` FROM `gserver`
|
|
||||||
WHERE `platform` LIKE ?
|
|
||||||
AND `last_contact` >= `last_failure`
|
|
||||||
ORDER BY `version` ASC', $platform);
|
|
||||||
$total += $platformCount['total'];
|
|
||||||
$users += $platformCount['users'];
|
|
||||||
|
|
||||||
// what versions for that platform do we know at all?
|
$versionCounts = [];
|
||||||
// again only the active nodes
|
$versions = DBA::p("SELECT COUNT(*) AS `total`, `version` FROM `gserver`
|
||||||
$versionCountsStmt = DBA::p('SELECT
|
WHERE `last_contact` >= `last_failure` AND `platform` = ?
|
||||||
COUNT(*) AS `total`,
|
GROUP BY `version` ORDER BY `version`", $gserver['platform']);
|
||||||
`version` FROM `gserver`
|
while ($version = DBA::fetch($versions)) {
|
||||||
WHERE `last_contact` >= `last_failure`
|
$version['version'] = str_replace(["\n", "\r", "\t"], " ", $version['version']);
|
||||||
AND `platform` LIKE ?
|
$versionCounts[] = $version;
|
||||||
GROUP BY `version`
|
|
||||||
ORDER BY `version`;', $platform);
|
|
||||||
$versionCounts = DBA::toArray($versionCountsStmt);
|
|
||||||
|
|
||||||
//
|
|
||||||
// clean up version numbers
|
|
||||||
//
|
|
||||||
// some platforms do not provide version information, add a unkown there
|
|
||||||
// to the version string for the displayed list.
|
|
||||||
foreach ($versionCounts as $key => $value) {
|
|
||||||
if ($versionCounts[$key]['version'] == '') {
|
|
||||||
$versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')];
|
|
||||||
}
|
}
|
||||||
|
DBA::close($versions);
|
||||||
|
|
||||||
|
$platform = $gserver['platform'];
|
||||||
|
|
||||||
|
if ($platform == 'Friendika') {
|
||||||
|
$platform = 'Friendica';
|
||||||
|
} elseif (in_array($platform, ['Red Matrix', 'redmatrix'])) {
|
||||||
|
$platform = 'red';
|
||||||
|
} elseif(stristr($platform, 'pleroma')) {
|
||||||
|
$platform = 'pleroma';
|
||||||
|
} elseif(stristr($platform, 'wordpress')) {
|
||||||
|
$platform = 'wordpress';
|
||||||
|
} elseif (!in_array($platform, $platforms)) {
|
||||||
|
$platform = 'other';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reformat and compact version numbers
|
if ($platform != $gserver['platform']) {
|
||||||
if ($platform == 'Pleroma') {
|
if ($platform == 'other') {
|
||||||
|
$versionCounts = $counts[$platform][1] ?? [];
|
||||||
|
$versionCounts[] = ['version' => $gserver['platform'] ?: L10n::t('unknown'), 'total' => $gserver['total']];
|
||||||
|
$gserver['version'] = '';
|
||||||
|
} else {
|
||||||
|
$versionCounts = array_merge($versionCounts, $counts[$platform][1] ?? []);
|
||||||
|
}
|
||||||
|
|
||||||
|
$gserver['platform'] = $platform;
|
||||||
|
$gserver['total'] += $counts[$platform][0]['total'] ?? 0;
|
||||||
|
$gserver['users'] += $counts[$platform][0]['users'] ?? 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($platform == 'Friendica') {
|
||||||
|
$versionCounts = self::reformaFriendicaVersions($versionCounts);
|
||||||
|
} elseif ($platform == 'pleroma') {
|
||||||
|
$versionCounts = self::reformaPleromaVersions($versionCounts);
|
||||||
|
} elseif ($platform == 'diaspora') {
|
||||||
|
$versionCounts = self::reformaDiasporaVersions($versionCounts);
|
||||||
|
}
|
||||||
|
|
||||||
|
$versionCounts = self::sortVersion($versionCounts);
|
||||||
|
|
||||||
|
$gserver['platform'] = $systems[$platform]['name'];
|
||||||
|
|
||||||
|
$counts[$platform] = [$gserver, $versionCounts, str_replace([' ', '%'], '', $platform), $systems[$platform]['color']];
|
||||||
|
}
|
||||||
|
DBA::close($gserver);
|
||||||
|
|
||||||
|
// some helpful text
|
||||||
|
$intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
|
||||||
|
$hint = L10n::t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
|
||||||
|
|
||||||
|
// load the template, replace the macros and return the page content
|
||||||
|
$t = Renderer::getMarkupTemplate('admin/federation.tpl');
|
||||||
|
return Renderer::replaceMacros($t, [
|
||||||
|
'$title' => L10n::t('Administration'),
|
||||||
|
'$page' => L10n::t('Federation Statistics'),
|
||||||
|
'$intro' => $intro,
|
||||||
|
'$hint' => $hint,
|
||||||
|
'$autoactive' => Config::get('system', 'poco_completion'),
|
||||||
|
'$counts' => $counts,
|
||||||
|
'$version' => FRIENDICA_VERSION,
|
||||||
|
'$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* early friendica versions have the format x.x.xxxx where xxxx is the
|
||||||
|
* DB version stamp; those should be operated out and versions be combined
|
||||||
|
*
|
||||||
|
* @param array $versionCounts list of version numbers
|
||||||
|
* @return array with cleaned version numbers
|
||||||
|
*/
|
||||||
|
private static function reformaFriendicaVersions(array $versionCounts)
|
||||||
|
{
|
||||||
|
$newV = [];
|
||||||
|
$newVv = [];
|
||||||
|
foreach ($versionCounts as $vv) {
|
||||||
|
$newVC = $vv['total'];
|
||||||
|
$newVV = $vv['version'];
|
||||||
|
$lastDot = strrpos($newVV, '.');
|
||||||
|
$len = strlen($newVV) - 1;
|
||||||
|
if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) {
|
||||||
|
$newVV = substr($newVV, 0, $lastDot);
|
||||||
|
}
|
||||||
|
if (isset($newV[$newVV])) {
|
||||||
|
$newV[$newVV] += $newVC;
|
||||||
|
} else {
|
||||||
|
$newV[$newVV] = $newVC;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach ($newV as $key => $value) {
|
||||||
|
array_push($newVv, ['total' => $value, 'version' => $key]);
|
||||||
|
}
|
||||||
|
$versionCounts = $newVv;
|
||||||
|
|
||||||
|
return $versionCounts;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
||||||
|
* part (-xx) should be removed to clean up the versions from the "head
|
||||||
|
* commit" information and combined into a single entry for x.x.x.x
|
||||||
|
*
|
||||||
|
* @param array $versionCounts list of version numbers
|
||||||
|
* @return array with cleaned version numbers
|
||||||
|
*/
|
||||||
|
private static function reformaDiasporaVersions(array $versionCounts)
|
||||||
|
{
|
||||||
|
$newV = [];
|
||||||
|
$newVv = [];
|
||||||
|
foreach ($versionCounts as $vv) {
|
||||||
|
$newVC = $vv['total'];
|
||||||
|
$newVV = $vv['version'];
|
||||||
|
$posDash = strpos($newVV, '-');
|
||||||
|
if ($posDash) {
|
||||||
|
$newVV = substr($newVV, 0, $posDash);
|
||||||
|
}
|
||||||
|
if (isset($newV[$newVV])) {
|
||||||
|
$newV[$newVV] += $newVC;
|
||||||
|
} else {
|
||||||
|
$newV[$newVV] = $newVC;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach ($newV as $key => $value) {
|
||||||
|
array_push($newVv, ['total' => $value, 'version' => $key]);
|
||||||
|
}
|
||||||
|
$versionCounts = $newVv;
|
||||||
|
|
||||||
|
return $versionCounts;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean up Pleroma version numbers
|
||||||
|
*
|
||||||
|
* @param array $versionCounts list of version numbers
|
||||||
|
* @return array with cleaned version numbers
|
||||||
|
*/
|
||||||
|
private static function reformaPleromaVersions(array $versionCounts)
|
||||||
|
{
|
||||||
$compacted = [];
|
$compacted = [];
|
||||||
foreach ($versionCounts as $key => $value) {
|
foreach ($versionCounts as $key => $value) {
|
||||||
$version = $versionCounts[$key]['version'];
|
$version = $versionCounts[$key]['version'];
|
||||||
|
|
@ -103,57 +223,27 @@ class Federation extends BaseAdminModule
|
||||||
foreach ($compacted as $version => $pl_total) {
|
foreach ($compacted as $version => $pl_total) {
|
||||||
$versionCounts[] = ['version' => $version, 'total' => $pl_total];
|
$versionCounts[] = ['version' => $version, 'total' => $pl_total];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $versionCounts;
|
||||||
}
|
}
|
||||||
|
|
||||||
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
/**
|
||||||
// part (-xx) should be removed to clean up the versions from the "head
|
* Reformat, sort and compact version numbers
|
||||||
// commit" information and combined into a single entry for x.x.x.x
|
*
|
||||||
if ($platform == 'Diaspora') {
|
* @param array $versionCounts list of version numbers
|
||||||
$newV = [];
|
* @return array with reformatted version numbers
|
||||||
$newVv = [];
|
*/
|
||||||
foreach ($versionCounts as $vv) {
|
private static function sortVersion(array $versionCounts)
|
||||||
$newVC = $vv['total'];
|
{
|
||||||
$newVV = $vv['version'];
|
//
|
||||||
$posDash = strpos($newVV, '-');
|
// clean up version numbers
|
||||||
if ($posDash) {
|
//
|
||||||
$newVV = substr($newVV, 0, $posDash);
|
// some platforms do not provide version information, add a unkown there
|
||||||
|
// to the version string for the displayed list.
|
||||||
|
foreach ($versionCounts as $key => $value) {
|
||||||
|
if ($versionCounts[$key]['version'] == '') {
|
||||||
|
$versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')];
|
||||||
}
|
}
|
||||||
if (isset($newV[$newVV])) {
|
|
||||||
$newV[$newVV] += $newVC;
|
|
||||||
} else {
|
|
||||||
$newV[$newVV] = $newVC;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
foreach ($newV as $key => $value) {
|
|
||||||
array_push($newVv, ['total' => $value, 'version' => $key]);
|
|
||||||
}
|
|
||||||
$versionCounts = $newVv;
|
|
||||||
}
|
|
||||||
|
|
||||||
// early friendica versions have the format x.x.xxxx where xxxx is the
|
|
||||||
// DB version stamp; those should be operated out and versions be
|
|
||||||
// conbined
|
|
||||||
if ($platform == 'Friendi%%a') {
|
|
||||||
$newV = [];
|
|
||||||
$newVv = [];
|
|
||||||
foreach ($versionCounts as $vv) {
|
|
||||||
$newVC = $vv['total'];
|
|
||||||
$newVV = $vv['version'];
|
|
||||||
$lastDot = strrpos($newVV, '.');
|
|
||||||
$len = strlen($newVV) - 1;
|
|
||||||
if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) {
|
|
||||||
$newVV = substr($newVV, 0, $lastDot);
|
|
||||||
}
|
|
||||||
if (isset($newV[$newVV])) {
|
|
||||||
$newV[$newVV] += $newVC;
|
|
||||||
} else {
|
|
||||||
$newV[$newVV] = $newVC;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
foreach ($newV as $key => $value) {
|
|
||||||
array_push($newVv, ['total' => $value, 'version' => $key]);
|
|
||||||
}
|
|
||||||
$versionCounts = $newVv;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Assure that the versions are sorted correctly
|
// Assure that the versions are sorted correctly
|
||||||
|
|
@ -172,26 +262,6 @@ class Federation extends BaseAdminModule
|
||||||
$versionCounts[] = $v2[$version];
|
$versionCounts[] = $v2[$version];
|
||||||
}
|
}
|
||||||
|
|
||||||
// the 3rd array item is needed for the JavaScript graphs as JS does
|
return $versionCounts;
|
||||||
// not like some characters in the names of variables...
|
|
||||||
$counts[$platform] = [$platformCount, $versionCounts, str_replace([' ', '%'], '', $platform), $colors[$platform]];
|
|
||||||
}
|
|
||||||
|
|
||||||
// some helpful text
|
|
||||||
$intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
|
|
||||||
$hint = L10n::t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
|
|
||||||
|
|
||||||
// load the template, replace the macros and return the page content
|
|
||||||
$t = Renderer::getMarkupTemplate('admin/federation.tpl');
|
|
||||||
return Renderer::replaceMacros($t, [
|
|
||||||
'$title' => L10n::t('Administration'),
|
|
||||||
'$page' => L10n::t('Federation Statistics'),
|
|
||||||
'$intro' => $intro,
|
|
||||||
'$hint' => $hint,
|
|
||||||
'$autoactive' => Config::get('system', 'poco_completion'),
|
|
||||||
'$counts' => $counts,
|
|
||||||
'$version' => FRIENDICA_VERSION,
|
|
||||||
'$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue