X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf.ex;h=5a4a76085dd41e95016120e4c82fc21f607fc5a7;hb=decaa64f75f8bd69622fa5fba757f99719f09808;hp=d43a8760b9246afbd6ce2de62c9a4136e80b0249;hpb=694bc43123a79293b02585bc457d08b0fbb1f103;p=akkoma
diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex
index d43a8760b..5a4a76085 100644
--- a/lib/pleroma/web/activity_pub/mrf.ex
+++ b/lib/pleroma/web/activity_pub/mrf.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF do
@@ -8,11 +8,8 @@ defmodule Pleroma.Web.ActivityPub.MRF do
def filter(policies, %{} = object) do
policies
|> Enum.reduce({:ok, object}, fn
- policy, {:ok, object} ->
- policy.filter(object)
-
- _, error ->
- error
+ policy, {:ok, object} -> policy.filter(object)
+ _, error -> error
end)
end
@@ -39,16 +36,32 @@ defmodule Pleroma.Web.ActivityPub.MRF do
@callback describe() :: {:ok | :error, Map.t()}
def describe(policies) do
- policies
- |> Enum.reduce({:ok, %{}}, fn
- policy, {:ok, data} ->
- {:ok, policy_data} = policy.describe()
- {:ok, Map.merge(data, policy_data)}
+ {:ok, policy_configs} =
+ policies
+ |> Enum.reduce({:ok, %{}}, fn
+ policy, {:ok, data} ->
+ {:ok, policy_data} = policy.describe()
+ {:ok, Map.merge(data, policy_data)}
- _, error ->
- error
- end)
+ _, error ->
+ error
+ end)
+
+ mrf_policies =
+ get_policies()
+ |> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
+
+ exclusions = Pleroma.Config.get([:instance, :mrf_transparency_exclusions])
+
+ base =
+ %{
+ mrf_policies: mrf_policies,
+ exclusions: length(exclusions) > 0
+ }
+ |> Map.merge(policy_configs)
+
+ {:ok, base}
end
- def describe(), do: get_policies() |> describe()
+ def describe, do: get_policies() |> describe()
end