X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..edd49e85823079d6de19cbc9f89c6abc0568382b:/app/models/user_block.rb?ds=sidebyside diff --git a/app/models/user_block.rb b/app/models/user_block.rb index de14dcaa9..92cee16cd 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -1,11 +1,38 @@ +# == Schema Information +# +# Table name: user_blocks +# +# id :integer not null, primary key +# user_id :bigint(8) not null +# creator_id :bigint(8) not null +# reason :text not null +# ends_at :datetime not null +# needs_view :boolean default(FALSE), not null +# revoker_id :bigint(8) +# created_at :datetime +# updated_at :datetime +# reason_format :enum default("markdown"), not null +# +# Indexes +# +# index_user_blocks_on_user_id (user_id) +# +# Foreign Keys +# +# user_blocks_moderator_id_fkey (creator_id => users.id) +# user_blocks_revoker_id_fkey (revoker_id => users.id) +# user_blocks_user_id_fkey (user_id => users.id) +# + class UserBlock < ActiveRecord::Base validate :moderator_permissions + validates :reason, :characters => true 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 + PERIODS = Settings.user_block_periods ## # scope to match active blocks @@ -26,11 +53,18 @@ 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. def revoke!(revoker) - update_attributes( + update( :ends_at => Time.now.getutc, :revoker_id => revoker.id, :needs_view => false