diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-18 07:13:18 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-18 07:13:18 +0000 |
| commit | 8e9a764dfcde315afd055c8e63543bfca24cc41b (patch) | |
| tree | 5ff567a79c9d20c78c0cdcbfd3ab3f644bf765bc /lib/pleroma/web/common_api/common_api.ex | |
| parent | cd7a6a25d28308fba18254be357be0f6b4d888f2 (diff) | |
| parent | c4a55e167afcfd25cf4c1efb46886f2defe72c22 (diff) | |
| download | pleroma-8e9a764dfcde315afd055c8e63543bfca24cc41b.tar.gz | |
Merge branch 'feature/mrf-always-nsfw' into 'develop'
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index a599ffee5..5a312d673 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -157,6 +157,7 @@ defmodule Pleroma.Web.CommonAPI do {to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility), context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", + sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), full_payload <- String.trim(status <> cw), length when length in 1..limit <- String.length(full_payload), object <- @@ -169,7 +170,8 @@ defmodule Pleroma.Web.CommonAPI do in_reply_to, tags, cw, - cc + cc, + sensitive ), object <- Map.put( |