Merge branch 'preload-user-timelines' into 'develop'

Preload thread mutes/bookmarks in user_statuses See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00 · 2019-08-14 01:04:07 +00:00 · 5c35d2f1d8
parent fe42844bda 8202f1634a
commit 5c35d2f1d8
1 changed files with 1 additions and 0 deletions
--- 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)