hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove sensitive-property setting #nsfw, create HashtagPolicy

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-12-28 23:21:53 +01:00
commit 3bc7d12271
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
15 changed files with 187 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/mrf.ex
View file

@ -92,7 +92,9 @@ defmodule Pleroma.Web.ActivityPub.MRF do
end
def get_policies do
Pleroma.Config.get([:mrf, :policies], []) |> get_policies()
Pleroma.Config.get([:mrf, :policies], [])
|> get_policies()
|> Enum.concat([Pleroma.Web.ActivityPub.MRF.HashtagPolicy])
end
defp get_policies(policy) when is_atom(policy), do: [policy]