X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/869d86a31fbc7982ba237c51ba4400f3ad148981..b95a8d03e32a86838d99ded814a08cb7aac44772:/app/abilities/api_capability.rb

diff --git a/app/abilities/api_capability.rb b/app/abilities/api_capability.rb
index 44e676345..1c2eab41f 100644
--- a/app/abilities/api_capability.rb
+++ b/app/abilities/api_capability.rb
@@ -5,21 +5,18 @@ class ApiCapability
 
   def initialize(token)
     if Settings.status != "database_offline"
-      user = if token.respond_to?(:resource_owner_id)
-               User.find(token.resource_owner_id)
-             elsif token.respond_to?(:user)
-               token.user
-             end
+      user = User.find(token.resource_owner_id)
 
       if user&.active?
         can [:create, :comment, :close, :reopen], Note if scope?(token, :write_notes)
-        can [:show, :data], Trace if scope?(token, :read_gpx)
+        can [:create, :destroy], NoteSubscription if scope?(token, :write_notes)
+        can [:read, :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)
         can [:gpx_files], User if scope?(token, :read_gpx)
-        can [:index, :show], UserPreference if scope?(token, :read_prefs)
+        can :read, UserPreference if scope?(token, :read_prefs)
         can [:update, :update_all, :destroy], UserPreference if scope?(token, :write_prefs)
-        can [:inbox, :outbox, :show, :update, :destroy], Message if scope?(token, :consume_messages)
+        can [:inbox, :outbox, :read, :update, :destroy], Message if scope?(token, :consume_messages)
         can [:create], Message if scope?(token, :send_messages)
 
         if user.terms_agreed?
@@ -31,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