X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0caaf54de5b85070548381a814106a07f366b11a..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/script/update-spam-blocks diff --git a/script/update-spam-blocks b/script/update-spam-blocks index eaf7d9dc3..89bccf1c9 100755 --- a/script/update-spam-blocks +++ b/script/update-spam-blocks @@ -5,26 +5,24 @@ require 'generator' addresses = User.count( :conditions => { - :status => ["suspended", "deleted"], - :creation_time => Time.now - 28.days .. Time.now + :status => %w(suspended deleted), + :creation_time => Time.now - 28.days..Time.now }, :group => :creation_ip ) -addresses.each do |address,count| - if count > 2 +addresses.each do |address, count| + if count > 1 acl = Acl.find(:first, :conditions => { - :address => address, - :netmask => "255.255.255.255" - }) + :address => address + }) unless acl - Acl.create( - :address => address, - :netmask => "255.255.255.255", - :k => "no_account", - :v => "auto_spam_block" - ) + Acl.create({ + :address => address, + :k => "no_account_creation", + :v => "auto_spam_block" + }, { :without_protection => true }) puts "Blocked #{address}" end @@ -32,10 +30,9 @@ addresses.each do |address,count| end acls = Acl.find(:all, :conditions => { - :netmask => "255.255.255.255", - :k => "no_account_creation", - :v => "auto_spam_block" -}) + :k => "no_account_creation", + :v => "auto_spam_block" + }) acls.each do |acl| unless addresses[acl.address]