diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-15 19:20:34 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-15 19:20:34 +0300 |
| commit | bedf92e064ec96f0b9bb95c2263616a2fe49017d (patch) | |
| tree | f07832cb01dcc5574c6be537c78e5e51fbb3fda6 /docs/API | |
| parent | fc81e5a49c34224e07e85f490a30f92db0835d45 (diff) | |
| parent | b1c1d2e5e1e1c43a068a7223f9ba69c689c878a3 (diff) | |
| download | pleroma-bedf92e064ec96f0b9bb95c2263616a2fe49017d.tar.gz pleroma-bedf92e064ec96f0b9bb95c2263616a2fe49017d.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
Diffstat (limited to 'docs/API')
| -rw-r--r-- | docs/API/admin_api.md | 13 | ||||
| -rw-r--r-- | docs/API/pleroma_api.md | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index 58d702347..57fb6bc6a 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -392,6 +392,19 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret - `email` - `name`, optional +- Response: + - On success: `204`, empty response + - On failure: + - 400 Bad Request, JSON: + + ```json + [ + { + "error": "Appropriate error message here" + } + ] + ``` + ## `GET /api/pleroma/admin/users/:nickname/password_reset` ### Get a password reset token for a given nickname diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md index 12e63ef9f..90c43c356 100644 --- a/docs/API/pleroma_api.md +++ b/docs/API/pleroma_api.md @@ -431,7 +431,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa # Emoji Reactions -Emoji reactions work a lot like favourites do. They make it possible to react to a post with a single emoji character. +Emoji reactions work a lot like favourites do. They make it possible to react to a post with a single emoji character. To detect the presence of this feature, you can check `pleroma_emoji_reactions` entry in the features list of nodeinfo. ## `PUT /api/v1/pleroma/statuses/:id/reactions/:emoji` ### React to a post with a unicode emoji |