transmogrifier: slightly clean up fix_explicit_addressing pipeline

[akkoma] / lib / pleroma / web / activity_pub / transmogrifier.ex

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index e9a801cf5b9412140a255513e29fdc3ce9fadea2..5d3feccfeef22d789b67ef6f25380d4b0d10ac7c 100644 (file)
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -113,14 +113,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def fix_explicit_addressing(object, _explicit_mentions), do: object
 
-  def fix_addressing(object) do
-    object =
-      object
-      |> fix_addressing_list("to")
-      |> fix_addressing_list("cc")
-      |> fix_addressing_list("bto")
-      |> fix_addressing_list("bcc")
+  # if directMessage flag is set to true, leave the addressing alone
+  def fix_explicit_addressing(%{"directMessage" => true} = object), do: object
 
+  def fix_explicit_addressing(object) do
     explicit_mentions =
       object
       |> Utils.determine_explicit_mentions()
@@ -131,6 +127,15 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> fix_explicit_addressing(explicit_mentions)
   end
 
+  def fix_addressing(object) do
+    object
+    |> fix_addressing_list("to")
+    |> fix_addressing_list("cc")
+    |> fix_addressing_list("bto")
+    |> fix_addressing_list("bcc")
+    |> fix_explicit_addressing
+  end
+
   def fix_actor(%{"attributedTo" => actor} = object) do
     object
     |> Map.put("actor", get_actor(%{"actor" => actor}))
@@ -378,6 +383,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         additional:
           Map.take(data, [
             "cc",
+            "directMessage",
             "id"
           ])
       }