From 65ff6589948059d8f95ec8cbff12db4c6a63537b Mon Sep 17 00:00:00 2001
From: Mint <>
Date: Sun, 2 Apr 2023 19:06:11 +0300
Subject: [PATCH] Use cond & better non-matching clause handling

---
 .../activity_pub/mrf/ex_nihilo_nihil_fit.ex   | 32 +++++++++----------
 .../mrf/media_removal_per_actor.ex            | 10 +++---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/ex_nihilo_nihil_fit.ex b/lib/pleroma/web/activity_pub/mrf/ex_nihilo_nihil_fit.ex
index c7b1b1e18..87d48069f 100644
--- a/lib/pleroma/web/activity_pub/mrf/ex_nihilo_nihil_fit.ex
+++ b/lib/pleroma/web/activity_pub/mrf/ex_nihilo_nihil_fit.ex
@@ -6,19 +6,19 @@ defmodule Pleroma.Web.ActivityPub.MRF.ExNihiloNihilFit do
   defp check_avatar_rewrite(actor, object) do
     actor_info = URI.parse(actor)
 
-    if actor_info.host in ["youjo.love", "lolison.top", "lolison.network", "rapemeat.solutions", "ghetti.monster"] do
-      object = Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/ca97357084c09219ce06457594af4a2054a97f5b52b4dde424aacdd988dc59a5.png"})
-    end
+    cond do
+      actor_info.host in ["youjo.love", "lolison.top", "lolison.network", "rapemeat.solutions", "ghetti.monster"] ->
+        {:ok, Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/ca97357084c09219ce06457594af4a2054a97f5b52b4dde424aacdd988dc59a5.png"})}
 
-    if actor in ["https://rot.gives/users/prouddegenerate", "https://rot.gives/users/Dagashi"] do
-      object = Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/ca97357084c09219ce06457594af4a2054a97f5b52b4dde424aacdd988dc59a5.png"})
-    end
+      actor in ["https://rot.gives/users/prouddegenerate", "https://rot.gives/users/Dagashi"] ->
+        {:ok, Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/ca97357084c09219ce06457594af4a2054a97f5b52b4dde424aacdd988dc59a5.png"})}
 
-    if actor in ["https://poa.st/users/graf", "https://khajiit.tech/users/graf"] do
-      object = Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/3a49fe5681e1311b5cf9c0c81b698c090321a59605baa2a09fff818237970b8d.png"})
-    end
+      actor in ["https://poa.st/users/graf", "https://khajiit.tech/users/graf"] ->
+        {:ok, Map.put(object, "icon", %{"type" => "Image", "url" => "https://ryona.agency/media/3a49fe5681e1311b5cf9c0c81b698c090321a59605baa2a09fff818237970b8d.png"})}
 
-    {:ok, object}
+      true ->
+        {:ok, object}
+    end
   end
 
   @impl true
@@ -54,13 +54,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.ExNihiloNihilFit do
     end
   end
 
-  @impl true
-  def filter(%{"actor" => actor} = object) do
-    with {:ok, object} <- check_avatar_rewrite(actor, object) do
-      {:ok, object}
-    end
-  end
-
   @impl true
   def filter(%{"id" => actor, "type" => obj_type} = object)
       when obj_type in ["Application", "Group", "Organization", "Person", "Service"] do
@@ -69,6 +62,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.ExNihiloNihilFit do
     end
   end
 
+  @impl true
+  def filter(object) do
+    {:ok, object}
+  end
+
   @impl true
   def describe, do: {:ok, %{}}
 end
diff --git a/lib/pleroma/web/activity_pub/mrf/media_removal_per_actor.ex b/lib/pleroma/web/activity_pub/mrf/media_removal_per_actor.ex
index 61a1d7bba..e913592af 100644
--- a/lib/pleroma/web/activity_pub/mrf/media_removal_per_actor.ex
+++ b/lib/pleroma/web/activity_pub/mrf/media_removal_per_actor.ex
@@ -19,16 +19,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaRemovalPerActor do
   end
 
   @impl true
-  def filter(%{"actor" => actor} = object) do
-    with {:ok, object} <- check_media_removal(actor, object) do
+  def filter(%{"id" => actor, "type" => obj_type} = object)
+      when obj_type in ["Application", "Group", "Organization", "Person", "Service"] do
+    with {:ok, object} <- check_profile_media_removal(actor, object) do
       {:ok, object}
     end
   end
 
   @impl true
-  def filter(%{"id" => actor, "type" => obj_type} = object)
-      when obj_type in ["Application", "Group", "Organization", "Person", "Service"] do
-    with {:ok, object} <- check_profile_media_removal(actor, object) do
+  def filter(%{"actor" => actor} = object) do
+    with {:ok, object} <- check_media_removal(actor, object) do
       {:ok, object}
     end
   end