Commit 41fc67aa authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch 'mastoapi/mime_type' into 'develop'

Extend MastoAPI to provide attachment mimetypes

See merge request !938
parents 0f42ea87 d7a34b60
Pipeline #9006 passed with stages
in 4 minutes and 21 seconds
......@@ -20,6 +20,12 @@ Has these additional fields under the `pleroma` object:
- `local`: true if the post was made on the local instance.
## Attachments
Has these additional fields under the `pleroma` object:
- `mime_type`: mime type of the attachment.
## Accounts
- `/api/v1/accounts/:id`: The `id` parameter can also be the `nickname` of the user. This only works in this endpoint, not the deeper nested ones for following etc.
......@@ -257,7 +257,8 @@ def render("attachment.json", %{attachment: attachment}) do
preview_url: href,
text_url: href,
type: type,
description: attachment["name"]
description: attachment["name"],
pleroma: %{mime_type: media_type}
......@@ -196,7 +196,8 @@ test "attachments" do
remote_url: "someurl",
preview_url: "someurl",
text_url: "someurl",
description: nil
description: nil,
pleroma: %{mime_type: "image/png"}
assert expected == StatusView.render("attachment.json", %{attachment: object})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment