diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
commit | 6badf2d252a980d496b894c7258a778c57639953 (patch) | |
tree | b7c71885c413a8205dbe9d01bab7c60ea75c11bf /app/models/user.rb | |
parent | cd534830adab89300703904ffe87894dec8e2f95 (diff) | |
parent | f4f22391b2d469bd1d5c29ec815daf020282f30c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 77e6a33b5..8985ebf53 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -88,7 +88,7 @@ class User < ApplicationRecord scope :confirmed, -> { where.not(confirmed_at: nil) } scope :enabled, -> { where(disabled: false) } scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) } - scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended: false }) } + scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where.not(accounts: { suspended_at: nil }) } scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) } scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) } |