mirror of
https://github.com/mastodon/mastodon.git
synced 2024-10-04 15:12:07 +00:00
Use enum-generated IpBlock.severity...
scopes
This commit is contained in:
parent
bf8eaaa9a5
commit
971001833a
|
@ -16,6 +16,6 @@ module RegistrationHelper
|
|||
end
|
||||
|
||||
def ip_blocked?(remote_ip)
|
||||
IpBlock.where(severity: :sign_up_block).exists?(['ip >>= ?', remote_ip.to_s])
|
||||
IpBlock.severity_sign_up_block.exists?(['ip >>= ?', remote_ip.to_s])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -36,7 +36,7 @@ class IpBlock < ApplicationRecord
|
|||
|
||||
class << self
|
||||
def blocked?(remote_ip)
|
||||
blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(IpBlock.where(severity: :no_access).pluck(:ip)) }
|
||||
blocked_ips_map = Rails.cache.fetch(CACHE_KEY) { FastIpMap.new(severity_no_access.pluck(:ip)) }
|
||||
blocked_ips_map.include?(remote_ip)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user