X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/619ac4c5b2fbdbc610007376ee11e3921e475520..f643b6627c52cc778a9df01a231a5cdfb89e77f7:/app/models/user_block.rb?ds=inline diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 46a8c282b..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 # @@ -37,7 +38,7 @@ class UserBlock < ApplicationRecord ## # 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 )