aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-18 04:11:46 +0000
committerkaniini <nenolod@gmail.com>2019-02-18 04:11:46 +0000
commita39a094cdabe9c2497fbd5cc4947650aff933c0d (patch)
treec7ffa2c1eb935fcd7bbb7d06e721c5d795f37a71 /lib/pleroma/web/common_api/common_api.ex
parent7456338ed3d0b36327c3f9b153630d36cd044bb9 (diff)
parent04b1c135543965860029557fc216eb38fd63b6c7 (diff)
downloadpleroma-a39a094cdabe9c2497fbd5cc4947650aff933c0d.tar.gz
Merge branch 'patch-image-description' into 'develop'
Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626
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),