Merge pull request #7983 from annando/nodeinfo-dfrn

Fix: Newer Friendica servers had been detected as ActivityPub
This commit is contained in:
Tobias Diekershoff 2019-12-21 15:02:10 +01:00 committed by GitHub
commit 03ee62e845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -549,7 +549,7 @@ class GServer
$protocols[$protocol] = true;
}
if (!empty($protocols['friendica'])) {
if (!empty($protocols['dfrn'])) {
$server['network'] = Protocol::DFRN;
} elseif (!empty($protocols['activitypub'])) {
$server['network'] = Protocol::ACTIVITYPUB;

View File

@ -126,7 +126,7 @@ class NodeInfo extends BaseModule
$nodeinfo = [
'version' => '1.0',
'software' => [
'name' => 'friendica',
'name' => 'Friendica',
'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
],
'protocols' => [
@ -191,7 +191,7 @@ class NodeInfo extends BaseModule
$nodeinfo = [
'version' => '2.0',
'software' => [
'name' => 'friendica',
'name' => 'Friendica',
'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
],
'protocols' => ['dfrn', 'activitypub'],