Merge branch 'chores/bump-copyright' into 'develop'

[akkoma] / lib / pleroma / workers / web_pusher_worker.ex

diff --git a/lib/pleroma/workers/web_pusher_worker.ex b/lib/pleroma/workers/web_pusher_worker.ex
index bea2baffb26d8dfc359c7abdcae3ced872ccfcf4..8fc2aff26ed6aab447670c9d479e6c722f8ba39c 100644 (file)
--- a/lib/pleroma/workers/web_pusher_worker.ex
+++ b/lib/pleroma/workers/web_pusher_worker.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Workers.WebPusherWorker do
@@ -9,8 +9,12 @@ defmodule Pleroma.Workers.WebPusherWorker do
   use Pleroma.Workers.WorkerHelper, queue: "web_push"
 
   @impl Oban.Worker
-  def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) do
-    notification = Repo.get(Notification, notification_id)
+  def perform(%Job{args: %{"op" => "web_push", "notification_id" => notification_id}}) do
+    notification =
+      Notification
+      |> Repo.get(notification_id)
+      |> Repo.preload([:activity, :user])
+
     Pleroma.Web.Push.Impl.perform(notification)
   end
 end