projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1342
[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 2b1d3b99a783117b2a0c647cded5b54dd814bfe5..a978c4013d03837dca7fc24cec2166e1f6ff0ec7 100644
(file)
--- a/
lib/pleroma/workers/web_pusher_worker.ex
+++ b/
lib/pleroma/workers/web_pusher_worker.ex
@@
-6,14
+6,15
@@
defmodule Pleroma.Workers.WebPusherWorker do
alias Pleroma.Notification
alias Pleroma.Repo
alias Pleroma.Notification
alias Pleroma.Repo
- # Note: `max_attempts` is intended to be overridden in `new/2` call
- use Oban.Worker,
- queue: "web_push",
- max_attempts: 1
+ use Pleroma.Workers.WorkerHelper, queue: "web_push"
@impl Oban.Worker
def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) 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, :user])
+
Pleroma.Web.Push.Impl.perform(notification)
end
end
Pleroma.Web.Push.Impl.perform(notification)
end
end