Merge branch 'fix/blocked-user-boosts' into 'develop'

[akkoma] / lib / pleroma / web / activity_pub / mrf / simple_policy.ex

diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index 1322744f112fa712a67dd99ae1d881657abdbfec..ea1af0f4d0f75be6f9ae0c246e847caa352ac3dd 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -15,7 +15,8 @@ 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)
     end
 
     {:ok, object}
@@ -23,10 +24,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
 
   @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
   defp check_media_nsfw(actor_info, object) do
-    if actor_info.host in @media_nsfw and object["attachment"] != nil and length(object["attachment"]) > 0 do
-      tags = (object["tag"] || []) ++ ["nsfw"]
-      object = Map.put(object, "tags", tags)
-      object = Map.put(object, "sensitive", true)
+    child_object = object["object"]
+
+    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)
     end
 
     {:ok, object}
@@ -38,9 +43,15 @@ 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"]
+      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 = Map.put(object, "to", to)
         object = Map.put(object, "cc", cc)