Browse Source

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

tags/v1.1.4
William Pitcock 5 years ago
parent
commit
ce47eb8b29
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      lib/pleroma/web/activity_pub/activity_pub.ex

+ 2
- 2
lib/pleroma/web/activity_pub/activity_pub.ex View File

@@ -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


Loading…
Cancel
Save