tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup

Browse source
This commit is contained in:
Michael 2019-12-21 14:03:47 +00:00
parent 90408b9d49 03ee62e845
commit 598f314577
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/API-Mastodon.md
View file

@ -11,21 +11,21 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat
## Entities ## 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 ## Implemented endpoints
- [GET /api/v1/follow_requests](https://docs.joinmastodon.org/api/rest/follow-requests/#get-api-v1-follow-requests) - [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/api/rest/follow-requests/#post-api-v1-follow-requests-id-authorize) - [POST /api/v1/follow_requests/:id/authorize](https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow)
- Returns a [Relationship](https://docs.joinmastodon.org/api/entities/#relationship) object. - Returns a [Relationship](https://docs.joinmastodon.org/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) - [POST /api/v1/follow_requests/:id/reject](https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow)
- Returns a [Relationship](https://docs.joinmastodon.org/api/entities/#relationship) object. - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object.
- POST /api/v1/follow_requests/:id/ignore - POST /api/v1/follow_requests/:id/ignore
- Friendica-specific, hides the follow request from the list and prevents the remote contact from retrying. - 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 - GET /api/v1/instance/peers - undocumented, but implemented by Mastodon and Pleroma

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'],