X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e72acaca9b988d41298415d51a10533d3a27e958..ebb37df15b6dee626a832f877d6322ad0b52b362:/app/models/user_block.rb diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 9150bae79..4fe50d921 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -15,7 +15,8 @@ # # 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 # @@ -28,16 +29,16 @@ class UserBlock < ApplicationRecord 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 + belongs_to :user, :class_name => "User" + belongs_to :creator, :class_name => "User" + belongs_to :revoker, :class_name => "User", :optional => true PERIODS = Settings.user_block_periods ## # scope to match active blocks def self.active - where("needs_view or ends_at > ?", Time.now.getutc) + where("needs_view or ends_at > ?", Time.now.utc) end ## @@ -50,7 +51,7 @@ class UserBlock < ApplicationRecord # returns true if the block is currently active (i.e: the user can't # use the API). def active? - needs_view || ends_at > Time.now.getutc + needs_view || ends_at > Time.now.utc end ## @@ -65,7 +66,7 @@ class UserBlock < ApplicationRecord # is the user object who is revoking the ban. def revoke!(revoker) update( - :ends_at => Time.now.getutc, + :ends_at => Time.now.utc, :revoker_id => revoker.id, :needs_view => false )