Merge branch 'fix-notification-warnings' into 'develop'

Fix notification warnings See merge request pleroma/pleroma!1683
2019-09-17 18:12:27 +00:00 · 2019-09-17 18:12:27 +00:00 · 7318095657
commit 7318095657
parent 2301de3d75 6193157f19
1 changed files with 5 additions and 1 deletions
--- a/lib/pleroma/workers/web_pusher_worker.ex
+++ b/lib/pleroma/workers/web_pusher_worker.ex
@ -10,7 +10,11 @@ defmodule Pleroma.Workers.WebPusherWorker do

  @impl Oban.Worker
  def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) do
-    notification = Repo.get(Notification, notification_id)
+    notification =
+      Notification
+      |> Repo.get(notification_id)
+      |> Repo.preload([:activity])
+
    Pleroma.Web.Push.Impl.perform(notification)
  end
 end