Merge remote-tracking branch 'upstream/pull/5346'

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

diff --git a/script/update-spam-blocks b/script/update-spam-blocks
index 4367fd8daac6f041661fa0c9048c0c83827329c9..7d665454582a842ebb09d6bf2d313dcee955a64d 100755 (executable)
--- a/script/update-spam-blocks
+++ b/script/update-spam-blocks
@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + "/../config/environment"
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 require "generator"
 
 addresses = User.count(
   :conditions => {
-    :status => %w(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
+  :group => :creation_address
 )
 
 addresses.each do |address, count|
   next unless count > 1
-  next if Acl.where(:address => address).exists?
+  next if Acl.exists?(:address => address)
 
   Acl.create({
                :address => address,