Updated about text

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 7bf8f86b5095dbf4d12697a826d3d6d3a3639203..d8fa95cb2319f2aeb7d31a9995641ca1a8496231 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -4,9 +4,21 @@ class UserBlock < ActiveRecord::Base
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
-  
+
   PERIODS = USER_BLOCK_PERIODS
 
+  ##
+  # scope to match active blocks
+  def self.active
+    self.where("needs_view or ends_at > ?", Time.now.getutc)
+  end
+
+  ##
+  # return a renderable version of the reason text.
+  def reason
+    RichText.new(read_attribute(:reason_format), read_attribute(:reason))
+  end
+
   ##
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
@@ -18,14 +30,15 @@ class UserBlock < ActiveRecord::Base
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)
-    update_attributes({
+    update_attributes(
       :ends_at => Time.now.getutc(),
       :revoker_id => revoker.id,
       :needs_view => false
-    }, :without_protection => true)
+    )
   end
 
-  private
+private
+
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,