pleroma

commit: 41fc67aa4993c119dae82578df7309d3999ac47a
parent: 0f42ea87d6bcb55d14a29c0ac4e600764359f30c
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Fri, 15 Mar 2019 09:48:50 +0000

Merge branch 'mastoapi/mime_type' into 'develop'

Extend MastoAPI to provide attachment mimetypes

See merge request pleroma/pleroma!938
Diffstat:
M
docs/Differences-in-MastodonAPI-Responses.md
6
++++++
M
lib/pleroma/web/mastodon_api/views/status_view.ex
3
++-
M
test/web/mastodon_api/status_view_test.exs
3
++-

3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/docs/Differences-in-MastodonAPI-Responses.md b/docs/Differences-in-MastodonAPI-Responses.md
@@ -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.
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -257,7 +257,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       preview_url: href,
       text_url: href,
       type: type,
-      description: attachment["name"]
+      description: attachment["name"],
+      pleroma: %{mime_type: media_type}
     }
   end
 
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
@@ -196,7 +196,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest 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})