diff options
| author | href <href@random.sh> | 2017-12-11 02:45:28 +0100 |
|---|---|---|
| committer | href <href@random.sh> | 2017-12-11 02:45:28 +0100 |
| commit | 9093b2cf4923274572729f46b688ab12f5a0bfdc (patch) | |
| tree | 1ef3a7bfacc825fdc5ea47da6ceafd7b450aec91 /lib/pleroma/web/common_api/common_api.ex | |
| parent | d1806ec07f44b617769bc862048df30b8a3336da (diff) | |
| parent | d5a13c10ac6a9a5f8dbb1932ffc85260f079a2dc (diff) | |
| download | pleroma-9093b2cf4923274572729f46b688ab12f5a0bfdc.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into media-proxy
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 |
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 dc94e5377..d3a9f7b85 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -56,7 +56,7 @@ defmodule Pleroma.Web.CommonAPI do inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]), to <- to_for_user_and_mentions(user, mentions, inReplyTo), tags <- Formatter.parse_tags(status, data), - content_html <- make_content_html(status, mentions, attachments, tags), + content_html <- make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]), context <- make_context(inReplyTo), cw <- data["spoiler_text"], object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw), |