diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-20 20:27:03 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-20 20:27:03 +0300 |
| commit | 6fd4f58ead9189697ed004b6ca593d5ba746898f (patch) | |
| tree | 447bf02a1bc76941686e2017b6b8bed4494737d4 /docs/API/pleroma_api.md | |
| parent | 1871a5ddb4a803ebe4fae6943a9b9c94f1f9c1a8 (diff) | |
| parent | 265746b21f5a58f49efbdbe9d9eecd697781b93b (diff) | |
| download | pleroma-6fd4f58ead9189697ed004b6ca593d5ba746898f.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Diffstat (limited to 'docs/API/pleroma_api.md')
| -rw-r--r-- | docs/API/pleroma_api.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md index 5895613a3..a25456b7d 100644 --- a/docs/API/pleroma_api.md +++ b/docs/API/pleroma_api.md @@ -265,7 +265,7 @@ See [Admin-API](admin_api.md) * Method `PUT` * Authentication: required * Params: - * `image`: Multipart image + * `file`: Multipart image * Response: JSON. Returns a mastodon media attachment entity when successful, otherwise returns HTTP 415 `{"error": "error_msg"}` * Example response: @@ -426,7 +426,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa * Authentication: required * Params: * `file`: file needs to be uploaded with the multipart request or link to remote file. - * `shortcode`: (*optional*) shortcode for new emoji, must be uniq for all emoji. If not sended, shortcode will be taken from original filename. + * `shortcode`: (*optional*) shortcode for new emoji, must be unique for all emoji. If not sended, shortcode will be taken from original filename. * `filename`: (*optional*) new emoji file name. If not specified will be taken from original filename. * Response: JSON, list of files for updated pack (hashmap -> shortcode => filename) with status 200, either error status with error message. |