diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 77dfda851..20e5bfb5c 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -126,7 +126,7 @@ defmodule Pleroma.Object do Logger.debug("Backtrace: #{inspect(Process.info(:erlang.self(), :current_stacktrace))}") end - def normalize(_, options \\ [fetch: false, id_only: false]) + def normalize(_, options \\ [fetch: false]) # If we pass an Activity to Object.normalize(), we can try to use the preloaded object. # Use this whenever possible, especially when walking graphs in an O(N) loop! @@ -155,9 +155,6 @@ defmodule Pleroma.Object do def normalize(ap_id, options) when is_binary(ap_id) do cond do - Keyword.get(options, :id_only) -> - ap_id - Keyword.get(options, :fetch) -> case Fetcher.fetch_object_from_id(ap_id, options) do {:ok, object} -> object diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex index 13b5b2542..4a70c5d47 100644 --- a/lib/pleroma/web/activity_pub/views/object_view.ex +++ b/lib/pleroma/web/activity_pub/views/object_view.ex @@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do alias Pleroma.Activity alias Pleroma.Object alias Pleroma.Web.ActivityPub.Transmogrifier + alias Pleroma.Web.ActivityPub.Utils def render("object.json", %{object: %Object{} = object}) do base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header(object.data) @@ -29,7 +30,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do def render("object.json", %{object: %Activity{} = activity}) do base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header(activity.data) - object_id = Object.normalize(activity, id_only: true) + object_id = object_id_from_activity(activity) additional = Transmogrifier.prepare_object(activity.data) @@ -37,4 +38,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do Map.merge(base, additional) end + + defp object_id_from_activity(%Activity{object: %Object{data: %{"id" => obj_id}}}), do: obj_id + defp object_id_from_activity(%Activity{data: %{"object" => ap_object_ref}}), do: Utils.get_ap_id(ap_object_ref) end