diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-27 08:48:19 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-27 08:48:19 +0300 |
| commit | bfc70fdf29c2e1067179165ef686e6abe20896b0 (patch) | |
| tree | b2e905360c2b059ab86e82014e20894ebae8f084 /docs/API | |
| parent | 8589632d0905c5d028ed7f01f63a1103788d3571 (diff) | |
| parent | 36838b516fc795720c33deb348113777a3c5212d (diff) | |
| download | pleroma-bfc70fdf29c2e1067179165ef686e6abe20896b0.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'docs/API')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 2 | ||||
| -rw-r--r-- | docs/API/pleroma_api.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 2236870c7..030660b34 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -29,7 +29,7 @@ Has these additional fields under the `pleroma` object: - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `expires_at`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire - `thread_muted`: true if the thread the post belongs to is muted -- `emoji_reactions`: A list with emoji / reaction count tuples. Contains no information about the reacting users, for that use the `emoji_reactions_by` endpoint. +- `emoji_reactions`: A list with emoji / reaction maps. The format is {emoji: "☕", count: 1}. Contains no information about the reacting users, for that use the `emoji_reactions_by` endpoint. ## Attachments diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md index 9ca8a5af0..9f5cafe5a 100644 --- a/docs/API/pleroma_api.md +++ b/docs/API/pleroma_api.md @@ -455,7 +455,7 @@ Emoji reactions work a lot like favourites do. They make it possible to react to * Example Response: ```json [ - ["😀", [{"id" => "xyz.."...}, {"id" => "zyx..."}]], - ["☕", [{"id" => "abc..."}]] + {"emoji": "😀", "count": 2, "accounts": [{"id" => "xyz.."...}, {"id" => "zyx..."}]}, + {"emoji": "☕", "count": 1, "accounts": [{"id" => "abc..."}]} ] ``` |