discorb 0.16.0 → 0.18.0

data/lib/discorb/interaction/response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents an interaction of Discord.
@@ -8,6 +9,8 @@ module Discorb
     # A module for response with source.
     #
     module SourceResponder
+      # @type instance: Discorb::Interaction
+
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
@@ -19,12 +22,18 @@ module Discorb
       #
       def defer_source(ephemeral: false)
         Async do
-          @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
-            type: 5,
-            data: {
-              flags: (ephemeral ? 1 << 6 : 0),
-            },
-          }).wait
+          @client.http.request(
+            Route.new(
+              "/interactions/#{@id}/#{@token}/callback",
+              "//interactions/:interaction_id/:token/callback",
+              :post
+            ), {
+              type: 5,
+              data: {
+                flags: (ephemeral ? 1 << 6 : 0),
+              },
+            }
+          ).wait
           @defered = true
         end
       end
@@ -39,30 +48,77 @@ module Discorb
       # @param [Discorb::Embed] embed The embed to send.
       # @param [Array<Discorb::Embed>] embeds The embeds to send. (max: 10)
       # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions to send.
+      # @param [Discorb::Attachment] attachment The attachment to send.
+      # @param [Array<Discorb::Attachment>] attachments The attachments to send. (max: 10)
       # @param [Array<Discorb::Component>, Array<Array<Discorb::Component>>] components The components to send.
       # @param [Boolean] ephemeral Whether to make the response ephemeral.
       #
-      # @return [Discorb::Interaction::SourceResponder::CallbackMessage, Discorb::Webhook::Message] The callback message.
+      # @return [Discorb::Interaction::SourceResponder::CallbackMessage, Discorb::Webhook::Message]
+      #   The callback message.
       #
-      def post(content = nil, tts: false, embed: nil, embeds: nil, allowed_mentions: nil, components: nil, ephemeral: false)
+      def post(
+        content = nil,
+        tts: false,
+        embed: nil,
+        embeds: nil,
+        allowed_mentions: nil,
+        attachment: nil,
+        attachments: nil,
+        components: nil,
+        ephemeral: false
+      )
         Async do
           payload = {}
           payload[:content] = content if content
           payload[:tts] = tts
           payload[:embeds] = (embeds || [embed]).map { |e| e&.to_hash }.filter { _1 }
-          payload[:allowed_mentions] = allowed_mentions&.to_hash(@client.allowed_mentions) || @client.allowed_mentions.to_hash
+          payload[: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)
+          attachments ||= attachment ? [attachment] : []
+
+          payload[:attachments] = attachments.map.with_index do |a, i|
+            {
+              id: i,
+              filename: a.filename,
+              description: a.description,
+            }
+          end
 
           ret = if @responded
-              _resp, data = @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}", "//webhooks/:webhook_id/:token", :post), payload).wait
+              _resp, data = @client.http.multipart_request(
+                Route.new(
+                  "/webhooks/#{@application_id}/#{@token}",
+                  "//webhooks/:webhook_id/:token",
+                  :post
+                ),
+                payload,
+                attachments
+              ).wait
               webhook = Webhook::URLWebhook.new("/webhooks/#{@application_id}/#{@token}")
               Webhook::Message.new(webhook, data, @client)
             elsif @defered
-              @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :patch), payload).wait
+              @client.http.multipart_request(
+                Route.new(
+                  "/webhooks/#{@application_id}/#{@token}/messages/@original",
+                  "//webhooks/:webhook_id/:token/messages/@original",
+                  :patch
+                ),
+                payload,
+                attachments
+              ).wait
               CallbackMessage.new(@client, payload, @application_id, @token)
             else
-              @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), { type: 4, data: payload }).wait
+              @client.http.multipart_request(
+                Route.new(
+                  "/interactions/#{@id}/#{@token}/callback",
+                  "//interactions/:interaction_id/:token/callback",
+                  :post
+                ),
+                { type: 4, data: payload },
+                attachments
+              ).wait
               CallbackMessage.new(@client, payload, @application_id, @token)
             end
           @responded = true
@@ -99,8 +155,8 @@ module Discorb
         # @param [Discorb::Embed] embed The new embed of the message.
         # @param [Array<Discorb::Embed>] embeds The new embeds of the message.
         # @param [Array<Discorb::Attachment>] attachments The attachments to remain.
-        # @param [Discorb::File] file The file to send.
-        # @param [Array<Discorb::File>] files The files to send.
+        # @param [Discorb::Attachment] file The file to send.
+        # @param [Array<Discorb::Attachment>] files The files to send.
         #
         # @return [Async::Task<void>] The task.
         #
@@ -118,7 +174,15 @@ 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_request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :patch), 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,
+            ).wait
           end
         end
 
@@ -133,7 +197,8 @@ module Discorb
         #
         def delete!
           Async do
-            @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :delete)).wait
+            @client.http.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original",
+                                           "//webhooks/:webhook_id/:token/messages/@original", :delete)).wait
           end
         end
 
@@ -147,6 +212,8 @@ module Discorb
     # A module for response with update.
     #
     module UpdateResponder
+      # @type instance: Discorb::Interaction
+
       #
       # Response with `DEFERRED_UPDATE_MESSAGE`(`6`).
       # @async
@@ -157,12 +224,18 @@ module Discorb
       #
       def defer_update(ephemeral: false)
         Async do
-          @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
-            type: 6,
-            data: {
-              flags: (ephemeral ? 1 << 6 : 0),
-            },
-          }).wait
+          @client.http.request(
+            Route.new(
+              "/interactions/#{@id}/#{@token}/callback",
+              "//interactions/:interaction_id/:token/callback",
+              :post
+            ), {
+              type: 6,
+              data: {
+                flags: (ephemeral ? 1 << 6 : 0),
+              },
+            }
+          ).wait
         end
       end
 
@@ -176,12 +249,24 @@ module Discorb
       # @param [Discorb::Embed] embed The embed to send.
       # @param [Array<Discorb::Embed>] embeds The embeds to send. (max: 10)
       # @param [Discorb::AllowedMentions] allowed_mentions The allowed mentions to send.
+      # @param [Discorb::Attachment] attachment The attachment to send.
+      # @param [Array<Discorb::Attachment>] attachments The attachments to send. (max: 10)
       # @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)
+      def edit(
+        content,
+        tts: false,
+        embed: nil,
+        embeds: nil,
+        allowed_mentions: nil,
+        attachment: nil,
+        attachments: nil,
+        components: nil,
+        ephemeral: false
+      )
         Async do
           payload = {}
           payload[:content] = content if content
@@ -192,10 +277,22 @@ module Discorb
               embeds
             end
           payload[:embeds] = tmp_embed.map(&:to_hash) if tmp_embed
-          payload[:allowed_mentions] = allowed_mentions ? allowed_mentions.to_hash(@client.allowed_mentions) : @client.allowed_mentions.to_hash
+          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.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), { type: 7, data: payload }).wait
+          attachments ||= [attachment] if attachment
+          payload[:attachments] = attachments.map.with_index do |a, i|
+            {
+              id: i,
+              filename: a.filename,
+              description: a.description,
+            }
+          end
+          @client.http.multipart_request(
+            Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback",
+                      :post), { type: 7, data: payload }, attachments
+          ).wait
         end
       end
     end
@@ -204,6 +301,8 @@ module Discorb
     # A module for response with modal.
     #
     module ModalResponder
+      # @type instance: Discorb::Interaction
+
       #
       # Response with `MODAL`(`9`).
       #
@@ -224,7 +323,7 @@ module Discorb
 
     private
 
-    def _set_data(*)
+    def _set_data(_)
       nil
     end
   end

data/lib/discorb/interaction/root.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents a user interaction with the bot.
@@ -10,10 +11,9 @@ module Discorb
     attr_reader :application_id
     # @return [Symbol] The type of interaction.
     attr_reader :type
-    # @return [Discorb::Member] The member that created the interaction.
-    attr_reader :member
-    # @return [Discorb::User] The user that created the interaction.
+    # @return [Discorb::User, Discorb::Member] The user or member that created the interaction.
     attr_reader :user
+    alias member user
     # @return [Integer] The type of interaction.
     # @note This is always `1` for now.
     attr_reader :version
@@ -53,8 +53,12 @@ module Discorb
       @type_id = self.class.interaction_type
       @guild_id = data[:guild_id] && Snowflake.new(data[:guild_id])
       @channel_id = data[:channel_id] && Snowflake.new(data[:channel_id])
-      @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]
+      if data[:member]
+        @user = guild.members[data[:member][:id]] || Member.new(@client, @guild_id, data[:member][:user],
+                                                                data[:member])
+      elsif data[:user]
+        @user = @client.users[data[:user][:id]] || User.new(@client, data[:user])
+      end
       @token = data[:token]
       @locale = data[:locale].to_s.gsub("-", "_").to_sym
       @guild_locale = data[:guild_locale].to_s.gsub("-", "_").to_sym
@@ -72,13 +76,6 @@ module Discorb
       @client.channels[@channel_id]
     end
 
-    def target
-      @member || @user
-    end
-
-    alias fired_by target
-    alias from target
-
     def inspect
       "#<#{self.class} id=#{@id}>"
     end
@@ -97,7 +94,10 @@ module Discorb
       def make_interaction(client, data)
         interaction = nil
         descendants.each do |klass|
-          interaction = klass.make_interaction(client, data) if !klass.interaction_type.nil? && klass.interaction_type == data[:type]
+          if !klass.interaction_type.nil? && klass.interaction_type == data[:type]
+            interaction = klass.make_interaction(client,
+                                                 data)
+          end
         end
         if interaction.nil?
           client.logger.warn("Unknown interaction type #{data[:type]}, initialized Interaction")

data/lib/discorb/interaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 %w[root response command components autocomplete modal].each do |file|
   require_relative "interaction/#{file}.rb"
 end

data/lib/discorb/invite.rb

@@ -114,7 +114,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.request(Route.new("/invites/#{@code}", "//invites/:code", :delete), audit_log_reason: reason)
+        @client.http.request(Route.new("/invites/#{@code}", "//invites/:code", :delete), {}, audit_log_reason: reason)
       end
     end
 
@@ -134,7 +134,10 @@ module Discorb
       end
       @inviter_data = data[:inviter]
       @target_type = TARGET_TYPES[data[:target_type]]
-      @target_user = @client.users[data[:target_user][:id]] || User.new(@client, data[:target_user]) if data[:target_user]
+      if data[:target_user]
+        @target_user = @client.users[data[:target_user][:id]] || User.new(@client,
+                                                                          data[:target_user])
+      end
       # @target_application = nil
 
       # @stage_instance = data[:stage_instance] && Invite::StageInstance.new(self, data[:stage_instance])

data/lib/discorb/member.rb

@@ -52,10 +52,10 @@ module Discorb
     #   @return [Discorb::Presence] The presence of the member.
     # @!attribute [r] activity
     #   @macro client_cache
-    #   @return [Discorb::Activity] The activity of the member. It's from the {#presence}.
+    #   @return [Discorb::Presence::Activity] The activity of the member. It's from the {#presence}.
     # @!attribute [r] activities
     #   @macro client_cache
-    #   @return [Array<Discorb::Activity>] The activities of the member. It's from the {#presence}.
+    #   @return [Array<Discorb::Presence::Activity>] The activities of the member. It's from the {#presence}.
     # @!attribute [r] status
     #   @macro client_cache
     #   @return [Symbol] The status of the member. It's from the {#presence}.
@@ -114,6 +114,7 @@ module Discorb
 
     def permissions
       return Permission.new((1 << 38) - 1) if owner?
+
       roles.map(&:permissions).sum(Permission.new(0))
     end
 
@@ -158,7 +159,10 @@ module Discorb
     #
     def add_role(role, reason: nil)
       Async do
-        @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
+        @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
 
@@ -173,7 +177,10 @@ module Discorb
     #
     def remove_role(role, reason: nil)
       Async do
-        @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
+        @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
 
@@ -194,7 +201,13 @@ module Discorb
     # @return [Async::Task<void>] The task.
     #
     def edit(
-      nick: Discorb::Unset, role: Discorb::Unset, mute: Discorb::Unset, deaf: Discorb::Unset, channel: Discorb::Unset, communication_disabled_until: Discorb::Unset, timeout_until: Discorb::Unset,
+      nick: Discorb::Unset,
+      role: Discorb::Unset,
+      mute: Discorb::Unset,
+      deaf: Discorb::Unset,
+      channel: Discorb::Unset,
+      communication_disabled_until: Discorb::Unset,
+      timeout_until: Discorb::Unset,
       reason: nil
     )
       Async do
@@ -204,9 +217,15 @@ module Discorb
         payload[:mute] = mute if mute != Discorb::Unset
         payload[:deaf] = deaf if deaf != Discorb::Unset
         communication_disabled_until = timeout_until if timeout_until != Discorb::Unset
-        payload[:communication_disabled_until] = communication_disabled_until&.iso8601 if communication_disabled_until != Discorb::Unset
+        if communication_disabled_until != Discorb::Unset
+          payload[:communication_disabled_until] =
+            communication_disabled_until&.iso8601
+        end
         payload[:channel_id] = channel&.id if channel != Discorb::Unset
-        @client.http.request(Route.new("/guilds/#{@guild_id}/members/#{@id}", "//guilds/:guild_id/members/:user_id", :patch), 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
 
@@ -265,6 +284,7 @@ module Discorb
     #
     def can_manage?(role)
       return true if owner?
+
       top_role = roles.max_by(&:position)
       top_role.position > role.position
     end
@@ -283,7 +303,7 @@ module Discorb
       @deaf = member_data[:deaf]
       @custom_avatar = member_data[:avatar] && Asset.new(self, member_data[:avatar])
       super(user_data)
-      @display_avatar = @avatar || @custom_avatar
+      @display_avatar = @custom_avatar || @avatar
       @client.guilds[@guild_id].members[@id] = self unless @guild_id.nil? || @client.guilds[@guild_id].nil?
       @_member_data.update(member_data)
     end

data/lib/discorb/message.rb

@@ -7,7 +7,7 @@ module Discorb
   class Message < DiscordModel
     # @return [Discorb::Snowflake] The ID of the message.
     attr_reader :id
-    # @return [Discorb::User, Discorb::Member] The user that sent the message.
+    # @return [Discorb::User, Discorb::Member, Webhook::Message::Author] The user that sent the message.
     attr_reader :author
     # @return [String] The content of the message.
     attr_reader :content
@@ -85,7 +85,9 @@ module Discorb
     # @return [Boolean] Whether the message is pinned.
     attr_reader :pinned
     alias pinned? pinned
-    @message_type = {
+    # @private
+    # @return [{Integer => Symbol}] The mapping of message type.
+    MESSAGE_TYPE = {
       0 => :default,
       1 => :recipient_add,
       2 => :recipient_remove,
@@ -215,8 +217,8 @@ module Discorb
       end
       if role
         ret.gsub!(/<@&(\d+)>/) do |_match|
-          role = guild&.roles&.[]($1)
-          role ? "@#{role.name}" : "@Unknown Role"
+          r = guild&.roles&.[]($1)
+          r ? "@#{r.name}" : "@Unknown Role"
         end
       end
       if emoji
@@ -257,8 +259,15 @@ module Discorb
     #
     # @return [Async::Task<void>] The task.
     #
-    def edit(content = Discorb::Unset, embed: Discorb::Unset, embeds: Discorb::Unset, allowed_mentions: Discorb::Unset,
-                                       attachments: Discorb::Unset, components: Discorb::Unset, supress: Discorb::Unset)
+    def edit(
+      content = Discorb::Unset,
+      embed: Discorb::Unset,
+      embeds: Discorb::Unset,
+      allowed_mentions: Discorb::Unset,
+      attachments: Discorb::Unset,
+      components: Discorb::Unset,
+      supress: Discorb::Unset
+    )
       Async do
         channel.edit_message(@id, content, embed: embed, embeds: embeds, allowed_mentions: allowed_mentions,
                                            attachments: attachments, components: components, supress: supress).wait
@@ -284,15 +293,17 @@ module Discorb
     #
     # @param [Boolean] fail_if_not_exists Whether to raise an error if the message does not exist.
     #
-    # @return [Hash] The reference object.
+    # @return [Discorb::Message::Reference] The reference object.
     #
     def to_reference(fail_if_not_exists: true)
-      {
-        message_id: @id,
-        channel_id: @channel_id,
-        guild_id: @guild_id,
-        fail_if_not_exists: fail_if_not_exists,
-      }
+      Reference.from_hash(
+        {
+          message_id: @id,
+          channel_id: @channel_id,
+          guild_id: @guild_id,
+          fail_if_not_exists: fail_if_not_exists,
+        }
+      )
     end
 
     def embed
@@ -331,7 +342,10 @@ module Discorb
     #
     def add_reaction(emoji)
       Async do
-        @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
+        @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
 
@@ -347,7 +361,11 @@ module Discorb
     #
     def remove_reaction(emoji)
       Async do
-        @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
+        @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
 
@@ -364,7 +382,17 @@ module Discorb
     #
     def remove_reaction_of(emoji, member)
       Async do
-        @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
+        @client.http.request(
+          Route.new(
+            "/channels/#{@channel_id}/messages/#{@id}/reactions/#{emoji.to_uri}/#{if member.is_a?(Member)
+              member.id
+            else
+              member
+            end}",
+            "//channels/:channel_id/messages/:message_id/reactions/:emoji/:user_id",
+            :delete
+          )
+        ).wait
       end
     end
 
@@ -374,7 +402,7 @@ module Discorb
     # Fetch reacted users of reaction.
     # @async
     #
-    # @param [Discorb::Emoji] emoji The emoji to fetch.
+    # @param [Discorb::Emoji, Discorb::PartialEmoji] emoji The emoji to fetch.
     # @param [Integer, nil] limit The maximum number of users to fetch. `nil` for no limit.
     # @param [Discorb::Snowflake, nil] after The ID of the user to start fetching from.
     #
@@ -386,7 +414,13 @@ module Discorb
           after = 0
           users = []
           loop do
-            _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
+            _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) }
@@ -397,7 +431,13 @@ module Discorb
           end
           next users
         else
-          _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
+          _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
@@ -487,7 +527,7 @@ module Discorb
       @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.from_hash(e) } : []
       @reactions = data[:reactions] ? data[:reactions].map { |r| Reaction.new(self, r) } : []
       @pinned = data[:pinned]
-      @type = self.class.message_type[data[:type]]
+      @type = MESSAGE_TYPE[data[:type]]
       @activity = data[:activity] && Activity.new(data[:activity])
       @application_id = data[:application_id]
       @message_reference = data[:message_reference] && Reference.from_hash(data[:message_reference])
@@ -500,10 +540,5 @@ module Discorb
       @data.update(data)
       @deleted = false
     end
-
-    class << self
-      # @private
-      attr_reader :message_type
-    end
   end
 end

data/lib/discorb/message_meta.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents a message in Discord.
@@ -75,8 +76,6 @@ module Discorb
         }
       end
 
-      alias to_reference to_hash
-
       #
       # Initialize a new reference from a hash.
       #
@@ -140,7 +139,8 @@ module Discorb
       def initialize(client, data)
         @id = Snowflake.new(data[:id])
         @name = data[:name]
-        @type = Discorb::Interaction.descendants.find { |c| c.interaction_type == data[:type] }
+        @type = (Discorb::Interaction.descendants.find { |c| c.interaction_type == data[:type] } or
+                 raise "Unknown interaction type: #{data[:type]}")
         @user = client.users[data[:user][:id]] || User.new(client, data[:user])
       end