X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..396f2e28dd27d514f7882c3918103b12764038de:/app/models/user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 6ebdeee0b..eb0daba65 100644
--- 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
-    RichText.new(read_attribute(:reason_format), read_attribute(:reason))
+    RichText.new(self[:reason_format], self[:reason])
   end
 
   ##
@@ -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.
@@ -44,7 +51,7 @@ class UserBlock < ActiveRecord::Base
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
-    errors.add(:base, I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? && !creator.moderator?
-    errors.add(:base, I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? || revoker.moderator?
+    errors.add(:base, I18n.t("user_block.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
+    errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) unless revoker_id.nil? || revoker.moderator?
   end
 end