Merge branch 'develop' into issue/1383

2019-12-09 19:41:43 +03:00 · 2019-12-09 19:41:43 +03:00 · 2b821036c4
commit 2b821036c4
parent 5876a9cb79 0d2c13a119
37 changed files with 926 additions and 409 deletions
--- a/lib/pleroma/workers/web_pusher_worker.ex
+++ b/lib/pleroma/workers/web_pusher_worker.ex
@ -13,7 +13,7 @@ defmodule Pleroma.Workers.WebPusherWorker do
    notification =
      Notification
      |> Repo.get(notification_id)
-      |> Repo.preload([:activity])
+      |> Repo.preload([:activity, :user])

    Pleroma.Web.Push.Impl.perform(notification)
  end