discorb 0.13.2 → 0.15.0

data/lib/discorb/http.rb

@@ -17,10 +17,11 @@ module Discorb
     end
 
     #
-    # Execute a GET request.
+    # Execute a request.
     # @async
     #
-    # @param [String] path The path to the resource.
+    # @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.
@@ -30,46 +31,25 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def get(path, headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("GET", path)
-        resp = http.get(get_path(path), get_headers(headers, "", audit_log_reason), **kwargs)
+    def request(path, body = "", headers: nil, 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)
+          else
+            http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+          end
         data = get_response_data(resp)
-        @ratelimit_handler.save("GET", path, resp)
-        handle_response(:patch, resp, data, path, nil, headers, audit_log_reason, kwargs)
+        @ratelimit_handler.save(path, resp)
+        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
       end
     end
 
     #
-    # Execute a POST request.
+    # Execute a multipart request.
     # @async
     #
-    # @param [String] path The path to the resource.
-    # @param [String, Hash] body The body of the request.
-    # @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.
-    #
-    # @return [Async::Task<Array(Net::HTTPResponse, Hash)>] The response and as JSON.
-    # @return [Async::Task<Array(Net::HTTPResponse, nil)>] The response was 204.
-    #
-    # @raise [Discorb::HTTPError] The request was failed.
-    #
-    def post(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("POST", path)
-        resp = http.post(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        data = get_response_data(resp)
-        @ratelimit_handler.save("POST", path, resp)
-        handle_response(:post, resp, data, path, body, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a multipart POST request.
-    # @async
-    #
-    # @param [String] path The path to the resource.
+    # @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.
@@ -81,133 +61,35 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def multipart_post(path, body = "", files, headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("POST", path)
-        req = Net::HTTP::Post.new(get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+    def multipart_request(path, body, files, headers: nil, 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)
         data = [
-          ["payload_json", get_body(body)],
+          ["payload_json", get_body(body)]
         ]
         files&.each_with_index do |file, i|
           next if file.nil?
-          data << ["files[#{i}]", file.io, { filename: file.filename, content_type: file.content_type }]
+          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
+            )
+            data << ["files[#{i}]", request_io, { filename: file.filename, content_type: file.content_type }]
+          else
+            data << ["files[#{i}]", file.io, { filename: file.filename, content_type: file.content_type }]
+          end
         end
         req.set_form(data, "multipart/form-data")
         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)
-        @ratelimit_handler.save("POST", path, resp)
-        handle_response(:post, resp, data, path, body, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a PATCH request.
-    # @async
-    #
-    # @param [String] path The path to the resource.
-    # @param [String, Hash] body The body of the request.
-    # @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.
-    #
-    # @return [Async::Task<Array(Net::HTTPResponse, Hash)>] The response and as JSON.
-    # @return [Async::Task<Array(Net::HTTPResponse, nil)>] The response was 204.
-    #
-    # @raise [Discorb::HTTPError] The request was failed.
-    #
-    def patch(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("PATCH", path)
-        resp = http.patch(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        data = get_response_data(resp)
-        @ratelimit_handler.save("PATCH", path, resp)
-        handle_response(:patch, resp, data, path, body, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a PATCH request.
-    # @async
-    #
-    # @param [String] path The path to the resource.
-    # @param [String, Hash] body The body of the request.
-    # @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.
-    #
-    # @return [Async::Task<Array(Net::HTTPResponse, Hash)>] The response and as JSON.
-    # @return [Async::Task<Array(Net::HTTPResponse, nil)>] The response was 204.
-    #
-    # @raise [Discorb::HTTPError] The request was failed.
-    #
-    def multipart_patch(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("PATCH", path)
-        req = Net::HTTP::Patch.new(get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
-        data = [
-          ["payload_json", get_body(body)],
-        ]
-        files&.each_with_index do |file, i|
-          data << ["files[#{i}]", file.io, { filename: file.filename, content_type: file.content_type }]
-        end
-        req.set_form(data, "multipart/form-data")
-        session = Net::HTTP.new("discord.com", 443)
-        session.use_ssl = true
-        resp = session.request(req)
-        data = get_response_data(resp)
-        @ratelimit_handler.save("PATCH", path, resp)
-        handle_response(:patch, resp, data, path, body, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a PUT request.
-    # @async
-    #
-    # @param [String] path The path to the resource.
-    # @param [String, Hash] body The body of the request.
-    # @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.
-    #
-    # @return [Async::Task<Array(Net::HTTPResponse, Hash)>] The response and as JSON.
-    # @return [Async::Task<Array(Net::HTTPResponse, nil)>] The response was 204.
-    #
-    # @raise [Discorb::HTTPError] The request was failed.
-    #
-    def put(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
-        @ratelimit_handler.wait("PUT", path)
-        resp = http.put(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        data = get_response_data(resp)
-        @ratelimit_handler.save("PUT", path, resp)
-        handle_response(:put, resp, data, path, body, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a DELETE request.
-    # @async
-    #
-    # @param [String] path The path to the resource.
-    # @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.
-    #
-    # @return [Async::Task<Array(Net::HTTPResponse, Hash)>] The response and as JSON.
-    # @return [Async::Task<Array(Net::HTTPResponse, nil)>] The response was 204.
-    #
-    # @raise [Discorb::HTTPError] The request was failed.
-    #
-    def delete(path, headers: nil, audit_log_reason: nil, **kwargs)
-      Async do
-        @ratelimit_handler.wait("DELETE", path)
-        resp = http.delete(get_path(path), get_headers(headers, "", audit_log_reason))
-        data = get_response_data(resp)
-        @ratelimit_handler.save("DELETE", path, resp)
-        handle_response(:delete, resp, data, path, nil, headers, audit_log_reason, kwargs)
+        @ratelimit_handler.save(path, resp)
+        handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
       end
     end
 
@@ -217,16 +99,12 @@ module Discorb
 
     private
 
-    def handle_response(method, resp, data, path, body, headers, audit_log_reason, kwargs)
+    def handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
       case resp.code
       when "429"
-        @client.log.info("Rate limit exceeded for #{method} #{path}, waiting #{data[:retry_after]} seconds")
+        @client.log.info("Rate limit exceeded for #{path.method} #{path.url}, waiting #{data[:retry_after]} seconds")
         sleep(data[:retry_after])
-        if body
-          __send__(method, path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        else
-          __send__(method, path, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
-        end
+        request(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
       when "400"
         raise BadRequestError.new(resp, data)
       when "401"
@@ -263,10 +141,10 @@ module Discorb
     end
 
     def get_path(path)
-      full_path = if path.start_with?("https://")
-          path
+      full_path = if path.url.start_with?("https://")
+          path.url
         else
-          API_BASE_URL + path
+          API_BASE_URL + path.url
         end
       uri = URI(full_path)
       full_path.sub(uri.scheme + "://" + uri.host, "")
@@ -276,15 +154,13 @@ module Discorb
       begin
         data = JSON.parse(resp.body, symbolize_names: true)
       rescue JSON::ParserError, TypeError
-        if resp.body.nil? || resp.body.empty?
-          data = nil
-        else
-          data = resp.body
-        end
-      end
-      if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
-        raise CloudFlareBanError.new(resp, @client)
+        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
 
@@ -294,6 +170,12 @@ module Discorb
       https
     end
 
+    def cdn_http
+      https = Net::HTTP.new("cdn.discordapp.com", 443)
+      https.use_ssl = true
+      https
+    end
+
     def recr_utf8(data)
       case data
       when Hash

data/lib/discorb/integration.rb

@@ -44,12 +44,11 @@ module Discorb
     }
 
     # @private
-    def initialize(client, data, guild_id, no_cache: false)
+    def initialize(client, data, guild_id)
       @client = client
       @data = data
       @guild_id = guild_id
       _set_data(data)
-      guild.integrations[@id] = self unless no_cache
     end
 
     def guild
@@ -66,7 +65,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild}/integrations/#{@id}", 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
 
@@ -110,5 +109,35 @@ module Discorb
         @name = data[:name]
       end
     end
+
+    #
+    # Represents an application for an integration.
+    #
+    class Application < DiscordModel
+      # @return [Discorb::Snowflake] The ID of the application.
+      attr_reader :id
+      # @return [String] The name of the application.
+      attr_reader :name
+      # @return [Asset] The icon of the application.
+      # @return [nil] If the application has no icon.
+      attr_reader :icon
+      # @return [String] The description of the application.
+      attr_reader :description
+      # @return [String] The summary of the application.
+      attr_reader :summary
+      # @return [Discorb::User] The bot user associated with the application.
+      # @return [nil] If the application has no bot user.
+      attr_reader :bot
+
+      # @private
+      def initialize(client, data)
+        @id = Snowflake.new(data[:id])
+        @name = data[:name]
+        @icon = data[:icon] && Asset.new(self, data[:icon])
+        @description = data[:description]
+        @summary = data[:summary]
+        @bot = data[:bot] and client.users[data[:bot][:id]] || Discorb::User.new(client, data[:bot])
+      end
+    end
   end
 end

data/lib/discorb/intents.rb

@@ -19,6 +19,7 @@ module Discorb
       dm_messages: 1 << 12,
       dm_reactions: 1 << 13,
       dm_typing: 1 << 14,
+      message_content: 1 << 15,
       scheduled_events: 1 << 16,
     }.freeze
 
@@ -39,9 +40,13 @@ module Discorb
     # @param dm_messages [Boolean] Whether dm messages related events are enabled.
     # @param dm_reactions [Boolean] Whether dm reactions related events are enabled.
     # @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.
     #
     # @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).
+    #   You should specify `message_content` intent for preventing unexpected changes in the future.
     #
     def initialize(guilds: true,
                    members: false,
@@ -58,6 +63,7 @@ module Discorb
                    dm_messages: true,
                    dm_reactions: true,
                    dm_typing: true,
+                   message_content: nil,
                    scheduled_events: true)
       @raw_value = {
         guilds: guilds,
@@ -75,6 +81,7 @@ module Discorb
         dm_messages: dm_messages,
         dm_reactions: dm_reactions,
         dm_typing: dm_typing,
+        message_content: message_content,
         scheduled_events: scheduled_events,
       }
     end
@@ -86,7 +93,7 @@ module Discorb
       if @raw_value.key?(name)
         @raw_value[name]
       elsif name.end_with?("=") && @raw_value.key?(name[0..-2].to_sym)
-        raise ArgumentError, "true/false expected" unless args.is_a? TrueClass or args.is_a?(FalseClass)
+        raise ArgumentError, "true/false expected" unless args.is_a?(TrueClass) || args.is_a?(FalseClass)
 
         @raw_value[name[0..-2].to_sym] = args
       else
@@ -129,9 +136,7 @@ module Discorb
 
       # Create new intent object with default values.
       # This will return intents without members and presence.
-      def default
-        from_value(@intent_bits.values.reduce(:+) - @intent_bits[:members] - @intent_bits[:presences])
-      end
+      alias default new
 
       # Create new intent object with all intents.
       def all

data/lib/discorb/interaction/autocomplete.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
   #
   # Represents auto complete interaction.
@@ -17,17 +18,17 @@ module Discorb
           next
         end
 
-        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild)
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild, {}, {})
         focused_index = options.find_index { |o| o[:focused] }
-        val = command.options.values[focused_index][:autocomplete]&.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+        val = command.options.values.filter { |option| option[:type] != :attachment }[focused_index][:autocomplete]&.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
         send_complete_result(val)
       end
     end
 
     # @private
     def send_complete_result(val)
-      @client.http.post("/interactions/#{@id}/#{@token}/callback", {
+      @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
         type: 8,
         data: {
           choices: val.map do |vk, vv|

data/lib/discorb/interaction/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
   #
   # Represents a command interaction.
@@ -5,7 +6,8 @@ module Discorb
   class CommandInteraction < Interaction
     @interaction_type = 2
     @interaction_name = :application_command
-    include Interaction::SourceResponse
+    include Interaction::SourceResponder
+    include Interaction::ModalResponder
 
     #
     # Represents a slash command interaction.
@@ -25,10 +27,10 @@ module Discorb
           return
         end
 
-        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        SlashCommand.modify_option_map(option_map, options, guild)
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        SlashCommand.modify_option_map(option_map, options, guild, @members, @attachments)
 
-        command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+        command.block.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
       end
 
       class << self
@@ -55,13 +57,13 @@ module Discorb
             options = data[:options]
           end
 
-          return name, options
+          [name, options]
         end
 
         # @private
-        def modify_option_map(option_map, options, guild)
+        def modify_option_map(option_map, options, guild, members, attachments)
           options ||= []
-          options.each_with_index do |option|
+          options.each do |option|
             val = case option[:type]
               when 3, 4, 5, 10
                 option[:value]
@@ -72,7 +74,9 @@ module Discorb
               when 8
                 guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
               when 9
-                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.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+              when 11
+                attachments[option[:value]]
               end
             option_map[option[:name]] = val
           end
@@ -92,6 +96,7 @@ module Discorb
       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])
         @client.commands.find { |c| c.name == data[:name] && c.type_raw == 2 }.block.call(self, @target)
       end
@@ -109,7 +114,8 @@ module Discorb
       private
 
       def _set_data(data)
-        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge(guild_id: @guild_id.to_s))
+        super
+        @target = @messages[data[:target_id]]
         @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
       end
     end
@@ -117,7 +123,26 @@ module Discorb
     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]&.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)
+        end
+        data[:resolved][:attachments]&.to_h do |id, attachment|
+          @attachments[id.to_s] = Attachment.new(attachment)
+        end
+      end
     end
 
     class << self

data/lib/discorb/interaction/components.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
 
   #
@@ -5,8 +6,10 @@ module Discorb
   # @abstract
   #
   class MessageComponentInteraction < Interaction
-    include Interaction::SourceResponse
-    include Interaction::UpdateResponse
+    include Interaction::SourceResponder
+    include Interaction::UpdateResponder
+    include Interaction::ModalResponder
+
     # @return [String] The content of the response.
     attr_reader :custom_id
     # @return [Discorb::Message] The target message.

data/lib/discorb/interaction/modal.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Discorb
+
+  #
+  # Represents a modal interaction.
+  #
+  class ModalInteraction < Interaction
+    include Interaction::SourceResponder
+
+    @interaction_type = 5
+    @interaction_name = :modal_submit
+    @event_name = :modal_submit
+
+    # @return [String] The custom id of the modal.
+    attr_reader :custom_id
+    # @return [{String => String}] The contents of the modal.
+    attr_reader :contents
+
+    private
+
+    def _set_data(data)
+      @custom_id = data[:custom_id]
+      @contents = data[:components].to_h do |component|
+        [component[:components][0][:custom_id], component[:components][0][:value]]
+      end
+    end
+
+    class << self
+      alias make_interaction new
+    end
+  end
+end