aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 00:10:17 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 00:10:17 +0000
commit9aea7cc224c09e37a9a46277a9fbfb0af383fc0e (patch)
tree157d2ff5124b4fc30e59d972856d6cb5e1975dad /lib
parent092cedede507b3e89134deb6f5d09c5db339dfae (diff)
downloadpleroma-9aea7cc224c09e37a9a46277a9fbfb0af383fc0e.tar.gz
activitypub: preload child objects when fetching timelines
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 2470b4a71..7d38a46e5 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -716,6 +716,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
limit: 20,
order_by: [fragment("? desc nulls last", activity.id)]
)
+ |> Activity.with_preloaded_object()
base_query
|> restrict_recipients(recipients, opts["user"])