Transmogrifier Test: Extract Announce handling.

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 80701bb63..6104af4f9 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -677,13 +677,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         _options
       ) do
     with actor <- Containment.get_actor(data),
-         {:ok, %User{} = actor} <- User.get_or_fetch_by_ap_id(actor),
-         {:ok, object} <- get_embedded_obj_helper(object_id, actor),
+         {_, {:ok, %User{} = actor}} <- {:fetch_user, User.get_or_fetch_by_ap_id(actor)},
+         {_, {:ok, object}} <- {:get_embedded, get_embedded_obj_helper(object_id, actor)},
          public <- Visibility.is_public?(data),
-         {:ok, activity, _object} <- ActivityPub.announce(actor, object, id, false, public) do
+         {_, {:ok, activity, _object}} <-
+           {:announce, ActivityPub.announce(actor, object, id, false, public)} do
       {:ok, activity}
     else
-      _e -> :error
+      e -> {:error, e}
     end
   end