transmogrifier: slightly clean up fix_explicit_addressing pipeline
authorWilliam Pitcock <nenolod@dereferenced.org>
Sun, 23 Dec 2018 15:44:26 +0000 (15:44 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Sun, 20 Jan 2019 02:27:48 +0000 (02:27 +0000)
lib/pleroma/web/activity_pub/transmogrifier.ex

index 5400aa657fa96ef462d735d6a851221747a201f3..5d3feccfeef22d789b67ef6f25380d4b0d10ac7c 100644 (file)
@@ -133,6 +133,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> fix_addressing_list("cc")
     |> fix_addressing_list("bto")
     |> fix_addressing_list("bcc")
+    |> fix_explicit_addressing
   end
 
   def fix_actor(%{"attributedTo" => actor} = object) do
@@ -367,7 +368,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     data =
       Map.put(data, "actor", actor)
       |> fix_addressing
-      |> fix_explicit_addressing
 
     with nil <- Activity.get_create_activity_by_object_ap_id(object["id"]),
          %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do