X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/45487e1ff8e7d334792440a2b5b3b1067269bfaf..4f79ae46127a2fdb46f904fe681620b205f8fa74:/app/models/user_block.rb?ds=inline diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 7af1f9bdc..9dd8d3138 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -2,20 +2,22 @@ # # 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 +# 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 +# deactivates_at :datetime # # Indexes # -# index_user_blocks_on_user_id (user_id) +# index_user_blocks_on_creator_id_and_id (creator_id,id) +# index_user_blocks_on_user_id (user_id) # # Foreign Keys # @@ -27,6 +29,8 @@ class UserBlock < ApplicationRecord validate :moderator_permissions validates :reason, :characters => true + validates :deactivates_at, :comparison => { :greater_than_or_equal_to => :ends_at }, :unless => -> { needs_view } + validates :deactivates_at, :absence => true, :if => -> { needs_view } belongs_to :user, :class_name => "User" belongs_to :creator, :class_name => "User" @@ -66,6 +70,7 @@ class UserBlock < ApplicationRecord def revoke!(revoker) update( :ends_at => Time.now.utc, + :deactivates_at => Time.now.utc, :revoker_id => revoker.id, :needs_view => false )