Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add InetContainer with scopes of containing and contained (#32802)

Browse source
This commit is contained in:
Matt Jankowski 2024-11-08 05:08:36 -05:00 • committed by GitHub
parent df54196a14
commit bde0f1239a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -125,7 +125,7 @@ class User < ApplicationRecord
scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
scope :matches_ip, ->(value) { left_joins(:ips).merge(IpBlock.contained_by(value)).group('users.id') }
before_validation :sanitize_role
before_create :set_approved
@ -444,7 +444,7 @@ class User < ApplicationRecord
end
def sign_up_from_ip_requires_approval?
sign_up_ip.present? && IpBlock.severity_sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
sign_up_ip.present? && IpBlock.severity_sign_up_requires_approval.containing(sign_up_ip.to_s).exists?
end
def sign_up_email_requires_approval?