aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-02-19 19:10:55 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-02-19 19:10:55 +0300
commitc0ecbf6669948740a091bdf5b5441fb6ee55f4fc (patch)
tree9ad9fadc6855b1529df7ce8403683c32f776265b /lib/pleroma/web/common_api/common_api.ex
parentd3fe2c8ec6116fbc3058f7a795ef59564bddfb08 (diff)
parent1dd718e83c76db218f12a98344b568fe10ecbefe (diff)
downloadpleroma-c0ecbf6669948740a091bdf5b5441fb6ee55f4fc.tar.gz
[#468] Merged `upstream/develop`.
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 86f249c54..90b208e54 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -95,7 +95,7 @@ defmodule Pleroma.Web.CommonAPI do
limit = Pleroma.Config.get([:instance, :limit])
with status <- String.trim(status),
- attachments <- attachments_from_ids(data["media_ids"]),
+ attachments <- attachments_from_ids(data),
mentions <- Formatter.parse_mentions(status),
inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
{to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility),