From 721005b3126e0920ab861fcc83195f160b0ee9a0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 13:00:31 -0400
Subject: [PATCH 1/2] Fix WebPush notifications not generating jobs

Dialyzer pointed this one out.

The WorkerHelper removal in !4166 was missing this Oban.insert() and tests were not noticing any problems because we mocked the Push.send function instead of executing it and checking for the Oban job.
---
 lib/pleroma/web/push.ex                             |  1 +
 test/pleroma/web/activity_pub/side_effects_test.exs | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/pleroma/web/push.ex b/lib/pleroma/web/push.ex
index d783f776a5..6d777142e9 100644
--- a/lib/pleroma/web/push.ex
+++ b/lib/pleroma/web/push.ex
@@ -29,5 +29,6 @@ def enabled, do: match?([subject: _, public_key: _, private_key: _], vapid_confi
           {:ok, Oban.Job.t()} | {:error, Oban.Job.changeset() | term()}
   def send(notification) do
     WebPusherWorker.new(%{"op" => "web_push", "notification_id" => notification.id})
+    |> Oban.insert()
   end
 end
diff --git a/test/pleroma/web/activity_pub/side_effects_test.exs b/test/pleroma/web/activity_pub/side_effects_test.exs
index 68922e536a..4a18cab686 100644
--- a/test/pleroma/web/activity_pub/side_effects_test.exs
+++ b/test/pleroma/web/activity_pub/side_effects_test.exs
@@ -54,20 +54,17 @@ test "it streams out notifications and streams" do
           [
             stream: fn _, _ -> nil end
           ]
-        },
-        {
-          Pleroma.Web.Push,
-          [],
-          [
-            send: fn _ -> nil end
-          ]
         }
       ]) do
         SideEffects.handle_after_transaction(meta)
 
         assert called(Pleroma.Web.Streamer.stream(["user", "user:notification"], notification))
         assert called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], :_))
-        assert called(Pleroma.Web.Push.send(notification))
+
+        assert_enqueued(
+          worker: "Pleroma.Workers.WebPusherWorker",
+          args: %{"notification_id" => notification.id, "op" => "web_push"}
+        )
       end
     end
   end

From 6900040fd075ed0bdee9aab0fe7bf2796d149634 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 13:03:25 -0400
Subject: [PATCH 2/2] Update changelog

---
 changelog.d/workerhelper.change | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/workerhelper.change b/changelog.d/workerhelper.change
index 7a20c4af82..539c9b54f7 100644
--- a/changelog.d/workerhelper.change
+++ b/changelog.d/workerhelper.change
@@ -1 +1 @@
-Worker configuration is no longer available. This only affects custom max_retries values for Oban queues.
+Worker configuration is no longer available. This only affects custom max_retries values for a couple Oban queues.