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

SimpleMRF: :silence --> :followers_only

Browse source
This commit is contained in:
Alex Gleason 2020-07-29 12:58:08 -05:00
commit 93638935d7
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View file

@ -109,13 +109,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
{:ok, object}
end
defp check_silence(%{host: actor_host} = _actor_info, object) do
silence =
Config.get([:mrf_simple, :silence])
defp check_followers_only(%{host: actor_host} = _actor_info, object) do
followers_only =
Config.get([:mrf_simple, :followers_only])
|> MRF.subdomains_regex()
object =
with true <- MRF.subdomain_match?(silence, actor_host),
with true <- MRF.subdomain_match?(followers_only, actor_host),
user <- User.get_cached_by_ap_id(object["actor"]) do
# Don't use Map.get/3 intentionally, these must not be nil
fixed_to = object["to"] || []
@ -200,7 +200,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
{:ok, object} <- check_media_removal(actor_info, object),
{:ok, object} <- check_media_nsfw(actor_info, object),
{:ok, object} <- check_ftl_removal(actor_info, object),
{:ok, object} <- check_silence(actor_info, object),
{:ok, object} <- check_followers_only(actor_info, object),
{:ok, object} <- check_report_removal(actor_info, object) do
{:ok, object}
else