diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-03-15 09:48:50 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-03-15 09:48:50 +0000 |
| commit | 41fc67aa4993c119dae82578df7309d3999ac47a (patch) | |
| tree | 8cf2d751d22f07b0dd0ec9e10419b626ec97490c /lib | |
| parent | 0f42ea87d6bcb55d14a29c0ac4e600764359f30c (diff) | |
| parent | d7a34b604b15f9e7f73cda834f513d6f62643005 (diff) | |
| download | pleroma-41fc67aa4993c119dae82578df7309d3999ac47a.tar.gz | |
Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index bf3aaf025..209119dd5 100644 --- 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 |