X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..506c0b5f0db8aca79ef61fa45cad508b7167817a:/app/models/user_block.rb?ds=inline diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 3759afd69..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.