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

Make quarentine work with list of tuples instead of strings

Browse source
This commit is contained in:
Ilja 2020-10-02 14:51:39 +02:00 • committed by Haelwenn (lanodan) Monnier
commit 27fe7b0274
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
5 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,6 +100,11 @@ defmodule Pleroma.Web.ActivityPub.MRF do
Enum.any?(domains, fn domain -> Regex.match?(domain, host) end)
end
@spec instance_list_from_tuples([{String.t(), String.t()}]) :: [String.t()]
def instance_list_from_tuples(list) do
Enum.map(list, fn {instance, _} -> instance end)
end
def describe(policies) do
{:ok, policy_configs} =
policies

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

@ -187,9 +187,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
defp instance_list(config_key) do
Config.get([:mrf_simple, config_key])
|> Enum.map(fn
{instance, _} -> instance
end)
|> MRF.instance_list_from_tuples()
end
@impl true

1
lib/pleroma/web/activity_pub/publisher.ex
View file

@ -112,6 +112,7 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
quarantined_instances =
Config.get([:instance, :quarantined_instances], [])
|> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
|> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)