onyxcord 2.0.13 → 3.2.0

data/lib/onyxcord/models/interaction.rb

@@ -0,0 +1,450 @@
+# frozen_string_literal: true
+
+require 'onyxcord/interactions/internal/application_command'
+require 'onyxcord/interactions/internal/option_builder'
+require 'onyxcord/interactions/internal/permission_builder'
+require 'onyxcord/interactions/internal/message'
+require 'onyxcord/interactions/internal/metadata'
+require 'onyxcord/webhooks'
+require 'onyxcord/internal/message_payload'
+
+module OnyxCord
+  # Base class for interaction objects.
+  class Interaction
+    include IDObject
+
+    # Interaction types.
+    # @see https://discord.com/developers/docs/interactions/slash-commands#interaction-interactiontype
+    TYPES = {
+      ping: 1,
+      command: 2,
+      component: 3,
+      autocomplete: 4,
+      modal_submit: 5
+    }.freeze
+
+    # Interaction response types.
+    # @see https://discord.com/developers/docs/interactions/slash-commands#interaction-response-interactioncallbacktype
+    CALLBACK_TYPES = {
+      pong: 1,
+      channel_message: 4,
+      deferred_message: 5,
+      deferred_update: 6,
+      update_message: 7,
+      autocomplete: 8,
+      modal: 9
+    }.freeze
+
+    # Interaction context types.
+    # @see https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-context-types
+    CONTEXTS = {
+      server: 0,
+      bot_dm: 1,
+      private_channel: 2
+    }.freeze
+
+    # Application integration types.
+    # @see https://discord.com/developers/docs/resources/application#application-object-application-integration-types
+    INTEGRATION_TYPES = {
+      server: 0,
+      user: 1
+    }.freeze
+
+    # Message flags for interaction responses.
+    # @see https://discord.com/developers/docs/resources/message#message-object-message-flags
+    FLAGS = {
+      ephemeral: 1 << 6,
+      suppress_embeds: 1 << 2,
+      suppress_notifications: 1 << 12
+    }.freeze
+
+    # @return [User, Member] The user that initiated the interaction.
+    attr_reader :user
+
+    # @return [Integer, nil] The ID of the server this interaction originates from.
+    attr_reader :server_id
+
+    # @return [Integer] The ID of the channel this interaction originates from.
+    attr_reader :channel_id
+
+    # @return [Channel] The channel where this interaction originates from.
+    attr_reader :channel
+
+    # @return [Integer] The ID of the application associated with this interaction.
+    attr_reader :application_id
+
+    # @return [String] The interaction token.
+    attr_reader :token
+
+    # @!visibility private
+    # @return [Integer] Currently pointless
+    attr_reader :version
+
+    # @return [Integer] The type of this interaction.
+    # @see TYPES
+    attr_reader :type
+
+    # @return [Hash] The interaction data.
+    attr_reader :data
+
+    # @return [Interactions::Message, nil] The message associated with this interaction.
+    attr_reader :message
+
+    # @return [Array<ActionRow>] The modal components associated with this interaction.
+    attr_reader :components
+
+    # @return [Permissions] The permissions the application has where this interaction originates from.
+    attr_reader :application_permissions
+
+    # @return [String] The selected language of the user that initiated this interaction.
+    attr_reader :user_locale
+
+    # @return [String, nil] The selected language of the server this interaction originates from.
+    attr_reader :server_locale
+
+    # @return [Integer] The context of where this interaction was initiated from.
+    attr_reader :context
+
+    # @return [Integer] The maximum number of bytes an attachment can have when responding to this interaction.
+    attr_reader :max_attachment_size
+
+    # @return [Array<Symbol>] The features of the server where this interaction was initiated from.
+    attr_reader :server_features
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+
+      @id = data['id'].to_i
+      @application_id = data['application_id'].to_i
+      @type = data['type']
+      @message = Interactions::Message.new(data['message'], @bot, self) if data['message']
+      @data = data['data']
+      @server_id = data['guild_id']&.to_i
+      @channel_id = data['channel_id']&.to_i
+      @channel = bot.ensure_channel(data['channel']) if data['channel']
+      @user = begin
+        if data['member'] && data['member']['user']
+          data['member']['guild_id'] = @server_id
+          server = bot.servers ? bot.servers[@server_id] : nil
+          OnyxCord::Member.new(data['member'], server, bot)
+        elsif data['user']
+          bot.ensure_user(data['user'])
+        end
+      rescue StandardError => e
+        OnyxCord::LOGGER.error("Failed to parse interaction user/member: #{e}")
+        nil
+      end
+      @token = data['token']
+      @version = data['version']
+      @components = @data['components']&.filter_map { |component| Components.from_data(component, @bot) } || []
+      @application_permissions = Permissions.new(data['app_permissions']) if data['app_permissions']
+      @user_locale = data['locale']
+      @server_locale = data['guild_locale']
+      @context = data['context']
+      @max_attachment_size = data['attachment_size_limit']
+      @integration_owners = data['authorizing_integration_owners']&.to_h { |key, value| [key.to_i, value.to_i] }
+      @server_features = data['guild'] ? data['guild']['features']&.map { |feature| feature.downcase.to_sym } : []
+    end
+
+    # Respond to the creation of this interaction. An interaction must be responded to or deferred,
+    # The response may be modified with {Interaction#edit_response} or deleted with {Interaction#delete_response}.
+    # Further messages can be sent with {Interaction#send_message}.
+    # @param content [String] The content of the message.
+    # @param tts [true, false]
+    # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.
+    # @param allowed_mentions [Hash, AllowedMentions] Mentions that can ping on this message.
+    # @param flags [Integer] Message flags.
+    # @param ephemeral [true, false] Whether this message should only be visible to the interaction initiator.
+    # @param wait [true, false] Whether this method should return a Message object of the interaction response.
+    # @param components [Array<#to_h>] An array of components.
+    # @param attachments [Array<File>] Files that can be referenced in embeds and components via `attachment://file.png`.
+    # @param has_components [true, false] Whether this message includes any V2 components. Enabling this disables sending content, polls, and embeds.
+    # @param poll [Hash, Poll::Builder, Poll, nil] The poll that should be attached to this message.
+    # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
+    # @yieldparam view [Webhooks::View] A builder for creating interaction components.
+    def respond(content: nil, tts: nil, embeds: nil, allowed_mentions: nil, flags: 0, ephemeral: nil, suppress_embeds: nil, suppress_notifications: nil, wait: false, components: nil, attachments: nil, has_components: false, components_v2: false, poll: nil)
+      flags |= FLAGS[:ephemeral] if ephemeral
+      flags |= FLAGS[:suppress_embeds] if suppress_embeds
+      flags |= FLAGS[:suppress_notifications] if suppress_notifications
+
+      builder = OnyxCord::Webhooks::Builder.new
+      view = OnyxCord::Webhooks::View.new
+
+      # Set builder defaults from parameters
+      prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      yield(builder, view) if block_given?
+
+      components ||= view
+      flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
+      data = builder.to_json_hash
+
+      response = OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:channel_message], data[:content], tts, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, nil, wait, data[:poll])
+      return unless wait
+
+      Interactions::Message.new(JSON.parse(response)['resource']['message'], @bot, self)
+    end
+
+    # Defer an interaction, setting a temporary response that can be later overriden by {Interaction#send_message}.
+    # This method is used when you want to use a single message for your response but require additional processing time, or to simply ack
+    # an interaction so an error is not displayed.
+    # @param flags [Integer] Message flags.
+    # @param ephemeral [true, false] Whether this message should only be visible to the interaction initiator.
+    def defer(flags: 0, ephemeral: true, suppress_embeds: nil, suppress_notifications: nil)
+      flags |= FLAGS[:ephemeral] if ephemeral
+      flags |= FLAGS[:suppress_embeds] if suppress_embeds
+      flags |= FLAGS[:suppress_notifications] if suppress_notifications
+
+      OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:deferred_message], nil, nil, nil, nil, flags)
+      nil
+    end
+
+    # Defer an update to an interaction. This is can only currently used by Button interactions.
+    def defer_update
+      OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:deferred_update])
+    end
+
+    # Create a modal as a response.
+    # @param title [String] The title of the modal being shown.
+    # @param custom_id [String] The custom_id used to identify the modal and store data.
+    # @param components [Array<Component, Hash>, nil] An array of components. These can be defined through the block as well.
+    # @yieldparam [OnyxCord::Webhooks::Modal] A builder for the modal's components.
+    def show_modal(title:, custom_id:, components: nil)
+      if block_given?
+        modal_builder = OnyxCord::Webhooks::Modal.new
+        yield modal_builder
+
+        components = modal_builder.to_a
+      end
+
+      OnyxCord::REST::Interaction.create_interaction_modal_response(@token, @id, custom_id, title, components.to_a) unless type == Interaction::TYPES[:modal_submit]
+      nil
+    end
+
+    # Respond to the creation of this interaction. An interaction must be responded to or deferred,
+    # The response may be modified with {Interaction#edit_response} or deleted with {Interaction#delete_response}.
+    # Further messages can be sent with {Interaction#send_message}.
+    # @param content [String] The content of the message.
+    # @param tts [true, false]
+    # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.
+    # @param allowed_mentions [Hash, AllowedMentions] Mentions that can ping on this message.
+    # @param flags [Integer] Message flags.
+    # @param ephemeral [true, false] Whether this message should only be visible to the interaction initiator.
+    # @param wait [true, false] Whether this method should return a Message object of the interaction response.
+    # @param components [Array<#to_h>] An array of components.
+    # @param attachments [Array<File>] Files that can be referenced in embeds and components via `attachment://file.png`.
+    # @param has_components [true, false] Whether this message includes any V2 components. Enabling this disables sending content, polls, and embeds.
+    # @param poll [Hash, Poll::Builder, Poll, nil] The poll that should be attached to this message.
+    # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
+    # @yieldparam view [Webhooks::View] A builder for creating interaction components.
+    def update_message(content: nil, tts: nil, embeds: nil, allowed_mentions: nil, flags: 0, ephemeral: nil, suppress_embeds: nil, suppress_notifications: nil, wait: false, components: nil, attachments: nil, has_components: false, components_v2: false, poll: nil)
+      flags |= FLAGS[:ephemeral] if ephemeral
+      flags |= FLAGS[:suppress_embeds] if suppress_embeds
+      flags |= FLAGS[:suppress_notifications] if suppress_notifications
+
+      builder = OnyxCord::Webhooks::Builder.new
+      view = OnyxCord::Webhooks::View.new
+
+      prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      yield(builder, view) if block_given?
+
+      components ||= view
+      flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
+      data = builder.to_json_hash
+
+      response = OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:update_message], data[:content], tts, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, nil, wait, data[:poll])
+      return unless wait
+
+      Interactions::Message.new(JSON.parse(response)['resource']['message'], @bot, self)
+    end
+
+    # Edit the original response to this interaction.
+    # @param content [String] The content of the message.
+    # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.
+    # @param allowed_mentions [Hash, AllowedMentions] Mentions that can ping on this message.
+    # @param flags [Integer] Message flags.
+    # @param components [Array<#to_h>] An array of components.
+    # @param attachments [Array<File>] Files that can be referenced in embeds and components via `attachment://file.png`.
+    # @param has_components [true, false] Whether this message includes any V2 components. Enabling this disables sending content, polls, and embeds.
+    # @param poll [Hash, Poll::Builder, Poll, nil] The poll that should be attached to this message.
+    # @return [InteractionMessage] The updated response message.
+    # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
+    def edit_response(content: nil, embeds: nil, allowed_mentions: nil, flags: 0, components: nil, attachments: nil, has_components: false, components_v2: false, poll: nil)
+      builder = OnyxCord::Webhooks::Builder.new
+      view = OnyxCord::Webhooks::View.new
+
+      prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      yield(builder, view) if block_given?
+
+      components ||= view
+      flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
+      data = builder.to_json_hash
+      resp = OnyxCord::REST::Interaction.edit_original_interaction_response(@token, @application_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll])
+
+      Interactions::Message.new(JSON.parse(resp), @bot, self)
+    end
+
+    # Delete the original interaction response.
+    def delete_response
+      OnyxCord::REST::Interaction.delete_original_interaction_response(@token, @application_id)
+    end
+
+    # @param content [String] The content of the message.
+    # @param tts [true, false]
+    # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.
+    # @param allowed_mentions [Hash, AllowedMentions] Mentions that can ping on this message.
+    # @param flags [Integer] Message flags.
+    # @param ephemeral [true, false] Whether this message should only be visible to the interaction initiator.
+    # @param attachments [Array<File>] Files that can be referenced in embeds and components via `attachment://file.png`.
+    # @param has_components [true, false] Whether this message includes any V2 components. Enabling this disables sending content, polls, and embeds.
+    # @param poll [Hash, Poll::Builder, Poll, nil] The poll that should be attached to this message.
+    # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
+    # @yieldparam view [Webhooks::View] A builder for creating interaction components.
+    def send_message(content: nil, embeds: nil, tts: false, allowed_mentions: nil, flags: 0, ephemeral: false, suppress_embeds: nil, suppress_notifications: nil, components: nil, attachments: nil, has_components: false, components_v2: false, poll: nil)
+      flags |= FLAGS[:ephemeral] if ephemeral
+      flags |= FLAGS[:suppress_embeds] if suppress_embeds
+      flags |= FLAGS[:suppress_notifications] if suppress_notifications
+
+      builder = OnyxCord::Webhooks::Builder.new
+      view = OnyxCord::Webhooks::View.new
+
+      prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      yield(builder, view) if block_given?
+
+      components ||= view
+      flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
+      data = builder.to_json_hash
+
+      resp = OnyxCord::REST::Webhook.token_execute_webhook(
+        @token, @application_id, true, data[:content], nil, nil, tts, nil, data[:embeds], data[:allowed_mentions], flags, components.to_a, attachments, data[:poll]
+      )
+      Interactions::Message.new(JSON.parse(resp), @bot, self)
+    end
+
+    alias edit_original edit_response
+    alias delete_original delete_response
+    alias followup send_message
+
+    # @param message [String, Integer, InteractionMessage, Message] The message created by this interaction to be edited.
+    # @param content [String] The message content.
+    # @param embeds [Array<Hash, Webhooks::Embed>] The embeds for the message.
+    # @param allowed_mentions [Hash, AllowedMentions] Mentions that can ping on this message.
+    # @param attachments [Array<File>] Files that can be referenced in embeds via `attachment://file.png`.
+    # @param flags [Integer] Message flags.
+    # @param has_components [true, false] Whether this message includes any V2 components. Enabling this disables sending content, polls, and embeds.
+    # @param poll [Hash, Poll::Builder, Poll, nil] The poll that should be attached to this message.
+    # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
+    def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, components: nil, attachments: nil, flags: 0, has_components: false, components_v2: false, poll: nil)
+      builder = OnyxCord::Webhooks::Builder.new
+      view = OnyxCord::Webhooks::View.new
+
+      prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      yield(builder, view) if block_given?
+
+      components ||= view
+      flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
+      data = builder.to_json_hash
+
+      resp = OnyxCord::REST::Webhook.token_edit_message(
+        @token, @application_id, message.resolve_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll]
+      )
+      Interactions::Message.new(JSON.parse(resp), @bot, self)
+    end
+
+    # @param message [Integer, String, InteractionMessage, Message] The message created by this interaction to be deleted.
+    def delete_message(message)
+      OnyxCord::REST::Webhook.token_delete_message(@token, @application_id, message.resolve_id)
+      nil
+    end
+
+    # Show autocomplete choices as a response.
+    # @param choices [Array<Hash>, Hash] Array of autocomplete choices to show the user.
+    def show_autocomplete_choices(choices)
+      choices = choices.map { |name, value| { name: name, value: value } } unless choices.is_a?(Array)
+      OnyxCord::REST::Interaction.create_interaction_response(@token, @id, CALLBACK_TYPES[:autocomplete], nil, nil, nil, nil, nil, nil, nil, choices)
+      nil
+    end
+
+    # Get the server associated with the interaction.
+    # @return [Server, nil] This will be nil for interactions that occur in DM channels or servers where the bot
+    #   does not have the `bot` scope.
+    def server
+      @bot.server(@server_id)
+    end
+
+    # Get the button component that triggered the interaction.
+    # @return [Components::Button, nil] The button that triggered this interaction if applicable, otherwise `nil`.
+    def button
+      @type == TYPES[:component] ? get_component(@data['custom_id']) : nil
+    end
+
+    # Get the text input components associated with the interaction.
+    # @return [Array<TextInput>] The text input components associated with this interaction.
+    def text_inputs
+      @components.filter_map do |entity|
+        entity.component if entity.is_a?(Components::Label) && entity.component.is_a?(Components::TextInput)
+      end
+    end
+
+    # Get a component by its custom ID.
+    # @param custom_id [String] the custom ID of the component to find.
+    # @return [TextInput, Button, SelectMenu, Checkbox, ModalActionGroup, nil] The component associated with the custom ID, or `nil`.
+    def get_component(custom_id)
+      components = flatten_components((@message&.components || []) + @components)
+      components.find { |component| component.respond_to?(:custom_id) && component.custom_id == custom_id }
+    end
+
+    # @return [true, false] whether the application was installed by the user who initiated this interaction.
+    def user_integration?
+      @integration_owners[1] == @user.id
+    end
+
+    # @return [true, false] whether the application was installed by the server where this interaction originates from.
+    def server_integration?
+      @server_id ? @integration_owners[0] == @server_id : false
+    end
+
+    private
+
+    # Set builder defaults from parameters
+    # @param builder [OnyxCord::Webhooks::Builder]
+    # @param content [String, nil]
+    # @param embeds [Array<Hash, OnyxCord::Webhooks::Embed>, nil]
+    # @param allowed_mentions [AllowedMentions, Hash, nil]
+    # @param poll [Poll, Poll::Builder, Hash, nil]
+    def prepare_builder(builder, content, embeds, allowed_mentions, poll)
+      builder.poll = poll
+      builder.content = content unless content == OnyxCord::MessagePayload::KEEP
+      builder.allowed_mentions = allowed_mentions
+      embeds&.each { |embed| builder << embed } unless embeds == OnyxCord::MessagePayload::KEEP
+    end
+
+    def edit_content(content, data)
+      content == OnyxCord::MessagePayload::KEEP ? OnyxCord::MessagePayload::KEEP : data[:content]
+    end
+
+    def edit_embeds(embeds, data)
+      embeds == OnyxCord::MessagePayload::KEEP ? OnyxCord::MessagePayload::KEEP : data[:embeds]
+    end
+
+    # @!visibility private
+    def flatten_components(components)
+      components = components.flat_map do |entity|
+        case entity
+        when Components::ActionRow
+          entity.components
+        when Components::Label
+          entity.component
+        when Components::Section
+          entity.accessory if entity.accessory.respond_to?(:custom_id)
+        when Components::Container
+          flatten_components(entity.components)
+        else
+          entity if entity.respond_to?(:custom_id)
+        end
+      end
+
+      components.compact
+    end
+  end
+end

data/lib/onyxcord/{data → models}/invite.rb

@@ -119,7 +119,7 @@ module OnyxCord
     # Deletes this invite
     # @param reason [String] The reason the invite is being deleted.
     def delete(reason = nil)
-      API::Invite.delete(@bot.token, @code, reason)
+      REST::Invite.delete(@bot.token, @code, reason)
     end
 
     alias_method :revoke, :delete

data/lib/onyxcord/{data → models}/member.rb

@@ -62,14 +62,14 @@ module OnyxCord
     # @param format [String, nil] If `nil`, the URL will default to `webp` for static avatars, and will detect if the member has a `gif` avatar. You can otherwise specify one of `webp`, `jpg`, `png`, or `gif` to override this.
     # @return [String, nil] the URL to the avatar image, or nil if the member doesn't have one.
     def server_avatar_url(format = nil)
-      API::Server.avatar_url(@server_id, @user.id, @server_avatar_id, format) if @server_avatar_id
+      REST::Server.avatar_url(@server_id, @user.id, @server_avatar_id, format) if @server_avatar_id
     end
 
     # Utility method to get a member's server banner URL.
     # @param format [String, nil] If `nil`, the URL will default to `webp` for static banners, and will detect if the member has a `gif` banner. You can otherwise specify one of `webp`, `jpg`, `png`, or `gif` to override this.
     # @return [String, nil] the URL to the banner image, or nil if the member doesn't have one.
     def server_banner_url(format = nil)
-      API::Server.banner_url(@server_id, @user.id, @server_banner_id, format) if @server_banner_id
+      REST::Server.banner_url(@server_id, @user.id, @server_banner_id, format) if @server_banner_id
     end
 
     MEMBER_FLAGS.each do |name, value|
@@ -234,7 +234,7 @@ module OnyxCord
       role_ids = role_id_array(role)
 
       if role_ids.one?
-        API::Server.add_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
+        REST::Server.add_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
       else
         old_role_ids = resolve_role_ids
         new_role_ids = (old_role_ids + role_ids).uniq
@@ -249,7 +249,7 @@ module OnyxCord
       role_ids = role_id_array(role)
 
       if role_ids.one?
-        API::Server.remove_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
+        REST::Server.remove_member_role(@bot.token, @server_id, @user.id, role_ids[0], reason)
       else
         old_role_ids = resolve_role_ids
         new_role_ids = old_role_ids.reject { |i| role_ids.include?(i) }
@@ -512,17 +512,17 @@ module OnyxCord
 
     # @!visibility private
     def update_member_data(new_data)
-      update_data(JSON.parse(API::Server.update_member(@bot.token, @server_id, @user.id, **new_data)))
+      update_data(JSON.parse(REST::Server.update_member(@bot.token, @server_id, @user.id, **new_data)))
     end
 
     # @!visibility private
     def update_current_member_data(new_data)
-      update_data(JSON.parse(API::Server.update_current_member(@bot.token, @server_id,
-                                                               new_data.key?(:nick) ? new_data[:nick] : :undef,
-                                                               new_data[:reason],
-                                                               new_data.key?(:bio) ? new_data[:bio] : :undef,
-                                                               new_data.key?(:banner) ? new_data[:banner] : :undef,
-                                                               new_data.key?(:avatar) ? new_data[:avatar] : :undef)))
+      update_data(JSON.parse(REST::Server.update_current_member(@bot.token, @server_id,
+                                                                new_data.key?(:nick) ? new_data[:nick] : :undef,
+                                                                new_data[:reason],
+                                                                new_data.key?(:bio) ? new_data[:bio] : :undef,
+                                                                new_data.key?(:banner) ? new_data[:banner] : :undef,
+                                                                new_data.key?(:avatar) ? new_data[:avatar] : :undef)))
     end
   end
 end

data/lib/onyxcord/{data → models}/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/message_components'
+require 'onyxcord/internal/message_payload'
 
 module OnyxCord
   # A message on Discord that was sent to a text channel
@@ -304,25 +304,33 @@ module OnyxCord
     # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2) can be edited.
     # @return [Message] the resulting message.
     def edit(new_content, new_embeds = nil, new_components = nil, flags = 0)
-      new_embeds = (new_embeds.instance_of?(Array) ? new_embeds.map(&:to_hash) : [new_embeds&.to_hash]).compact
+      new_embeds = if new_embeds == OnyxCord::MessagePayload::KEEP
+                     new_embeds
+                   else
+                     (if new_embeds.instance_of?(Array)
+                        new_embeds.map { |embed| embed.respond_to?(:to_hash) ? embed.to_hash : embed }
+                      else
+                        [new_embeds&.to_hash]
+                      end).compact
+                   end
       new_components = new_components.to_a
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, new_components)
 
-      response = API::Channel.edit_message(@bot.token, @channel.id, @id, new_content, :undef, new_embeds, new_components, flags)
+      response = REST::Channel.edit_message(@bot.token, @channel.id, @id, new_content, :undef, new_embeds, new_components, flags)
       Message.new(JSON.parse(response), @bot)
     end
 
     # Deletes this message.
     # @return [nil]
     def delete(reason = nil)
-      API::Channel.delete_message(@bot.token, @channel.id, @id, reason)
+      REST::Channel.delete_message(@bot.token, @channel.id, @id, reason)
       nil
     end
 
     # Pins this message
     # @return [nil]
     def pin(reason = nil)
-      API::Channel.pin_message(@bot.token, @channel.id, @id, reason)
+      REST::Channel.pin_message(@bot.token, @channel.id, @id, reason)
       @pinned = true
       nil
     end
@@ -330,7 +338,7 @@ module OnyxCord
     # Unpins this message
     # @return [nil]
     def unpin(reason = nil)
-      API::Channel.unpin_message(@bot.token, @channel.id, @id, reason)
+      REST::Channel.unpin_message(@bot.token, @channel.id, @id, reason)
       @pinned = false
       nil
     end
@@ -338,7 +346,7 @@ module OnyxCord
     # Crossposts a message in a news channel.
     # @return [Message] the updated message object.
     def crosspost
-      response = API::Channel.crosspost_message(@bot.token, @channel.id, @id)
+      response = REST::Channel.crosspost_message(@bot.token, @channel.id, @id)
       Message.new(JSON.parse(response), @bot)
     end
 
@@ -411,7 +419,7 @@ module OnyxCord
     # @return [Message] the resulting message.
     def suppress_embeds
       flags = @flags | (1 << 2)
-      response = API::Channel.edit_message(@bot.token, @channel.id, @id, :undef, :undef, :undef, :undef, flags)
+      response = REST::Channel.edit_message(@bot.token, @channel.id, @id, :undef, :undef, :undef, :undef, flags)
       Message.new(JSON.parse(response), @bot)
     end
 
@@ -431,7 +439,7 @@ module OnyxCord
     # @return [nil]
     def create_reaction(reaction)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
-      API::Channel.create_reaction(@bot.token, @channel.id, @id, reaction)
+      REST::Channel.create_reaction(@bot.token, @channel.id, @id, reaction)
       nil
     end
 
@@ -450,7 +458,7 @@ module OnyxCord
       type = Reaction::TYPES[type] || type
 
       get_reactions = proc do |fetch_limit, after_id = nil|
-        resp = API::Channel.get_reactions(@bot.token, @channel.id, @id, reaction, nil, after_id, fetch_limit, type)
+        resp = REST::Channel.get_reactions(@bot.token, @channel.id, @id, reaction, nil, after_id, fetch_limit, type)
         JSON.parse(resp).map { |d| User.new(d, @bot) }
       end
 
@@ -483,26 +491,26 @@ module OnyxCord
     # @param reaction [String, #to_reaction] the reaction to remove
     def delete_reaction(user, reaction)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
-      API::Channel.delete_user_reaction(@bot.token, @channel.id, @id, reaction, user.resolve_id)
+      REST::Channel.delete_user_reaction(@bot.token, @channel.id, @id, reaction, user.resolve_id)
     end
 
     # Deletes this client's reaction on this message.
     # @param reaction [String, #to_reaction] the reaction to remove
     def delete_own_reaction(reaction)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
-      API::Channel.delete_own_reaction(@bot.token, @channel.id, @id, reaction)
+      REST::Channel.delete_own_reaction(@bot.token, @channel.id, @id, reaction)
     end
 
     # Removes all reactions from this message.
     def delete_all_reactions
-      API::Channel.delete_all_reactions(@bot.token, @channel.id, @id)
+      REST::Channel.delete_all_reactions(@bot.token, @channel.id, @id)
     end
 
     # Removes all reactions for a single emoji.
     # @param reaction [String, #to_reaction] the reaction to remove.
     def delete_all_reactions_for_emoji(reaction)
       reaction = reaction.to_reaction if reaction.respond_to?(:to_reaction)
-      API::Channel.delete_all_emoji_reactions(@bot.token, @channel.id, @id, reaction.to_s)
+      REST::Channel.delete_all_emoji_reactions(@bot.token, @channel.id, @id, reaction.to_s)
     end
 
     # The inspect method is overwritten to give more useful output

data/lib/onyxcord/{data → models}/poll.rb

@@ -91,7 +91,7 @@ module OnyxCord
     def close
       raise OnyxCord::Errors::NoPermission, 'Cannot close the poll' if !@message.from_bot? || closed?
 
-      Message.new(JSON.parse(API::Channel.end_poll(@bot.token, @message.channel.id, @message.id)), @bot)
+      Message.new(JSON.parse(REST::Channel.end_poll(@bot.token, @message.channel.id, @message.id)), @bot)
     end
 
     # Check if two poll objects are equivalent.
@@ -187,7 +187,7 @@ module OnyxCord
         after_time = after.is_a?(Time) ? IDObject.synthesise(after) : after&.resolve_id
 
         get_users = lambda do |limit, after|
-          data = API::Channel.get_poll_voters(@bot.token, channel_id, @message_id, @id, after:, limit:)
+          data = REST::Channel.get_poll_voters(@bot.token, channel_id, @message_id, @id, after:, limit:)
           JSON.parse(data)['users'].collect { |poll_voter_data| @bot.ensure_user(poll_voter_data) }
         end
 

data/lib/onyxcord/{data → models}/primary_server.rb

@@ -44,7 +44,7 @@ module OnyxCord
     # @param format [String] the URL will default to `webp`. You can otherwise specify one of `jpg` or `png` to override this.
     # @return [String] the URL to the server tag's badge image.
     def badge_url(format = 'webp')
-      API.server_tag_badge_url(@server_id, @badge_id, format)
+      REST.server_tag_badge_url(@server_id, @badge_id, format)
     end
 
     # Comparison based off of server ID.