discordrb-webhooks 3.7.2 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791e80dc497003f6690ab2bff6727dc35574bdfe9335a99b38ef84581f43f561
-  data.tar.gz: f5f096cf7d7f78c0c1a42d803d2e294f425ff64a0b9a5136474dfcfe36c839e2
+  metadata.gz: 6d59a6fd132ccdb647c4e1de2ea5f622812214b405b0b3a0238d572f3459e7d9
+  data.tar.gz: 0cf571b8db5c1c564cfd27ead9c68a027765829cc26434632b6f8fcca180f698
 SHA512:
-  metadata.gz: 163c5254987d59a81561b98fc5a8f1bf1634c0503e80431024bb8a535e9d02d916de0b19b4d80e94a29a2dbcc512e8f3cd97e25243cd3cabe12edfbc73c06814
-  data.tar.gz: 2f3ad3fa91ace42d5c72c612002664703cbd798beb513798f3acad35c12bae1a111c931c50f415333646388380994cf1a6c938cb61b609c5090eb5584b20f618
+  metadata.gz: 9f07cb9c9190b1d1123fc7b7f7683eef2baf4881a027413de00665918e3540748bd7018836f5a06f027b8c56940d7ab85d90eaa2a43b96b5c046fdadcca09525
+  data.tar.gz: 2bbe3e0c5c366f387ab65ad233f680da8e9cb3144f4a4b07d1efc3bf432651d90a1f2c3b9d873bb96ca0c33431e219d2801c03861c587559496843736b21e76a

data/lib/discordrb/webhooks/modal.rb

@@ -5,76 +5,276 @@ class Discordrb::Webhooks::Modal
   # A mapping of names to types of components usable in a modal.
   COMPONENT_TYPES = {
     action_row: 1,
-    text_input: 4
+    string_select: 3,
+    text_input: 4,
+    user_select: 5,
+    role_select: 6,
+    mentionable_select: 7,
+    channel_select: 8,
+    text_display: 10,
+    label: 18,
+    file_upload: 19,
+    radio_group: 21,
+    checkbox_group: 22,
+    checkbox: 23
   }.freeze
 
-  # This builder is used when constructing an ActionRow. All current components must be within an action row, but this can
-  # change in the future. A message can have 5 action rows, each action row can hold a weight of 5. Buttons have a weight of 1,
-  # and dropdowns have a weight of 5.
-  class RowBuilder
-    # A mapping of short names to types of input styles. `short` is a single line where `paragraph` is a block.
+  # Builder for radio and checkbox groups.
+  class GroupBuilder
+    # @!visibility private
+    def initialize(type, custom_id, id, options = [], required = nil, min_values = nil, max_values = nil)
+      @id = id
+      @type = type
+      @custom_id = custom_id
+      @options = options
+      @required = required
+      @min_values = min_values
+      @max_values = max_values
+    end
+
+    # Add a checkbox component to the group.
+    # @param value [String] The value that the checkbox represents.
+    # @param label [String] The primary text of the checkbox.
+    # @param description [String, nil] The description of the checkbox.
+    # @param default [true, false, nil] Whether or not the checkbox should be checked by default.
+    def checkbox(value:, label:, description: nil, default: nil)
+      raise "Cannot add a checkbox to a #{@type}" unless @type == :checkbox_group
+
+      @options << { value: value, label: label, description: description, default: default }
+    end
+
+    # Add a radio button component to the group.
+    # @param value [String] The value that the radio button represents.
+    # @param label [String] The primary text of the radio button.
+    # @param description [String, nil] The description of the radio button.
+    # @param default [true, false, nil] Whether or not the radio button should be selected by default.
+    def radio_button(value:, label:, description: nil, default: nil)
+      raise "Cannot add a radio button to a #{@type}" unless @type == :radio_group
+
+      @options << { value: value, label: label, description: description, default: default }
+    end
+
+    alias_method :button, :radio_button
+
+    # @!visibility private
+    def to_h
+      {
+        id: @id,
+        type: COMPONENT_TYPES[@type],
+        custom_id: @custom_id,
+        options: @options.map(&:to_h),
+        required: @required,
+        min_values: @min_values,
+        max_values: @max_values
+      }.compact
+    end
+  end
+
+  # This builder is used when adding a label component to a modal.
+  class LabelBuilder
+    # A mapping of text input styles to symbol names. `short` is a single line where `paragraph` is a block.
     TEXT_INPUT_STYLES = {
       short: 1,
       paragraph: 2
     }.freeze
 
-    # @!visibility private
-    def initialize
-      @components = []
+    # Create a label component.
+    # @param label [String, nil] The label of the label component. This
+    #   field should always be passed, and will be required in 4.0.
+    # @param id [Integer, nil] The unique 32-bit ID of the label component.
+    # @param description [String, nil] The description of the label component.
+    # @yieldparam builder [LabelBuilder] Yields the initialized label component.
+    def initialize(label: nil, id: nil, description: nil)
+      @id = id
+      @label = label
+      @description = description
+
+      yield self if block_given?
     end
 
-    # Add a text input to this action row.
+    # Add a text input to the label component.
     # @param style [Symbol, Integer] The text input's style type. See {TEXT_INPUT_STYLES}
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #  There is a limit of 100 characters to each custom_id.
-    # @param label [String, nil] The text label for the field.
+    # @param id [Integer] The integer ID for this component. This is not to be confused with custom_id.
     # @param min_length [Integer, nil] The minimum input length for a text input, min 0, max 4000.
     # @param max_length [Integer, nil] The maximum input length for a text input, min 1, max 4000.
     # @param required [true, false, nil] Whether this component is required to be filled, default true.
     # @param value [String, nil] A pre-filled value for this component, max 4000 characters.
     # @param placeholder [String, nil] Custom placeholder text if the input is empty, max 100 characters
-    def text_input(style:, custom_id:, label: nil, min_length: nil, max_length: nil, required: nil, value: nil, placeholder: nil)
-      style = TEXT_INPUT_STYLES[style] || style
+    # @param label [String, nil] This parameter is deprecated and will be removed soon. Please pass this argument to {LabelBuilder#initialize} instead.
+    def text_input(style:, custom_id:, id: nil, min_length: nil, max_length: nil, required: nil, value: nil, placeholder: nil, label: nil)
+      @label = label unless label.nil?
 
-      @components << {
-        style: style,
+      @component = {
+        id: id,
+        style: TEXT_INPUT_STYLES[style] || style,
         custom_id: custom_id,
         type: COMPONENT_TYPES[:text_input],
-        label: label,
         min_length: min_length,
         max_length: max_length,
         required: required,
         value: value,
         placeholder: placeholder
-      }
+      }.compact
+    end
+
+    # Add a string select menu to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the string select. This is not to be confused with the `custom_id`.
+    # @param options [Array<Hash>] Options that can be selected in this menu. Can also be provided via the yielded builder.
+    # @param placeholder [String, nil] Default text to show when no entries are selected.
+    # @param min_values [Integer, nil] The minimum amount of values a user must select.
+    # @param max_values [Integer, nil] The maximum amount of values a user can select.
+    # @param required [true, false, nil] Whether a value must be selected for the component.
+    # @yieldparam builder [SelectMenuBuilder] The select menu builder is yielded to allow for the modification of attributes.
+    def string_select(custom_id:, id: nil, options: [], placeholder: nil, min_values: nil, max_values: nil, required: nil)
+      builder = Discordrb::Webhooks::View::SelectMenuBuilder.new(custom_id, options, placeholder, min_values, max_values, nil, select_type: :string_select, id: id, required: required)
+
+      yield builder if block_given?
+
+      @component = builder.to_h
+    end
+
+    alias_method :select_menu, :string_select
+
+    # Add a select user to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the user select. This is not to be confused with the `custom_id`.
+    # @param placeholder [String, nil] Default text to show when no entries are selected.
+    # @param min_values [Integer, nil] The minimum amount of values a user must select.
+    # @param max_values [Integer, nil] The maximum amount of values a user can select.
+    # @param required [true, false, nil] Whether a value must be selected for the component.
+    def user_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, required: nil)
+      @component = Discordrb::Webhooks::View::SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, nil, select_type: :user_select, id: id, required: required).to_h
+    end
+
+    # Add a select role to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the role select. This is not to be confused with the `custom_id`.
+    # @param placeholder [String, nil] Default text to show when no entries are selected.
+    # @param min_values [Integer, nil] The minimum amount of values a user must select.
+    # @param max_values [Integer, nil] The maximum amount of values a user can select.
+    # @param required [true, false, nil] Whether a value must be selected for the component.
+    def role_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, required: nil)
+      @component = Discordrb::Webhooks::View::SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, nil, select_type: :role_select, id: id, required: required).to_h
+    end
+
+    # Add a select mentionable to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the mentionable select. This is not to be confused with the `custom_id`.
+    # @param placeholder [String, nil] Default text to show when no entries are selected.
+    # @param min_values [Integer, nil] The minimum amount of values a user must select.
+    # @param max_values [Integer, nil] The maximum amount of values a user can select.
+    # @param required [true, false, nil] Whether a value must be selected for the component.
+    def mentionable_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, required: nil)
+      @component = Discordrb::Webhooks::View::SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, nil, select_type: :mentionable_select, id: id, required: required).to_h
+    end
+
+    # Add a select channel to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the channel select. This is not to be confused with the `custom_id`.
+    # @param placeholder [String, nil] Default text to show when no entries are selected.
+    # @param min_values [Integer, nil] The minimum amount of values a user must select.
+    # @param max_values [Integer, nil] The maximum amount of values a user can select.
+    # @param required [true, false, nil] Whether a value must be selected for the component.
+    # @param types [Array<Symbol, Integer>, nil] The channel types to include in the select menu.
+    def channel_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, required: nil, types: nil)
+      builder = Discordrb::Webhooks::View::SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, nil, select_type: :channel_select, id: id, required: required).to_h
+
+      builder[:channel_types] = types.map { |type| Discordrb::Channel::TYPES[type] || type } if types
+
+      @component = builder
+    end
+
+    # Add a file upload component to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the file upload component. This is not to be confused with the `custom_id`.
+    # @param min_values [Integer, nil] The minimum amount of files a user must upload.
+    # @param max_values [Integer, nil] The maximum amount of files a user has to upload.
+    # @param required [true, false, nil] Whether or not a file must be uploaded to the component.
+    def file_upload(custom_id:, id: nil, min_values: nil, max_values: nil, required: nil)
+      @component = { type: COMPONENT_TYPES[:file_upload], custom_id: custom_id, id: id, min_values: min_values, max_values: max_values, required: required }.compact
+    end
+
+    # Add a standalone checkbox component to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the checkbox component. This is not to be confused with the `custom_id`.
+    # @param default [true, false, nil] Whether or not the checkbox is checked by default.
+    def checkbox(custom_id:, id: nil, default: false)
+      @component = { type: COMPONENT_TYPES[:checkbox], custom_id: custom_id, id: id, default: default }.compact
+    end
+
+    # Add a group of radio buttons to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the radio group component. This is not to be confused with the `custom_id`.
+    # @param buttons [Array<Hash>] Radio buttons for the group. Can also be provided via the yielded builder.
+    # @param required [true, false, nil] Whether or not a radio button in the group must be selected.
+    def radio_group(custom_id:, id: nil, buttons: [], required: nil)
+      builder = GroupBuilder.new(:radio_group, custom_id, id, buttons, required)
+
+      yield builder if block_given?
+
+      @component = builder.to_h
+    end
+
+    # Add a group of checkboxes to the label component.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the checkbox group component. This is not to be confused with the `custom_id`.
+    # @param checkboxes [Array<Hash>] Checkboxes for the group. Can also be provided via the yielded builder.
+    # @param min_values [Integer, nil] The minimum number of checkboxes a user must check.
+    # @param max_values [Integer, nil] The maximum number of checkboxes a user is allowed to check.
+    # @param required [true, false, nil] Whether or not a checkbox must be checked.
+    def checkbox_group(custom_id:, id: nil, checkboxes: [], min_values: nil, max_values: nil, required: nil)
+      builder = GroupBuilder.new(:checkbox_group, custom_id, id, checkboxes, required, min_values, max_values)
+
+      yield builder if block_given?
+
+      @component = builder.to_h
     end
 
     # @!visibility private
     def to_h
-      { type: COMPONENT_TYPES[:action_row], components: @components }
+      { type: COMPONENT_TYPES[:label], label: @label, description: @description, component: @component }.compact
     end
   end
 
-  attr_reader :rows
-
+  # @!visibility private
   def initialize
-    @rows = []
+    @components = []
 
     yield self if block_given?
   end
 
-  # Add a new ActionRow to the view
-  # @yieldparam [RowBuilder]
-  def row
-    new_row = RowBuilder.new
-
-    yield new_row
+  # @!visibility private
+  def to_a
+    @components.map(&:to_h)
+  end
 
-    @rows << new_row
+  # Add a label component to the view.
+  # @see LabelBuilder#initialize
+  def label(...)
+    @components << LabelBuilder.new(...)
   end
 
-  # @!visibility private
-  def to_a
-    @rows.map(&:to_h)
+  # Add a text display component to the view.
+  # @see Webhooks::View::TextDisplayBuilder#initialize
+  def text_display(...)
+    @components << Discordrb::Webhooks::View::TextDisplayBuilder.new(...)
   end
+
+  # @deprecated Please use {#label} instead.
+  alias_method :row, :label
+
+  # @deprecated This alias will be removed in future releases.
+  RowBuilder = LabelBuilder
 end

data/lib/discordrb/webhooks/version.rb

@@ -4,6 +4,6 @@
 module Discordrb
   module Webhooks
     # The current version of discordrb-webhooks.
-    VERSION = '3.7.2'
+    VERSION = '3.8.0'
   end
 end

data/lib/discordrb/webhooks/view.rb

@@ -11,8 +11,14 @@ class Discordrb::Webhooks::View
     link: 5
   }.freeze
 
+  # Possible separator size names and values.
+  SEPARATOR_SIZES = {
+    small: 1,
+    large: 2
+  }.freeze
+
   # Component types.
-  # @see https://discord.com/developers/docs/interactions/message-components#component-types
+  # @see https://discord.com/developers/docs/components/reference#component-object-component-types
   COMPONENT_TYPES = {
     action_row: 1,
     button: 2,
@@ -21,28 +27,44 @@ class Discordrb::Webhooks::View
     user_select: 5,
     role_select: 6,
     mentionable_select: 7,
-    channel_select: 8
+    channel_select: 8,
+    section: 9,
+    text_display: 10,
+    thumbnail: 11,
+    media_gallery: 12,
+    file: 13,
+    separator: 14,
+    container: 17
+    # label: 18, # (defined in modal.rb)
+    # file_upload: 19, (defined in modal.rb)
+    # radio_group: 21, (defined in modal.rb)
+    # checkbox_group: 22, (defined in modal.rb)
+    # checkbox: 23 (defined in modal.rb)
   }.freeze
 
-  # This builder is used when constructing an ActionRow. All current components must be within an action row, but this can
-  # change in the future. A message can have 5 action rows, each action row can hold a weight of 5. Buttons have a weight of 1,
+  # This builder is used when constructing an ActionRow. Button and select menu components must be within an action row, but this can
+  # change in the future. A message can have 10 action rows, each action row can hold a weight of 5. Buttons have a weight of 1,
   # and dropdowns have a weight of 5.
   class RowBuilder
     # @!visibility private
-    def initialize
+    def initialize(id: nil)
+      @id = id
       @components = []
+
+      yield self if block_given?
     end
 
     # Add a button to this action row.
     # @param style [Symbol, Integer] The button's style type. See {BUTTON_STYLES}
+    # @param id [Integer, nil] The unique 32-bit ID of the button component. This is not to be confused with the `custom_id`.
     # @param label [String, nil] The text label for the button. Either a label or emoji must be provided.
-    # @param emoji [#to_h, String, Integer] An emoji ID, or unicode emoji to attach to the button. Can also be a object
+    # @param emoji [#to_h, String, Integer] An emoji ID, or unicode emoji to attach to the button. Can also be an object
     #   that responds to `#to_h` which returns a hash in the format of `{ id: Integer, name: string }`.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
     # @param disabled [true, false] Whether this button is disabled and shown as greyed out.
     # @param url [String, nil] The URL, when using a link style button.
-    def button(style:, label: nil, emoji: nil, custom_id: nil, disabled: nil, url: nil)
+    def button(style:, id: nil, label: nil, emoji: nil, custom_id: nil, disabled: nil, url: nil)
       style = BUTTON_STYLES[style] || style
 
       emoji = case emoji
@@ -52,20 +74,21 @@ class Discordrb::Webhooks::View
                 emoji&.to_h
               end
 
-      @components << { type: COMPONENT_TYPES[:button], label: label, emoji: emoji, style: style, custom_id: custom_id, disabled: disabled, url: url }
+      @components << { type: COMPONENT_TYPES[:button], id: id, label: label, emoji: emoji, style: style, custom_id: custom_id, disabled: disabled, url: url }.compact
     end
 
-    # Add a select string to this action row.
+    # Add a string select to this action row.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the string select. This is not to be confused with the `custom_id`.
     # @param options [Array<Hash>] Options that can be selected in this menu. Can also be provided via the yielded builder.
     # @param placeholder [String, nil] Default text to show when no entries are selected.
     # @param min_values [Integer, nil] The minimum amount of values a user must select.
     # @param max_values [Integer, nil] The maximum amount of values a user can select.
     # @param disabled [true, false, nil] Grey out the component to make it unusable.
     # @yieldparam builder [SelectMenuBuilder]
-    def string_select(custom_id:, options: [], placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
-      builder = SelectMenuBuilder.new(custom_id, options, placeholder, min_values, max_values, disabled, select_type: :string_select)
+    def string_select(custom_id:, options: [], id: nil, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
+      builder = SelectMenuBuilder.new(custom_id, options, placeholder, min_values, max_values, disabled, select_type: :string_select, id: id)
 
       yield builder if block_given?
 
@@ -77,57 +100,67 @@ class Discordrb::Webhooks::View
     # Add a select user to this action row.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the user select. This is not to be confused with the `custom_id`.
     # @param placeholder [String, nil] Default text to show when no entries are selected.
     # @param min_values [Integer, nil] The minimum amount of values a user must select.
     # @param max_values [Integer, nil] The maximum amount of values a user can select.
     # @param disabled [true, false, nil] Grey out the component to make it unusable.
-    def user_select(custom_id:, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
-      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :user_select).to_h
+    def user_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
+      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :user_select, id: id).to_h
     end
 
     # Add a select role to this action row.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the role select. This is not to be confused with the `custom_id`.
     # @param placeholder [String, nil] Default text to show when no entries are selected.
     # @param min_values [Integer, nil] The minimum amount of values a user must select.
     # @param max_values [Integer, nil] The maximum amount of values a user can select.
     # @param disabled [true, false, nil] Grey out the component to make it unusable.
-    def role_select(custom_id:, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
-      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :role_select).to_h
+    def role_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
+      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :role_select, id: id).to_h
     end
 
     # Add a select mentionable to this action row.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the mentionable select. This is not to be confused with the `custom_id`.
     # @param placeholder [String, nil] Default text to show when no entries are selected.
     # @param min_values [Integer, nil] The minimum amount of values a user must select.
     # @param max_values [Integer, nil] The maximum amount of values a user can select.
     # @param disabled [true, false, nil] Grey out the component to make it unusable.
-    def mentionable_select(custom_id:, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
-      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :mentionable_select).to_h
+    def mentionable_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
+      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :mentionable_select, id: id).to_h
     end
 
     # Add a select channel to this action row.
     # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
     #   There is a limit of 100 characters to each custom_id.
+    # @param id [Integer, nil] The unique 32-bit ID of the channel select. This is not to be confused with the `custom_id`.
     # @param placeholder [String, nil] Default text to show when no entries are selected.
     # @param min_values [Integer, nil] The minimum amount of values a user must select.
     # @param max_values [Integer, nil] The maximum amount of values a user can select.
     # @param disabled [true, false, nil] Grey out the component to make it unusable.
-    def channel_select(custom_id:, placeholder: nil, min_values: nil, max_values: nil, disabled: nil)
-      @components << SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :channel_select).to_h
+    # @param types [Array<Symbol, Integer>, nil] The channel types to include in the select menu.
+    def channel_select(custom_id:, id: nil, placeholder: nil, min_values: nil, max_values: nil, disabled: nil, types: nil)
+      builder = SelectMenuBuilder.new(custom_id, [], placeholder, min_values, max_values, disabled, select_type: :channel_select, id: id).to_h
+
+      builder[:channel_types] = types.map { |type| Discordrb::Channel::TYPES[type] || type } if types
+
+      @components << builder
     end
 
     # @!visibility private
     def to_h
-      { type: COMPONENT_TYPES[:action_row], components: @components }
+      { type: COMPONENT_TYPES[:action_row], id: @id, components: @components }.compact
     end
   end
 
   # A builder to assist in adding options to select menus.
   class SelectMenuBuilder
     # @!visibility hidden
-    def initialize(custom_id, options = [], placeholder = nil, min_values = nil, max_values = nil, disabled = nil, select_type: :string_select)
+    def initialize(custom_id, options = [], placeholder = nil, min_values = nil, max_values = nil, disabled = nil, select_type: :string_select, id: nil, required: nil)
+      @id = id
       @custom_id = custom_id
       @options = options
       @placeholder = placeholder
@@ -135,13 +168,14 @@ class Discordrb::Webhooks::View
       @max_values = max_values
       @disabled = disabled
       @select_type = select_type
+      @required = required
     end
 
     # Add an option to this select menu.
     # @param label [String] The title of this option.
     # @param value [String] The value that this option represents.
     # @param description [String, nil] An optional description of the option.
-    # @param emoji [#to_h, String, Integer] An emoji ID, or unicode emoji to attach to the button. Can also be a object
+    # @param emoji [#to_h, String, Integer] An emoji ID, or unicode emoji to attach to the button. Can also be an object
     #   that responds to `#to_h` which returns a hash in the format of `{ id: Integer, name: string }`.
     # @param default [true, false, nil] Whether this is the default selected option.
     def option(label:, value:, description: nil, emoji: nil, default: nil)
@@ -159,36 +193,282 @@ class Discordrb::Webhooks::View
     def to_h
       {
         type: COMPONENT_TYPES[@select_type],
+        id: @id,
         options: @options,
         placeholder: @placeholder,
         min_values: @min_values,
         max_values: @max_values,
         custom_id: @custom_id,
-        disabled: @disabled
-      }
+        disabled: @disabled,
+        required: @required
+      }.compact
     end
   end
 
-  attr_reader :rows
+  # A text display component allows you to send message content.
+  class TextDisplayBuilder
+    # Create a text display component.
+    # @param content [String] The content of the text display component.
+    # @param id [Integer, nil] The unique 32-bit ID of the text display component.
+    def initialize(content:, id: nil)
+      @id = id
+      @content = content
+    end
 
-  def initialize
-    @rows = []
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:text_display], id: @id, content: @content }.compact
+    end
+  end
 
-    yield self if block_given?
+  # A separator allows you to add a barrier between components.
+  class SeparatorBuilder
+    # Create a separator component.
+    # @param divider [true, false] Whether or not the separator should act as a visible barrier.
+    # @param id [Integer, nil] The unique 32-bit ID of the separator component.
+    # @param spacing [Symbol, Integer] The size of the separator component's padding. See {SEPARATOR_SIZES}.
+    def initialize(divider:, id: nil, spacing: nil)
+      @id = id
+      @divider = divider
+      @spacing = SEPARATOR_SIZES[spacing] || spacing
+    end
+
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:separator], id: @id, divider: @divider, spacing: @spacing }.compact
+    end
   end
 
-  # Add a new ActionRow to the view
-  # @yieldparam [RowBuilder]
-  def row
-    new_row = RowBuilder.new
+  # A file component lets you send a file via an attachment://<filename> reference.
+  class FileBuilder
+    # Create a file component.
+    # @param url [String] An `attachment://<filename>` reference to the attached file.
+    # @param id [Integer, nil] The unique 32-bit ID of the file component.
+    # @param spoiler [true, false] Whether or not to apply a spoiler label to the file.
+    def initialize(url:, id: nil, spoiler: false)
+      @id = id
+      @file = { url: }
+      @spoiler = spoiler
+    end
 
-    yield new_row
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:file], id: @id, spoiler: @spoiler, file: @file }.compact
+    end
+  end
+
+  # A media gallery component is a gallery grid.
+  class MediaGalleryBuilder
+    # Create a media gallery component.
+    # @param id [Integer, nil] The unique 32-bit ID of the media gallery component.
+    # @yieldparam builder [MediaGalleryBuilder] Yields the initialized media gallery component.
+    def initialize(id: nil)
+      @id = id
+      @items = []
+
+      yield self if block_given?
+    end
+
+    # Add a gallery item to the media gallery component.
+    # @param url [String] The URL to the gallery item's media.
+    # @param description [String, nil] The description of the gallery item.
+    # @param spoiler [true, false] Whether or not to apply a spoiler label to the gallery item.
+    def item(url:, description: nil, spoiler: false)
+      @items << { media: { url: }, description: description, spoiler: spoiler }.compact
+    end
 
-    @rows << new_row
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:media_gallery], id: @id, items: @items }.compact
+    end
+  end
+
+  # A section allows you to group together an accessory with text display components.
+  class SectionBuilder
+    # Create a section component.
+    # @param id [Integer, nil] The unique 32-bit ID of the section component.
+    # @yieldparam builder [SectionBuilder] Yields the initialized section component.
+    def initialize(id: nil)
+      @id = id
+      @accessory = nil
+      @components = []
+
+      yield self if block_given?
+    end
+
+    # Add a text display component to this section.
+    # @see TextDisplayBuilder#initialize
+    def text_display(...)
+      @components << TextDisplayBuilder.new(...)
+    end
+
+    # Set the thumbnail for the section. This is mutually exclusive with {#button}.
+    # @param url [String] The URL to the thumbnail image.
+    # @param id [Integer, nil] The unique 32-bit ID of the thumbnail component.
+    # @param description [String, nil] The description of the thumbnail.
+    # @param spoiler [true, false] Whether or not to apply a spoiler label to the thumbnail.
+    def thumbnail(url:, id: nil, description: nil, spoiler: false)
+      @accessory = { type: COMPONENT_TYPES[:thumbnail], id: id, media: { url: }, description: description, spoiler: spoiler }.compact
+    end
+
+    # Set the button for the section. This is mutually exclusive with {#thumbnail}.
+    # @param style [Symbol, Integer] The button's style type. See {BUTTON_STYLES}
+    # @param id [Integer, nil] The unique 32-bit ID of the button component. This is not to be confused with the `custom_id`.
+    # @param label [String, nil] The text label for the button. Either a label or emoji must be provided.
+    # @param emoji [#to_h, String, Integer] An emoji ID, or unicode emoji to attach to the button. Can also be an object
+    # that responds to `#to_h` which returns a hash in the format of `{ id: Integer, name: string }`.
+    # @param custom_id [String] Custom IDs are used to pass state to the events that are raised from interactions.
+    # There is a limit of 100 characters to each custom_id.
+    # @param disabled [true, false] Whether this button is disabled and shown as greyed out.
+    # @param url [String, nil] The URL, when using a link style button.
+    def button(style:, id: nil, label: nil, emoji: nil, custom_id: nil, disabled: nil, url: nil)
+      style = BUTTON_STYLES[style] || style
+
+      emoji = case emoji
+              when Integer, String
+                emoji.to_i.positive? ? { id: emoji } : { name: emoji }
+              else
+                emoji&.to_h
+              end
+
+      @accessory = { type: COMPONENT_TYPES[:button], id: id, label: label, emoji: emoji, style: style, custom_id: custom_id, disabled: disabled, url: url }.compact
+    end
+
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:section], id: @id, components: @components.map(&:to_h), accessory: @accessory }.compact
+    end
+  end
+
+  # This builder can be used to construct a container. These are similar to embeds.
+  class ContainerBuilder
+    # Create a container component.
+    # @param id [Integer, nil] The unique 32-bit ID of the container component.
+    # @param colour [Array, Integer, String, ColourRGB, nil] The accent colour of the container
+    #   component. This argument can be passed via the American spelling (`color:`) as well.
+    # @param spoiler [true, false] Whether or not to apply a spoiler label to the container component.
+    # @yieldparam builder [ContainerBuilder] Yields the initialized container component.
+    def initialize(id: nil, color: nil, colour: nil, spoiler: false)
+      @id = id
+      @spoiler = spoiler
+      @components = []
+      self.colour = (colour || color)
+
+      yield self if block_given?
+    end
+
+    # Add a row component to the container.
+    # @see RowBuilder#initialize
+    def row(...)
+      @components << RowBuilder.new(...)
+    end
+
+    # Add a file component to the container.
+    # @see FileBuilder#initialize
+    def file(...)
+      @components << FileBuilder.new(...)
+    end
+
+    alias_method :file_display, :file
+
+    # Add a section component to the container.
+    # @see SectionBuilder#initialize
+    def section(...)
+      @components << SectionBuilder.new(...)
+    end
+
+    # Add a separator component to the container.
+    # @see SeparatorBuilder#initialize
+    def separator(...)
+      @components << SeparatorBuilder.new(...)
+    end
+
+    # Add a text display component to the container.
+    # @see TextDisplayBuilder#initialize
+    def text_display(...)
+      @components << TextDisplayBuilder.new(...)
+    end
+
+    # Add a media gallery component to the container.
+    # @see MediaGalleryBuilder#initialize
+    def media_gallery(...)
+      @components << MediaGalleryBuilder.new(...)
+    end
+
+    # Set the color of the container.
+    # @param colour [Array, Integer, String, ColourRGB, nil] The accent colour of the container component, or `nil` to clear the accent colour.
+    def colour=(colour)
+      @colour = case colour
+                when Array
+                  (colour[0] << 16) | (colour[1] << 8) | colour[2]
+                when String
+                  colour.delete('#').to_i(16)
+                else
+                  colour&.to_i
+                end
+    end
+
+    alias_method :color=, :colour=
+
+    # @!visibility private
+    def to_h
+      { type: COMPONENT_TYPES[:container], id: @id, accent_color: @colour, spoiler: @spoiler, components: @components.map(&:to_h) }.compact
+    end
+  end
+
+  # @!visibility private
+  def initialize
+    @components = []
+
+    yield self if block_given?
   end
 
   # @!visibility private
   def to_a
-    @rows.map(&:to_h)
+    @components.map(&:to_h)
+  end
+
+  # Add a row component to the view.
+  # @see RowBuilder#initialize
+  def row(...)
+    @components << RowBuilder.new(...)
+  end
+
+  # Add a file component to the view.
+  # @see FileBuilder#initialize
+  def file(...)
+    @components << FileBuilder.new(...)
+  end
+
+  alias_method :file_display, :file
+
+  # Add a section component to the view.
+  # @see SectionBuilder#initialize
+  def section(...)
+    @components << SectionBuilder.new(...)
+  end
+
+  # Add a separator component to the view.
+  # @see SeparatorBuilder#initialize
+  def separator(...)
+    @components << SeparatorBuilder.new(...)
+  end
+
+  # Add a container component to the view.
+  # @see ContainerBuilder#initialize
+  def container(...)
+    @components << ContainerBuilder.new(...)
+  end
+
+  # Add a text display component to the view.
+  # @see TextDisplayBuilder#initialize
+  def text_display(...)
+    @components << TextDisplayBuilder.new(...)
+  end
+
+  # Add a media gallery component to the view.
+  # @see MediaGalleryBuilder#initialize
+  def media_gallery(...)
+    @components << MediaGalleryBuilder.new(...)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb-webhooks
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.0
 platform: ruby
 authors:
 - meew0
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Webhook client for discordrb
 test_files: []