forked from AkkomaGang/akkoma
Make the object reference in both render("show.json", _) functions consistently named
This commit is contained in:
parent
210aa42f74
commit
8d601d3b23
1 changed files with 7 additions and 7 deletions
|
@ -124,16 +124,16 @@ def render(
|
|||
) do
|
||||
user = CommonAPI.get_user(activity.data["actor"])
|
||||
created_at = Utils.to_masto_date(activity.data["published"])
|
||||
activity_object = Object.normalize(activity, fetch: false)
|
||||
object = Object.normalize(activity, fetch: false)
|
||||
|
||||
reblogged_parent_activity =
|
||||
if opts[:parent_activities] do
|
||||
Activity.Queries.find_by_object_ap_id(
|
||||
opts[:parent_activities],
|
||||
activity_object.data["id"]
|
||||
object.data["id"]
|
||||
)
|
||||
else
|
||||
Activity.create_by_object_ap_id(activity_object.data["id"])
|
||||
Activity.create_by_object_ap_id(object.data["id"])
|
||||
|> Activity.with_preloaded_bookmark(opts[:for])
|
||||
|> Activity.with_set_thread_muted_field(opts[:for])
|
||||
|> Repo.one()
|
||||
|
@ -142,7 +142,7 @@ def render(
|
|||
reblog_rendering_opts = Map.put(opts, :activity, reblogged_parent_activity)
|
||||
reblogged = render("show.json", reblog_rendering_opts)
|
||||
|
||||
favorited = opts[:for] && opts[:for].ap_id in (activity_object.data["likes"] || [])
|
||||
favorited = opts[:for] && opts[:for].ap_id in (object.data["likes"] || [])
|
||||
|
||||
bookmarked = Activity.get_bookmark(reblogged_parent_activity, opts[:for]) != nil
|
||||
|
||||
|
@ -154,8 +154,8 @@ def render(
|
|||
|
||||
%{
|
||||
id: to_string(activity.id),
|
||||
uri: activity_object.data["id"],
|
||||
url: activity_object.data["id"],
|
||||
uri: object.data["id"],
|
||||
url: object.data["id"],
|
||||
account:
|
||||
AccountView.render("show.json", %{
|
||||
user: user,
|
||||
|
@ -180,7 +180,7 @@ def render(
|
|||
media_attachments: reblogged[:media_attachments] || [],
|
||||
mentions: mentions,
|
||||
tags: reblogged[:tags] || [],
|
||||
application: build_application(activity_object.data["generator"]),
|
||||
application: build_application(object.data["generator"]),
|
||||
language: nil,
|
||||
emojis: [],
|
||||
pleroma: %{
|
||||
|
|
Loading…
Reference in a new issue