onyxcord 2.0.13 → 3.2.0

data/lib/onyxcord/models.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'onyxcord/utils/allowed_mentions'
+require 'onyxcord/utils/permissions'
+require 'onyxcord/utils/id_object'
+require 'onyxcord/utils/colour_rgb'
+require 'onyxcord/core/errors'
+require 'onyxcord/rest/client'
+require 'onyxcord/rest/routes/channel'
+require 'onyxcord/rest/routes/server'
+require 'onyxcord/rest/routes/invite'
+require 'onyxcord/rest/routes/user'
+require 'onyxcord/rest/routes/webhook'
+require 'onyxcord/webhooks/embeds'
+require 'onyxcord/webhooks/view'
+require 'onyxcord/utils/paginator'
+require 'time'
+require 'base64'
+
+require 'onyxcord/models/activity'
+require 'onyxcord/models/application'
+require 'onyxcord/models/user'
+require 'onyxcord/models/voice_state'
+require 'onyxcord/models/voice_region'
+require 'onyxcord/models/member'
+require 'onyxcord/models/recipient'
+require 'onyxcord/models/profile'
+require 'onyxcord/models/role'
+require 'onyxcord/models/invite'
+require 'onyxcord/models/overwrite'
+require 'onyxcord/models/channel'
+require 'onyxcord/models/embed'
+require 'onyxcord/models/attachment'
+require 'onyxcord/models/message'
+require 'onyxcord/models/reaction'
+require 'onyxcord/models/emoji'
+require 'onyxcord/models/integration'
+require 'onyxcord/models/server'
+require 'onyxcord/models/webhook'
+require 'onyxcord/models/audit_logs'
+require 'onyxcord/models/interaction'
+require 'onyxcord/models/component'
+require 'onyxcord/models/avatar_decoration'
+require 'onyxcord/models/collectibles'
+require 'onyxcord/models/primary_server'
+require 'onyxcord/models/server_preview'
+require 'onyxcord/models/call'
+require 'onyxcord/models/snapshot'
+require 'onyxcord/models/role_subscription'
+require 'onyxcord/models/message_activity'
+require 'onyxcord/models/team'
+require 'onyxcord/models/install_params'
+require 'onyxcord/models/role_connection_data'
+require 'onyxcord/models/channel_tag'
+require 'onyxcord/models/timestamp'
+require 'onyxcord/models/scheduled_event'
+require 'onyxcord/models/poll'

data/lib/onyxcord/{api.rb → rest/client.rb}

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'onyxcord/http'
-require 'onyxcord/json'
-require 'onyxcord/async/runtime'
+require 'onyxcord/internal/http'
+require 'onyxcord/internal/json'
+require 'onyxcord/internal/async_runtime'
 require 'time'
 
-require 'onyxcord/errors'
-require 'onyxcord/rate_limiter/rest'
-require 'onyxcord/rate_limiter/async_rest'
+require 'onyxcord/core/errors'
+require_relative '../internal/rate_limiter/rest'
+require_relative '../internal/rate_limiter/async_rest'
 
 # List of methods representing endpoints in Discord's API
-module OnyxCord::API
+module OnyxCord::REST
   # The base URL of the Discord REST API.
   APIBASE = 'https://discord.com/api/v9'
 
@@ -62,16 +62,16 @@ module OnyxCord::API
 
   # Resets all rate limit mutexes
   def reset_mutexes
-    @rate_limiter = OnyxCord::RateLimiter::Rest.new
-    @async_rate_limiter = OnyxCord::RateLimiter::AsyncRest.new
+    @rate_limiter = ::OnyxCord::Internal::RateLimiter::Rest.new
+    @async_rate_limiter = ::OnyxCord::Internal::RateLimiter::AsyncRest.new
   end
 
   def rate_limiter
-    @rate_limiter ||= OnyxCord::RateLimiter::Rest.new
+    @rate_limiter ||= ::OnyxCord::Internal::RateLimiter::Rest.new
   end
 
   def async_rate_limiter
-    @async_rate_limiter ||= OnyxCord::RateLimiter::AsyncRest.new
+    @async_rate_limiter ||= ::OnyxCord::Internal::RateLimiter::AsyncRest.new
   end
 
   def rate_limiter_stats
@@ -98,16 +98,24 @@ module OnyxCord::API
   # @param url [String] The URL to request.
   # @param body [String, Hash, nil] The request body.
   # @param headers [Hash] Additional headers.
-  # @return [OnyxCord::HTTP::Response]
+  # @return [OnyxCord::Internal::HTTP::Response]
   def raw_request(type, url, body = nil, **headers)
     headers[:user_agent] = user_agent
 
-    response = OnyxCord::HTTP.request(type, url, body, **headers)
+    response = ::OnyxCord::Internal::HTTP.request(type, url, body, **headers)
 
     if response.code == 403
-      noprm = OnyxCord::Errors::NoPermission.new
+      route = request_diagnostic(type, url, body, headers)
+      noprm = OnyxCord::Errors::NoPermission.new(
+        "The bot doesn't have the required permission to do this!",
+        status: response.code,
+        headers: response.headers,
+        route: route,
+        body: response.body,
+        response: response
+      )
       noprm.define_singleton_method(:_response) { response }
-      raise noprm, "The bot doesn't have the required permission to do this!"
+      raise noprm
     end
 
     # Retry on 502 Bad Gateway
@@ -124,7 +132,7 @@ module OnyxCord::API
     if Async::Task.current?
       request_async(key, major_parameter, type, *attributes)
     else
-      OnyxCord::AsyncRuntime.run { request_async(key, major_parameter, type, *attributes) }
+      OnyxCord::Internal::AsyncRuntime.run { request_async(key, major_parameter, type, *attributes) }
     end
   end
 
@@ -151,26 +159,45 @@ module OnyxCord::API
 
     retries = 0
     max_retries = key == :gateway ? 0 : 3
+    retryable_codes = [500, 502, 503, 504].freeze
 
     begin
       async_rate_limiter.before_request(key, major_parameter)
 
       response = nil
       loop do
-        response = OnyxCord::HTTP.request(type, url, body, **headers)
-        break unless response.code == 502
+        begin
+          response = ::OnyxCord::Internal::HTTP.request(type, url, body, **headers)
+        rescue StandardError => e
+          retries += 1
+          raise unless retries < max_retries
+
+          OnyxCord::LOGGER.warn("Temporary HTTP failure while sending request (#{e.class}), retrying")
+          OnyxCord::Internal::AsyncRuntime.sleep(retries * 0.5)
+          next
+        end
+
+        break unless retryable_codes.include?(response.code)
 
         retries += 1
         break unless retries < max_retries
 
-        OnyxCord::LOGGER.warn('Got a 502 while sending a request! Not a big deal, retrying the request')
-        OnyxCord::AsyncRuntime.sleep(retries * 0.5)
+        OnyxCord::LOGGER.warn("Got HTTP #{response.code} while sending a request, retrying")
+        OnyxCord::Internal::AsyncRuntime.sleep(retries * 0.5)
       end
 
       if response.code == 403
-        noprm = OnyxCord::Errors::NoPermission.new
+        route = request_diagnostic(type, url, body, headers)
+        noprm = OnyxCord::Errors::NoPermission.new(
+          "The bot doesn't have the required permission to do this!",
+          status: response.code,
+          headers: response.headers,
+          route: route,
+          body: response.body,
+          response: response
+        )
         noprm.define_singleton_method(:_response) { response }
-        raise noprm, "The bot doesn't have the required permission to do this!"
+        raise noprm
       end
 
       if response.code >= 400 && response.code != 429
@@ -180,10 +207,20 @@ module OnyxCord::API
           nil
         end
 
-        raise "HTTP #{response.code}: #{response.body}" unless data
+        route = request_diagnostic(type, url, body, headers)
+        unless data
+          raise OnyxCord::Errors::HTTPError.new(
+            "HTTP #{response.code} #{route}: #{response.body}",
+            status: response.code,
+            headers: response.headers,
+            route: route,
+            body: response.body,
+            response: response
+          )
+        end
 
         err_klass = OnyxCord::Errors.error_class_for(data['code'] || 0)
-        e = err_klass.new(data['message'], data['errors'])
+        e = err_klass.new(data['message'], data['errors'], status: response.code, headers: response.headers, route: route, body: response.body, response: response)
         OnyxCord::LOGGER.error(e.full_message)
         raise e
       end
@@ -206,9 +243,9 @@ module OnyxCord::API
       if body_data['code'] == 110_000
         case body_data['retry_after']
         when 0, 1, nil
-          OnyxCord::AsyncRuntime.sleep(rand(4.5..5.0))
+          OnyxCord::Internal::AsyncRuntime.sleep(rand(4.5..5.0))
         else
-          OnyxCord::AsyncRuntime.sleep(body_data['retry_after'])
+          OnyxCord::Internal::AsyncRuntime.sleep(body_data['retry_after'])
         end
 
         return request_async(key, major_parameter, type, url, body, headers)
@@ -243,6 +280,25 @@ module OnyxCord::API
     end
   end
 
+  def request_diagnostic(type, url, body, headers)
+    clean_url = url.to_s.sub(%r{/webhooks/(\d+)/[^?]+}, '/webhooks/\1/[token]')
+                   .sub(%r{/interactions/(\d+)/[^/]+}, '/interactions/\1/[token]')
+    header_keys = headers.keys.map(&:to_s).sort.join(',')
+    body_info = if body.is_a?(Hash)
+                  body.map do |key, value|
+                    path = value.path if value.respond_to?(:path)
+                    detail = path ? "file:#{File.basename(path)}" : value.to_s.bytesize
+                    "#{key}=#{detail}"
+                  end.join(',')
+                else
+                  body.nil? ? 'nil' : "#{body.class}:#{body.to_s.bytesize}"
+                end
+
+    "(#{type.to_s.upcase} #{clean_url} headers=#{header_keys} body=#{body_info})"
+  rescue StandardError => e
+    "(diagnostic_failed=#{e.class}: #{e.message})"
+  end
+
   # Make an icon URL from server and icon IDs
   def icon_url(server_id, icon_id, format = 'webp')
     "#{cdn_url}/icons/#{server_id}/#{icon_id}.#{format}"
@@ -392,4 +448,4 @@ module OnyxCord::API
   end
 end
 
-OnyxCord::API.reset_mutexes
+OnyxCord::REST.reset_mutexes

data/lib/onyxcord/{api → rest/routes}/application.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 # API calls for slash commands.
-module OnyxCord::API::Application
+module OnyxCord::REST::Application
   module_function
 
   # Get a list of global application commands.
   # https://discord.com/developers/docs/interactions/slash-commands#get-global-application-commands
   def get_global_commands(token, application_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_commands,
       nil,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands",
       Authorization: token
     )
   end
@@ -19,24 +19,26 @@ module OnyxCord::API::Application
   # Get a global application command by ID.
   # https://discord.com/developers/docs/interactions/slash-commands#get-global-application-command
   def get_global_command(token, application_id, command_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_commands_cid,
       nil,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands/#{command_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands/#{command_id}",
       Authorization: token
     )
   end
 
   # Create a global application command.
   # https://discord.com/developers/docs/interactions/slash-commands#create-global-application-command
-  def create_global_command(token, application_id, name, description, options = [], default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = false, integration_types = nil)
-    OnyxCord::API.request(
+  def create_global_command(token, application_id, name, description, options = [], default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = false, integration_types = nil, name_localizations: nil, description_localizations: nil)
+    OnyxCord::REST.request(
       :applications_aid_commands,
       nil,
       :post,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands",
-      { name: name, description: description, options: options, default_permission: default_permission, type: type, default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types }.to_json,
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands",
+      { name: name, description: description, options: options, default_permission: default_permission, type: type,
+        default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types,
+        name_localizations: name_localizations, description_localizations: description_localizations }.compact.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -44,13 +46,15 @@ module OnyxCord::API::Application
 
   # Edit a global application command.
   # https://discord.com/developers/docs/interactions/slash-commands#edit-global-application-command
-  def edit_global_command(token, application_id, command_id, name = nil, description = nil, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = nil, integration_types = nil)
-    OnyxCord::API.request(
+  def edit_global_command(token, application_id, command_id, name = nil, description = nil, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = nil, integration_types = nil, name_localizations: nil, description_localizations: nil)
+    OnyxCord::REST.request(
       :applications_aid_commands_cid,
       nil,
       :patch,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands/#{command_id}",
-      { name: name, description: description, options: options, default_permission: default_permission, type: type, default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types }.compact.to_json,
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands/#{command_id}",
+      { name: name, description: description, options: options, default_permission: default_permission, type: type,
+        default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types,
+        name_localizations: name_localizations, description_localizations: description_localizations }.compact.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -59,11 +63,11 @@ module OnyxCord::API::Application
   # Delete a global application command.
   # https://discord.com/developers/docs/interactions/slash-commands#delete-global-application-command
   def delete_global_command(token, application_id, command_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_commands_cid,
       nil,
       :delete,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands/#{command_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands/#{command_id}",
       Authorization: token
     )
   end
@@ -71,11 +75,11 @@ module OnyxCord::API::Application
   # Set global application commands in bulk.
   # https://discord.com/developers/docs/interactions/slash-commands#bulk-overwrite-global-application-commands
   def bulk_overwrite_global_commands(token, application_id, commands)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_commands,
       nil,
       :put,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/commands",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/commands",
       commands.to_json,
       Authorization: token,
       content_type: :json
@@ -85,11 +89,11 @@ module OnyxCord::API::Application
   # Get a guild's commands for an application.
   # https://discord.com/developers/docs/interactions/slash-commands#get-guild-application-commands
   def get_guild_commands(token, application_id, guild_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands,
       guild_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
       Authorization: token
     )
   end
@@ -97,24 +101,26 @@ module OnyxCord::API::Application
   # Get a guild command by ID.
   # https://discord.com/developers/docs/interactions/slash-commands#get-guild-application-command
   def get_guild_command(token, application_id, guild_id, command_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid,
       guild_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
       Authorization: token
     )
   end
 
   # Create an application command for a guild.
   # https://discord.com/developers/docs/interactions/slash-commands#create-guild-application-command
-  def create_guild_command(token, application_id, guild_id, name, description, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = false)
-    OnyxCord::API.request(
+  def create_guild_command(token, application_id, guild_id, name, description, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = false, integration_types = nil, name_localizations: nil, description_localizations: nil)
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands,
       guild_id,
       :post,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
-      { name: name, description: description, options: options, default_permission: default_permission, type: type, default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw }.to_json,
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
+      { name: name, description: description, options: options, default_permission: default_permission, type: type,
+        default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types,
+        name_localizations: name_localizations, description_localizations: description_localizations }.compact.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -122,13 +128,15 @@ module OnyxCord::API::Application
 
   # Edit an application command for a guild.
   # https://discord.com/developers/docs/interactions/slash-commands#edit-guild-application-command
-  def edit_guild_command(token, application_id, guild_id, command_id, name = nil, description = nil, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = nil)
-    OnyxCord::API.request(
+  def edit_guild_command(token, application_id, guild_id, command_id, name = nil, description = nil, options = nil, default_permission = nil, type = 1, default_member_permissions = nil, contexts = nil, nsfw = nil, integration_types = nil, name_localizations: nil, description_localizations: nil)
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid,
       guild_id,
       :patch,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
-      { name: name, description: description, options: options, default_permission: default_permission, type: type, default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw }.compact.to_json,
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
+      { name: name, description: description, options: options, default_permission: default_permission, type: type,
+        default_member_permissions: default_member_permissions, contexts: contexts, nsfw: nsfw, integration_types: integration_types,
+        name_localizations: name_localizations, description_localizations: description_localizations }.compact.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -137,11 +145,11 @@ module OnyxCord::API::Application
   # Delete an application command for a guild.
   # https://discord.com/developers/docs/interactions/slash-commands#delete-guild-application-command
   def delete_guild_command(token, application_id, guild_id, command_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid,
       guild_id,
       :delete,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}",
       Authorization: token
     )
   end
@@ -149,11 +157,11 @@ module OnyxCord::API::Application
   # Set guild commands in bulk.
   # https://discord.com/developers/docs/interactions/slash-commands#bulk-overwrite-guild-application-commands
   def bulk_overwrite_guild_commands(token, application_id, guild_id, commands)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands,
       guild_id,
       :put,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands",
       commands.to_json,
       Authorization: token,
       content_type: :json
@@ -163,11 +171,11 @@ module OnyxCord::API::Application
   # Get the permissions for a specific guild command.
   # https://discord.com/developers/docs/interactions/slash-commands#get-application-command-permissions
   def get_guild_command_permissions(token, application_id, guild_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_permissions,
       guild_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
       Authorization: token
     )
   end
@@ -175,11 +183,11 @@ module OnyxCord::API::Application
   # Edit the permissions for a specific guild command.
   # https://discord.com/developers/docs/interactions/slash-commands#edit-application-command-permissions
   def edit_guild_command_permissions(token, application_id, guild_id, command_id, permissions)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid_permissions,
       guild_id,
       :put,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}/permissions",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}/permissions",
       { permissions: permissions }.to_json,
       Authorization: token,
       content_type: :json
@@ -189,11 +197,11 @@ module OnyxCord::API::Application
   # Edit permissions for all commands in a guild.
   # https://discord.com/developers/docs/interactions/slash-commands#batch-edit-application-command-permissions
   def batch_edit_command_permissions(token, application_id, guild_id, permissions)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid_permissions,
       guild_id,
       :put,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
       permissions.to_json,
       Authorization: token,
       content_type: :json
@@ -203,11 +211,11 @@ module OnyxCord::API::Application
   # Get all of the permissions for the commands in a guild.
   # https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command-permissions
   def get_guild_application_command_permissions(token, application_id, guild_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_permissions,
       guild_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/permissions",
       Authorization: token
     )
   end
@@ -215,11 +223,11 @@ module OnyxCord::API::Application
   # Get the permissions for a specific command in a guild.
   # https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
   def get_application_command_permissions(token, application_id, guild_id, command_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_guilds_gid_commands_cid_permissions,
       guild_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}/permissions",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/guilds/#{guild_id}/commands/#{command_id}/permissions",
       Authorization: token
     )
   end
@@ -227,11 +235,11 @@ module OnyxCord::API::Application
   # Get a list of application emojis.
   # https://discord.com/developers/docs/resources/emoji#list-application-emojis
   def list_application_emojis(token, application_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_emojis,
       application_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/emojis",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/emojis",
       Authorization: token
     )
   end
@@ -239,11 +247,11 @@ module OnyxCord::API::Application
   # Get an application emoji by ID.
   # https://discord.com/developers/docs/resources/emoji#get-application-emoji
   def get_application_emoji(token, application_id, emoji_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_emojis_eid,
       application_id,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
       Authorization: token
     )
   end
@@ -251,11 +259,11 @@ module OnyxCord::API::Application
   # Create an application emoji.
   # https://discord.com/developers/docs/resources/emoji#create-application-emoji
   def create_application_emoji(token, application_id, name, image)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_emojis,
       application_id,
       :post,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/emojis",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/emojis",
       { name: name, image: image }.to_json,
       Authorization: token,
       content_type: :json
@@ -265,11 +273,11 @@ module OnyxCord::API::Application
   # Edit an application emoji.
   # https://discord.com/developers/docs/resources/emoji#modify-application-emoji
   def edit_application_emoji(token, application_id, emoji_id, name)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_emojis_eid,
       application_id,
       :patch,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
       { name: name }.to_json,
       Authorization: token,
       content_type: :json
@@ -279,11 +287,11 @@ module OnyxCord::API::Application
   # Delete an application emoji.
   # https://discord.com/developers/docs/resources/emoji#delete-application-emoji
   def delete_application_emoji(token, application_id, emoji_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_emojis_eid,
       application_id,
       :delete,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/emojis/#{emoji_id}",
       Authorization: token
     )
   end
@@ -291,11 +299,11 @@ module OnyxCord::API::Application
   # Edit the current application for the requesting bot user.
   # https://discord.com/developers/docs/resources/application#edit-current-application
   def update_current_application(token, custom_install_url: :undef, description: :undef, role_connections_verification_url: :undef, install_params: :undef, integration_types_config: :undef, flags: :undef, interactions_endpoint_url: :undef, tags: :undef, event_webhooks_url: :undef, event_webhooks_status: :undef, event_webhooks_types: :undef, icon: :undef, cover_image: :undef)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_me,
       nil,
       :patch,
-      "#{OnyxCord::API.api_base}/applications/@me",
+      "#{OnyxCord::REST.api_base}/applications/@me",
       { custom_install_url:, description:, role_connections_verification_url:, install_params:, integration_types_config:, flags:, interactions_endpoint_url:, tags:, event_webhooks_url:, event_webhooks_status:, event_webhooks_types:, icon:, cover_image: }.reject { |_, value| value == :undef }.to_json,
       Authorization: token,
       content_type: :json
@@ -305,12 +313,26 @@ module OnyxCord::API::Application
   # Get a list of role connection metadata records.
   # https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records
   def get_application_role_connection_metadata_records(token, application_id)
-    OnyxCord::API.request(
+    OnyxCord::REST.request(
       :applications_aid_role_connections_metadata,
       nil,
       :get,
-      "#{OnyxCord::API.api_base}/applications/#{application_id}/role-connections/metadata",
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/role-connections/metadata",
       Authorization: token
     )
   end
+
+  # Update the role connection metadata records for the application.
+  # https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records
+  def set_application_role_connection_metadata_records(token, application_id, metadata)
+    OnyxCord::REST.request(
+      :applications_aid_role_connections_metadata,
+      nil,
+      :put,
+      "#{OnyxCord::REST.api_base}/applications/#{application_id}/role-connections/metadata",
+      metadata.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
 end