discorb 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a82de8344e0dad10cce48b6a49bb6c520df2980518f5ead7a107d8196d7f6b
-  data.tar.gz: 1277c6e8a2e20bd6245952dbc0001874cd7abf80c220dede886e06d9cd034643
+  metadata.gz: 45868a2fa9284bc0910bdad465983c490f44b721ccc49632df681e79e78fd727
+  data.tar.gz: 969d627479e5381da98e1775186e23f9a193244180135b8dc9396878a425ee43
 SHA512:
-  metadata.gz: 6ed3a9bb11473db377910096ff3eaa74e4a0c1c7b73afd85975dbd6b4b541620aceb3d4e096ae4268f75590b5c52e1c62250d6e73457b9515ada6895c040a20e
-  data.tar.gz: 8bbc17b2bee9cdf935a381bcb6f60b261f243281e9fb65fcc309852f310648d6aa4f41747252431b665355efcd4e26ea6a77be7cf7535a14a495a6a9f1372df3
+  metadata.gz: 2732b467bfc1ba6af2d6938b384026e5219bfce03ff646669870e311601ec7b0258a72ba1c4b6fd6c9a60d1c3186c3890842916bb2f387542cf1d2ee7fbafab3
+  data.tar.gz: a825f0d8497f8f62c024fa381441d9a19da54b0aa2fe71a7b87fc6ef17bc74f7e65a1681b6dc9c7abb1a2f746e6d821abaf4ae28ae6d9661226e7276dce2f551

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+Official Discord.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

data/Changelog.md

@@ -6,6 +6,14 @@
 
 ## v0.13
 
+### v0.13.4
+
+- Add: Show command on `discorb setup`
+- Fix: Fix issue when logging in to file(#6, thanks `deanpcmad`)
+- Fix: Fix rate limit handing
+- Fix: Fix `Client#users`, it was always empty
+- Fix: Fix sorting dictionary
+
 ### v0.13.3
 
 - Fix: Fix INTEGRATION_xxx event

data/lib/discorb/app_command.rb

@@ -129,10 +129,32 @@ module Discorb
           end
           final_guild_ids = local_commands.map(&:guild_ids).flatten.map(&:to_s).uniq
           app_info = fetch_application.wait
-          http.put("/applications/#{app_info.id}/commands", global_commands.map(&:to_hash)).wait unless global_commands.empty?
+          @http.request(
+            Route.new(
+              "/applications/#{app_info.id}/commands",
+              "//applications/:application_id/commands",
+              :put
+            ),
+            global_commands.map(&:to_hash)
+          ).wait unless global_commands.empty?
+          if ENV["DISCORB_CLI_FLAG"] == "setup"
+            sputs "Registered commands for global:"
+            global_commands.each do |command|
+              iputs "- #{command.name}"
+            end
+          end
           final_guild_ids.each do |guild_id|
             commands = local_commands.select { |c| c.guild_ids.include?(guild_id) }
-            http.put("/applications/#{app_info.id}/guilds/#{guild_id}/commands", commands.map(&:to_hash)).wait
+            @http.request(
+              Route.new("/applications/#{app_info.id}/guilds/#{guild_id}/commands",
+                        "//applications/:application_id/guilds/:guild_id/commands",
+                        :put),
+              commands.map(&:to_hash)
+            ).wait
+            sputs "Registered commands for #{guild_id}:"
+            commands.each do |command|
+              iputs "- #{command.name}"
+            end
           end unless final_guild_ids.empty?
           @log.info "Successfully setup commands"
         end

data/lib/discorb/channel.rb

@@ -174,7 +174,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete(base_url.wait.to_s, audit_log_reason: reason).wait
+        @client.http.request(Route.new(base_url.wait.to_s, "//webhooks/:webhook_id/:token", :delete), audit_log_reason: reason).wait
         @deleted = true
         self
       end
@@ -201,7 +201,7 @@ module Discorb
         }
         payload[:lock_permissions] = lock_permissions
         payload[:parent_id] = parent&.id if parent != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/channels", "//guilds/:guild_id/channels", :patch), payload, audit_log_reason: reason).wait
       end
     end
 
@@ -292,7 +292,7 @@ module Discorb
         default_auto_archive_duration ||= archive_in
         payload[:default_auto_archive_duration] = default_auto_archive_duration if default_auto_archive_duration != Discorb::Unset
 
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -313,7 +313,7 @@ module Discorb
         payload = {}
         payload[:name] = name
         payload[:avatar] = avatar.to_s if avatar
-        _resp, data = @client.http.post("/channels/#{@id}/webhooks", payload).wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/webhooks", "//channels/:channel_id/webhooks", :post), payload).wait
         Webhook.new([@client, data])
       end
     end
@@ -326,7 +326,7 @@ module Discorb
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/webhooks").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/webhooks", "//channels/:channel_id/webhooks", :get)).wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
@@ -354,7 +354,7 @@ module Discorb
 
         message_ids = messages.map { |m| Discorb::Utils.try(m, :id).to_s }
 
-        @client.http.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
+        @client.http.request(Route.new("/channels/#{@id}/messages/bulk-delete", "//channels/:channel_id/messages/bulk-delete", :post), { messages: message_ids }).wait
       end
     end
 
@@ -384,7 +384,7 @@ module Discorb
           deny: deny_value,
           type: target.is_a?(Member) ? 1 : 0,
         }
-        @client.http.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/permissions/#{target.id}", "//channels/:channel_id/permissions/:target_id", :put), payload, audit_log_reason: reason).wait
       end
     end
 
@@ -404,7 +404,7 @@ module Discorb
     #
     def delete_permissions(target, reason: nil)
       Async do
-        @client.http.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/permissions/#{target.id}", "//channels/:channel_id/permissions/:target_id", :delete), audit_log_reason: reason).wait
       end
     end
 
@@ -420,7 +420,7 @@ module Discorb
     #
     def fetch_invites
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/invites").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/invites", "//channels/:channel_id/invites", :get)).wait
         data.map { |invite| Invite.new(@client, invite) }
       end
     end
@@ -440,7 +440,7 @@ module Discorb
     #
     def create_invite(max_age: nil, max_uses: nil, temporary: false, unique: false, reason: nil)
       Async do
-        _resp, data = @client.http.post("/channels/#{@id}/invites", {
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/invites", "//channels/:channel_id/invites", :post), {
           max_age: max_age,
           max_uses: max_uses,
           temporary: temporary,
@@ -461,7 +461,7 @@ module Discorb
     #
     def follow_from(target, reason: nil)
       Async do
-        @client.http.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{target.id}/followers", "//channels/:channel_id/followers", :post), { webhook_channel_id: @id }, audit_log_reason: reason).wait
       end
     end
 
@@ -476,7 +476,7 @@ module Discorb
     #
     def follow_to(target, reason: nil)
       Async do
-        @client.http.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}/followers", "//channels/:channel_id/followers", :post), { webhook_channel_id: target.id }, audit_log_reason: reason).wait
       end
     end
 
@@ -497,17 +497,15 @@ module Discorb
     def start_thread(name, message: nil, auto_archive_duration: 1440, public: true, rate_limit_per_user: nil, slowmode: nil, reason: nil)
       Async do
         _resp, data = if message.nil?
-            @client.http.post(
-              "/channels/#{@id}/threads", {
-                name: name,
-                auto_archive_duration: auto_archive_duration,
-                type: public ? 11 : 10,
-                rate_limit_per_user: rate_limit_per_user || slowmode,
-              },
-              audit_log_reason: reason,
-            ).wait
+            @client.http.request(Route.new("/channels/#{@id}/threads", "//channels/:channel_id/threads", :post), {
+              name: name,
+              auto_archive_duration: auto_archive_duration,
+              type: public ? 11 : 10,
+              rate_limit_per_user: rate_limit_per_user || slowmode,
+            },
+                                 audit_log_reason: reason).wait
           else
-            @client.http.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
+            @client.http.request(Route.new("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", "//channels/:channel_id/messages/:message_id/threads", :post), {
               name: name, auto_archive_duration: auto_archive_duration,
             }, audit_log_reason: reason).wait
           end
@@ -525,7 +523,7 @@ module Discorb
     #
     def fetch_archived_public_threads
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/public").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/threads/archived/public", "//channels/:channel_id/threads/archived/public", :get)).wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -538,7 +536,7 @@ module Discorb
     #
     def fetch_archived_private_threads
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/private").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/threads/archived/private", "//channels/:channel_id/threads/archived/private", :get)).wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -558,7 +556,7 @@ module Discorb
           before = 0
           threads = []
           loop do
-            _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
+            _resp, data = @client.http.request(Route.new("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}", "//channels/:channel_id/users/@me/threads/archived/private", :get)).wait
             threads += data[:threads].map { |thread| Channel.make_channel(@client, thread) }
             before = data[:threads][-1][:id]
 
@@ -566,7 +564,7 @@ module Discorb
           end
           threads
         else
-          _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
+          _resp, data = @client.http.request(Route.new("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}", "//channels/:channel_id/users/@me/threads/archived/private", :get)).wait
           data.map { |thread| Channel.make_channel(@client, thread) }
         end
       end
@@ -634,7 +632,7 @@ module Discorb
         payload[:user_limit] = user_limit if user_limit != Discorb::Unset
         payload[:rtc_region] = rtc_region if rtc_region != Discorb::Unset
 
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -707,7 +705,7 @@ module Discorb
         payload[:position] = position if position != Discorb::Unset
         payload[:bitrate] = bitrate if bitrate != Discorb::Unset
         payload[:rtc_region] = rtc_region if rtc_region != Discorb::Unset
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -726,7 +724,7 @@ module Discorb
     #
     def start(topic, public: false, reason: nil)
       Async do
-        _resp, data = @client.http.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
+        _resp, data = @client.http.request(Route.new("/stage-instances", "//stage-instances", :post), { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
         StageInstance.new(@client, data)
       end
     end
@@ -740,7 +738,7 @@ module Discorb
     #
     def fetch_stage_instance
       Async do
-        _resp, data = @client.http.get("/stage-instances/#{@id}").wait
+        _resp, data = @client.http.request(Route.new("/stage-instances/#{@id}", "//stage-instances/:stage_instance_id", :get)).wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -863,7 +861,7 @@ module Discorb
         auto_archive_duration ||= archive_in
         payload[:auto_archive_duration] = auto_archive_duration if auto_archive_duration != Discorb::Unset
         payload[:locked] = locked if locked != Discorb::Unset
-        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.request(Route.new("/channels/#{@id}", "//channels/:channel_id", :patch), payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -952,9 +950,9 @@ module Discorb
     def add_member(member = :me)
       Async do
         if member == :me
-          @client.http.post("/channels/#{@id}/thread-members/@me").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/@me", "//channels/:channel_id/thread-members/@me", :post)).wait
         else
-          @client.http.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}", "//channels/:channel_id/thread-members/:user_id", :post)).wait
         end
       end
     end
@@ -971,9 +969,9 @@ module Discorb
     def remove_member(member = :me)
       Async do
         if member == :me
-          @client.http.delete("/channels/#{@id}/thread-members/@me").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/@me", "//channels/:channel_id/thread-members/@me", :delete)).wait
         else
-          @client.http.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.request(Route.new("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}", "//channels/:channel_id/thread-members/:user_id", :delete)).wait
         end
       end
     end
@@ -987,7 +985,7 @@ module Discorb
     #
     def fetch_members
       Async do
-        _resp, data = @client.http.get("/channels/#{@id}/thread-members").wait
+        _resp, data = @client.http.request(Route.new("/channels/#{@id}/thread-members", "//channels/:channel_id/thread-members", :get)).wait
         data.map { |d| @members[d[:id]] = Member.new(@client, d) }
       end
     end
@@ -1062,24 +1060,26 @@ module Discorb
   end
 
   class CategoryChannel < GuildChannel
-    attr_reader :channels
-
     @channel_type = 4
 
+    def channels
+      @client.channels.values.filter { |channel| channel.parent == self }
+    end
+
     def text_channels
-      @channels.filter { |c| c.is_a? TextChannel }
+      channels.filter { |c| c.is_a? TextChannel }
     end
 
     def voice_channels
-      @channels.filter { |c| c.is_a? VoiceChannel }
+      channels.filter { |c| c.is_a? VoiceChannel }
     end
 
     def news_channel
-      @channels.filter { |c| c.is_a? NewsChannel }
+      channels.filter { |c| c.is_a? NewsChannel }
     end
 
     def stage_channels
-      @channels.filter { |c| c.is_a? StageChannel }
+      channels.filter { |c| c.is_a? StageChannel }
     end
 
     def create_text_channel(*args, **kwargs)
@@ -1097,13 +1097,6 @@ module Discorb
     def create_stage_channel(*args, **kwargs)
       guild.create_stage_channel(*args, parent: self, **kwargs)
     end
-
-    private
-
-    def _set_data(data)
-      @channels = @client.channels.values.filter { |channel| channel.parent == self }
-      super
-    end
   end
 
   class DMChannel < Channel

data/lib/discorb/client.rb

@@ -63,7 +63,7 @@ module Discorb
     # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions that the client is using.
     # @param [Discorb::Intents] intents The intents that the client is currently using.
     # @param [Integer] message_caches The number of messages to cache.
-    # @param [#puts] log The IO object to use for logging.
+    # @param [#write] log The IO object to use for logging.
     # @param [Boolean] colorize_log Whether to colorize the log.
     # @param [:debug, :info, :warn, :error, :critical] log_level The log level.
     # @param [Boolean] wait_until_ready Whether to delay event dispatch until ready.
@@ -212,7 +212,7 @@ module Discorb
     #
     def fetch_user(id)
       Async do
-        _resp, data = http.get("/users/#{id}").wait
+        _resp, data = @http.request(Route.new("/users/#{id}", "//users/:user_id", :get)).wait
         User.new(self, data)
       end
     end
@@ -229,7 +229,7 @@ module Discorb
     #
     def fetch_channel(id)
       Async do
-        _resp, data = http.get("/channels/#{id}").wait
+        _resp, data = @http.request(Route.new("/channels/#{id}", "//channels/:channel_id", :get)).wait
         Channel.make_channel(self, data)
       end
     end
@@ -246,7 +246,7 @@ module Discorb
     #
     def fetch_guild(id)
       Async do
-        _resp, data = http.get("/guilds/#{id}").wait
+        _resp, data = @http.request(Route.new("/guilds/#{id}", "//guilds/:guild_id", :get)).wait
         Guild.new(self, data, false)
       end
     end
@@ -263,7 +263,7 @@ module Discorb
     #
     def fetch_invite(code, with_count: false, with_expiration: false)
       Async do
-        _resp, data = http.get("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}").wait
+        _resp, data = @http.request(Route.new("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}", "//invites/:code", :get)).wait
         Invite.new(self, data, false)
       end
     end
@@ -281,7 +281,7 @@ module Discorb
       Async do
         next @application if @application && !force
 
-        _resp, data = http.get("/oauth2/applications/@me").wait
+        _resp, data = @http.request(Route.new("/oauth2/applications/@me", "//oauth2/applications/@me", :get)).wait
         @application = Application.new(self, data)
         @application
       end
@@ -295,7 +295,7 @@ module Discorb
     #
     def fetch_nitro_sticker_packs
       Async do
-        _resp, data = http.get("/stickers-packs").wait
+        _resp, data = @http.request(Route.new("/stickers-packs", "//stickers-packs", :get)).wait
         data.map { |pack| Sticker::Pack.new(self, pack) }
       end
     end

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 
@@ -117,6 +117,35 @@ module Discorb
     alias id to_s
   end
 
+  #
+  # Represents an endpoint.
+  # @private
+  #
+  class Route
+    attr_reader :url, :key, :method
+
+    def initialize(url, key, method)
+      @url = url
+      @key = key
+      @method = method
+    end
+
+    def hash
+      @url.hash
+    end
+
+    def identifier
+      "#{@method} #{@key}"
+    end
+
+    def major_param
+      param_type = @key.split("/").find { |k| k.start_with?(":") }
+      return "" unless param_type
+      param = url.gsub(API_BASE_URL, "").split("/")[@key.split("/").index(param_type) - 1]
+      %w[:channel_id :guild_id :webhook_id].include?(param_type) ? param : ""
+    end
+  end
+
   # @return [Object] Object that represents nil.
   #   This is used as a default value for optional parameters.
   Unset = Object.new

data/lib/discorb/dictionary.rb

@@ -16,6 +16,7 @@ module Discorb
       @cache = hash.transform_keys(&:to_s)
       @limit = limit
       @sort = sort
+      @cache = @cache.sort_by(&@sort).to_h if @sort
     end
 
     #
@@ -39,7 +40,7 @@ module Discorb
     # @param [Discorb::Dictionary] other The dictionary to merge.
     #
     def merge(other)
-      @cache.merge!(other)
+      @cache.merge!(other.to_h)
     end
 
     #
@@ -73,6 +74,13 @@ module Discorb
       end
     end
 
+    #
+    # Convert the dictionary to a hash.
+    #
+    def to_h
+      @cache
+    end
+
     #
     # Returns the values of the dictionary.
     #
@@ -104,7 +112,7 @@ module Discorb
       end
     end
 
-    def respond_to_missing?(name, args, kwargs)
+    def respond_to_missing?(name, ...)
       if values.respond_to?(name)
         true
       else

data/lib/discorb/emoji.rb

@@ -96,7 +96,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name != Discorb::Unset
         payload[:roles] = roles.map { |r| Discorb::Utils.try(r, :id) } if roles != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :patch), payload, audit_log_reason: reason)
         self
       end
     end
@@ -113,7 +113,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :delete), audit_log_reason: reason).wait
         @available = false
         self
       end