diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-23 09:45:12 +0200 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-23 09:45:12 +0200 |
| commit | 0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34 (patch) | |
| tree | 724bd17a5ed9d89827b3095e149cfda4fb10fe61 /lib/pleroma/web/common_api/common_api.ex | |
| parent | 17bfd000d7d44ff13cf7becbfd9ce08b896d66eb (diff) | |
| parent | 75e78d4e239a5c999306e92b181b0e29c52dc9db (diff) | |
| download | pleroma-0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34.tar.gz | |
fix merge conflict
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( |