X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fsimple_policy.ex;h=8d770387db960fddc6c6b169c33573e955d99455;hb=76722ea9c8dfbb8fefe247883946aa5c872d9a49;hp=cb8eaf1ec7a25d9c90529d5b96cf7fceec85735c;hpb=7a52c4549c5936e691357d0ba77e5e54bd94e928;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index cb8eaf1ec..8d770387d 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
   alias Pleroma.User
+  @behaviour Pleroma.Web.ActivityPub.MRF
 
   @mrf_policy Application.get_env(:pleroma, :mrf_simple)
 
@@ -15,23 +16,28 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
   @media_removal Keyword.get(@mrf_policy, :media_removal)
   defp check_media_removal(actor_info, object) do
     if actor_info.host in @media_removal do
-      object = Map.delete(object, "attachments")
+      child_object = Map.delete(object["object"], "attachment")
+      object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
   defp check_media_nsfw(actor_info, object) do
     child_object = object["object"]
-    if actor_info.host in @media_nsfw and child_object["attachment"] != nil and length(child_object["attachment"]) > 0 do
+
+    if actor_info.host in @media_nsfw and child_object["attachment"] != nil and
+         length(child_object["attachment"]) > 0 do
       tags = (child_object["tag"] || []) ++ ["nsfw"]
       child_object = Map.put(child_object, "tags", tags)
       child_object = Map.put(child_object, "sensitive", true)
       object = Map.put(object, "object", child_object)
+      {:ok, object}
+    else
+      {:ok, object}
     end
-
-    {:ok, object}
   end
 
   @ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
@@ -40,18 +46,31 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
       user = User.get_by_ap_id(object["actor"])
 
       # flip to/cc relationship to make the post unlisted
-      if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and user.follower_address in object["cc"] do
-        to = List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++ [user.follower_address]
-        cc = List.delete(object["cc"], user.follower_address) ++ ["https://www.w3.org/ns/activitystreams#Public"]
+      object =
+        if "https://www.w3.org/ns/activitystreams#Public" in object["to"] and
+             user.follower_address in object["cc"] do
+          to =
+            List.delete(object["to"], "https://www.w3.org/ns/activitystreams#Public") ++
+              [user.follower_address]
 
-        object = Map.put(object, "to", to)
-        object = Map.put(object, "cc", cc)
-      end
-    end
+          cc =
+            List.delete(object["cc"], user.follower_address) ++
+              ["https://www.w3.org/ns/activitystreams#Public"]
+
+          object
+          |> Map.put("to", to)
+          |> Map.put("cc", cc)
+        else
+          object
+        end
 
-    {:ok, object}
+      {:ok, object}
+    else
+      {:ok, object}
+    end
   end
 
+  @impl true
   def filter(object) do
     actor_info = URI.parse(object["actor"])
 
@@ -61,7 +80,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
          {:ok, object} <- check_ftl_removal(actor_info, object) do
       {:ok, object}
     else
-      e -> {:reject, nil}
+      _e -> {:reject, nil}
     end
   end
 end