X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ccc70fb914a4f565d2f637e2202df76dffe77a50..1bee96ede16e1dab41ad82efb9f2486da68a642f:/app/abilities/api_capability.rb?ds=inline diff --git a/app/abilities/api_capability.rb b/app/abilities/api_capability.rb index 2035afff9..0e953d50b 100644 --- a/app/abilities/api_capability.rb +++ b/app/abilities/api_capability.rb @@ -5,10 +5,11 @@ 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) + can [:create, :destroy], NoteSubscription if scope?(token, :write_notes) can [:show, :data], Trace if scope?(token, :read_gpx) can [:create, :update, :destroy], Trace if scope?(token, :write_gpx) can [:details], User if scope?(token, :read_prefs) @@ -27,7 +28,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