discorb 0.15.0 → 0.17.0

data/lib/discorb/interaction/response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents an interaction of Discord.
@@ -19,12 +20,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
@@ -42,27 +49,45 @@ 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 [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,
+        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)
 
           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.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.request(Route.new("/webhooks/#{@application_id}/#{@token}/messages/@original", "//webhooks/:webhook_id/:token/messages/@original", :patch), 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.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), { 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
@@ -74,7 +99,15 @@ module Discorb
       # Represents of a callback message of interaction.
       #
       class CallbackMessage
+        #
+        # Initializes a new instance of CallbackMessage.
         # @private
+        #
+        # @param [Client] client The client.
+        # @param [Hash] data The payload.
+        # @param [String] application_id The application ID.
+        # @param [String] token The token.
+        #
         def initialize(client, data, application_id, token)
           @client = client
           @data = data
@@ -110,7 +143,10 @@ 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, headers: headers,
+            ).wait
           end
         end
 
@@ -125,9 +161,14 @@ 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
+
+        def inspect
+          "#<#{self.class.name} application_id=#{@application_id}"
+        end
       end
     end
 
@@ -145,12 +186,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
 
@@ -180,10 +227,14 @@ 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
+          @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

@@ -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
@@ -38,7 +38,13 @@ module Discorb
     @interaction_type = nil
     @interaction_name = nil
 
+    #
+    # Initialize a new interaction.
     # @private
+    #
+    # @param [Discorb::Client] client The client this interaction belongs to.
+    # @param [Hash] data The data of the interaction.
+    #
     def initialize(client, data)
       @client = client
       @id = Snowflake.new(data[:id])
@@ -47,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
@@ -66,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
@@ -81,20 +84,32 @@ module Discorb
       # @private
       attr_reader :interaction_type, :interaction_name, :event_name
 
+      #
+      # Create a new Interaction instance from the data.
       # @private
+      #
+      # @param [Discorb::Client] client The client this interaction belongs to.
+      # @param [Hash] data The data of the interaction.
+      #
       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.log.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
+          client.logger.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
           interaction = Interaction.new(client, data)
         end
         interaction
       end
 
+      #
+      # Returns the descendants of the class.
       # @private
+      #
       def descendants
         ObjectSpace.each_object(Class).select { |klass| klass < self }
       end

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

@@ -66,13 +66,22 @@ module Discorb
     #   Whether the invite is temporary.
     #   @return [Boolean]
 
-    @target_types = {
+    # @private
+    # @return [{Integer => Symbol}] The mapping of target types.
+    TARGET_TYPES = {
       nil => :voice,
       1 => :stream,
       2 => :guild,
     }.freeze
 
+    #
+    # Initialize a new invite.
     # @private
+    #
+    # @param [Discorb::Client] client The client.
+    # @param [Hash] data The data of invite.
+    # @param [Boolean] gateway Whether the data is from gateway.
+    #
     def initialize(client, data, gateway)
       @client = client
       @data = data[:data]
@@ -105,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
 
@@ -124,8 +133,11 @@ module Discorb
         @expires_at = data[:expires_at] && Time.iso8601(data[:expires_at])
       end
       @inviter_data = data[:inviter]
-      @target_type = self.class.target_types[data[:target_type]]
-      @target_user = @client.users[data[:target_user][:id]] || User.new(@client, data[:target_user]) if data[:target_user]
+      @target_type = TARGET_TYPES[data[:target_type]]
+      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])
@@ -137,10 +149,5 @@ module Discorb
       @temporary = data[:temporary]
       @created_at = Time.iso8601(data[:created_at])
     end
-
-    class << self
-      # @private
-      attr_reader :target_types
-    end
   end
 end

data/lib/discorb/member.rb

@@ -62,7 +62,15 @@ module Discorb
     # @!attribute [r] owner?
     #   @return [Boolean] Whether the member is the owner of the guild.
 
+    #
+    # Initialize a new instance of the member.
     # @private
+    #
+    # @param [Discorb::Client] client The client.
+    # @param [Discorb::Snowflake] guild_id The ID of the guild.
+    # @param [Hash] user_data The data of the user.
+    # @param [Hash] member_data The data of the member.
+    #
     def initialize(client, guild_id, user_data, member_data)
       @guild_id = guild_id
       @client = client
@@ -106,6 +114,7 @@ module Discorb
 
     def permissions
       return Permission.new((1 << 38) - 1) if owner?
+
       roles.map(&:permissions).sum(Permission.new(0))
     end
 
@@ -150,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
 
@@ -165,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
 
@@ -186,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
@@ -196,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
 
@@ -248,6 +275,20 @@ module Discorb
       end
     end
 
+    #
+    # Checks if the member can manage the given role.
+    #
+    # @param [Discorb::Role] role The role.
+    #
+    # @return [Boolean] `true` if the member can manage the role.
+    #
+    def can_manage?(role)
+      return true if owner?
+
+      top_role = roles.max_by(&:position)
+      top_role.position > role.position
+    end
+
     private
 
     def _set_data(user_data, member_data)

data/lib/discorb/message.rb

@@ -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,
@@ -152,7 +154,14 @@ module Discorb
       !@guild_id.nil?
     end
 
+    #
+    # Initialize a new message.
     # @private
+    #
+    # @param [Discorb::Client] client The client.
+    # @param [Hash] data The data of the welcome screen.
+    # @param [Boolean] no_cache Whether to disable caching.
+    #
     def initialize(client, data, no_cache: false)
       @client = client
       @data = {}
@@ -250,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
@@ -324,7 +340,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
 
@@ -340,7 +359,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
 
@@ -357,7 +380,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
 
@@ -379,7 +412,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) }
@@ -390,7 +429,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
@@ -446,7 +491,8 @@ module Discorb
       "#<#{self.class} #{@content.inspect} id=#{@id}>"
     end
 
-    # @private
+    private
+
     def _set_data(data)
       @id = Snowflake.new(data[:id])
       @channel_id = data[:channel_id]
@@ -479,7 +525,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])
@@ -492,10 +538,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.
@@ -88,18 +89,31 @@ module Discorb
       def self.from_hash(data)
         new(data[:guild_id], data[:channel_id], data[:message_id], fail_if_not_exists: data[:fail_if_not_exists])
       end
+
+      def inspect
+        "#<#{self.class.name} #{@channel_id}/#{@message_id}>"
+      end
     end
 
     #
     # Represents a sticker.
     #
     class Sticker
-      attr_reader :id, :name, :format
+      # @return [Discorb::Snowflake] The sticker ID.
+      attr_reader :id
+      # @return [String] The sticker name.
+      attr_reader :name
+      # @return [Symbol] The sticker format.
+      attr_reader :format
 
       def initialize(data)
         @id = Snowflake.new(data[:id])
         @name = data[:name]
-        @format = Discorb::Sticker.sticker_format[data[:format]]
+        @format = Discorb::Sticker::STICKER_FORMAT[data[:format]]
+      end
+
+      def inspect
+        "#<#{self.class.name} #{@id}: #{@name} format=#{@format}>"
       end
     end
 
@@ -107,7 +121,7 @@ module Discorb
     # Represents a interaction of message.
     #
     class Interaction < DiscordModel
-      # @return [Discorb::Snowflake] The user ID.
+      # @return [Discorb::Snowflake] The interaction ID.
       attr_reader :id
       # @return [String] The name of command.
       # @return [nil] If the message is not a command.
@@ -117,13 +131,23 @@ module Discorb
       # @return [Discorb::User] The user.
       attr_reader :user
 
+      #
+      # Initialize a new interaction.
       # @private
+      #
+      # @param [Discorb::Client] client The client.
+      # @param [Hash] data The interaction data.
+      #
       def initialize(client, data)
         @id = Snowflake.new(data[:id])
         @name = data[:name]
         @type = Discorb::Interaction.descendants.find { |c| c.interaction_type == data[:type] }
         @user = client.users[data[:user][:id]] || User.new(client, data[:user])
       end
+
+      def inspect
+        "<#{self.class.name} #{@id}: #{@name} type=#{@type} #{@user}>"
+      end
     end
 
     #
@@ -135,22 +159,28 @@ module Discorb
       # @return [Symbol] The type of activity.
       attr_reader :type
 
-      @type = {
+      # @private
+      # @return [{Integer => Symbol}] The mapping of activity type.
+      TYPES = {
         1 => :join,
         2 => :spectate,
         3 => :listen,
         5 => :join_request,
-      }
+      }.freeze
 
+      #
+      # Initialize a new activity.
       # @private
+      #
+      # @param [Hash] data The activity data.
+      #
       def initialize(data)
         @name = data[:name]
-        @type = self.class.type(data[:type])
+        @type = TYPES[data[:type]]
       end
 
-      class << self
-        # @private
-        attr_reader :type
+      def inspect
+        "<#{self.class.name} #{@name} type=#{@type}>"
       end
     end
   end