diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-14 01:04:07 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-14 01:04:07 +0000 |
| commit | 5c35d2f1d83583d87c0fb621265b8105207e6746 (patch) | |
| tree | c470d131f88e185b6c88a842464768028f9a8793 | |
| parent | fe42844bda3059ae3be8779c3a84c48244e1120a (diff) | |
| parent | 8202f1634a14037081cbef839e3fe528c6ca48b5 (diff) | |
| download | pleroma-5c35d2f1d83583d87c0fb621265b8105207e6746.tar.gz | |
Merge branch 'preload-user-timelines' into 'develop'
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 1 |
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 d473a3ed9..cf55c9520 100644 --- 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) |