friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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
parent f0e1c54d1d 1af52dd050
commit 03ee62e845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/GServer.php
View File

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

4
src/Module/NodeInfo.php
View File

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