discordrb 3.7.2 → 3.8.0

data/lib/discordrb/events/integrations.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require 'discordrb/data'
+require 'discordrb/events/generic'
+
+module Discordrb::Events
+  # Generic superclass for integration events.
+  class IntegrationEvent < Event
+    # @return [Server] the server associated with the event.
+    attr_reader :server
+
+    # @return [Integration] the integration associated with the event.
+    attr_reader :integration
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+      @server = bot.server(data['guild_id'].to_i)
+      @integration = Discordrb::Integration.new(data, @bot, @server)
+    end
+  end
+
+  # Raised whenever an integration is created.
+  class IntegrationCreateEvent < IntegrationEvent; end
+
+  # Raised whenever an integration is updated.
+  class IntegrationUpdateEvent < IntegrationEvent; end
+
+  # Raised whenever an integration is deleted.
+  class IntegrationDeleteEvent < Event
+    # @return [Server] the server associated with the event.
+    attr_reader :server
+
+    # @return [Integer] the ID of the integration that was removed.
+    attr_reader :integration_id
+
+    # @return [Integer, nil] the ID of the application that was removed.
+    attr_reader :application_id
+
+    # @!visibility private
+    def initialize(data, bot)
+      @bot = bot
+      @server = bot.server(data['guild_id'].to_i)
+      @integration_id = data['id'].to_i
+      @application_id = data['application_id']&.to_i
+    end
+  end
+
+  # Generic event handler for integration events.
+  class IntegrationEventHandler < EventHandler
+    # @!visibility private
+    def matches?(event)
+      # Check for the proper event type.
+      return false unless event.is_a?(IntegrationEvent)
+
+      [
+        matches_all(@attributes[:server], event.server) do |a, e|
+          a&.resolve_id == e&.resolve_id
+        end,
+
+        matches_all(@attributes[:id], event.integration) do |a, e|
+          a&.resolve_id == e&.resolve_id
+        end,
+
+        matches_all(@attributes[:application], event.integration) do |a, e|
+          a&.resolve_id == e.application&.resolve_id
+        end
+      ].reduce(true, &:&)
+    end
+  end
+
+  # Event handler for INTEGRATION_CREATE events.
+  class IntegrationCreateEventHandler < IntegrationEventHandler; end
+
+  # Event handler for INTEGRATION_UPDATE events.
+  class IntegrationUpdateEventHandler < IntegrationEventHandler; end
+
+  # Event handler for INTEGRATION_DELETE events.
+  class IntegrationDeleteEventHandler < EventHandler
+    # @!visibility private
+    def matches?(event)
+      # Check for the proper event type.
+      return false unless event.is_a?(IntegrationDeleteEvent)
+
+      [
+        matches_all(@attributes[:server], event.server) do |a, e|
+          a&.resolve_id == e&.resolve_id
+        end,
+
+        matches_all(@attributes[:id], event.integration_id) do |a, e|
+          a&.resolve_id == e&.resolve_id
+        end,
+
+        matches_all(@attributes[:application], event.application_id) do |a, e|
+          a&.resolve_id == e&.resolve_id
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/events/interactions.rb

@@ -6,6 +6,9 @@ require 'discordrb/data'
 module Discordrb::Events
   # Generic subclass for interaction events
   class InteractionCreateEvent < Event
+    # Struct to allow accessing data via [] or methods.
+    Resolved = Struct.new('Resolved', :channels, :members, :messages, :roles, :users, :attachments) # rubocop:disable Lint/StructNewOverride
+
     # @return [Interaction] The interaction for this event.
     attr_reader :interaction
 
@@ -33,7 +36,13 @@ module Discordrb::Events
     # @!attribute [r] context
     #   @return [Integer]
     #   @see Interaction#context
-    delegate :type, :server, :server_id, :channel, :channel_id, :user, :user_locale, :context, to: :interaction
+    # @!attribute [r] user_integration?
+    #   @return [true, false]
+    #   @see Interaction#user_integration?
+    # @!attribute [r] server_integration?
+    #   @return [true, false]
+    #   @see Interaction#server_integration?
+    delegate :type, :server, :server_id, :channel, :channel_id, :user, :user_locale, :context, :user_integration?, :server_integration?, to: :interaction
 
     # @!visibility private
     def initialize(data, bot)
@@ -95,6 +104,38 @@ module Discordrb::Events
     def get_component(...)
       @interaction.get_component(...)
     end
+
+    private
+
+    # @!visibility private
+    def process_resolved(resolved_data)
+      resolved_data['users']&.each do |id, data|
+        @resolved[:users][id.to_i] = @bot.ensure_user(data)
+      end
+
+      resolved_data['roles']&.each do |id, data|
+        @resolved[:roles][id.to_i] = Discordrb::Role.new(data, @bot)
+      end
+
+      resolved_data['channels']&.each do |id, data|
+        data['guild_id'] = @interaction.server_id
+        @resolved[:channels][id.to_i] = Discordrb::Channel.new(data, @bot)
+      end
+
+      resolved_data['members']&.each do |id, data|
+        data['user'] = resolved_data['users'][id]
+        data['guild_id'] = @interaction.server_id
+        @resolved[:members][id.to_i] = Discordrb::Member.new(data, nil, @bot)
+      end
+
+      resolved_data['messages']&.each do |id, data|
+        @resolved[:messages][id.to_i] = Discordrb::Message.new(data, @bot)
+      end
+
+      resolved_data['attachments']&.each do |id, data|
+        @resolved[:attachments][id.to_i] = Discordrb::Attachment.new(data, nil, @bot)
+      end
+    end
   end
 
   # Event handler for INTERACTION_CREATE events.
@@ -130,9 +171,6 @@ module Discordrb::Events
 
   # Event for ApplicationCommand interactions.
   class ApplicationCommandEvent < InteractionCreateEvent
-    # Struct to allow accessing data via [] or methods.
-    Resolved = Struct.new('Resolved', :channels, :members, :messages, :roles, :users, :attachments) # rubocop:disable Lint/StructNewOverride
-
     # @return [Symbol] The name of the command.
     attr_reader :command_name
 
@@ -145,7 +183,7 @@ module Discordrb::Events
     # @return [Symbol, nil] The name of the subcommand relevant to this event.
     attr_reader :subcommand
 
-    # @return [Resolved]
+    # @return [Resolved] The resolved channels, roles, users, members, and attachments for this event.
     attr_reader :resolved
 
     # @return [Hash<Symbol, Object>] Arguments provided to the command, mapped as `Name => Value`.
@@ -198,35 +236,6 @@ module Discordrb::Events
 
     private
 
-    def process_resolved(resolved_data)
-      resolved_data['users']&.each do |id, data|
-        @resolved[:users][id.to_i] = @bot.ensure_user(data)
-      end
-
-      resolved_data['roles']&.each do |id, data|
-        @resolved[:roles][id.to_i] = Discordrb::Role.new(data, @bot)
-      end
-
-      resolved_data['channels']&.each do |id, data|
-        data['guild_id'] = @interaction.server_id
-        @resolved[:channels][id.to_i] = Discordrb::Channel.new(data, @bot)
-      end
-
-      resolved_data['members']&.each do |id, data|
-        data['user'] = resolved_data['users'][id]
-        data['guild_id'] = @interaction.server_id
-        @resolved[:members][id.to_i] = Discordrb::Member.new(data, nil, @bot)
-      end
-
-      resolved_data['messages']&.each do |id, data|
-        @resolved[:messages][id.to_i] = Discordrb::Message.new(data, @bot)
-      end
-
-      resolved_data['attachments']&.each do |id, data|
-        @resolved[:attachments][id.to_i] = Discordrb::Attachment.new(data, nil, @bot)
-      end
-    end
-
     def transform_options_hash(hash)
       hash.to_h { |opt| [opt['name'], opt['options'] || opt['value']] }
     end
@@ -397,15 +406,40 @@ module Discordrb::Events
 
   # An event for when a user submits a modal.
   class ModalSubmitEvent < ComponentEvent
-    # @return [Array<TextInputComponent>]
+    # @return [Array<Component>] an array of partial component objects that were in the modal.
     attr_reader :components
 
+    # @return [Resolved] The resolved channels, roles, users, members, and attachments for the modal.
+    attr_reader :resolved
+
+    # @!visibility private
+    def initialize(data, bot)
+      super
+
+      @resolved = Resolved.new({}, {}, {}, {}, {}, {})
+      process_resolved(data['data']['resolved']) if data['data']['resolved']
+    end
+
     # Get the value of an input passed to the modal.
     # @param custom_id [String] The custom ID of the component to look for.
-    # @return [String, nil]
+    # @return [String, nil] The selected value for the component.
     def value(custom_id)
       get_component(custom_id)&.value
     end
+
+    # Get the selected values from a select menu or file upload component.
+    # @param custom_id [String] The custom ID of the component to look for.
+    # @return [Array<String>, nil] The values that were chosen for the component.
+    def values(custom_id)
+      get_component(custom_id)&.values
+    end
+
+    # Get the attachments that a user uploaded in this modal.
+    # @param custom_id [String] The custom ID of the file upload component to get attachments for.
+    # @return [Array<Attachment>] the attachments that were uploaded to the file upload component.
+    def attachments(custom_id)
+      values(custom_id)&.map { |id| @resolved[:attachments][id.to_i] } || []
+    end
   end
 
   # Event handler for a modal submission.
@@ -455,7 +489,7 @@ module Discordrb::Events
     def initialize(data, bot)
       super
 
-      users = data['data']['resolved']['users'].keys.map { |e| bot.user(e) }
+      users = data['data']['resolved']['users'].map { |_, user| @bot.ensure_user(user) }
       roles = data['data']['resolved']['roles'] ? data['data']['resolved']['roles'].keys.map { |e| bot.server(data['guild_id']).role(e) } : []
       @values = { users: users, roles: roles }
     end

data/lib/discordrb/events/message.rb

@@ -18,7 +18,7 @@ module Discordrb::Events
     # @param allowed_mentions [Hash, Discordrb::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
     # @param message_reference [Message, String, Integer, nil] The message, or message ID, to reply to if any.
     # @param components [View, Array<Hash>, nil] A collection of components to attach to the message.
-    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2) and SUPPRESS_NOTIFICATIONS (1 << 12) can be set.
+    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2), SUPPRESS_NOTIFICATIONS (1 << 12), and IS_COMPONENTS_V2 (1 << 15) can be set.
     # @return [Discordrb::Message] the message that was sent
     def send_message(content, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, message_reference = nil, components = nil, flags = 0)
       channel.send_message(content, tts, embed, attachments, allowed_mentions, message_reference, components, flags)
@@ -33,7 +33,7 @@ module Discordrb::Events
     # @param allowed_mentions [Hash, Discordrb::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
     # @param message_reference [Message, String, Integer, nil] The message, or message ID, to reply to if any.
     # @param components [View, Array<Hash>, nil] A collection of components to attach to the message.
-    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2) and SUPPRESS_NOTIFICATIONS (1 << 12) can be set.
+    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2), SUPPRESS_NOTIFICATIONS (1 << 12), and IS_COMPONENTS_V2 (1 << 15) can be set.
     # @yield [embed] Yields the embed to allow for easy building inside a block.
     # @yieldparam embed [Discordrb::Webhooks::Embed] The embed from the parameters, or a new one.
     # @return [Message] The resulting message.
@@ -49,7 +49,7 @@ module Discordrb::Events
     # @param attachments [Array<File>] Files that can be referenced in embeds via `attachment://file.png`
     # @param allowed_mentions [Hash, Discordrb::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
     # @param components [View, Array<Hash>, nil] A collection of components to attach to the message.
-    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2) and SUPPRESS_NOTIFICATIONS (1 << 12) can be set.
+    # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2), SUPPRESS_NOTIFICATIONS (1 << 12), and IS_COMPONENTS_V2 (1 << 15) can be set.
     def send_temporary_message(content, timeout, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, components = nil, flags = 0)
       channel.send_temporary_message(content, timeout, tts, embed, attachments, allowed_mentions, components, flags)
     end

data/lib/discordrb/version.rb

@@ -3,5 +3,5 @@
 # Discordrb and all its functionality, in this case only the version.
 module Discordrb
   # The current version of discordrb.
-  VERSION = '3.7.2'
+  VERSION = '3.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.8.0
 platform: ruby
 authors:
 - meew0
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ dependencies:
         version: '1.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ dependencies:
         version: '1.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - lib/discordrb/events/channels.rb
 - lib/discordrb/events/generic.rb
 - lib/discordrb/events/guilds.rb
+- lib/discordrb/events/integrations.rb
 - lib/discordrb/events/interactions.rb
 - lib/discordrb/events/invites.rb
 - lib/discordrb/events/lifetime.rb
@@ -399,7 +400,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: Discord API for Ruby
 test_files: []