Set the reported_user in a callback

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 3759afd692f4c5dbd0e3a66f43b12ce9b12a71a3..eb0daba6569731cad0fe0486b6ea814099e6d2d5 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -16,7 +16,7 @@ class UserBlock < ActiveRecord::Base
   ##
   # return a renderable version of the reason text.
   def reason
   ##
   # return a renderable version of the reason text.
   def reason

-    RichText.new(read_attribute(:reason_format), read_attribute(:reason))
+    RichText.new(self[:reason_format], self[:reason])

   end
 
   ##
   end
 
   ##


@@ -26,6 +26,13 @@ class UserBlock < ActiveRecord::Base
     needs_view || ends_at > Time.now.getutc
   end
 
     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.
   ##
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.