projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'avatar-removing' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf.ex
b/lib/pleroma/web/activity_pub/mrf.ex
index a0b3af432b18ecc5cde7a84765a3f07924d7ad1a..206d6af52baf91545916d3fbc4e7c546639f995e 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf.ex
+++ b/
lib/pleroma/web/activity_pub/mrf.ex
@@
-8,18
+8,15
@@
defmodule Pleroma.Web.ActivityPub.MRF do
def filter(policies, %{} = object) do
policies
|> Enum.reduce({:ok, object}, fn
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
def filter(%{} = object), do: get_policies() |> filter(object)
def get_policies do
end)
end
def filter(%{} = object), do: get_policies() |> filter(object)
def get_policies do
- Pleroma.Config.get([:
instance, :rewrite_policy
], []) |> get_policies()
+ Pleroma.Config.get([:
mrf, :policies
], []) |> get_policies()
end
defp get_policies(policy) when is_atom(policy), do: [policy]
end
defp get_policies(policy) when is_atom(policy), do: [policy]
@@
-54,7
+51,7
@@
defmodule Pleroma.Web.ActivityPub.MRF do
get_policies()
|> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
get_policies()
|> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
- exclusions = Pleroma.Config.get([:
instance, :mrf_
transparency_exclusions])
+ exclusions = Pleroma.Config.get([:
mrf, :
transparency_exclusions])
base =
%{
base =
%{