Merge branch 'develop' into feature/gen-magic

[akkoma] / lib / pleroma / workers / cron / digest_emails_worker.ex

diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex
index c589a59eb8da754feef4ea1a419ad7d4eb93c193..0c56f00fb4ec65d91fd9ad82c1499ba4ed1f18a5 100644 (file)
--- a/lib/pleroma/workers/cron/digest_emails_worker.ex
+++ b/lib/pleroma/workers/cron/digest_emails_worker.ex
@@ -19,7 +19,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
   require Logger
 
   @impl Oban.Worker
-  def perform(_opts, _job) do
+  def perform(_job) do
     config = Config.get([:email_notifications, :digest])
 
     if config[:active] do
@@ -31,12 +31,15 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
 
       from(u in inactive_users_query,
         where: fragment(~s(? ->'digest' @> 'true'), u.email_notifications),
+        where: not is_nil(u.email),
         where: u.last_digest_emailed_at < datetime_add(^now, ^negative_interval, "day"),
         select: u
       )
       |> Repo.all()
       |> send_emails
     end
+
+    :ok
   end
 
   def send_emails(users) do