From bf426c53b4e1c025d7857adf485976421175cdf6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 7 Nov 2023 15:11:14 -0500
Subject: [PATCH] Fix digest email processing, consolidate Oban queues

The email related jobs can all share a single Oban queue
---
 changelog.d/digest_emails.fix                            | 1 +
 config/config.exs                                        | 1 -
 lib/pleroma/workers/cron/digest_emails_worker.ex         | 2 +-
 lib/pleroma/workers/cron/new_users_digest_worker.ex      | 2 +-
 .../20231107200724_consolidate_email_queues.exs          | 9 +++++++++
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/digest_emails.fix
 create mode 100644 priv/repo/migrations/20231107200724_consolidate_email_queues.exs

diff --git a/changelog.d/digest_emails.fix b/changelog.d/digest_emails.fix
new file mode 100644
index 000000000..335a24464
--- /dev/null
+++ b/changelog.d/digest_emails.fix
@@ -0,0 +1 @@
+Fix the processing of email digest jobs.
diff --git a/config/config.exs b/config/config.exs
index e8ae31542..ad3a98f46 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -590,7 +590,6 @@ config :pleroma, Oban,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 1,
-    new_users_digest: 1,
     mute_expire: 5
   ],
   plugins: [Oban.Plugins.Pruner],
diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex
index 1540c1605..0292bbb3b 100644
--- a/lib/pleroma/workers/cron/digest_emails_worker.ex
+++ b/lib/pleroma/workers/cron/digest_emails_worker.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
   The worker to send digest emails.
   """
 
-  use Oban.Worker, queue: "digest_emails"
+  use Oban.Worker, queue: "mailer"
 
   alias Pleroma.Config
   alias Pleroma.Emails
diff --git a/lib/pleroma/workers/cron/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex
index 267fe2837..1c3e445aa 100644
--- a/lib/pleroma/workers/cron/new_users_digest_worker.ex
+++ b/lib/pleroma/workers/cron/new_users_digest_worker.ex
@@ -9,7 +9,7 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do
 
   import Ecto.Query
 
-  use Pleroma.Workers.WorkerHelper, queue: "new_users_digest"
+  use Pleroma.Workers.WorkerHelper, queue: "mailer"
 
   @impl Oban.Worker
   def perform(_job) do
diff --git a/priv/repo/migrations/20231107200724_consolidate_email_queues.exs b/priv/repo/migrations/20231107200724_consolidate_email_queues.exs
new file mode 100644
index 000000000..63f5af369
--- /dev/null
+++ b/priv/repo/migrations/20231107200724_consolidate_email_queues.exs
@@ -0,0 +1,9 @@
+defmodule Pleroma.Repo.Migrations.ConsolidateEmailQueues do
+  use Ecto.Migration
+
+  def change do
+    execute(
+      "UPDATE oban_jobs SET queue = 'mailer' WHERE queue in ('digest_emails', 'new_users_digest')"
+    )
+  end
+end