Fix most auto-correctable rubocop issues

[rails.git] / script / update-spam-blocks

diff --git a/script/update-spam-blocks b/script/update-spam-blocks
index eaf7d9dc36574b6c47471e18f73b9157a2232b08..89bccf1c9251b40cd4c10ca4481c05601ba461ab 100755 (executable)
--- 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]