MRF: simple policy: contain media removal/nsfw ops to create activities only
authorWilliam Pitcock <nenolod@dereferenced.org>
Mon, 10 Sep 2018 00:53:37 +0000 (00:53 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Mon, 10 Sep 2018 01:16:01 +0000 (01:16 +0000)
lib/pleroma/web/activity_pub/mrf/simple_policy.ex

index 7fecb8a4f4093cae5ce7c46efa66126d9ef74eac..49caef5b279835b20c61faf18d94448d5dfc6c44 100644 (file)
@@ -23,7 +23,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
   end
 
   @media_removal Keyword.get(@mrf_policy, :media_removal)
-  defp check_media_removal(actor_info, object) do
+  defp check_media_removal(actor_info, %{"type" => activity_type} = object)
+       when activity_type == "Create" do
     if actor_info.host in @media_removal do
       child_object = Map.delete(object["object"], "attachment")
       object = Map.put(object, "object", child_object)
@@ -33,8 +34,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
     end
   end
 
+  defp check_media_removal(actor_info, object), do: {:ok, object}
+
   @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
-  defp check_media_nsfw(actor_info, object) do
+  defp check_media_nsfw(actor_info, %{"type" => activity_type} = object)
+       when activity_type == "Create" do
     child_object = object["object"]
 
     if actor_info.host in @media_nsfw and child_object["attachment"] != nil and
@@ -49,6 +53,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
     end
   end
 
+  defp check_media_nsfw(actor_info, object), do: {:ok, object}
+
   @ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
   defp check_ftl_removal(actor_info, object) do
     if actor_info.host in @ftl_removal do