diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2021-12-28 16:27:27 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2021-12-28 16:27:27 +0100 |
| commit | 746c9daa62d591b0559768251889cccb025e7db0 (patch) | |
| tree | 6c95e23bf0c3c3a76dc25e013a7dfccd3d8a98be /docs | |
| parent | f734579965b6f1a635e0622356e9cf6d4fff00bb (diff) | |
| parent | de7f84deb3ebe57744630950860f8fbf64a414a2 (diff) | |
| download | pleroma-746c9daa62d591b0559768251889cccb025e7db0.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/development/API/differences_in_mastoapi_responses.md | 6 | ||||
| -rw-r--r-- | docs/development/API/pleroma_api.md | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/docs/development/API/differences_in_mastoapi_responses.md b/docs/development/API/differences_in_mastoapi_responses.md index 6c1ecb559..518aca114 100644 --- a/docs/development/API/differences_in_mastoapi_responses.md +++ b/docs/development/API/differences_in_mastoapi_responses.md @@ -383,12 +383,6 @@ Pleroma is generally compatible with the Mastodon 2.7.2 API, but some newer feat - `GET /api/v1/endorsements`: Returns an empty array, `[]` -### Profile directory - -*Added in Mastodon 3.0.0* - -- `GET /api/v1/directory`: Returns HTTP 404 - ### Featured tags *Added in Mastodon 3.0.0* diff --git a/docs/development/API/pleroma_api.md b/docs/development/API/pleroma_api.md index 8f6422da0..0e7367a72 100644 --- a/docs/development/API/pleroma_api.md +++ b/docs/development/API/pleroma_api.md @@ -159,10 +159,12 @@ See [Admin-API](admin_api.md) "muting": false, "muting_notifications": false, "subscribing": true, + "notifying": true, "requested": false, "domain_blocking": false, "showing_reblogs": true, - "endorsed": false + "endorsed": false, + "note": "" } ``` @@ -183,10 +185,12 @@ See [Admin-API](admin_api.md) "muting": false, "muting_notifications": false, "subscribing": false, + "notifying": false, "requested": false, "domain_blocking": false, "showing_reblogs": true, - "endorsed": false + "endorsed": false, + "note": "" } ``` |