Skip to content
Snippets Groups Projects
Commit ff2c28fd authored by kaniini's avatar kaniini
Browse files

activitypub: mrf: tag policy: refactor the filtering hook a bit

parent 9a69f08e
No related branches found
No related tags found
No related merge requests found
...@@ -87,9 +87,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do ...@@ -87,9 +87,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
defp process_tag(_, message), do: {:ok, message} defp process_tag(_, message), do: {:ok, message}
@impl true def filter_message(actor, message) do
def filter(%{"object" => target_actor, "type" => "Follow"} = message) do User.get_cached_by_ap_id(actor)
User.get_cached_by_ap_id(target_actor)
|> get_tags() |> get_tags()
|> Enum.reduce({:ok, message}, fn |> Enum.reduce({:ok, message}, fn
tag, {:ok, message} -> tag, {:ok, message} ->
...@@ -101,17 +100,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do ...@@ -101,17 +100,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
end end
@impl true @impl true
def filter(%{"actor" => actor, "type" => "Create"} = message) do def filter(%{"object" => target_actor, "type" => "Follow"} = message),
User.get_cached_by_ap_id(actor) do: filter_message(target_actor, message)
|> get_tags()
|> Enum.reduce({:ok, message}, fn
tag, {:ok, message} ->
process_tag(tag, message)
_, error -> @impl true
error def filter(%{"actor" => actor, "type" => "Create"} = message),
end) do: filter_message(actor, message)
end
@impl true @impl true
def filter(message), do: {:ok, message} def filter(message), do: {:ok, message}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment