X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Factivity.ex;h=e432fcb0738c9a333a068a6f8035e4c332c8a4e1;hb=3a7c14645ed726bd6b7deb6489ec0578c4d8cd79;hp=7845c264a22a1255d634fea1510b055775d5fe51;hpb=f841eb7cdb83afc444dfe260581b6be6e690a717;p=akkoma

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 7845c264a..e432fcb07 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -73,6 +73,11 @@ defmodule Pleroma.Activity do
         )
     )
     |> preload([activity, object], object: object)
+    |> with_preloaded_bookmarks()
+  end
+
+  def with_preloaded_bookmarks(query) do
+    query
     |> preload(:bookmarks)
   end
 
@@ -105,9 +110,9 @@ defmodule Pleroma.Activity do
             activity.data,
             activity.data
           ),
-        preload: [object: o],
-        preload: :bookmarks
+        preload: [object: o]
       )
+      |> with_preloaded_bookmarks()
     )
   end
 
@@ -126,9 +131,9 @@ defmodule Pleroma.Activity do
           activity.data,
           activity.data
         ),
-      preload: [object: o],
-      preload: :bookmarks
+      preload: [object: o]
     )
+    |> with_preloaded_bookmarks()
     |> Repo.one()
   end