Update DigestEmailWorker to compile and send emails via queue

diff --git a/lib/mix/tasks/pleroma/digest.ex b/lib/mix/tasks/pleroma/digest.ex
index 19c4ce71e58940c5793b38889ca6dd4c0e81cac8..81c207e10848f92aab6f9695f003a35127845244 100644 (file)
--- a/lib/mix/tasks/pleroma/digest.ex
+++ b/lib/mix/tasks/pleroma/digest.ex
@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Pleroma.Digest do
 
     patched_user = %{user | last_digest_emailed_at: last_digest_emailed_at}
 
-    :ok = Pleroma.DigestEmailWorker.run([patched_user])
+    _user = Pleroma.DigestEmailWorker.perform(patched_user)
     Mix.shell().info("Digest email have been sent to #{nickname} (#{user.email})")
   end
 end

diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/digest_email_worker.ex
index 8c28dca180fe3cd4447af1958af092c7a71c30c4..adc24797fc61fcb52a2654347e6eee6fe1b8790e 100644 (file)
--- a/lib/pleroma/digest_email_worker.ex
+++ b/lib/pleroma/digest_email_worker.ex
@@ -1,6 +1,8 @@
 defmodule Pleroma.DigestEmailWorker do
   import Ecto.Query
 
+  @queue_name :digest_emails
+
   def run do
     config = Pleroma.Config.get([:email_notifications, :digest])
     negative_interval = -Map.fetch!(config, :interval)
@@ -15,18 +17,19 @@ defmodule Pleroma.DigestEmailWorker do
       select: u
     )
     |> Pleroma.Repo.all()
-    |> run()
+    |> Enum.each(&PleromaJobQueue.enqueue(@queue_name, __MODULE__, [&1]))
   end
 
-  def run([]), do: :ok
-
-  def run([user | users]) do
+  @doc """
+  Send digest email to the given user.
+  Updates `last_digest_emailed_at` field for the user and returns the updated user.
+  """
+  @spec perform(Pleroma.User.t()) :: Pleroma.User.t()
+  def perform(user) do
     with %Swoosh.Email{} = email <- Pleroma.Emails.UserEmail.digest_email(user) do
       Pleroma.Emails.Mailer.deliver_async(email)
     end
 
     Pleroma.User.touch_last_digest_emailed_at(user)
-
-    run(users)
   end
 end