aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2019-07-14 22:32:11 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2019-07-14 22:32:11 +0300
commitb052a9d4d0323eb64c0a741a499906659a674244 (patch)
treeb6df7872b75658aa49617d4f93200c5679d1fa48 /lib
parent168dc97c37f274b258b04eb7e883640b84259714 (diff)
downloadpleroma-b052a9d4d0323eb64c0a741a499906659a674244.tar.gz
Update DigestEmailWorker to compile and send emails via queue
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/pleroma/digest.ex2
-rw-r--r--lib/pleroma/digest_email_worker.ex15
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/mix/tasks/pleroma/digest.ex b/lib/mix/tasks/pleroma/digest.ex
index 19c4ce71e..81c207e10 100644
--- 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 8c28dca18..adc24797f 100644
--- 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