X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..7cd900eca0af0f2eaeb54360ec8d1b9153434455:/script/update-spam-blocks diff --git a/script/update-spam-blocks b/script/update-spam-blocks index c21b17cff..b5656f6ac 100755 --- a/script/update-spam-blocks +++ b/script/update-spam-blocks @@ -1,45 +1,40 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/environment' -require 'generator' +require File.join(File.dirname(__FILE__), "..", "config", "environment") +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.utc - 28.days..Time.now.utc }, :group => :creation_ip ) -addresses.each do |address,count| - if count > 1 - acl = Acl.find(:first, :conditions => { - :address => address, - }) - - unless acl - Acl.create({ - :address => address, - :k => "no_account_creation", - :v => "auto_spam_block" - }, :without_protection => true) - - puts "Blocked #{address}" - end - end +addresses.each do |address, count| + next unless count > 1 + next if Acl.exists?(:address => address) + + Acl.create({ + :address => address, + :k => "no_account_creation", + :v => "auto_spam_block" + }, { :without_protection => true }) + + puts "Blocked #{address}" end acls = Acl.find(:all, :conditions => { - :k => "no_account_creation", - :v => "auto_spam_block" -}) + :k => "no_account_creation", + :v => "auto_spam_block" + }) acls.each do |acl| - unless addresses[acl.address] - acl.delete + next if addresses[acl.address] + + acl.delete - puts "Unblocked #{acl.address}" - end + puts "Unblocked #{acl.address}" end exit 0