projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[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 0a00129df86ac8e4e162b91c79f5354c54166f28..83dc75d608698f8eb0d547990dbbc26ee79f7bac 100644
(file)
--- a/
lib/pleroma/workers/cron/digest_emails_worker.ex
+++ b/
lib/pleroma/workers/cron/digest_emails_worker.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
@@
-19,7
+19,7
@@
defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
require Logger
@impl Oban.Worker
require Logger
@impl Oban.Worker
- def perform(_
opts, _
job) do
+ def perform(_job) do
config = Config.get([:email_notifications, :digest])
if config[:active] 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),
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
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
end
def send_emails(users) do