0b19625bfb
Non-Create/Listen activities had their associated object field normalized and fetched, but only to use their `id` field, which is both slow and redundant. This also failed on Undo activities, which delete the associated object/activity in database. Undo activities will now render properly and database loads should improve ever so slightly.
41 lines
1.3 KiB
Elixir
41 lines
1.3 KiB
Elixir
# Pleroma: A lightweight social networking server
|
|
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
|
|
# SPDX-License-Identifier: AGPL-3.0-only
|
|
|
|
defmodule Pleroma.Web.ActivityPub.ObjectView do
|
|
use Pleroma.Web, :view
|
|
alias Pleroma.Activity
|
|
alias Pleroma.Object
|
|
alias Pleroma.Web.ActivityPub.Transmogrifier
|
|
|
|
def render("object.json", %{object: %Object{} = object}) do
|
|
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
|
|
|
|
additional = Transmogrifier.prepare_object(object.data)
|
|
Map.merge(base, additional)
|
|
end
|
|
|
|
def render("object.json", %{object: %Activity{data: %{"type" => activity_type}} = activity})
|
|
when activity_type in ["Create", "Listen"] do
|
|
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
|
|
object = Object.normalize(activity, fetch: false)
|
|
|
|
additional =
|
|
Transmogrifier.prepare_object(activity.data)
|
|
|> Map.put("object", Transmogrifier.prepare_object(object.data))
|
|
|
|
Map.merge(base, additional)
|
|
end
|
|
|
|
def render("object.json", %{object: %Activity{} = activity}) do
|
|
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
|
|
object_id = Object.normalize(activity, id_only: true)
|
|
|
|
additional =
|
|
Transmogrifier.prepare_object(activity.data)
|
|
|> Map.put("object", object_id)
|
|
|
|
Map.merge(base, additional)
|
|
end
|
|
end
|