From 162755c3c8cb109ccb88b7ba84bdd9cd7e116553 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sat, 21 Dec 2019 14:24:24 +0100 Subject: [PATCH 1/2] Update API-Mastodon.md --- doc/API-Mastodon.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/API-Mastodon.md b/doc/API-Mastodon.md index 546aca2431..c9eeb60dfe 100644 --- a/doc/API-Mastodon.md +++ b/doc/API-Mastodon.md @@ -11,21 +11,21 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat ## Entities -These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/api/entities/). +These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/entities/). ## Implemented endpoints -- [GET /api/v1/follow_requests](https://docs.joinmastodon.org/api/rest/follow-requests/#get-api-v1-follow-requests) -- [POST /api/v1/follow_requests/:id/authorize](https://docs.joinmastodon.org/api/rest/follow-requests/#post-api-v1-follow-requests-id-authorize) - - Returns a [Relationship](https://docs.joinmastodon.org/api/entities/#relationship) object. -- [POST /api/v1/follow_requests/:id/reject](https://docs.joinmastodon.org/api/rest/follow-requests/#post-api-v1-follow-requests-id-reject) - - Returns a [Relationship](https://docs.joinmastodon.org/api/entities/#relationship) object. +- [GET /api/v1/follow_requests](https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows) +- [POST /api/v1/follow_requests/:id/authorize](https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow) + - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object. +- [POST /api/v1/follow_requests/:id/reject](https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow) + - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object. - POST /api/v1/follow_requests/:id/ignore - Friendica-specific, hides the follow request from the list and prevents the remote contact from retrying. - - Returns a [Relationship](https://docs.joinmastodon.org/api/entities/#relationship) object. + - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object. -- [GET /api/v1/instance](https://docs.joinmastodon.org/api/rest/instances) +- [GET /api/v1/instance](https://docs.joinmastodon.org/methods/instance#fetch-instance) - GET /api/v1/instance/peers - undocumented, but implemented by Mastodon and Pleroma From 1af52dd0509c46798979673844fb70484de2cac6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Dec 2019 13:51:25 +0000 Subject: [PATCH 2/2] Fix: Newer Friendica servers had been detected as ActivityPub --- src/Model/GServer.php | 2 +- src/Module/NodeInfo.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 43aa92f33e..41c8fa44bf 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -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; diff --git a/src/Module/NodeInfo.php b/src/Module/NodeInfo.php index deec94d93f..8e3692e3d3 100644 --- a/src/Module/NodeInfo.php +++ b/src/Module/NodeInfo.php @@ -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'],