diff options
| author | rinpatch <rin@patch.cx> | 2021-03-19 08:48:22 +0000 |
|---|---|---|
| committer | rinpatch <rin@patch.cx> | 2021-03-19 08:48:22 +0000 |
| commit | f930e83fa2a7e2184ca6bd09773d81568e7c755c (patch) | |
| tree | 2b2323d9f5f26dee318a7586fa0ecafa907fc0ca /lib/pleroma/web/common_api/activity_draft.ex | |
| parent | 67bde35e710e7c3c800364b4ab94a3fd81833ffa (diff) | |
| parent | 3bc7d122712b5cc35ba509542bde63ca130d6a40 (diff) | |
| download | pleroma-f930e83fa2a7e2184ca6bd09773d81568e7c755c.tar.gz | |
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
Diffstat (limited to 'lib/pleroma/web/common_api/activity_draft.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/activity_draft.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex index 73f1b0931..8668b600e 100644 --- a/lib/pleroma/web/common_api/activity_draft.ex +++ b/lib/pleroma/web/common_api/activity_draft.ex @@ -179,7 +179,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do end defp sensitive(draft) do - sensitive = draft.params[:sensitive] || Enum.member?(draft.tags, {"#nsfw", "nsfw"}) + sensitive = draft.params[:sensitive] %__MODULE__{draft | sensitive: sensitive} end |