mirror of
https://github.com/discourse/discourse.git
synced 2024-12-21 21:03:54 +08:00
958437e7dd
instead of "last emailed" so that people getting email notifications (from a watched topic for example) also get the activity summaries.
Context - https://meta.discourse.org/t/activity-summary-not-sent-if-other-emails-are-sent/293040
Internal Ref - t/125582
Improvement over 95885645d9
56 lines
2.0 KiB
Ruby
56 lines
2.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Jobs
|
|
class EnqueueDigestEmails < ::Jobs::Scheduled
|
|
every 30.minutes
|
|
|
|
def execute(args)
|
|
return if SiteSetting.disable_emails == "yes"
|
|
return if SiteSetting.disable_digest_emails?
|
|
return if SiteSetting.private_email?
|
|
|
|
target_user_ids.each do |user_id|
|
|
::Jobs.enqueue(:user_email, type: "digest", user_id: user_id)
|
|
end
|
|
end
|
|
|
|
def target_user_ids
|
|
# Users who want to receive digest email within their chosen digest email frequency
|
|
query =
|
|
User
|
|
.real
|
|
.activated
|
|
.not_staged
|
|
.not_suspended
|
|
.joins(:user_option, :user_stat, :user_emails)
|
|
.where("user_options.email_digests")
|
|
.where(
|
|
"COALESCE(user_options.digest_after_minutes, ?) > 0",
|
|
SiteSetting.default_email_digest_frequency,
|
|
)
|
|
.where("user_stats.bounce_score < ?", SiteSetting.bounce_score_threshold)
|
|
.where("user_emails.primary")
|
|
.where(
|
|
"COALESCE(user_stats.digest_attempted_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * COALESCE(user_options.digest_after_minutes, ?))",
|
|
SiteSetting.default_email_digest_frequency,
|
|
)
|
|
.where(
|
|
"COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * COALESCE(user_options.digest_after_minutes, ?))",
|
|
SiteSetting.default_email_digest_frequency,
|
|
)
|
|
.where(
|
|
"COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * ?)",
|
|
SiteSetting.suppress_digest_email_after_days,
|
|
)
|
|
.order("user_stats.digest_attempted_at ASC NULLS FIRST")
|
|
|
|
# If the site requires approval, make sure the user is approved
|
|
query = query.where("approved OR moderator OR admin") if SiteSetting.must_approve_users?
|
|
|
|
query = query.limit(GlobalSetting.max_digests_enqueued_per_30_mins_per_site)
|
|
|
|
query.pluck(:id)
|
|
end
|
|
end
|
|
end
|