diff options
| author | eal <eal@waifu.club> | 2017-11-18 14:34:37 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2017-11-18 14:34:37 +0000 |
| commit | 7b397ed125b55172390a8143bfb21ecab571ad97 (patch) | |
| tree | eaf8417b010b75cc7a6cb8200196c6da59522c8f /lib/pleroma/web/common_api/common_api.ex | |
| parent | 4647bcd6e647ad31ba492a6e712721b58bf47e83 (diff) | |
| parent | f53cdabcdf5e64c862e0532e6d5ad26666e9c83f (diff) | |
| download | pleroma-7b397ed125b55172390a8143bfb21ecab571ad97.tar.gz | |
Merge branch 'sensitive-content-bit' into 'develop'
Add #nsfw tag if sensitive content bit is set
Closes #78
See merge request pleroma/pleroma!23
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 9ae7b095a..9bc7f2ce6 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -55,7 +55,7 @@ defmodule Pleroma.Web.CommonAPI do mentions <- Formatter.parse_mentions(status), 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), + tags <- Formatter.parse_tags(status, data), content_html <- make_content_html(status, mentions, attachments, tags), context <- make_context(inReplyTo), cw <- data["spoiler_text"], |