X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cd7af7e0b2ad97687849576ed4e3f52c37a6d55..cabee400321555597cfa3b8a348d702ee758d530:/app/models/user_block.rb diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 46a8c282b..7af1f9bdc 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -37,7 +37,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 +50,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 +65,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 )