X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..6c51b3cc0ad7e193c7dae3794502088faab37c7b:/app/models/user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 7bf8f86b5..cb1a97dca 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -5,8 +5,22 @@ class UserBlock < ActiveRecord::Base
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
   
+  after_initialize :set_defaults
+
   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 +32,21 @@ 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
+
+  ##
+  # set default values for new records.
+  def set_defaults
+    self.reason_format = "markdown" unless self.attribute_present?(:reason_format)
   end
 
-  private
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,