diff options
| author | pluralcafe-docker <git@plural.cafe> | 2019-01-04 21:19:55 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2019-01-04 21:19:55 +0000 |
| commit | 74134e490c49d8a7d88cc69720e22cd88cee9233 (patch) | |
| tree | bd7fc8d41f7887037401ff86c81bc93d5fb00d01 /app/workers/scheduler | |
| parent | 797a8429a0deb511e6d6092edad39f856231534e (diff) | |
| parent | 0acd51acdc1e670bf57f58671cb8e30743782c63 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/workers/scheduler')
| -rw-r--r-- | app/workers/scheduler/email_scheduler.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/workers/scheduler/email_scheduler.rb b/app/workers/scheduler/email_scheduler.rb index 24ec89b29..1eeeee412 100644 --- a/app/workers/scheduler/email_scheduler.rb +++ b/app/workers/scheduler/email_scheduler.rb @@ -5,6 +5,9 @@ class Scheduler::EmailScheduler sidekiq_options unique: :until_executed, retry: 0 + FREQUENCY = 7.days.freeze + SIGN_IN_OFFSET = 1.day.freeze + def perform eligible_users.reorder(nil).find_each do |user| next unless user.allows_digest_emails? @@ -15,11 +18,8 @@ class Scheduler::EmailScheduler private def eligible_users - User.confirmed - .joins(:account) - .where(accounts: { silenced: false, suspended: false }) - .where(disabled: false) - .where('current_sign_in_at < ?', 20.days.ago) - .where('last_emailed_at IS NULL OR last_emailed_at < ?', 20.days.ago) + User.emailable + .where('current_sign_in_at < ?', (FREQUENCY + SIGN_IN_OFFSET).ago) + .where('last_emailed_at IS NULL OR last_emailed_at < ?', FREQUENCY.ago) end end |