summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-10-04 13:37:17 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-10-05 20:09:08 +0200
commit28651df478bd8a69f66c4e613076324bb154969d (patch)
treeb1ee60456f68a998be989bc625f7475930a71cdf
parent56d31db13043dd9215991adf7a4319f51e42086f (diff)
downloadpleroma-28651df478bd8a69f66c4e613076324bb154969d.tar.gz
pleroma-28651df478bd8a69f66c4e613076324bb154969d.zip
MRF Transparency
-rw-r--r--lib/pleroma/web/nodeinfo/nodeinfo_controller.ex20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 3b495ad86..1f1b0282c 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -28,11 +28,23 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
stats = Stats.get_stats()
mrf_simple = Application.get_env(:pleroma, :mrf_simple)
+ mrf_policies = Keyword.get(instance, :rewrite_policy)
+
mrf_policies =
- if(is_list(instance.rewrite_policy)) do
- instance.rewrite_policy
+ if(is_list(mrf_policies)) do
+ mrf_policies
+ |> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
+ else
+ [to_string(mrf_policies) |> String.split(".") |> List.last()]
+ end
+
+ quarantined = Keyword.get(instance, :quarantined_instances)
+
+ quarantined =
+ if is_list(quarantined) do
+ quarantined
else
- [instance.rewrite_policy]
+ []
end
staff_accounts =
@@ -76,7 +88,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
federation: %{
mrf_policies: mrf_policies,
mrf_simple: mrf_simple,
- quarantined_instances: instance.quarantined_instances
+ quarantined_instances: quarantined
}
}
}