projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Actually use preloaded bookmarks in views
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index 7845c264a22a1255d634fea1510b055775d5fe51..e432fcb0738c9a333a068a6f8035e4c332c8a4e1 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-73,6
+73,11
@@
defmodule Pleroma.Activity do
)
)
|> preload([activity, object], object: object)
)
)
|> preload([activity, object], object: object)
+ |> with_preloaded_bookmarks()
+ end
+
+ def with_preloaded_bookmarks(query) do
+ query
|> preload(:bookmarks)
end
|> preload(:bookmarks)
end
@@
-105,9
+110,9
@@
defmodule Pleroma.Activity do
activity.data,
activity.data
),
activity.data,
activity.data
),
- preload: [object: o],
- preload: :bookmarks
+ preload: [object: o]
)
)
+ |> with_preloaded_bookmarks()
)
end
)
end
@@
-126,9
+131,9
@@
defmodule Pleroma.Activity do
activity.data,
activity.data
),
activity.data,
activity.data
),
- preload: [object: o],
- preload: :bookmarks
+ preload: [object: o]
)
)
+ |> with_preloaded_bookmarks()
|> Repo.one()
end
|> Repo.one()
end