mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-29 18:46:23 -05:00
d51019ee53
There were actually 2 bugs: 1/ Calling '.try(:key)' on a hash doesn't work. So EmailLogs were never associated to a user. 2/ Turns out that we update the 'user.last_emailed_at' whenever we create an EmailLog (in the 'after_create' callback). So we need to always create an EmailLog (whenever the email is sent or skipped).
34 lines
1.2 KiB
Ruby
34 lines
1.2 KiB
Ruby
module Jobs
|
|
|
|
# A daily job that will enqueue digest emails to be sent to users
|
|
class EnqueueDigestEmails < Jobs::Scheduled
|
|
every 6.hours
|
|
|
|
def execute(args)
|
|
unless SiteSetting.disable_digest_emails?
|
|
target_user_ids.each do |user_id|
|
|
Jobs.enqueue(:user_email, type: :digest, user_id: user_id)
|
|
end
|
|
end
|
|
end
|
|
|
|
def target_user_ids
|
|
# Users who want to receive emails and haven't been emailed in the last day
|
|
query = User.real
|
|
.where(email_digests: true, active: true, staged: false)
|
|
.not_suspended
|
|
.where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * digest_after_days)")
|
|
.where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * digest_after_days)")
|
|
.where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
|
|
|
|
# If the site requires approval, make sure the user is approved
|
|
if SiteSetting.must_approve_users?
|
|
query = query.where("approved OR moderator OR admin")
|
|
end
|
|
|
|
query.pluck(:id)
|
|
end
|
|
|
|
end
|
|
|
|
end
|