aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2017-11-20 20:55:27 +0000
committereal <eal@waifu.club>2017-11-20 20:55:27 +0000
commit9b35a4e850ca9fe1d36b9157054bcde3b4e41083 (patch)
treee1989eb3d6a48bd6d04da957dcbdad9ccca08cac
parent3d29fc5462e4b6bd9f0ee1f343ce971ef8606381 (diff)
parentfa19de97ba6b135ac09dfede2dba33c40520dcf1 (diff)
downloadpleroma-9b35a4e850ca9fe1d36b9157054bcde3b4e41083.tar.gz
Merge branch 'fix/mastoapi-attachment-count' into 'develop'
MastoAPI: no more than 4 attachments. See merge request pleroma/pleroma!28
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex2
1 files changed, 1 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 38abdb35f..5585a5605 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
sensitive: sensitive,
spoiler_text: object["summary"] || "",
visibility: "public",
- media_attachments: attachments,
+ media_attachments: attachments |> Enum.take(4),
mentions: mentions,
tags: [], # fix,
application: %{