Merge branch 'fix/remove_auto_nsfw' into 'develop'

Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00 · 2021-03-19 08:48:22 +00:00 · f930e83fa2
commit f930e83fa2
parent 67bde35e71 3bc7d12271
15 changed files with 187 additions and 62 deletions
--- 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