diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:32:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:36:04 +0300 |
| commit | 1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch) | |
| tree | 3d613f7c6129f667ea16aedfe46259d9ca6bde29 /docs/api | |
| parent | 73ae38ca04df02656bfb239ceba4ffe64879e927 (diff) | |
| parent | 50ab06435353144582f6afbf37402aef13c2b3f1 (diff) | |
| download | pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/admin_api.md | 1 | ||||
| -rw-r--r-- | docs/api/pleroma_api.md | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 573111416..fcdb33944 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -711,6 +711,7 @@ Compile time settings (need instance reboot): } ] } +``` - Response: diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md index a469ddfbf..ac5489aa3 100644 --- a/docs/api/pleroma_api.md +++ b/docs/api/pleroma_api.md @@ -423,6 +423,15 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa * Response: JSON, "ok" and 200 status if the pack was downloaded, or 500 if there were errors downloading the pack +## `POST /api/pleroma/emoji/packs/list_from` +### Requests the instance to list the packs from another instance +* Method `POST` +* Authentication: required +* Params: + * `instance_address`: the address of the instance to download from +* Response: JSON with the pack list, same as if the request was made to that instance's + list endpoint directly + 200 status + ## `GET /api/pleroma/emoji/packs/:name/download_shared` ### Requests a local pack from the instance * Method `GET` |