diff options
author | William Pitcock <nenolod@dereferenced.org> | 2019-03-23 02:38:59 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2019-03-23 03:05:10 +0000 |
commit | ce47eb8b29aaba8f59720597485d3c586fbb7831 (patch) | |
tree | c226389674eee09979e3d5641a5a0c348469f2a6 /lib | |
parent | aabcecb26935475b5985b6438774ee1d3cc14514 (diff) | |
download | pleroma-ce47eb8b29aaba8f59720597485d3c586fbb7831.tar.gz |
activitypub: when fetching objects, use the preloaded object from the synthesized activity
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 4 |
1 files changed, 2 insertions, 2 deletions
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 |