commit: 5c35d2f1d83583d87c0fb621265b8105207e6746
parent: fe42844bda3059ae3be8779c3a84c48244e1120a
Author: kaniini <ariadne@dereferenced.org>
Date: Wed, 14 Aug 2019 01:04:07 +0000
Merge branch 'preload-user-timelines' into 'develop'
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -626,6 +626,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
params =
params
|> Map.put("type", ["Create", "Announce"])
+ |> Map.put("user", reading_user)
|> Map.put("actor_id", user.ap_id)
|> Map.put("whole_db", true)
|> Map.put("pinned_activity_ids", user.info.pinned_activities)