Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation...

[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 2fa7b3194d02235856ab7b1bfcd08aaede549b9d..6cd91826db178ba72f9cc0859fe7eac5c7397eca 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -74,11 +74,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
 
     object =
       if MRF.subdomain_match?(media_nsfw, actor_host) do
-        child_object =
-          child_object
-          |> Map.put("hashtags", (child_object["hashtags"] || []) ++ ["nsfw"])
-          |> Map.put("sensitive", true)
-
+        tags = (child_object["tag"] || []) ++ ["nsfw"]
+        child_object = Map.put(child_object, "tag", tags)
+        child_object = Map.put(child_object, "sensitive", true)
         Map.put(object, "object", child_object)
       else
         object