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

Merge pull request #11213 from annando/platform-cleaning 

Platforms:  only use and show trusted detections
This commit is contained in:
Hypolite Petovan 2022-02-05 23:10:04 -05:00 committed by GitHub
parent 121e40357c 650f90df25
commit a12dc9300e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/GServer.php
View File

@ -1566,6 +1566,10 @@ class GServer
return $serverdata;
}
// Using only body information we cannot safely detect a lot of systems.
// So we define a list of platforms that we can detect safely.
$valid_platforms = ['friendica', 'friendika', 'hubzilla', 'misskey', 'peertube', 'wordpress', 'write.as'];
$doc = new DOMDocument();
@$doc->loadHTML($curlResult->getBody());
$xpath = new DOMXPath($doc);
@ -1594,6 +1598,10 @@ class GServer
}
}
if (!in_array(strtolower($attr['content']), $valid_platforms)) {
continue;
}
if ($attr['name'] == 'description') {
$serverdata['info'] = $attr['content'];
}
@ -1653,6 +1661,10 @@ class GServer
}
}
if (!in_array(strtolower($attr['content']), $valid_platforms)) {
continue;
}
if ($attr['property'] == 'og:site_name') {
$serverdata['site_name'] = $attr['content'];
}

7
src/Module/Admin/Federation.php
View File

@ -24,6 +24,7 @@ namespace Friendica\Module\Admin;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\GServer;
use Friendica\Module\BaseAdmin;
class Federation extends BaseAdmin
@ -71,15 +72,15 @@ class Federation extends BaseAdmin
$gservers = DBA::p("SELECT COUNT(*) AS `total`, SUM(`registered-users`) AS `users`, `platform`,
ANY_VALUE(`network`) AS `network`, MAX(`version`) AS `version`
FROM `gserver` WHERE NOT `failed` GROUP BY `platform`");
FROM `gserver` WHERE NOT `failed` AND `detection-method` != ? GROUP BY `platform`", GServer::DETECT_MANUAL);
while ($gserver = DBA::fetch($gservers)) {
$total += $gserver['total'];
$users += $gserver['users'];
$versionCounts = [];
$versions = DBA::p("SELECT COUNT(*) AS `total`, `version` FROM `gserver`
WHERE NOT `failed` AND `platform` = ?
GROUP BY `version` ORDER BY `version`", $gserver['platform']);
WHERE NOT `failed` AND `platform` = ? AND `detection-method` != ?
GROUP BY `version` ORDER BY `version`", $gserver['platform'], GServer::DETECT_MANUAL);
while ($version = DBA::fetch($versions)) {
$version['version'] = str_replace(["\n", "\r", "\t"], " ", $version['version']);