projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1559-follow-request-notifications' 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..58ad25e399199d957b74e23bfba70d1efacadfdd 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.WebPusherWorker do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.WebPusherWorker do
@@
-10,7
+10,11
@@
defmodule Pleroma.Workers.WebPusherWorker do
@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