X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ccc70fb914a4f565d2f637e2202df76dffe77a50..afe5512b0fbb4971e1cdda857be38ebd4fd9be2b:/app/abilities/api_capability.rb diff --git a/app/abilities/api_capability.rb b/app/abilities/api_capability.rb index 2035afff9..d8be13643 100644 --- a/app/abilities/api_capability.rb +++ b/app/abilities/api_capability.rb @@ -5,7 +5,7 @@ class ApiCapability def initialize(token) if Settings.status != "database_offline" - user = (User.find(token.resource_owner_id) if token.respond_to?(:resource_owner_id)) + user = User.find(token.resource_owner_id) if user&.active? can [:create, :comment, :close, :reopen], Note if scope?(token, :write_notes) @@ -27,7 +27,7 @@ class ApiCapability if user.moderator? can [:destroy, :restore], ChangesetComment if scope?(token, :write_api) can :destroy, Note if scope?(token, :write_notes) - can :redact, [OldNode, OldWay, OldRelation] if user&.terms_agreed? && (scope?(token, :write_api) || scope?(token, :write_redactions)) + can :redact, [OldNode, OldWay, OldRelation] if user&.terms_agreed? && scope?(token, :write_redactions) end end end