discorb 0.13.4 → 0.15.1

data/lib/discorb/gateway.rb

@@ -14,12 +14,22 @@ module Discorb
   module Gateway
     #
     # Represents an event.
+    # @abstract
     #
     class GatewayEvent
+      #
+      # Initializes a new instance of the GatewayEvent class.
       # @private
+      #
+      # @param [Hash] data The data of the event.
+      #
       def initialize(data)
         @data = data
       end
+
+      def inspect
+        "#<#{self.class}>"
+      end
     end
 
     #
@@ -61,7 +71,13 @@ module Discorb
       alias reactor fired_by
       alias from fired_by
 
+      #
+      # Initializes a new instance of the ReactionEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -121,8 +137,15 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::User] The user associated with the integration.
 
+      #
+      # Initialize a new instance of the IntegrationDeleteEvent class.
       # @private
-      def initialize(client, data)
+      #
+      #
+      # @param [Hash] data The data of the event.
+      #
+      #
+      def initialize(_client, data)
         @id = Snowflake.new(data[:id])
         @guild_id = data[:guild_id]
         @user_id = data[:application_id]
@@ -157,7 +180,13 @@ module Discorb
       # @return [Discorb::Message] The message the reaction was sent in.
       attr_reader :message
 
+      #
+      # Initialize a new instance of the ReactionRemoveAllEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -207,7 +236,13 @@ module Discorb
       # @return [Discorb::UnicodeEmoji, Discorb::PartialEmoji] The emoji that was reacted with.
       attr_reader :emoji
 
+      #
+      # Initialize a new instance of the ReactionRemoveEmojiEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -246,7 +281,13 @@ module Discorb
       attr_reader :guild
       # @return [Discorb::ScheduledEvent] The scheduled event.
       attr_reader :scheduled_event
+      #
+      # Initialize a new instance of the ScheduledEventUserEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @scheduled_event_id = Snowflake.new(data[:scheduled_event_id])
@@ -261,7 +302,6 @@ module Discorb
     #
     # Represents a `MESSAGE_UPDATE` event.
     #
-
     class MessageUpdateEvent < GatewayEvent
       # @return [Discorb::Message] The message before update.
       attr_reader :before
@@ -306,8 +346,8 @@ module Discorb
         @timestamp = Time.iso8601(data[:edited_timestamp])
         @mention_everyone = data[:mention_everyone]
         @mention_roles = data[:mention_roles].map { |r| guild.roles[r] } if data.key?(:mention_roles)
-        @attachments = data[:attachments].map { |a| Attachment.new(a) } if data.key?(:attachments)
-        @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.new(data: e) } : [] if data.key?(:embeds)
+        @attachments = data[:attachments].map { |a| Attachment.from_hash(a) } if data.key?(:attachments)
+        @embeds = data[:embeds] ? data[:embeds].map { |e| Embed.from_hash(e) } : [] if data.key?(:embeds)
       end
 
       def channel
@@ -343,7 +383,13 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the message was sent in.
 
+      #
+      # Initialize a new instance of the UnknownDeleteBulkMessage class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, id, data)
         @client = client
         @id = id
@@ -375,7 +421,13 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild the message was sent in.
 
+      #
+      # Initialize a new instance of the InviteDeleteEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -393,18 +445,6 @@ module Discorb
       end
     end
 
-    class GuildIntegrationsUpdateEvent < GatewayEvent
-      def initialize(client, data)
-        @client = client
-        @data = data
-        @guild_id = Snowflake.new(data[:guild_id])
-      end
-
-      def guild
-        @client.guilds[@guild_id]
-      end
-    end
-
     #
     # Represents a `TYPING_START` event.
     #
@@ -428,7 +468,13 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Member, Discorb::User] The member or user that started typing.
 
+      #
+      # Initialize a new instance of the TypingStartEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -505,7 +551,13 @@ module Discorb
       #   @macro client_cache
       #   @return [Discorb::Guild] The guild where the webhook was updated.
 
+      #
+      # Initialize a new instance of the WebhooksUpdateEvent class.
       # @private
+      #
+      # @param [Discorb::Client] client The client that instantiated the object.
+      # @param [Hash] data The data of the event.
+      #
       def initialize(client, data)
         @client = client
         @data = data
@@ -528,26 +580,28 @@ module Discorb
     module Handler
       private
 
-      def connect_gateway(reconnect, force_close: false)
+      def connect_gateway(reconnect)
         if reconnect
           @log.info "Reconnecting to gateway..."
         else
           @log.info "Connecting to gateway..."
         end
         Async do
-          if @connection
+          if @connection && !@connection.closed?
             Async do
-              if force_close
-                @connection.force_close
-              else
-                @connection.close
-              end
+              @connection.close
             end
           end
           @http = HTTP.new(self)
           _, gateway_response = @http.request(Route.new("/gateway", "//gateway", :get)).wait
           gateway_url = gateway_response[:url]
-          endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
+          gateway_version = if @intents.to_h[:message_content].nil?
+              warn "message_content intent not set, using gateway version 9. You should specify `message_content` intent for preventing unexpected changes in the future."
+              9
+            else
+              10
+            end
+          endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=#{gateway_version}&encoding=json&compress=zlib-stream",
                                                  alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
             @connection = Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection)
@@ -578,7 +632,8 @@ module Discorb
                    Errno::ECONNRESET,
                    IOError => e
               @log.error "Gateway connection closed accidentally: #{e.class}: #{e.message}"
-              connect_gateway(true, force_close: true)
+              @connection.force_close
+              connect_gateway(true)
             else # should never happen
               connect_gateway(true)
             end
@@ -593,13 +648,13 @@ module Discorb
             when 4014
               raise ClientError.new("Disallowed intents were specified"), cause: nil
             when 4002, 4003, 4005, 4007
-              raise ClientError.new(<<~EOS), cause: e
-                                               Disconnected from gateway, probably due to library issues.
-                                               #{e.message}
+              raise ClientError.new(<<~ERROR), cause: e
+                                                 Disconnected from gateway, probably due to library issues.
+                                                 #{e.message}
 
-                                               Please report this to the library issue tracker.
-                                               https://github.com/discorb-lib/discorb/issues
-                                             EOS
+                                                 Please report this to the library issue tracker.
+                                                 https://github.com/discorb-lib/discorb/issues
+                                               ERROR
             when 1001
               @log.info "Gateway closed with code 1001, reconnecting."
               connect_gateway(true)
@@ -608,8 +663,9 @@ module Discorb
               @log.debug "#{e.message}"
               connect_gateway(false)
             end
-          rescue => e
+          rescue StandardError => e
             @log.error "Discord WebSocket error: #{e.full_message}"
+            @connection.force_close
             connect_gateway(false)
           end
         end
@@ -622,7 +678,7 @@ module Discorb
       end
 
       def handle_gateway(payload, reconnect)
-        Async do |task|
+        Async do |_task|
           data = payload[:d]
           @last_s = payload[:s] if payload[:s]
           @log.debug "Received message with opcode #{payload[:op]} from gateway:"
@@ -648,7 +704,7 @@ module Discorb
               send_gateway(2, **payload)
             end
           when 7
-            @log.info "Received opcode 7, reconnecting"
+            @log.info "Received opcode 7, stopping tasks"
             @tasks.map(&:stop)
           when 9
             @log.warn "Received opcode 9, closed connection"
@@ -673,7 +729,7 @@ module Discorb
       end
 
       def handle_heartbeat
-        Async do |task|
+        Async do |_task|
           interval = @heartbeat_interval
           sleep((interval / 1000.0 - 1) * rand)
           loop do
@@ -700,9 +756,7 @@ module Discorb
           @session_id = data[:session_id]
           @user = ClientUser.new(self, data[:user])
           @uncached_guilds = data[:guilds].map { |g| g[:id] }
-          if @uncached_guilds == [] or !@intents.guilds
-            ready
-          end
+          ready if (@uncached_guilds == []) || !@intents.guilds
           dispatch(:ready)
           @tasks << handle_heartbeat
         when "GUILD_CREATE"
@@ -714,7 +768,7 @@ module Discorb
               ready
             end
           elsif @guilds.has?(data[:id])
-            @guilds[data[:id]].send(:_set_data, data)
+            @guilds[data[:id]].send(:_set_data, data, true)
             dispatch(:guild_available, guild)
           else
             guild = Guild.new(self, data, true)
@@ -737,7 +791,7 @@ module Discorb
           return @log.warn "Unknown guild id #{data[:id]}, ignoring" unless (guild = @guilds.delete(data[:id]))
 
           dispatch(:guild_delete, guild)
-          if guild.has?(:unavailable)
+          if data[:unavailable]
             dispatch(:guild_destroy, guild)
           else
             dispatch(:guild_leave, guild)
@@ -811,7 +865,7 @@ module Discorb
 
           if (member = thread.members[data[:id]])
             old = ThreadChannel::Member.new(self, member.instance_variable_get(:@data))
-            member._set_data(data)
+            member.send(:_set_data, data)
           else
             old = nil
             member = ThreadChannel::Member.new(self, data)
@@ -898,14 +952,13 @@ module Discorb
             guild.emojis.delete(emoji)
           end
         when "GUILD_INTEGRATIONS_UPDATE"
-          # dispatch(:guild_integrations_update, GuildIntegrationsUpdateEvent.new(self, data))
-          # Currently not implemented
+          dispatch(:guild_integrations_update, @guilds[data[:guild_id]])
         when "INTEGRATION_CREATE"
           dispatch(:integration_create, Integration.new(self, data, data[:guild_id]))
         when "INTEGRATION_UPDATE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
 
-          before = Integration.new(self, data, data[:guild_id])
+          integration = Integration.new(self, data, data[:guild_id])
           dispatch(:integration_update, integration)
         when "INTEGRATION_DELETE"
           return @log.warn "Unknown guild id #{data[:guild_id]}, ignoring" unless (guild = @guilds[data[:guild_id]])
@@ -1091,12 +1144,12 @@ module Discorb
              (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
             target_message.reactions.delete(target_reaction)
           end
-          dispatch(:reaction_remove_emoji, ReactionRemoveEmojiEvent.new(data))
+          dispatch(:reaction_remove_emoji, ReactionRemoveEmojiEvent.new(self, data))
         when "TYPING_START"
           dispatch(:typing_start, TypingStartEvent.new(self, data))
         when "INTERACTION_CREATE"
           interaction = Interaction.make_interaction(self, data)
-          dispatch(:integration_create, interaction)
+          dispatch(:interaction_create, interaction)
 
           dispatch(interaction.class.event_name, interaction)
         when "RESUMED"
@@ -1114,15 +1167,15 @@ module Discorb
           old = event.dup
           event.send(:_set_data, data)
           dispatch(:scheduled_event_update, old, event)
-          if old.status != event.status
+          if old.status == event.status
+            dispatch(:scheduled_event_edit, old, event)
+          else
             case event.status
             when :active
               dispatch(:scheduled_event_start, event)
             when :completed
               dispatch(:scheduled_event_end, event)
             end
-          else
-            dispatch(:scheduled_event_edit, old, event)
           end
         when "GUILD_SCHEDULED_EVENT_DELETE"
           @log.warn("Unknown guild id #{data[:guild_id]}, ignoring") unless (guild = @guilds[data[:guild_id]])
@@ -1175,6 +1228,10 @@ module Discorb
         @closed = false
       end
 
+      def inspect
+        "<#{self.class.name} #{io.fileno}>"
+      end
+
       def closed?
         @closed
       end
@@ -1182,15 +1239,19 @@ module Discorb
       def close
         super
         @closed = true
-      rescue
+      rescue StandardError
         force_close
       end
 
       def force_close
-        @framer.instance_variable_get(:@stream).close
+        io.close
         @closed = true
       end
 
+      def io
+        @framer.instance_variable_get(:@stream).instance_variable_get(:@io).instance_variable_get(:@io).instance_variable_get(:@io)
+      end
+
       def parse(buffer)
         # noop
         buffer.to_s

data/lib/discorb/gateway_requests.rb

@@ -5,7 +5,9 @@ module Discorb
   # Represents an activity for Gateway Command.
   #
   class Activity
-    @types = {
+    # @private
+    # @return [{Symbol => Integer}] The mapping of activity types.
+    TYPES = {
       playing: 0,
       streaming: 1,
       listening: 2,
@@ -22,7 +24,7 @@ module Discorb
     #
     def initialize(name, type = :playing, url = nil)
       @name = name
-      @type = self.class.types[type]
+      @type = TYPES[type] or raise ArgumentError, "Invalid activity type: #{type}"
       @url = url
     end
 
@@ -42,10 +44,5 @@ module Discorb
     def inspect
       "#<#{self.class} @type=#{@type}>"
     end
-
-    class << self
-      # @private
-      attr_reader :types
-    end
   end
 end

data/lib/discorb/guild.rb

@@ -115,27 +115,36 @@ module Discorb
     # @!attribute [r] me
     #   @return [Discorb::Member] The client's member in the guild.
 
-    @mfa_levels = %i[none elevated].freeze
-    @nsfw_levels = %i[default explicit safe age_restricted].freeze
-    @verification_levels = %i[none low medium high very_high].freeze
-    @default_message_notifications = %i[all_messages only_mentions].freeze
-    @explicit_content_filter = %i[disabled_in_text members_without_roles all_members].freeze
+    # @private
+    # @return [Array<Symbol>] The mapping of mfa_level.
+    MFA_LEVELS = %i[none elevated].freeze
+    # @private
+    # @return [Array<Symbol>] The mapping of nsfw_level.
+    NSFW_LEVELS = %i[default explicit safe age_restricted].freeze
+    # @private
+    # @return [Array<Symbol>] The mapping of verification_level.
+    VERIFICATION_LEVELS = %i[none low medium high very_high].freeze
+    # @private
+    # @return [Array<Symbol>] The mapping of default_message_notifications.
+    DEFAULT_MESSAGE_NOTIFICATIONS = %i[all_messages only_mentions].freeze
+    # @private
+    # @return [Array<Symbol>] The mapping of explicit_content_filter.
+    EXPLICIT_CONTENT_FILTER = %i[disabled_in_text members_without_roles all_members].freeze
 
+    #
+    # Creates a new guild object.
     # @private
+    #
+    # @param [Discorb::Client] client The client that owns this guild.
+    # @param [Hash] data The data of the guild.
+    # @param [Boolean] is_create_event Whether the guild is created by a `GUILD_CREATE` event.
+    #
     def initialize(client, data, is_create_event)
       @client = client
       @data = {}
       _set_data(data, is_create_event)
     end
 
-    # @private
-    def update!
-      Async do
-        _, data = @client.get("/guilds/#{@id}").wait
-        _set_data(data, false)
-      end
-    end
-
     def afk_channel
       @client.channels[@afk_channel_id]
     end
@@ -242,9 +251,9 @@ module Discorb
               description: description,
               scheduled_start_time: start_time.iso8601,
               scheduled_end_time: end_time&.iso8601,
-              privacy_level: Discorb::ScheduledEvent.privacy_level.key(privacy_level),
+              privacy_level: Discorb::ScheduledEvent::PRIVACY_LEVEL.key(privacy_level),
               channel_id: channel&.id,
-              entity_type: Discorb::ScheduledEvent.entity_type.key(:stage_instance),
+              entity_type: Discorb::ScheduledEvent::ENTITY_TYPE.key(:stage_instance),
             }
           when :voice
             raise ArgumentError, "channel must be provided for voice events" unless channel
@@ -253,9 +262,9 @@ module Discorb
               description: description,
               scheduled_start_time: start_time.iso8601,
               scheduled_end_time: end_time&.iso8601,
-              privacy_level: Discorb::ScheduledEvent.privacy_level.key(privacy_level),
+              privacy_level: Discorb::ScheduledEvent::PRIVACY_LEVEL.key(privacy_level),
               channel_id: channel&.id,
-              entity_type: Discorb::ScheduledEvent.entity_type.key(:voice),
+              entity_type: Discorb::ScheduledEvent::ENTITY_TYPE.key(:voice),
             }
           when :external
             raise ArgumentError, "location must be provided for external events" unless location
@@ -265,8 +274,8 @@ module Discorb
               description: description,
               scheduled_start_time: start_time.iso8601,
               scheduled_end_time: end_time.iso8601,
-              privacy_level: Discorb::ScheduledEvent.privacy_level.key(privacy_level),
-              entity_type: Discorb::ScheduledEvent.entity_type.key(:external),
+              privacy_level: Discorb::ScheduledEvent::PRIVACY_LEVEL.key(privacy_level),
+              entity_type: Discorb::ScheduledEvent::ENTITY_TYPE.key(:external),
               entity_metadata: {
                 location: location,
               },
@@ -614,7 +623,7 @@ module Discorb
     #
     def fetch_members(limit: 0, after: nil)
       Async do
-        unless limit == 0
+        unless limit.zero?
           _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members?#{URI.encode_www_form({ after: after, limit: limit })}", "//guilds/:guild_id/members", :get)).wait
           next data[:members].map { |m| Member.new(@client, @id, m[:user], m) }
         end
@@ -625,9 +634,7 @@ module Discorb
           _resp, data = @client.http.request(Route.new("/guilds/#{@id}/members?#{URI.encode_www_form(params)}", "//guilds/:guild_id/members", :get)).wait
           ret += data.map { |m| Member.new(@client, @id, m[:user], m) }
           after = data.last[:user][:id]
-          if data.length != 1000
-            break
-          end
+          break if data.length != 1000
         end
         ret
       end
@@ -860,7 +867,7 @@ module Discorb
     def fetch_voice_regions
       Async do
         _resp, data = @client.http.request(Route.new("/guilds/#{@id}/voice", "//guilds/:guild_id/voice", :get)).wait
-        data.map { |d| VoiceRegion.new(@client, d) }
+        data.map { |d| VoiceRegion.new(d) }
       end
     end
 
@@ -873,7 +880,7 @@ module Discorb
     def fetch_invites
       Async do
         _resp, data = @client.http.request(Route.new("/guilds/#{@id}/invites", "//guilds/:guild_id/invites", :get)).wait
-        data.map { |d| Invite.new(@client, d) }
+        data.map { |d| Invite.new(@client, d, false) }
       end
     end
 
@@ -886,7 +893,7 @@ module Discorb
     def fetch_integrations
       Async do
         _resp, data = @client.http.request(Route.new("/guilds/#{@id}/integrations", "//guilds/:guild_id/integrations", :get)).wait
-        data.map { |d| Integration.new(@client, d) }
+        data.map { |d| Integration.new(@client, d, @id) }
       end
     end
 
@@ -1014,7 +1021,14 @@ module Discorb
       # @!attribute [r] url
       #   @return [String] The vanity URL.
 
+      #
+      # Initialize a new instance of the {VanityInvite} class.
       # @private
+      #
+      # @param [Discorb::Client] client The client.
+      # @param [Discorb::Guild] guild The guild.
+      # @param [Hash] data The data of the invite.
+      #
       def initialize(client, guild, data)
         @client = client
         @guild = guild
@@ -1049,7 +1063,14 @@ module Discorb
       # @!attribute [r] json_url
       #   @return [String] The JSON URL.
 
+      #
+      # Initialize a new instance of the {Widget} class.
       # @private
+      #
+      # @param [Discorb::Client] client The client.
+      # @param [Discorb::Snowflake] guild_id The guild ID.
+      # @param [Hash] data The data from Discord.
+      #
       def initialize(client, guild_id, data)
         @client = client
         @enabled = data[:enabled]
@@ -1113,7 +1134,14 @@ module Discorb
       # @return [String] The reason for the ban.
       attr_reader :reason
 
+      #
+      # Initialize a new instance of the {Ban} class.
       # @private
+      #
+      # @param [Discorb::Client] client The client.
+      # @param [Discorb::Guild] guild The guild.
+      # @param [Hash] data The data from Discord.
+      #
       def initialize(client, guild, data)
         @client = client
         @guild = guild
@@ -1123,9 +1151,6 @@ module Discorb
     end
 
     class << self
-      # @private
-      attr_reader :nsfw_levels, :mfa_levels, :verification_levels, :default_message_notifications, :explicit_content_filter
-
       #
       # Returns a banner url from the guild's ID.
       #
@@ -1152,9 +1177,9 @@ module Discorb
       @unavailable = false
       @name = data[:name]
       @members = Discorb::Dictionary.new
-      data[:members].each do |m|
+      data[:members]&.each do |m|
         Member.new(@client, @id, m[:user], m)
-      end if data[:members]
+      end
       @splash = data[:splash] && Asset.new(self, data[:splash], path: "splashes/#{@id}")
       @discovery_splash = data[:discovery_splash] && Asset.new(self, data[:discovery_splash], path: "discovery-splashes/#{@id}")
       @owner_id = data[:owner_id]
@@ -1172,10 +1197,10 @@ module Discorb
         @emojis[e[:id]] = CustomEmoji.new(@client, self, e)
       end
       @features = data[:features].map { |f| f.downcase.to_sym }
-      @mfa_level = self.class.mfa_levels[data[:mfa_level]]
-      @verification_level = self.class.verification_levels[data[:verification_level]]
-      @default_message_notifications = self.class.default_message_notifications[data[:default_message_notifications]]
-      @explicit_content_filter = self.class.explicit_content_filter[data[:explicit_content_filter]]
+      @mfa_level = MFA_LEVELS[data[:mfa_level]]
+      @verification_level = VERIFICATION_LEVELS[data[:verification_level]]
+      @default_message_notifications = DEFAULT_MESSAGE_NOTIFICATIONS[data[:default_message_notifications]]
+      @explicit_content_filter = EXPLICIT_CONTENT_FILTER[data[:explicit_content_filter]]
       @system_channel_id = data[:system_channel_id]
       @system_channel_flag = SystemChannelFlag.new(0b111 - data[:system_channel_flags])
       @rules_channel_id = data[:rules_channel_id]
@@ -1190,7 +1215,7 @@ module Discorb
       @approximate_member_count = data[:approximate_member_count]
       @approximate_presence_count = data[:approximate_presence_count]
       @welcome_screen = data[:welcome_screen].nil? ? nil : WelcomeScreen.new(@client, self, data[:welcome_screen])
-      @nsfw_level = self.class.nsfw_levels[data[:nsfw_level]]
+      @nsfw_level = NSFW_LEVELS[data[:nsfw_level]]
       return unless is_create_event
 
       @stickers = data[:stickers].nil? ? [] : data[:stickers].map { |s| Sticker::GuildSticker.new(self, s) }
@@ -1200,13 +1225,13 @@ module Discorb
       tmp_channels = data[:channels].filter { |c| !c.key?(:thread_metadata) }.map do |c|
         Channel.make_channel(@client, c.merge({ guild_id: @id }))
       end
-      @channels = Dictionary.new(tmp_channels.map { |c| [c.id, c] }.to_h, sort: ->(c) { c[1].position })
-      @voice_states = Dictionary.new(data[:voice_states].map { |v| [Snowflake.new(v[:user_id]), VoiceState.new(@client, v.merge({ guild_id: @id }))] }.to_h)
+      @channels = Dictionary.new(tmp_channels.to_h { |c| [c.id, c] }, sort: ->(c) { c[1].position })
+      @voice_states = Dictionary.new(data[:voice_states].to_h { |v| [Snowflake.new(v[:user_id]), VoiceState.new(@client, v.merge({ guild_id: @id }))] })
       @threads = data[:threads] ? data[:threads].map { |t| Channel.make_channel(@client, t) } : []
-      @presences = Dictionary.new(data[:presences].map { |pr| [Snowflake.new(pr[:user][:id]), Presence.new(@client, pr)] }.to_h)
+      @presences = Dictionary.new(data[:presences].to_h { |pr| [Snowflake.new(pr[:user][:id]), Presence.new(@client, pr)] })
       @max_presences = data[:max_presences]
-      @stage_instances = Dictionary.new(data[:stage_instances].map { |s| [Snowflake.new(s[:id]), StageInstance.new(@client, s)] }.to_h)
-      @scheduled_events = Dictionary.new(data[:guild_scheduled_events].map { |s| [Snowflake.new(s[:id]), ScheduledEvent.new(@client, s)] }.to_h)
+      @stage_instances = Dictionary.new(data[:stage_instances].to_h { |s| [Snowflake.new(s[:id]), StageInstance.new(@client, s)] })
+      @scheduled_events = Dictionary.new(data[:guild_scheduled_events].to_h { |s| [Snowflake.new(s[:id]), ScheduledEvent.new(@client, s)] })
       @data.update(data)
     end
   end
@@ -1241,7 +1266,14 @@ module Discorb
     # @return [Discorb::Guild] The guild the welcome screen belongs to.
     attr_reader :guild
 
+    #
+    # Initializes the welcome screen.
     # @private
+    #
+    # @param [Discorb::Client] client The client.
+    # @param [Discorb::Guild] guild The guild the welcome screen belongs to.
+    # @param [Hash] data The data of the welcome screen.
+    #
     def initialize(client, guild, data)
       @client = client
       @description = data[:description]