aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlja <domainepublic@spectraltheorem.be>2020-10-02 19:08:04 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2021-08-06 07:59:52 +0200
commitdfeb3862da2ceaf63db300be1a916f5139250bc2 (patch)
tree250cca647b242a0ca90f2e9b828edd3da06ace26
parente0c7d7719797bad0edf7e5c5bd0d3c43cace6f36 (diff)
downloadpleroma-dfeb3862da2ceaf63db300be1a916f5139250bc2.tar.gz
config :mrf, :transparency_exclusions works with tumples now
-rw-r--r--lib/pleroma/web/activity_pub/mrf/simple_policy.ex2
-rw-r--r--test/pleroma/web/node_info_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index fe0dc874b..2f26fc3a0 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -258,7 +258,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
@impl true
def describe do
- exclusions = Config.get([:mrf, :transparency_exclusions])
+ exclusions = Config.get([:mrf, :transparency_exclusions]) |> MRF.instance_list_from_tuples()
mrf_simple =
Config.get(:mrf_simple)
diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs
index 7731aadcc..477c44a51 100644
--- a/test/pleroma/web/node_info_test.exs
+++ b/test/pleroma/web/node_info_test.exs
@@ -170,7 +170,7 @@ defmodule Pleroma.Web.NodeInfoTest do
test "it performs exclusions from MRF transparency data if configured", %{conn: conn} do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
clear_config([:mrf, :transparency], true)
- clear_config([:mrf, :transparency_exclusions], ["other.site"])
+ clear_config([:mrf, :transparency_exclusions], [{"other.site", "We don't want them to know"}])
simple_config = %{"reject" => [{"example.com", ""}, {"other.site", ""}]}
clear_config(:mrf_simple, simple_config)