discorb 0.13.0 → 0.13.4

data/lib/discorb/guild_template.rb

@@ -45,19 +45,20 @@ module Discorb
 
     #
     # Edit the template.
-    # @macro async
-    # @macro http
+    # @async
     # @macro edit
     #
     # @param [String] name The new name of the template.
     # @param [String] description The new description of the template.
     #
-    def edit(name = nil, description = :unset)
+    # @return [Async::Task<void>] The task.
+    #
+    def edit(name = nil, description = Discorb::Unset)
       Async do
         payload = {}
         payload[:name] = name if name
-        payload[:description] = description if description != :unset
-        @client.http.patch("/guilds/#{@source_guild_id}/templates/#{@code}", payload).wait
+        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
       end
     end
 
@@ -65,24 +66,26 @@ module Discorb
 
     #
     # Update the template.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def update
       Async do
-        _resp, data = @client.http.put("/guilds/#{@source_guild_id}/templates/#{@code}").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
 
     #
     # Delete the template.
-    # @macro async
-    # @macro http
+    # @async
+    #
+    # @return [Async::Task<void>] The task.
     #
     def delete!
       Async do
-        @client.http.delete("/guilds/#{@source_guild_id}/templates/#{@code}").wait
+        @client.http.request(Route.new("/guilds/#{@source_guild_id}/templates/#{@code}", "//guilds/:guild_id/templates/:code", :delete)).wait
       end
     end
 
@@ -98,7 +101,7 @@ module Discorb
       attr_reader :afk_timeout
       # @return [Discorb::Dictionary{Discorb::Snowflake => Discorb::Role}] A dictionary of roles in the guild.
       attr_reader :roles
-      # @return [Discorb::Guild::SystemChannelFlag] The flag for the system channel.
+      # @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.
       attr_reader :channels

data/lib/discorb/http.rb

@@ -17,125 +17,68 @@ module Discorb
     end
 
     #
-    # Execute a GET request.
-    # @macro async
+    # 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.
     #
-    # @return [Array(Net::HTTPResponse, Hash)] The response and as JSON.
+    # @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 get(path, headers: nil, audit_log_reason: nil, **kwargs)
+    def request(path, body = "", 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)
-        data = get_response_data(resp)
-        @ratelimit_handler.save("GET", path, resp)
-        handle_response(:patch, resp, data, path, nil, headers, audit_log_reason, kwargs)
-      end
-    end
-
-    #
-    # Execute a POST request.
-    # @macro 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 [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 PATCH request.
-    # @macro 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 [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)
+        @ratelimit_handler.wait(path)
+        if %i[post patch put].include? path.method
+          resp = http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
+        else
+          resp = http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+        end
         data = get_response_data(resp)
-        @ratelimit_handler.save("PATCH", path, resp)
-        handle_response(:patch, resp, data, path, body, 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 PUT request.
-    # @macro async
+    # Execute a multipart 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.
     # @param [String] audit_log_reason The audit log reason to send with the request.
     # @param [Hash] kwargs The keyword arguments.
     #
-    # @return [Array(Net::HTTPResponse, Hash)] The response and as JSON.
+    # @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)
+    def multipart_request(path, body = "", files, 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.
-    # @macro 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 [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))
+        @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)],
+        ]
+        files&.each_with_index do |file, i|
+          next if file.nil?
+          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("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
 
@@ -143,52 +86,14 @@ module Discorb
       "#<#{self.class} client=#{@client}>"
     end
 
-    #
-    # A helper method to send multipart/form-data requests for creating messages.
-    #
-    # @param [Hash] payload The payload to send.
-    # @param [Array<Discorb::File>] files The files to send.
-    #
-    # @return [Array(String, String)] The boundary and body.
-    #
-    def self.multipart(payload, files)
-      boundary = "DiscorbBySevenC7CMultipartFormData#{Time.now.to_f}"
-      str_payloads = [<<~HTTP]
-        Content-Disposition: form-data; name="payload_json"
-        Content-Type: application/json
-
-        #{payload.to_json}
-      HTTP
-      files.each_with_index do |single_file, i|
-        str_payloads << <<~HTTP
-          Content-Disposition: form-data; name="files[#{i}]"; filename="#{single_file.filename}"
-          Content-Type: #{single_file.content_type}
-
-          #{single_file.io.read}
-        HTTP
-      end
-      payload = +"--#{boundary}".encode(Encoding::ASCII_8BIT)
-      str_payloads.each do |str_payload|
-        payload << "\r\n".encode(Encoding::ASCII_8BIT)
-        payload << str_payload.force_encoding(Encoding::ASCII_8BIT)
-        payload << "\r\n--#{boundary}".encode(Encoding::ASCII_8BIT)
-      end
-      payload += +"--".encode(Encoding::ASCII_8BIT)
-      [boundary, payload]
-    end
-
     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"
@@ -225,10 +130,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, "")

data/lib/discorb/integration.rb

@@ -49,7 +49,6 @@ module Discorb
       @data = data
       @guild_id = guild_id
       _set_data(data)
-      guild.integrations[@id] = self unless no_cache
     end
 
     def guild
@@ -58,12 +57,15 @@ module Discorb
 
     #
     # Delete the integration.
+    # @async
     #
     # @param [String] reason The reason for deleting the integration.
     #
+    # @return [Async::Task<void>] The task.
+    #
     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
 
@@ -107,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/interaction/autocomplete.rb

@@ -27,7 +27,7 @@ module Discorb
 
     # @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/response.rb

@@ -7,14 +7,15 @@ module Discorb
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
+      # @return [Async::Task<void>] The task.
+      #
       def defer_source(ephemeral: false)
         Async do
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", {
+          @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
             type: 5,
             data: {
               flags: (ephemeral ? 1 << 6 : 0),
@@ -27,8 +28,7 @@ module Discorb
       #
       # Response with `CHANNEL_MESSAGE_WITH_SOURCE`(`4`).
       #
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
@@ -51,14 +51,14 @@ module Discorb
           payload[:flags] = (ephemeral ? 1 << 6 : 0)
 
           ret = if @responded
-              _resp, data = @client.http.post("/webhooks/#{@application_id}/#{@token}", payload).wait
+              _resp, data = @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}", "//webhooks/:webhook_id/:token", :post), payload).wait
               webhook = Webhook::URLWebhook.new("/webhooks/#{@application_id}/#{@token}")
               Webhook::Message.new(webhook, data, @client)
             elsif @defered
-              @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload).wait
+              @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :patch), payload).wait
               CallbackMessage.new(@client, payload, @application_id, @token)
             else
-              @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 4, data: payload }).wait
+              @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), { type: 4, data: payload }).wait
               CallbackMessage.new(@client, payload, @application_id, @token)
             end
           @responded = true
@@ -77,8 +77,7 @@ module Discorb
 
         #
         # Edits the callback message.
-        # @macro async
-        # @macro http
+        # @async
         # @macro edit
         #
         # @param [String] content The new content of the message.
@@ -88,27 +87,23 @@ module Discorb
         # @param [Discorb::File] file The file to send.
         # @param [Array<Discorb::File>] files The files to send.
         #
+        # @return [Async::Task<void>] The task.
+        #
         def edit(
-          content = :unset,
-          embed: :unset, embeds: :unset,
-          file: :unset, files: :unset,
-          attachments: :unset
+          content = Discorb::Unset,
+          embed: Discorb::Unset, embeds: Discorb::Unset,
+          file: Discorb::Unset, files: Discorb::Unset,
+          attachments: Discorb::Unset
         )
           Async do
             payload = {}
-            payload[:content] = content if content != :unset
-            payload[:embeds] = embed ? [embed.to_hash] : [] if embed != :unset
-            payload[:embeds] = embeds.map(&:to_hash) if embeds != :unset
-            payload[:attachments] = attachments.map(&:to_hash) if attachments != :unset
-            files = [file] if file != :unset
-            if files == :unset
-              headers = {
-                "Content-Type" => "application/json",
-              }
-            else
-              headers, payload = HTTP.multipart(payload, files)
-            end
-            @client.http.patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload, headers: headers).wait
+            payload[:content] = content if content != Discorb::Unset
+            payload[:embeds] = embed ? [embed.to_hash] : [] if embed != Discorb::Unset
+            payload[:embeds] = embeds.map(&:to_hash) if embeds != Discorb::Unset
+            payload[:attachments] = attachments.map(&:to_hash) if attachments != Discorb::Unset
+            files = [file] if file != Discorb::Unset
+            files = [] if files == Discorb::Unset
+            @client.http.multipart_request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :patch), payload, files, headers: headers).wait
           end
         end
 
@@ -116,11 +111,14 @@ module Discorb
 
         #
         # Deletes the callback message.
+        # @async
         # @note This will fail if the message is ephemeral.
         #
+        # @return [Async::Task<void>] The task.
+        #
         def delete!
           Async do
-            @client.http.delete("/webhooks/#{@application_id}/#{@token}/messages/@original").wait
+            @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :delete)).wait
           end
         end
       end
@@ -132,12 +130,15 @@ module Discorb
     module UpdateResponse
       #
       # Response with `DEFERRED_UPDATE_MESSAGE`(`6`).
+      # @async
       #
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
+      # @return [Async::Task<void>] The task.
+      #
       def defer_update(ephemeral: false)
         Async do
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", {
+          @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
             type: 6,
             data: {
               flags: (ephemeral ? 1 << 6 : 0),
@@ -149,8 +150,7 @@ module Discorb
       #
       # Response with `UPDATE_MESSAGE`(`7`).
       #
-      # @macro async
-      # @macro http
+      # @async
       #
       # @param [String] content The content of the response.
       # @param [Boolean] tts Whether to send the message as text-to-speech.
@@ -160,6 +160,8 @@ module Discorb
       # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
+      # @return [Async::Task<void>] The task.
+      #
       def edit(content, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
         Async do
           payload = {}
@@ -174,7 +176,7 @@ module Discorb
           payload[:allowed_mentions] = allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
           payload[:components] = Component.to_payload(components) if components
           payload[:flags] = (ephemeral ? 1 << 6 : 0)
-          @client.http.post("/interactions/#{@id}/#{@token}/callback", { type: 7, data: payload }).wait
+          @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), { type: 7, data: payload }).wait
         end
       end
     end

data/lib/discorb/interaction/root.rb

@@ -18,6 +18,12 @@ module Discorb
     attr_reader :version
     # @return [String] The token for the interaction.
     attr_reader :token
+    # @return [Symbol] The locale of the user that created the interaction.
+    # @note This modifies the language code, `-` will be replaced with `_`.
+    attr_reader :locale
+    # @return [Symbol] The locale of the guild that created the interaction.
+    # @note This modifies the language code, `-` will be replaced with `_`.
+    attr_reader :guild_locale
 
     # @!attribute [r] guild
     #   @macro client_cache
@@ -43,6 +49,8 @@ module Discorb
       @member = guild.members[data[:member][:id]] || Member.new(@client, @guild_id, data[:member][:user], data[:member]) if data[:member]
       @user = @client.users[data[:user][:id]] || User.new(@client, data[:user]) if data[:user]
       @token = data[:token]
+      @locale = data[:locale].to_s.gsub("-", "_").to_sym
+      @guild_locale = data[:guild_locale].to_s.gsub("-", "_").to_sym
       @version = data[:version]
       @defered = false
       @responded = false

data/lib/discorb/invite.rb

@@ -100,11 +100,12 @@ module Discorb
     end
 
     # Delete the invite.
-    # @macro async
-    # @macro http
+    # @async
+    # @return [Async::Task<void>] The task.
+    #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/invites/#{@code}", audit_log_reason: reason)
+        @client.http.request(Route.new("/invites/#{@code}", "//invites/:code", :delete), audit_log_reason: reason)
       end
     end
 

data/lib/discorb/log.rb

@@ -71,10 +71,11 @@ module Discorb
 
       time = Time.now.iso8601
       if @colorize_log
-        @out.puts("\e[90m#{time}\e[0m #{color}#{name.ljust(5)}\e[0m #{message}")
+        @out.write("\e[90m#{time}\e[0m #{color}#{name.ljust(5)}\e[0m #{message}\n")
       else
-        @out.puts("#{time} #{name.ljust(5)} #{message}")
+        @out.write("#{time} #{name.ljust(5)} #{message}\n")
       end
+      @out.flush
     end
   end
 end