discorb 0.16.0 → 0.18.0

data/lib/discorb/guild_template.rb

@@ -19,7 +19,7 @@ module Discorb
     attr_reader :created_at
     # @return [Time] The time this template was last updated.
     attr_reader :updated_at
-    # @return [Discorb::Guild] The guild where the template was created.
+    # @return [Discorb::Snowflake] The ID of guild where the template was created.
     attr_reader :source_guild_id
     # @return [Discorb::GuildTemplate::TemplateGuild] The guild where the template was created.
     attr_reader :serialized_source_guild
@@ -64,7 +64,10 @@ module Discorb
         payload = {}
         payload[:name] = name if name
         payload[:description] = description if description != Discorb::Unset
-        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :patch), payload).wait
+        @client.http.request(
+          Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code",
+                    :patch), payload
+        ).wait
       end
     end
 
@@ -78,7 +81,8 @@ module Discorb
     #
     def update
       Async do
-        _resp, data = @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :put)).wait
+        _resp, data = @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}",
+                                                     "//guilds/:guild_id/templates/:code", :put)).wait
         _set_data(data)
       end
     end
@@ -91,7 +95,8 @@ module Discorb
     #
     def delete!
       Async do
-        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :delete)).wait
+        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}",
+                                       "//guilds/:guild_id/templates/:code", :delete)).wait
       end
     end
 
@@ -109,7 +114,8 @@ module Discorb
       attr_reader :roles
       # @return [Discorb::SystemChannelFlag] The flag for the system channel.
       attr_reader :system_channel_flags
-      # @return [Discorb::Dictionary{Discorb::Snowflake => Discorb::GuildChannel}] A dictionary of channels in the guild.
+      # @return [Discorb::Dictionary{Discorb::Snowflake => Discorb::GuildChannel}]
+      #   A dictionary of channels in the guild.
       attr_reader :channels
       # @return [String] The description of the guild.
       attr_reader :description

data/lib/discorb/http.rb

@@ -27,7 +27,6 @@ module Discorb
     #
     # @param [Discorb::Route] path The path to the resource.
     # @param [String, Hash] body The body of the request. Defaults to an empty string.
-    # @param [Hash] headers The headers to send with the request.
     # @param [String] audit_log_reason The audit log reason to send with the request.
     # @param [Hash] kwargs The keyword arguments.
     #
@@ -36,17 +35,28 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def request(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
+    def request(path, body = "", audit_log_reason: nil, **kwargs)
       Async do |_task|
         @ratelimit_handler.wait(path)
         resp = if %i[post patch put].include? path.method
-            http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
+            http.send(
+              path.method,
+              get_path(path),
+              get_body(body),
+              get_headers(body, audit_log_reason),
+              **kwargs,
+            )
           else
-            http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+            http.send(
+              path.method,
+              get_path(path),
+              get_headers(body, audit_log_reason),
+              **kwargs,
+            )
           end
         data = get_response_data(resp)
         @ratelimit_handler.save(path, resp)
-        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+        handle_response(resp, data, path, body, nil, audit_log_reason, kwargs)
       end
     end
 
@@ -56,8 +66,7 @@ module Discorb
     #
     # @param [Discorb::Route] path The path to the resource.
     # @param [String, Hash] body The body of the request.
-    # @param [Array<Discorb::File>] files The files to upload.
-    # @param [Hash] headers The headers to send with the request.
+    # @param [Array<Discorb::Attachment>] files The files to upload.
     # @param [String] audit_log_reason The audit log reason to send with the request.
     # @param [Hash] kwargs The keyword arguments.
     #
@@ -66,21 +75,30 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def multipart_request(path, body, files, headers: nil, audit_log_reason: nil, **kwargs)
+    def multipart_request(path, body, files, audit_log_reason: nil, **kwargs)
       Async do |_task|
         @ratelimit_handler.wait(path)
-        req = Net::HTTP.const_get(path.method.to_s.capitalize).new(get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+        req = Net::HTTP.const_get(path.method.to_s.capitalize).new(
+          get_path(path),
+          get_headers(body, audit_log_reason),
+          **kwargs,
+        )
+        # @type var data: Array[untyped]
         data = [
           ["payload_json", get_body(body)],
         ]
         files&.each_with_index do |file, i|
           next if file.nil?
+
           if file.created_by == :discord
             request_io = StringIO.new(
-              cdn_http.get(URI.parse(file.url).path, {
-                "Content-Type" => nil,
-                "User-Agent" => Discorb::USER_AGENT,
-              }).body
+              cdn_http.get(
+                (URI.parse(file.url).path || raise("Could not parse url")),
+                {
+                  "Content-Type" => nil,
+                  "User-Agent" => Discorb::USER_AGENT,
+                }
+              ).body
             )
             data << ["files[#{i}]", request_io, { filename: file.filename, content_type: file.content_type }]
           else
@@ -91,10 +109,11 @@ module Discorb
         session = Net::HTTP.new("discord.com", 443)
         session.use_ssl = true
         resp = session.request(req)
-        files&.then { _1.filter(&:will_close).each { |f| f.io.close } }
-        data = get_response_data(resp)
+        resp_data = get_response_data(resp)
         @ratelimit_handler.save(path, resp)
-        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+        response = handle_response(resp, resp_data, path, body, files, audit_log_reason, kwargs)
+        files&.then { _1.filter(&:will_close).each { |f| f.io.close } }
+        response
       end
     end
 
@@ -104,12 +123,16 @@ module Discorb
 
     private
 
-    def handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
+    def handle_response(resp, data, path, body, files, audit_log_reason, kwargs)
       case resp.code
       when "429"
         @client.logger.info("Rate limit exceeded for #{path.method} #{path.url}, waiting #{data[:retry_after]} seconds")
         sleep(data[:retry_after])
-        request(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
+        if files
+          multipart_request(path, body, files, audit_log_reason: audit_log_reason, **kwargs).wait
+        else
+          request(path, body, audit_log_reason: audit_log_reason, **kwargs).wait
+        end
       when "400"
         raise BadRequestError.new(resp, data)
       when "401"
@@ -123,14 +146,19 @@ module Discorb
       end
     end
 
-    def get_headers(headers, body = "", audit_log_reason = nil)
+    def get_headers(body = "", audit_log_reason = nil)
       ret = if body.nil? || body == ""
-          { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}" }
+          {
+            "User-Agent" => USER_AGENT,
+            "authorization" => "Bot #{@client.token}",
+          }
         else
-          { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}",
-            "content-type" => "application/json" }
+          {
+            "User-Agent" => USER_AGENT,
+            "authorization" => "Bot #{@client.token}",
+            "content-type" => "application/json",
+          }
         end
-      ret.merge!(headers) if !headers.nil? && headers.length.positive?
       ret["X-Audit-Log-Reason"] = audit_log_reason unless audit_log_reason.nil?
       ret
     end
@@ -160,12 +188,13 @@ module Discorb
         data = JSON.parse(resp.body, symbolize_names: true)
       rescue JSON::ParserError, TypeError
         data = if resp.body.nil? || resp.body.empty?
-            nil
+            {}
           else
             resp.body
           end
       end
       raise CloudFlareBanError.new(resp, @client) if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
+
       data
     end
 

data/lib/discorb/integration.rb

@@ -74,7 +74,10 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.request(Route.new("/guilds/#{@guild}/integrations/#{@id}", "//guilds/:guild_id/integrations/:integration_id", :delete), audit_log_reason: reason).wait
+        @client.http.request(
+          Route.new("/guilds/#{@guild}/integrations/#{@id}", "//guilds/:guild_id/integrations/:integration_id",
+                    :delete), {}, audit_log_reason: reason
+        ).wait
       end
     end
 

data/lib/discorb/intents.rb

@@ -23,6 +23,8 @@ module Discorb
       dm_typing: 1 << 14,
       message_content: 1 << 15,
       scheduled_events: 1 << 16,
+      automod_configuration: 1 << 20,
+      automod_execution: 1 << 21,
     }.freeze
 
     #
@@ -44,29 +46,34 @@ module Discorb
     # @param dm_typing [Boolean] Whether dm typing related events are enabled.
     # @param message_content [Boolean] Whether message content will be sent with events.
     # @param scheduled_events [Boolean] Whether events related scheduled events are enabled.
-    #
+    # @param automod_configuration [Boolean] Whether automod configuration related events are enabled.
+    # @param automod_execution [Boolean] Whether automod execution related events are enabled.
     # @note You must enable privileged intents to use `members` and/or `presences` intents.
     # @note Message Content Intent is not required to use `message_content` intents for now,
-    #   this will be required in April 30, 2022. [Learn More](https://support-dev.discord.com/hc/en-us/articles/4404772028055).
+    #   this will be required in September 1, 2022. [Learn More](https://support-dev.discord.com/hc/en-us/articles/4404772028055).
     #   You should specify `message_content` intent for preventing unexpected changes in the future.
     #
-    def initialize(guilds: true,
-                   members: false,
-                   bans: true,
-                   emojis: true,
-                   integrations: true,
-                   webhooks: true,
-                   invites: true,
-                   voice_states: true,
-                   presences: false,
-                   messages: true,
-                   reactions: true,
-                   typing: true,
-                   dm_messages: true,
-                   dm_reactions: true,
-                   dm_typing: true,
-                   message_content: nil,
-                   scheduled_events: true)
+    def initialize(
+      guilds: true,
+      members: false,
+      bans: true,
+      emojis: true,
+      integrations: true,
+      webhooks: true,
+      invites: true,
+      voice_states: true,
+      presences: false,
+      messages: true,
+      reactions: true,
+      typing: true,
+      dm_messages: true,
+      dm_reactions: true,
+      dm_typing: true,
+      message_content: nil,
+      scheduled_events: true,
+      automod_configuration: true,
+      automod_execution: true
+    )
       @raw_value = {
         guilds: guilds,
         members: members,
@@ -85,6 +92,8 @@ module Discorb
         dm_typing: dm_typing,
         message_content: message_content,
         scheduled_events: scheduled_events,
+        automod_configuration: automod_configuration,
+        automod_execution: automod_execution,
       }
     end
 

data/lib/discorb/interaction/autocomplete.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents auto complete interaction.
@@ -12,35 +13,46 @@ module Discorb
     def _set_data(data)
       super
       Sync do
-        name, options = Discorb::CommandInteraction::SlashCommand.get_command_data(data)
+        name, options = Discorb::CommandInteraction::ChatInputCommand.get_command_data(data)
 
-        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+        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::SlashCommand.modify_option_map(option_map, options, guild, {}, {})
+        Discorb::CommandInteraction::ChatInputCommand.modify_option_map(option_map, options, guild, {}, {})
         focused_index = options.find_index { |o| o[:focused] }
-        val = command.options.values.filter { |option| option[:type] != :attachment }[focused_index][:autocomplete]&.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
+        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
+      @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", fallback: $stderr
+      @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

data/lib/discorb/interaction/command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents a command interaction.
@@ -12,7 +13,7 @@ module Discorb
     #
     # Represents a slash command interaction.
     #
-    class SlashCommand < CommandInteraction
+    class ChatInputCommand < CommandInteraction
       @command_type = 1
       @event_name = :slash_command
 
@@ -21,15 +22,15 @@ module Discorb
       def _set_data(data)
         super
 
-        name, options = SlashCommand.get_command_data(data)
+        name, options = ChatInputCommand.get_command_data(data)
 
-        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+        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]] }
-        SlashCommand.modify_option_map(option_map, options, guild, @members, @attachments)
+        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
@@ -82,13 +83,25 @@ module Discorb
               when 3, 4, 5, 10
                 option[:value]
               when 6
-                members[option[:value]] || guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
+                members[option[:value]] || guild && (guild.members[option[:value]] ||
+                                                     guild.fetch_member(option[:value]).wait)
               when 7
-                guild.channels[option[:value]] || guild.fetch_channels.wait.find { |channel| channel.id == option[:value] }
+                if guild
+                  guild.channels[option[:value]] || guild.fetch_channels.wait.find do |channel|
+                    channel.id == option[:value]
+                  end
+                end
               when 8
-                guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+                guild && (guild.roles[option[:value]] ||
+                          guild.fetch_roles.wait.find { |role| role.id == option[:value] })
               when 9
-                members[option[:value]] || guild.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+                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
@@ -112,8 +125,17 @@ module Discorb
 
       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])
-        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 2 }.block.call(self, @target)
+        @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
 
@@ -132,7 +154,12 @@ module Discorb
       def _set_data(data)
         super
         @target = @messages[data[:target_id]]
-        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
+        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
 
@@ -152,10 +179,11 @@ module Discorb
             @client, @guild_id, data[:resolved][:users][id], member
           )
         end
-        data[:resolved][:messages]&.to_h do |id, _message|
-          @messages[id.to_i] = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge(guild_id: @guild_id.to_s)).merge(guild_id: @guild_id.to_s)
+
+        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]&.to_h do |id, attachment|
+        data[:resolved][:attachments]&.each do |id, attachment|
           @attachments[id.to_s] = Attachment.new(attachment)
         end
       end

data/lib/discorb/interaction/components.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Discorb
 
+module Discorb
   #
   # Represents a message component interaction.
   # @abstract
@@ -41,7 +41,10 @@ module Discorb
       #
       def make_interaction(client, data)
         nested_classes.each do |klass|
-          return klass.new(client, data) if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
+          if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
+            return klass.new(client,
+                             data)
+          end
         end
         client.logger.warn("Unknown component type #{data[:component_type]}, initialized Interaction")
         MessageComponentInteraction.new(client, data)

data/lib/discorb/interaction/modal.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Discorb
-
   #
   # Represents a modal interaction.
   #