Fix User#active scope only returning suspended users (#11111)

Fix a regression from #10660
6 years ago · 17747e2cd7
parent 83dd4d4204
commit 17747e2cd7
1 changed files with 1 additions and 1 deletions
--- 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.not(accounts: { suspended_at: nil }) }
+  scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
  scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
  scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }