discordrb 3.7.2 → 3.8.0

data/lib/discordrb/data/integration.rb

@@ -3,23 +3,21 @@
 module Discordrb
   # Integration Account
   class IntegrationAccount
+    include IDObject
+
     # @return [String] this account's name.
     attr_reader :name
 
-    # @return [Integer] this account's ID.
-    attr_reader :id
-
     # @!visibility private
     def initialize(data)
-      @name = data['name']
       @id = data['id'].to_i
+      @name = data['name']
     end
   end
 
   # Bot/OAuth2 application for discord integrations
   class IntegrationApplication
-    # @return [Integer] the ID of the application.
-    attr_reader :id
+    include IDObject
 
     # @return [String] the name of the application.
     attr_reader :name
@@ -30,9 +28,6 @@ module Discordrb
     # @return [String] the description of the application.
     attr_reader :description
 
-    # @return [String] the summary of the application.
-    attr_reader :summary
-
     # @return [User, nil] the bot associated with this application.
     attr_reader :bot
 
@@ -42,8 +37,7 @@ module Discordrb
       @name = data['name']
       @icon = data['icon']
       @description = data['description']
-      @summary = data['summary']
-      @bot = Discordrb::User.new(data['user'], bot) if data['user']
+      @bot = bot.ensure_user(data['bot']) if data['bot']
     end
   end
 
@@ -51,38 +45,50 @@ module Discordrb
   class Integration
     include IDObject
 
+    # Map of expire behaviors.
+    EXPIRE_BEHAVIORS = {
+      remove: 0,
+      kick: 1
+    }.freeze
+
     # @return [String] the integration name
     attr_reader :name
 
     # @return [Server] the server the integration is linked to
     attr_reader :server
 
-    # @return [User] the user the integration is linked to
+    # @return [User, nil] the user who added the integration to the server. This will be `nil`
+    #  for very old integrations, or if the integration was sent via a Gateway event.
     attr_reader :user
 
-    # @return [Integer, nil] the role that this integration uses for "subscribers"
+    # @return [Integer, nil] the ID of the role that this integration uses for "subscribers"
     attr_reader :role_id
 
-    # @return [true, false] whether emoticons are enabled
+    # @return [true, false] whether or not emoticons are enabled
     attr_reader :emoticon
     alias_method :emoticon?, :emoticon
+    alias_method :emoticons?, :emoticon
 
-    # @return [String] the integration type (YouTube, Twitch, etc.)
+    # @return [String] the integration type (YouTube, Twitch, Discord, etc.)
     attr_reader :type
 
     # @return [true, false] whether the integration is enabled
     attr_reader :enabled
+    alias_method :enabled?, :enabled
 
-    # @return [true, false] whether the integration is syncing
+    # @return [true, false] whether or not the integration is syncing
     attr_reader :syncing
+    alias_method :syncing?, :syncing
 
     # @return [IntegrationAccount] the integration account information
     attr_reader :account
 
-    # @return [Time] the time the integration was synced at
+    # @return [Time, nil] the time the integration was last synced at
     attr_reader :synced_at
 
-    # @return [Symbol] the behaviour of expiring subscribers (:remove = Remove User from role; :kick = Kick User from server)
+    # @return [Symbol, nil] the behaviour of expiring subscribers. When this is `:remove`, the
+    #  associated role will be removed from the user. When this is `:kick`, the user will be
+    #  kicked out of the server
     attr_reader :expire_behaviour
     alias_method :expire_behavior, :expire_behaviour
 
@@ -92,34 +98,47 @@ module Discordrb
     # @return [Integer, nil] how many subscribers this integration has.
     attr_reader :subscriber_count
 
-    # @return [true, false] has this integration been revoked.
+    # @return [true, false] whether or not this integration been revoked.
     attr_reader :revoked
+    alias_method :revoked?, :revoked
+
+    # @return [IntegrationApplication, nil] the application for the integration.
+    attr_reader :application
+
+    # @return [Array<String>] the oauth2 scopes the application has been authorized for
+    attr_reader :scopes
 
     # @!visibility private
     def initialize(data, bot, server)
       @bot = bot
-
-      @name = data['name']
       @server = server
       @id = data['id'].to_i
+      @name = data['name']
       @enabled = data['enabled']
-      @syncing = data['syncing']
+      @syncing = data['syncing'] || false
       @type = data['type']
       @account = IntegrationAccount.new(data['account'])
-      @synced_at = Time.parse(data['synced_at'])
-      @expire_behaviour = %i[remove kick][data['expire_behavior']]
-      @expire_grace_period = data['expire_grace_period']
-      @user = @bot.ensure_user(data['user'])
+      @synced_at = Time.parse(data['synced_at']) if data['synced_at']
+      @expire_behaviour = EXPIRE_BEHAVIORS.key(data['expire_behavior']) if data['expire_behavior']
+      @expire_grace_period = data['expire_grace_period'] || 0
+      @user = @bot.ensure_user(data['user']) if data['user']
       @role_id = data['role_id']&.to_i
-      @emoticon = data['enable_emoticons']
+      @emoticon = data['enable_emoticons'] || false
       @subscriber_count = data['subscriber_count']&.to_i
-      @revoked = data['revoked']
+      @revoked = data['revoked'] || false
       @application = IntegrationApplication.new(data['application'], bot) if data['application']
+      @scopes = data['scopes'] || []
+    end
+
+    # Get the role that this integration uses for subscribers.
+    # @return [Role, nil] The role that this integration uses for subscribers.
+    def subscriber_role
+      @server.role(@role_id) if @role_id
     end
 
-    # The inspect method is overwritten to give more useful output
+    # The inspect method is overwritten to give more useful output.
     def inspect
-      "<Integration name=#{@name} id=#{@id} type=#{@type} enabled=#{@enabled}>"
+      "<Integration name=\"#{@name}\" id=#{@id} type=\"#{@type}\" enabled=#{@enabled}>"
     end
   end
 end

data/lib/discordrb/data/interaction.rb

@@ -76,7 +76,7 @@ module Discordrb
     # @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 the interaction was initiated from.
+    # @return [Array<Symbol>] The features of the server where this interaction was initiated from.
     attr_reader :server_features
 
     # @!visibility private
@@ -86,7 +86,7 @@ module Discordrb
       @id = data['id'].to_i
       @application_id = data['application_id'].to_i
       @type = data['type']
-      @message = data['message']
+      @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
@@ -120,11 +120,13 @@ module Discordrb
     # @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 via `attachment://file.png`.
+    # @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 content and embeds.
     # @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, wait: false, components: nil, attachments: nil)
+    def respond(content: nil, tts: nil, embeds: nil, allowed_mentions: nil, flags: 0, ephemeral: nil, wait: false, components: nil, attachments: nil, has_components: false)
       flags |= 1 << 6 if ephemeral
+      flags |= (1 << 15) if has_components
 
       builder = Discordrb::Webhooks::Builder.new
       view = Discordrb::Webhooks::View.new
@@ -189,11 +191,13 @@ module Discordrb
     # @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 via `attachment://file.png`.
+    # @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 content and embeds.
     # @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, wait: false, components: nil, attachments: nil)
+    def update_message(content: nil, tts: nil, embeds: nil, allowed_mentions: nil, flags: 0, ephemeral: nil, wait: false, components: nil, attachments: nil, has_components: false)
       flags |= 1 << 6 if ephemeral
+      flags |= (1 << 15) if has_components
 
       builder = Discordrb::Webhooks::Builder.new
       view = Discordrb::Webhooks::View.new
@@ -216,11 +220,15 @@ module Discordrb
     # @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 via `attachment://file.png`.
+    # @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 content and embeds.
     # @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, components: nil, attachments: nil)
+    def edit_response(content: nil, embeds: nil, allowed_mentions: nil, flags: 0, components: nil, attachments: nil, has_components: false)
+      flags |= (1 << 15) if has_components
+
       builder = Discordrb::Webhooks::Builder.new
       view = Discordrb::Webhooks::View.new
 
@@ -229,7 +237,7 @@ module Discordrb
 
       components ||= view
       data = builder.to_json_hash
-      resp = Discordrb::API::Interaction.edit_original_interaction_response(@token, @application_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments)
+      resp = Discordrb::API::Interaction.edit_original_interaction_response(@token, @application_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments, flags)
 
       Interactions::Message.new(JSON.parse(resp), @bot, @interaction)
     end
@@ -245,10 +253,12 @@ module Discordrb
     # @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 via `attachment://file.png`.
+    # @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 content and embeds.
     # @yieldparam builder [Webhooks::Builder] An optional message builder. Arguments passed to the method overwrite builder data.
-    def send_message(content: nil, embeds: nil, tts: false, allowed_mentions: nil, flags: 0, ephemeral: false, components: nil, attachments: nil)
+    def send_message(content: nil, embeds: nil, tts: false, allowed_mentions: nil, flags: 0, ephemeral: false, components: nil, attachments: nil, has_components: false)
       flags |= 64 if ephemeral
+      flags |= (1 << 15) if has_components
 
       builder = Discordrb::Webhooks::Builder.new
       view = Discordrb::Webhooks::View.new
@@ -270,11 +280,15 @@ module Discordrb
     # @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 content and embeds.
     # @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)
+    def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, components: nil, attachments: nil, flags: 0, has_components: false)
       builder = Discordrb::Webhooks::Builder.new
       view = Discordrb::Webhooks::View.new
 
+      flags |= (1 << 15) if has_components
+
       prepare_builder(builder, content, embeds, allowed_mentions)
       yield builder, view if block_given?
 
@@ -282,7 +296,7 @@ module Discordrb
       data = builder.to_json_hash
 
       resp = Discordrb::API::Webhook.token_edit_message(
-        @token, @application_id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments
+        @token, @application_id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments, flags
       )
       Interactions::Message.new(JSON.parse(resp), @bot, @interaction)
     end
@@ -301,39 +315,38 @@ module Discordrb
       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
 
-    # @return [Hash, nil] Returns the button that triggered this interaction if applicable, otherwise nil
+    # Get the button component that triggered the interaction.
+    # @return [Components::Button, nil] The button that triggered this interaction if applicable, otherwise `nil`.
     def button
-      return unless @type == TYPES[:component]
-
-      @message['components'].each do |row|
-        Components::ActionRow.new(row, @bot).buttons.each do |button|
-          return button if button.custom_id == @data['custom_id']
-        end
-      end
+      @type == TYPES[:component] ? get_component(@data['custom_id']) : nil
     end
 
-    # @return [Array<TextInput>]
+    # Get the text input components associated with the interaction.
+    # @return [Array<TextInput>] The text input components associated with this interaction.
     def text_inputs
-      @components&.select { |component| component.is_a? TextInput } | []
+      @components.filter_map do |entity|
+        entity.component if entity.is_a?(Components::Label) && entity.component.is_a?(Components::TextInput)
+      end
     end
 
-    # @return [TextInput, Button, SelectMenu]
+    # 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)
-      top_level = @components.flat_map(&:components) || []
-      message_level = (@message.instance_of?(Hash) ? Message.new(@message, @bot) : @message)&.components&.flat_map(&:components) || []
-      components = top_level.concat(message_level)
-      components.find { |component| component.custom_id == 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
+      @integration_owners[1] == @user.id
     end
 
     # @return [true, false] whether the application was installed by the server where this interaction originates from.
@@ -353,6 +366,26 @@ module Discordrb
       builder.allowed_mentions = allowed_mentions
       embeds&.each { |embed| builder << embed }
     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
 
   # An ApplicationCommand for slash commands.

data/lib/discordrb/data/message.rb

@@ -82,9 +82,6 @@ module Discordrb
     # @return [Channel] the channel in which this message was sent.
     attr_reader :channel
 
-    # @return [Time] the timestamp at which this message was sent.
-    attr_reader :timestamp
-
     # @return [Time] the timestamp at which this message was edited. `nil` if the message was never edited.
     attr_reader :edited_timestamp
     alias_method :edit_timestamp, :edited_timestamp
@@ -161,11 +158,16 @@ module Discordrb
       @type = data['type']
       @tts = data['tts']
       @nonce = data['nonce']
+      @flags = data['flags'] || 0
+      @position = data['position'] || 0
       @mention_everyone = data['mention_everyone']
       @webhook_id = data['webhook_id']&.to_i
 
-      @referenced_message = Message.new(data['referenced_message'], bot) if data['referenced_message']
+      @edited_timestamp = Time.parse(data['edited_timestamp']) if data['edited_timestamp']
+      @edited = !@edited_timestamp.nil?
+
       @message_reference = data['message_reference']
+      @referenced_message = Message.new(data['referenced_message'], @bot) if data['referenced_message']
 
       if data['author']
         if @webhook_id
@@ -177,56 +179,31 @@ module Discordrb
 
           # Turn the message user into a recipient - we can't use the channel recipient
           # directly because the bot may also send messages to the channel
-          @author = Recipient.new(bot.user(data['author']['id'].to_i), @channel, bot)
+          @author = Recipient.new(@bot.user(data['author']['id'].to_i), @channel, @bot)
         else
           @author_id = data['author']['id'].to_i
         end
       end
 
-      @timestamp = Time.parse(data['timestamp']) if data['timestamp']
-      @edited_timestamp = data['edited_timestamp'].nil? ? nil : Time.parse(data['edited_timestamp'])
-      @edited = !@edited_timestamp.nil?
-
-      @emoji = []
-
-      @reactions = []
-
-      data['reactions']&.each do |element|
-        @reactions << Reaction.new(element)
-      end
-
-      @mentions = []
-
-      data['mentions']&.each do |element|
-        @mentions << bot.ensure_user(element)
-      end
-
+      @reactions = data['reactions']&.map { |reaction| Reaction.new(reaction) } || []
+      @mentions = data['mentions']&.map { |mention| @bot.ensure_user(mention) } || []
       @mention_roles = data['mention_roles']&.map(&:to_i) || []
 
-      @attachments = []
-      @attachments = data['attachments'].map { |e| Attachment.new(e, self, @bot) } if data['attachments']
-
-      @embeds = []
-      @embeds = data['embeds'].map { |e| Embed.new(e, self) } if data['embeds']
-
-      @components = []
-      @components = data['components'].map { |component_data| Components.from_data(component_data, @bot) } if data['components']
-
-      @flags = data['flags'] || 0
-
-      @thread = data['thread'] ? @bot.ensure_channel(data['thread']) : nil
-
-      @pinned_at = data['pinned_at'] ? Time.parse(data['pinned_at']) : nil
+      @attachments = data['attachments']&.map { |attachment| Attachment.new(attachment, self, @bot) } || []
+      @embeds = data['embeds']&.map { |embed| Embed.new(embed, self) } || []
+      @components = data['components']&.map { |component| Components.from_data(component, @bot) } || []
 
-      @call = data['call'] ? Call.new(data['call'], @bot) : nil
+      @thread = @bot.ensure_channel(data['thread']) if data['thread']
+      @pinned_at = Time.parse(data['pinned_at']) if data['pinned_at']
+      @call = Call.new(data['call'], @bot) if data['call']
 
       @snapshots = data['message_snapshots']&.map { |snapshot| Snapshot.new(snapshot['message'], @bot) } || []
-
       @role_subscription = RoleSubscriptionData.new(data['role_subscription_data'], self, @bot) if data['role_subscription_data']
-
-      @position = data['position'] || 0
     end
 
+    # @deprecated Please migrate to using {#creation_time} instead.
+    alias_method :timestamp, :creation_time
+
     # @return [Member, User] the user that sent this message. (Will be a {Member} most of the time, it should only be a
     #   {User} for old messages when the author has left the server since then)
     def author
@@ -377,18 +354,21 @@ module Discordrb
 
     # @return [Array<Emoji>] the emotes that were used/mentioned in this message.
     def emoji
-      return if @content.nil?
-      return @emoji unless @emoji.empty?
+      return [] if @content.empty? || @content.nil?
 
-      @emoji = @bot.parse_mentions(@content).select { |el| el.is_a? Discordrb::Emoji }
+      @emoji ||= @bot.parse_mentions(@content).select { |mention| mention.is_a?(Discordrb::Emoji) }
     end
 
+    alias_method :emojis, :emoji
+
     # Check if any emoji were used in this message.
     # @return [true, false] whether or not any emoji were used
     def emoji?
-      emoji&.empty?
+      emoji.any?
     end
 
+    alias_method :emojis?, :emoji?
+
     # Check if any reactions were used in this message.
     # @return [true, false] whether or not this message has reactions
     def reactions?
@@ -529,16 +509,18 @@ module Discordrb
 
     # @return [Array<Components::Button>]
     def buttons
-      results = @components.collect do |component|
+      buttons = @components.flat_map do |component|
         case component
         when Components::Button
           component
-        when Components::ActionRow
+        when Components::Section
+          component.accessory if component.accessory.is_a?(Components::Button)
+        when Components::ActionRow, Components::Container
           component.buttons
         end
       end
 
-      results.flatten.compact
+      buttons.compact
     end
 
     # to_message -> self or message

data/lib/discordrb/data/reaction.rb

@@ -54,5 +54,11 @@ module Discordrb
     def to_s
       id.nil? ? name : "#{name}:#{id}"
     end
+
+    # Converts this Reaction into a hash that can be sent back to Discord in other endpoints.
+    # @return [Hash] A hash representation of this reaction's emoji.
+    def to_h
+      id.nil? ? { name: name } : { id: id }
+    end
   end
 end

data/lib/discordrb/data/server.rb

@@ -158,7 +158,8 @@ module Discordrb
       member(@bot.profile)
     end
 
-    # @return [Array<Integration>] an array of all the integrations connected to this server.
+    # @return [Array<Integration>] an array of the integrations in this server.
+    # @note If the server has more than 50 integrations, they cannot be accessed.
     def integrations
       integration = JSON.parse(API::Server.integrations(@bot.token, @id))
       integration.map { |element| Integration.new(element, @bot, self) }
@@ -921,6 +922,19 @@ module Discordrb
       process_emoji(new_data['emojis'])
     end
 
+    # Updates the threads for this server's cache
+    # @note For internal use only
+    # @!visibility private
+    def clear_threads(ids = nil)
+      if ids.nil?
+        @channels.reject!(&:thread?)
+        @channels_by_id.delete_if { |_, channel| channel.thread? }
+      else
+        @channels.reject! { |channel| channel.thread? && ids.any?(channel.parent&.id) }
+        @channels_by_id.delete_if { |_, channel| channel.thread? && ids.any?(channel.parent&.id) }
+      end
+    end
+
     # The inspect method is overwritten to give more useful output
     def inspect
       "<Server name=#{@name} id=#{@id} large=#{@large} region=#{@region} owner=#{@owner} afk_channel_id=#{@afk_channel_id} system_channel_id=#{@system_channel_id} afk_timeout=#{@afk_timeout}>"

data/lib/discordrb/data/snapshot.rb

@@ -38,11 +38,11 @@ module Discordrb
       @content = data['content']
       @mention_roles = data['mention_roles']&.map(&:resolve_id) || []
       @embeds = data['embeds']&.map { |embed| Embed.new(embed, self) } || []
-      @attachments = data['attachments']&.map { |file| Attachment.new(file, self, bot) } || []
+      @attachments = data['attachments']&.map { |file| Attachment.new(file, self, @bot) } || []
       @created_at = data['timestamp'] ? Time.parse(data['timestamp']) : nil
       @edited_at = data['edited_timestamp'] ? Time.parse(data['edited_timestamp']) : nil
-      @mentions = data['mentions']&.map { |mention| bot.ensure_user(mention) } || []
-      @components = data['components']&.map { |component| Components.from_data(component, bot) } || []
+      @mentions = data['mentions']&.map { |mention| @bot.ensure_user(mention) } || []
+      @components = data['components']&.map { |component| Components.from_data(component, @bot) } || []
     end
 
     # Check whether the message snapshot has been edited.
@@ -85,7 +85,9 @@ module Discordrb
         case component
         when Components::Button
           component
-        when Components::ActionRow
+        when Components::Section
+          component.accessory if component.accessory.is_a?(Components::Button)
+        when Components::ActionRow, Components::Container
           component.buttons
         end
       end

data/lib/discordrb/data/webhook.rb

@@ -136,7 +136,7 @@ module Discordrb
     # @return [Message, nil] If `wait` is `true`, a {Message} will be returned. Otherwise this method will return `nil`.
     # @note This is only available to webhooks with publically exposed tokens. This excludes channel follow webhooks and webhooks retrieved
     #   via the audit log.
-    def execute(content: nil, username: nil, avatar_url: nil, tts: nil, file: nil, embeds: nil, allowed_mentions: nil, wait: true, builder: nil, components: nil)
+    def execute(content: nil, username: nil, avatar_url: nil, tts: nil, file: nil, embeds: nil, allowed_mentions: nil, wait: true, builder: nil, components: nil, flags: 0, has_components: false)
       raise Discordrb::Errors::UnauthorizedWebhook unless @token
 
       params = { content: content, username: username, avatar_url: avatar_url, tts: tts, file: file, embeds: embeds, allowed_mentions: allowed_mentions }
@@ -144,12 +144,14 @@ module Discordrb
       builder ||= Webhooks::Builder.new
       view = Webhooks::View.new
 
+      flags |= (1 << 15) if has_components
+
       yield(builder, view) if block_given?
 
       data = builder.to_json_hash.merge(params.compact)
       components ||= view
 
-      resp = API::Webhook.token_execute_webhook(@token, @id, wait, data[:content], data[:username], data[:avatar_url], data[:tts], data[:file], data[:embeds], data[:allowed_mentions], nil, components.to_a)
+      resp = API::Webhook.token_execute_webhook(@token, @id, wait, data[:content], data[:username], data[:avatar_url], data[:tts], data[:file], data[:embeds], data[:allowed_mentions], flags, components.to_a)
 
       Message.new(JSON.parse(resp), @bot) if wait
     end
@@ -173,7 +175,7 @@ module Discordrb
     # @return [Message] The updated message.
     # @param components [View, Array<Hash>] Interaction components to associate with this message.
     # @note When editing `allowed_mentions`, it will update visually in the client but not alert the user with a notification.
-    def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, builder: nil, components: nil)
+    def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, builder: nil, components: nil, flags: 0, has_components: false)
       raise Discordrb::Errors::UnauthorizedWebhook unless @token
 
       params = { content: content, embeds: embeds, allowed_mentions: allowed_mentions }.compact
@@ -181,12 +183,14 @@ module Discordrb
       builder ||= Webhooks::Builder.new
       view ||= Webhooks::View.new
 
+      flags |= (1 << 15) if has_components
+
       yield(builder, view) if block_given?
 
       data = builder.to_json_hash.merge(params.compact)
       components ||= view
 
-      resp = API::Webhook.token_edit_message(@token, @id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a)
+      resp = API::Webhook.token_edit_message(@token, @id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, nil, flags)
       Message.new(JSON.parse(resp), @bot)
     end