diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account_filter.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index c1e6b0deb..c7bf07787 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -65,7 +65,7 @@ class AccountFilter when 'email' accounts_with_users.merge User.matches_email(value) when 'ip' - valid_ip?(value) ? accounts_with_users.where('users.current_sign_in_ip <<= ?', value) : Account.none + valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value)) : Account.none when 'staff' accounts_with_users.merge User.staff else diff --git a/app/models/user.rb b/app/models/user.rb index 7147a9a31..a1753784d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -93,6 +93,7 @@ class User < ApplicationRecord 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_at: nil }) } scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) } + scope :matches_ip, ->(value) { left_joins(:session_activations).where('users.current_sign_in_ip <<= ?', value).or(left_joins(:session_activations).where('users.last_sign_in_ip <<= ?', value)).or(left_joins(:session_activations).where('session_activations.ip <<= ?', value)) } scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) } before_validation :sanitize_languages |