Merge remote-tracking branch 'openstreetmap/pull/1449'

[rails.git] / app / models / user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index de14dcaa9617f351941b93925cc7b1453ee6357b..eb0daba6569731cad0fe0486b6ea814099e6d2d5 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -26,6 +26,13 @@ class UserBlock < ActiveRecord::Base
     needs_view || ends_at > Time.now.getutc
   end
 
+  ##
+  # returns true if the block is a "zero hour" block
+  def zero_hour?
+    # if the times differ more than 1 minute we probably have more important issues
+    needs_view && (ends_at.to_i - updated_at.to_i) < 60
+  end
+
   ##
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.