discorb 0.13.3 → 0.13.4

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)
+    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.
-    # @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)
+        @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("POST", path, resp)
-        handle_response(:post, 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 multipart POST request.
+    # 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.
@@ -81,10 +61,10 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def multipart_post(path, body = "", files, 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("POST", path)
-        req = Net::HTTP::Post.new(get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+        @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)],
         ]
@@ -97,117 +77,8 @@ module Discorb
         session.use_ssl = true
         resp = session.request(req)
         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 +88,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 +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

@@ -65,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
 

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

@@ -15,7 +15,7 @@ module Discorb
       #
       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),
@@ -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
@@ -103,7 +103,7 @@ module Discorb
             payload[:attachments] = attachments.map(&:to_hash) if attachments != Discorb::Unset
             files = [file] if file != Discorb::Unset
             files = [] if files == Discorb::Unset
-            @client.http.multipart_patch("/webhooks/#{@application_id}/#{@token}/messages/@original", payload, files, headers: headers).wait
+            @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
 
@@ -118,7 +118,7 @@ module Discorb
         #
         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
@@ -138,7 +138,7 @@ module Discorb
       #
       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),
@@ -176,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/invite.rb

@@ -105,7 +105,7 @@ module Discorb
     #
     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

data/lib/discorb/member.rb

@@ -152,7 +152,7 @@ module Discorb
     #
     def add_role(role, reason: nil)
       Async do
-        @client.http.put("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", nil, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", "//guilds/:guild_id/members/:user_id/roles/:role_id", :put), nil, audit_log_reason: reason).wait
       end
     end
 
@@ -167,7 +167,7 @@ module Discorb
     #
     def remove_role(role, reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}/roles/#{role.is_a?(Role) ? role.id : role}", "//guilds/:guild_id/members/:user_id/roles/:role_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -200,7 +200,7 @@ module Discorb
         communication_disabled_until = timeout_until if timeout_until != Discorb::Unset
         payload[:communication_disabled_until] = communication_disabled_until&.iso8601 if communication_disabled_until != Discorb::Unset
         payload[:channel_id] = channel&.id if channel != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild_id}/members/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}", "//guilds/:guild_id/members/:user_id", :patch), payload, audit_log_reason: reason).wait
       end
     end
 

data/lib/discorb/message.rb

@@ -379,7 +379,7 @@ module Discorb
     #
     def add_reaction(emoji)
       Async do
-        @client.http.put("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", nil).wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", "//channels/:channel_id/messages/:message_id/reactions/:emoji/@me", :put), nil).wait
       end
     end
 
@@ -395,7 +395,7 @@ module Discorb
     #
     def remove_reaction(emoji)
       Async do
-        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me").wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/@me", "//channels/:channel_id/messages/:message_id/reactions/:emoji/@me", :delete)).wait
       end
     end
 
@@ -412,7 +412,7 @@ module Discorb
     #
     def remove_reaction_of(emoji, member)
       Async do
-        @client.http.delete("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}").wait
+        @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{member.is_a?(Member) ? member.id : member}", "//channels/:channel_id/messages/:message_id/reactions/:emoji/:user_id", :delete)).wait
       end
     end
 
@@ -434,7 +434,7 @@ module Discorb
           after = 0
           users = []
           loop do
-            _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}").wait
+            _resp, data = @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=100&after=#{after}", "//channels/:channel_id/messages/:message_id/reactions/:emoji", :get)).wait
             break if data.empty?
 
             users += data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
@@ -445,7 +445,7 @@ module Discorb
           end
           next users
         else
-          _resp, data = @client.http.get("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}").wait
+          _resp, data = @client.http.request(Route.new("/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}?limit=#{limit}&after=#{after}", "//channels/:channel_id/messages/:message_id/reactions/:emoji", :get)).wait
           next data.map { |r| guild&.members&.[](r[:id]) || @client.users[r[:id]] || User.new(@client, r) }
         end
       end

data/lib/discorb/modules.rb

@@ -38,7 +38,7 @@ module Discorb
         payload[:message_reference] = reference.to_reference if reference
         payload[:components] = Component.to_payload(components) if components
         files = [file]
-        _resp, data = @client.http.multipart_post("/channels/#{channel_id.wait}/messages", payload, files).wait
+        _resp, data = @client.http.multipart_request(Route.new("/channels/#{channel_id.wait}/messages", "//channels/:channel_id/messages", :post), payload, files).wait
         Message.new(@client, data.merge({ guild_id: @guild_id.to_s }))
       end
     end
@@ -74,7 +74,7 @@ module Discorb
           allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
         payload[:components] = Component.to_payload(components) if components
         payload[:flags] = (supress ? 1 << 2 : 0) unless supress.nil?
-        @client.http.patch("/channels/#{channel_id.wait}/messages/#{message_id}", payload).wait
+        @client.http.request(Route.new("/channels/#{channel_id.wait}/messages/#{message_id}", "//channels/:channel_id/messages/:message_id", :patch), payload).wait
       end
     end
 
@@ -89,7 +89,7 @@ module Discorb
     #
     def delete_message!(message_id, reason: nil)
       Async do
-        @client.http.delete("/channels/#{channel_id.wait}/messages/#{message_id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{channel_id.wait}/messages/#{message_id}", "//channels/:channel_id/messages/:message_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -106,7 +106,7 @@ module Discorb
     #
     def fetch_message(id)
       Async do
-        _resp, data = @client.http.get("/channels/#{channel_id.wait}/messages/#{id}").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages/#{id}", "//channels/:channel_id/messages/:message_id", :get)).wait
         Message.new(@client, data.merge({ guild_id: @guild_id.to_s }))
       end
     end
@@ -130,7 +130,7 @@ module Discorb
           after: Discorb::Utils.try(around, :id),
           around: Discorb::Utils.try(before, :id),
         }.filter { |_k, v| !v.nil? }.to_h
-        _resp, messages = @client.http.get("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}").wait
+        _resp, messages = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}", "//channels/:channel_id/messages", :get)).wait
         messages.map { |m| Message.new(@client, m.merge({ guild_id: @guild_id.to_s })) }
       end
     end
@@ -143,7 +143,7 @@ module Discorb
     #
     def fetch_pins
       Async do
-        _resp, data = @client.http.get("/channels/#{channel_id.wait}/pins").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{channel_id.wait}/pins", "//channels/:channel_id/pins", :get)).wait
         data.map { |pin| Message.new(@client, pin) }
       end
     end
@@ -159,7 +159,7 @@ module Discorb
     #
     def pin_message(message, reason: nil)
       Async do
-        @client.http.put("/channels/#{channel_id.wait}/pins/#{message.id}", {}, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{channel_id.wait}/pins/#{message.id}", "//channels/:channel_id/pins/:message_id", :put), {}, audit_log_reason: reason).wait
       end
     end
 
@@ -174,7 +174,7 @@ module Discorb
     #
     def unpin_message(message, reason: nil)
       Async do
-        @client.http.delete("/channels/#{channel_id.wait}/pins/#{message.id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{channel_id.wait}/pins/#{message.id}", "//channels/:channel_id/pins/:message_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -195,7 +195,7 @@ module Discorb
         begin
           post_task = Async do
             loop do
-              @client.http.post("/channels/#{@id}/typing", {})
+              @client.http.request(Route.new("/channels/#{@id}/typing", "//channels/:channel_id/typing", :post), {})
               sleep(5)
             end
           end
@@ -205,7 +205,7 @@ module Discorb
         end
       else
         Async do |task|
-          @client.http.post("/channels/#{@id}/typing", {})
+          @client.http.request(Route.new("/channels/#{@id}/typing", "//channels/:channel_id/typing", :post), {})
         end
       end
     end

data/lib/discorb/presence.rb

@@ -175,12 +175,12 @@ module Discorb
       # Represents the assets of an activity.
       #
       class Asset < DiscordModel
-        # @return [String] The large image ID of the asset.
+        # @return [String] The large image ID or URL of the asset.
         attr_reader :large_image
         alias large_id large_image
         # @return [String] The large text of the activity.
         attr_reader :large_text
-        # @return [String] The small image ID of the activity.
+        # @return [String] The small image ID or URL of the activity.
         attr_reader :small_image
         alias small_id small_image
         # @return [String] The small text of the activity.

data/lib/discorb/rate_limit.rb

@@ -9,8 +9,8 @@ module Discorb
     # @private
     def initialize(client)
       @client = client
-      @current_ratelimits = {}
       @path_ratelimit_bucket = {}
+      @path_ratelimit_hash = {}
       @global = false
     end
 
@@ -21,12 +21,10 @@ module Discorb
     #
     # Wait for the rate limit to reset.
     #
-    # @param [String] method The HTTP method.
-    # @param [String] path The path.
+    # @param [Discorb::Route] path The path.
     #
-    def wait(method, path)
-      return if path.start_with?("https://")
-
+    def wait(path)
+      # return if path.url.start_with?("https://")
       if @global && @global > Time.now.to_f
         time = @global - Time.now.to_f
         @client.log.info("global rate limit reached, waiting #{time} seconds")
@@ -34,36 +32,34 @@ module Discorb
         @global = false
       end
 
-      return unless hash = @path_ratelimit_bucket[method + path]
+      return unless hash = @path_ratelimit_hash[path.identifier]
 
-      return unless b = @current_ratelimits[hash]
+      return unless bucket = @path_ratelimit_bucket[hash + path.major_param]
 
-      if b[:reset_at] < Time.now.to_f
-        @current_ratelimits.delete(hash)
+      if bucket[:reset_at] < Time.now.to_f
+        @path_ratelimit_bucket.delete(path.identifier + path.major_param)
         return
       end
-      return if b[:remaining] > 0
+      return if bucket[:remaining] > 0
 
-      time = b[:reset_at] - Time.now.to_f
-      @client.log.info("rate limit for #{method} #{path} reached, waiting #{time} seconds")
+      time = bucket[:reset_at] - Time.now.to_f
+      @client.log.info("rate limit for #{path.identifier} with #{path.major_param} reached, waiting #{time.round(4)} seconds")
       sleep(time)
     end
 
     #
     # Save the rate limit.
     #
-    # @param [String] method The HTTP method.
     # @param [String] path The path.
     # @param [Net::HTTPResponse] resp The response.
     #
-    def save(method, path, resp)
+    def save(path, resp)
       if resp["X-Ratelimit-Global"] == "true"
         @global = Time.now.to_f + JSON.parse(resp.body, symbolize_names: true)[:retry_after]
       end
       return unless resp["X-RateLimit-Remaining"]
-
-      @path_ratelimit_bucket[method + path] = resp["X-RateLimit-Bucket"]
-      @current_ratelimits[resp["X-RateLimit-Bucket"]] = {
+      @path_ratelimit_hash[path.identifier] = resp["X-Ratelimit-Bucket"]
+      @path_ratelimit_bucket[resp["X-Ratelimit-Bucket"] + path.major_param] = {
         remaining: resp["X-RateLimit-Remaining"].to_i,
         reset_at: Time.now.to_f + resp["X-RateLimit-Reset-After"].to_f,
       }

data/lib/discorb/role.rb

@@ -99,7 +99,7 @@ module Discorb
     #
     def move(position, reason: nil)
       Async do
-        @client.http.patch("/guilds/#{@guild.id}/roles", { id: @id, position: position }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/roles", "//guilds/:guild_id/roles", :patch), { id: @id, position: position }, audit_log_reason: reason).wait
       end
     end
 
@@ -133,7 +133,7 @@ module Discorb
             payload[:unicode_emoji] = icon.to_s
           end
         end
-        @client.http.patch("/guilds/#{@guild.id}/roles/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/roles/#{@id}", "//guilds/:guild_id/roles/:role_id", :patch), payload, audit_log_reason: reason).wait
       end
     end
 
@@ -148,7 +148,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild.id}/roles/#{@id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/roles/#{@id}", "//guilds/:guild_id/roles/:role_id", :delete), audit_log_reason: reason).wait
       end
     end
 

data/lib/discorb/sticker.rb

@@ -83,7 +83,7 @@ module Discorb
           payload[:name] = name unless name == Discorb::Unset
           payload[:description] = description unless description == Discorb::Unset
           payload[:tags] = tag.name unless tag == Discorb::Unset
-          @client.http.patch("/guilds/#{@guild_id}/stickers/#{@id}", payload, audit_log_reason: reason).wait
+          @client.http.request(Route.new("/guilds/#{@guild_id}/stickers/#{@id}", "//guilds/:guild_id/stickers/:sticker_id", :patch), payload, audit_log_reason: reason).wait
         end
       end
 
@@ -97,7 +97,7 @@ module Discorb
       #
       def delete!(reason: nil)
         Async do
-          @client.http.delete("/guilds/#{@guild_id}/stickers/#{@id}", audit_log_reason: reason).wait
+          @client.http.request(Route.new("/guilds/#{@guild_id}/stickers/#{@id}", "//guilds/:guild_id/stickers/:sticker_id", :delete), audit_log_reason: reason).wait
         end
       end