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/utils.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/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index bee2fd159..d93c0d46e 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -223,7 +223,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do in_reply_to, tags, cw \\ nil, - cc \\ [] + cc \\ [], + sensitive \\ false ) do object = %{ "type" => "Note", @@ -231,6 +232,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do "cc" => cc, "content" => content_html, "summary" => cw, + "sensitive" => !Enum.member?(["false", "False", "0", false], sensitive), "context" => context, "attachment" => attachments, "actor" => actor, |