Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

[akkoma] / lib / pleroma / activity.ex

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 6542e684e1c82ef04794010889b4b774188a331a..d594038849bbd6ed68bd7f774adb52cacec7b911 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -113,6 +113,7 @@ defmodule Pleroma.Activity do
     from([a] in query,
       left_join: b in Bookmark,
       on: b.user_id == ^user.id and b.activity_id == a.id,
+      as: :bookmark,
       preload: [bookmark: b]
     )
   end
@@ -123,6 +124,7 @@ defmodule Pleroma.Activity do
     from([a] in query,
       left_join: r in ReportNote,
       on: a.id == r.activity_id,
+      as: :report_note,
       preload: [report_notes: r]
     )
   end