From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 23 Mar 2019 02:38:59 +0000 (+0000)
Subject: activitypub: when fetching objects, use the preloaded object from the synthesized... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ce47eb8b29aaba8f59720597485d3c586fbb7831;p=akkoma

activitypub: when fetching objects, use the preloaded object from the synthesized activity
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 0441376e3..80c64ae04 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -957,7 +957,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
            },
            :ok <- Transmogrifier.contain_origin(id, params),
            {:ok, activity} <- Transmogrifier.handle_incoming(params) do
-        {:ok, Object.normalize(activity.data["object"])}
+        {:ok, Object.normalize(activity)}
       else
         {:error, {:reject, nil}} ->
           {:reject, nil}
@@ -969,7 +969,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
 
           case OStatus.fetch_activity_from_url(id) do
-            {:ok, [activity | _]} -> {:ok, Object.normalize(activity.data["object"])}
+            {:ok, [activity | _]} -> {:ok, Object.normalize(activity)}
             e -> e
           end
       end