diff options
| author | lambda <lain@soykaf.club> | 2019-04-10 06:22:51 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-10 06:22:51 +0000 |
| commit | c8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (patch) | |
| tree | b52b9e6306b5e237fa3b5dbea375bf89f53d5c11 /docs/api/pleroma_api.md | |
| parent | 0ab563d3341f7cf9bb3e9f85a869499701cbb7d9 (diff) | |
| parent | b57b43027cf958d3a3a82b95f155ae27b235b543 (diff) | |
| download | pleroma-c8440b5e0c97c5d5c03e4b99e30a61df6ab95319.tar.gz | |
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
Diffstat (limited to 'docs/api/pleroma_api.md')
| -rw-r--r-- | docs/api/pleroma_api.md | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md index 05bcea1b6..a1ea41fe3 100644 --- a/docs/api/pleroma_api.md +++ b/docs/api/pleroma_api.md @@ -10,7 +10,29 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi * Authentication: not required * Params: none * Response: JSON -* Example response: `[{"kalsarikannit_f":{"tags":["Finmoji"],"image_url":"/finmoji/128px/kalsarikannit_f-128.png"}},{"perkele":{"tags":["Finmoji"],"image_url":"/finmoji/128px/perkele-128.png"}},{"blobdab":{"tags":["SomeTag"],"image_url":"/emoji/blobdab.png"}},"happiness":{"tags":["Finmoji"],"image_url":"/finmoji/128px/happiness-128.png"}}]` +* Example response: +```json +{ + "girlpower": { + "tags": [ + "Finmoji" + ], + "image_url": "/finmoji/128px/girlpower-128.png" + }, + "education": { + "tags": [ + "Finmoji" + ], + "image_url": "/finmoji/128px/education-128.png" + }, + "finnishlove": { + "tags": [ + "Finmoji" + ], + "image_url": "/finmoji/128px/finnishlove-128.png" + } +} +``` * Note: Same data as Mastodon API’s `/api/v1/custom_emojis` but in a different format ## `/api/pleroma/follow_import` |