discorb 0.19.0 → 0.20.0

data/lib/discorb/interaction/autocomplete.rb

@@ -1,62 +1,76 @@
-# frozen_string_literal: true
-
-module Discorb
-  #
-  # Represents auto complete interaction.
-  #
-  class AutoComplete < Interaction
-    @interaction_type = 4
-    @interaction_name = :auto_complete
-
-    private
-
-    def _set_data(data)
-      super
-      Sync do
-        name, options = Discorb::CommandInteraction::ChatInputCommand.get_command_data(data)
-
-        unless (command = @client.callable_commands.find { |c| c.to_s == name && c.type_raw == 1 })
-          @client.logger.warn "Unknown command name #{name}, ignoring"
-          next
-        end
-
-        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
-        Discorb::CommandInteraction::ChatInputCommand.modify_option_map(option_map, options, guild, {}, {})
-        focused_index = options.find_index { |o| o[:focused] }
-        val = command.options.values.filter do |option|
-          option[:type] != :attachment
-        end[focused_index][:autocomplete]&.call(self, *command.options.map do |k, _v|
-          option_map[k.to_s]
-        end)
-        send_complete_result(val)
-      end
-    end
-
-    def send_complete_result(val)
-      @client.http.request(
-        Route.new(
-          "/interactions/#{@id}/#{@token}/callback",
-          "//interactions/:interaction_id/:token/callback",
-          :post
-        ), {
-          type: 8,
-          data: {
-            choices: val.map do |vk, vv|
-              {
-                name: vk,
-                value: vv,
-              }
-            end,
-          },
-        }
-      ).wait
-    rescue Discorb::NotFoundError
-      @client.logger.warn "Failed to send auto complete result, " \
-                          "This may be caused by the suggestion is taking too long (over 3 seconds) to respond"
-    end
-
-    class << self
-      alias make_interaction new
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Discorb
+  #
+  # Represents auto complete interaction.
+  #
+  class AutoComplete < Interaction
+    @interaction_type = 4
+    @interaction_name = :auto_complete
+
+    private
+
+    def _set_data(data)
+      super
+      Sync do
+        name, options =
+          Discorb::CommandInteraction::ChatInputCommand.get_command_data(data)
+
+        unless (
+                 command =
+                   @client.callable_commands.find do |c|
+                     c.to_s == name && c.type_raw == 1
+                   end
+               )
+          @client.logger.warn "Unknown command name #{name}, ignoring"
+          next
+        end
+
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        Discorb::CommandInteraction::ChatInputCommand.modify_option_map(
+          option_map,
+          options,
+          guild,
+          {},
+          {}
+        )
+        focused_index = options.find_index { |o| o[:focused] }
+        val =
+          command.options.values.filter do |option|
+            option[:type] != :attachment
+          end[
+            focused_index
+          ][
+            :autocomplete
+          ]&.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
+        send_complete_result(val)
+      end
+    end
+
+    def send_complete_result(val)
+      @client
+        .http
+        .request(
+          Route.new(
+            "/interactions/#{@id}/#{@token}/callback",
+            "//interactions/:interaction_id/:token/callback",
+            :post
+          ),
+          {
+            type: 8,
+            data: {
+              choices: val.map { |vk, vv| { name: vk, value: vv } }
+            }
+          }
+        )
+        .wait
+    rescue Discorb::NotFoundError
+      @client.logger.warn "Failed to send auto complete result, " \
+                            "This may be caused by the suggestion is taking too long (over 3 seconds) to respond"
+    end
+
+    class << self
+      alias make_interaction new
+    end
+  end
+end

data/lib/discorb/interaction/command.rb

@@ -1,224 +1,279 @@
-# frozen_string_literal: true
-
-module Discorb
-  #
-  # Represents a command interaction.
-  #
-  class CommandInteraction < Interaction
-    @interaction_type = 2
-    @interaction_name = :application_command
-    include Interaction::SourceResponder
-    include Interaction::ModalResponder
-
-    #
-    # Represents a slash command interaction.
-    #
-    class ChatInputCommand < CommandInteraction
-      @command_type = 1
-      @event_name = :slash_command
-
-      private
-
-      def _set_data(data)
-        super
-
-        name, options = ChatInputCommand.get_command_data(data)
-
-        unless (command = @client.callable_commands.find { |c| c.to_s == name && c.type_raw == 1 })
-          @client.logger.warn "Unknown command name #{name}, ignoring"
-          return
-        end
-
-        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
-        ChatInputCommand.modify_option_map(option_map, options, guild, @members, @attachments)
-
-        command.block.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
-      end
-
-      class << self
-        #
-        # Get command data from the given data.
-        # @private
-        #
-        # @param [Hash] data The data of the command.
-        #
-        def get_command_data(data)
-          name = data[:name]
-          options = nil
-          return name, options unless (option = data[:options]&.first)
-
-          case option[:type]
-          when 1
-            name += " #{option[:name]}"
-            options = option[:options]
-          when 2
-            name += " #{option[:name]}"
-            unless option[:options]&.first&.[](:type) == 1
-              options = option[:options]
-              return name, options
-            end
-            option_sub = option[:options]&.first
-            name += " #{option_sub[:name]}"
-            options = option_sub[:options]
-          else
-            options = data[:options]
-          end
-
-          [name, options]
-        end
-
-        #
-        # Modify the option map with the given options.
-        # @private
-        #
-        # @param [Hash] option_map The option map to modify.
-        # @param [Array<Hash>] options The options for modifying.
-        # @param [Discorb::Guild] guild The guild where the command is executed.
-        # @param [{Discorb::Snowflake => Discorb::Member}] members The cached members of the guild.
-        # @param [{Integer => Discorb::Attachment}] attachments The cached attachments of the message.
-        def modify_option_map(option_map, options, guild, members, attachments)
-          options ||= []
-          options.each do |option|
-            val = case option[:type]
-              when 3, 4, 5, 10
-                option[:value]
-              when 6
-                members[option[:value]] || guild && (guild.members[option[:value]] ||
-                                                     guild.fetch_member(option[:value]).wait)
-              when 7
-                if guild
-                  guild.channels[option[:value]] || guild.fetch_channels.wait.find do |channel|
-                    channel.id == option[:value]
-                  end
-                end
-              when 8
-                guild && (guild.roles[option[:value]] ||
-                          guild.fetch_roles.wait.find { |role| role.id == option[:value] })
-              when 9
-                members[option[:value]] ||
-                guild && (guild.members[option[:value]] ||
-                          guild.roles[option[:value]] ||
-                          guild.fetch_member(option[:value]).wait ||
-                          guild.fetch_roles.wait.find do |role|
-                            role.id == option[:value]
-                          end)
-              when 11
-                attachments[option[:value]]
-              end
-            option_map[option[:name]] = val
-          end
-        end
-      end
-    end
-
-    #
-    # Represents a user context menu interaction.
-    #
-    class UserMenuCommand < CommandInteraction
-      @command_type = 2
-      @event_name = :user_command
-
-      # @return [Discorb::Member, Discorb::User] The target user.
-      attr_reader :target
-
-      private
-
-      def _set_data(data)
-        super
-        @target = guild.members[data[:target_id]] || Discorb::Member.new(
-          @client, @guild_id,
-          data[:resolved][:users][data[:target_id].to_sym],
-          data[:resolved][:members][data[:target_id].to_sym]
-        )
-        command = @client.commands.find { |c| c.name["default"] == data[:name] && c.type_raw == 2 }
-        if command
-          command.block.call(self, @target)
-        else
-          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
-        end
-      end
-    end
-
-    #
-    # Represents a message context menu interaction.
-    #
-    class MessageMenuCommand < CommandInteraction
-      @command_type = 3
-      @event_name = :message_command
-
-      # @return [Discorb::Message] The target message.
-      attr_reader :target
-
-      private
-
-      def _set_data(data)
-        super
-        @target = @messages[data[:target_id]]
-        command = @client.commands.find { |c| c.name["default"] == data[:name] && c.type_raw == 3 }
-        if command
-          command.block.call(self, @target)
-        else
-          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
-        end
-      end
-    end
-
-    private
-
-    def _set_data(data)
-      super
-      @name = data[:name]
-      @messages, @attachments, @members = {}, {}, {}
-
-      if data[:resolved]
-        data[:resolved][:users]&.each do |id, user|
-          @client.users[id] = Discorb::User.new(@client, user)
-        end
-        data[:resolved][:members]&.each do |id, member|
-          @members[id] = Discorb::Member.new(
-            @client, @guild_id, data[:resolved][:users][id], member
-          )
-        end
-
-        data[:resolved][:messages]&.each do |id, message|
-          @messages[id.to_s] = Message.new(@client, message.merge(guild_id: @guild_id.to_s))
-        end
-        data[:resolved][:attachments]&.each do |id, attachment|
-          @attachments[id.to_s] = Attachment.new(attachment)
-        end
-      end
-    end
-
-    class << self
-      # @private
-      attr_reader :command_type, :event_name
-
-      #
-      # Creates a new CommandInteraction instance for the given data.
-      # @private
-      #
-      # @param [Discorb::Client] client The client.
-      # @param [Hash] data The data for the command.
-      #
-      def make_interaction(client, data)
-        nested_classes.each do |klass|
-          if !klass.command_type.nil? && klass.command_type == data[:data][:type]
-            interaction = klass.new(client, data)
-            client.dispatch(klass.event_name, interaction)
-            return interaction
-          end
-        end
-        client.logger.warn("Unknown command type #{data[:type]}, initialized CommandInteraction")
-        CommandInteraction.new(client, data)
-      end
-
-      #
-      # Returns the classes under this class.
-      # @private
-      #
-      def nested_classes
-        constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Discorb
+  #
+  # Represents a command interaction.
+  #
+  class CommandInteraction < Interaction
+    @interaction_type = 2
+    @interaction_name = :application_command
+    include Interaction::SourceResponder
+    include Interaction::ModalResponder
+
+    #
+    # Represents a slash command interaction.
+    #
+    class ChatInputCommand < CommandInteraction
+      @command_type = 1
+      @event_name = :slash_command
+
+      private
+
+      def _set_data(data)
+        super
+
+        name, options = ChatInputCommand.get_command_data(data)
+
+        unless (
+                 command =
+                   @client.callable_commands.find do |c|
+                     c.to_s == name && c.type_raw == 1
+                   end
+               )
+          @client.logger.warn "Unknown command name #{name}, ignoring"
+          return
+        end
+
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        ChatInputCommand.modify_option_map(
+          option_map,
+          options,
+          guild,
+          @members,
+          @attachments
+        )
+
+        command.block.call(
+          self,
+          *command.options.map { |k, _v| option_map[k.to_s] }
+        )
+      end
+
+      class << self
+        #
+        # Get command data from the given data.
+        # @private
+        #
+        # @param [Hash] data The data of the command.
+        #
+        def get_command_data(data)
+          name = data[:name]
+          options = nil
+          return name, options unless (option = data[:options]&.first)
+
+          case option[:type]
+          when 1
+            name += " #{option[:name]}"
+            options = option[:options]
+          when 2
+            name += " #{option[:name]}"
+            unless option[:options]&.first&.[](:type) == 1
+              options = option[:options]
+              return name, options
+            end
+            option_sub = option[:options]&.first
+            name += " #{option_sub[:name]}"
+            options = option_sub[:options]
+          else
+            options = data[:options]
+          end
+
+          [name, options]
+        end
+
+        #
+        # Modify the option map with the given options.
+        # @private
+        #
+        # @param [Hash] option_map The option map to modify.
+        # @param [Array<Hash>] options The options for modifying.
+        # @param [Discorb::Guild] guild The guild where the command is executed.
+        # @param [{Discorb::Snowflake => Discorb::Member}] members The cached members of the guild.
+        # @param [{Integer => Discorb::Attachment}] attachments The cached attachments of the message.
+        def modify_option_map(option_map, options, guild, members, attachments)
+          options ||= []
+          options.each do |option|
+            val =
+              case option[:type]
+              when 3, 4, 5, 10
+                option[:value]
+              when 6
+                members[option[:value]] ||
+                  (
+                    guild &&
+                      (
+                        guild.members[option[:value]] ||
+                          guild.fetch_member(option[:value]).wait
+                      )
+                  )
+              when 7
+                if guild
+                  guild.channels[option[:value]] ||
+                    guild.fetch_channels.wait.find do |channel|
+                      channel.id == option[:value]
+                    end
+                end
+              when 8
+                guild &&
+                  (
+                    guild.roles[option[:value]] ||
+                      guild.fetch_roles.wait.find do |role|
+                        role.id == option[:value]
+                      end
+                  )
+              when 9
+                members[option[:value]] ||
+                  (
+                    guild &&
+                      (
+                        guild.members[option[:value]] ||
+                          guild.roles[option[:value]] ||
+                          guild.fetch_member(option[:value]).wait ||
+                          guild.fetch_roles.wait.find do |role|
+                            role.id == option[:value]
+                          end
+                      )
+                  )
+              when 11
+                attachments[option[:value]]
+              end
+            option_map[option[:name]] = val
+          end
+        end
+      end
+    end
+
+    #
+    # Represents a user context menu interaction.
+    #
+    class UserMenuCommand < CommandInteraction
+      @command_type = 2
+      @event_name = :user_command
+
+      # @return [Discorb::Member, Discorb::User] The target user.
+      attr_reader :target
+
+      private
+
+      def _set_data(data)
+        super
+        @target =
+          guild.members[data[:target_id]] ||
+            Discorb::Member.new(
+              @client,
+              @guild_id,
+              data[:resolved][:users][data[:target_id].to_sym],
+              data[:resolved][:members][data[:target_id].to_sym]
+            )
+        command =
+          @client.commands.find do |c|
+            c.name["default"] == data[:name] && c.type_raw == 2
+          end
+        if command
+          command.block.call(self, @target)
+        else
+          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
+        end
+      end
+    end
+
+    #
+    # Represents a message context menu interaction.
+    #
+    class MessageMenuCommand < CommandInteraction
+      @command_type = 3
+      @event_name = :message_command
+
+      # @return [Discorb::Message] The target message.
+      attr_reader :target
+
+      private
+
+      def _set_data(data)
+        super
+        @target = @messages[data[:target_id]]
+        command =
+          @client.commands.find do |c|
+            c.name["default"] == data[:name] && c.type_raw == 3
+          end
+        if command
+          command.block.call(self, @target)
+        else
+          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
+        end
+      end
+    end
+
+    private
+
+    def _set_data(data)
+      super
+      @name = data[:name]
+      @messages = {}
+      @attachments = {}
+      @members = {}
+
+      if data[:resolved]
+        data[:resolved][:users]&.each do |id, user|
+          @client.users[id] = Discorb::User.new(@client, user)
+        end
+        data[:resolved][:members]&.each do |id, member|
+          @members[id] = Discorb::Member.new(
+            @client,
+            @guild_id,
+            data[:resolved][:users][id],
+            member
+          )
+        end
+
+        data[:resolved][:messages]&.each do |id, message|
+          @messages[id.to_s] = Message.new(
+            @client,
+            message.merge(guild_id: @guild_id.to_s)
+          )
+        end
+        data[:resolved][:attachments]&.each do |id, attachment|
+          @attachments[id.to_s] = Attachment.new(attachment)
+        end
+      end
+    end
+
+    class << self
+      # @private
+      attr_reader :command_type, :event_name
+
+      #
+      # Creates a new CommandInteraction instance for the given data.
+      # @private
+      #
+      # @param [Discorb::Client] client The client.
+      # @param [Hash] data The data for the command.
+      #
+      def make_interaction(client, data)
+        nested_classes.each do |klass|
+          unless !klass.command_type.nil? &&
+                   klass.command_type == data[:data][:type]
+            next
+          end
+          interaction = klass.new(client, data)
+          client.dispatch(klass.event_name, interaction)
+          return interaction
+        end
+        client.logger.warn(
+          "Unknown command type #{data[:type]}, initialized CommandInteraction"
+        )
+        CommandInteraction.new(client, data)
+      end
+
+      #
+      # Returns the classes under this class.
+      # @private
+      #
+      def nested_classes
+        constants
+          .select { |c| const_get(c).is_a? Class }
+          .map { |c| const_get(c) }
+      end
+    end
+  end
+end