discorb 0.16.0 → 0.17.0

data/lib/discorb/http.rb

@@ -40,7 +40,8 @@ module Discorb
       Async do |_task|
         @ratelimit_handler.wait(path)
         resp = if %i[post patch put].include? path.method
-            http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
+                 http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason),
+                           **kwargs)
           else
             http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
           end
@@ -69,18 +70,23 @@ module Discorb
     def multipart_request(path, body, files, headers: nil, audit_log_reason: nil, **kwargs)
       Async do |_task|
         @ratelimit_handler.wait(path)
-        req = Net::HTTP.const_get(path.method.to_s.capitalize).new(get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+        req = Net::HTTP.const_get(path.method.to_s.capitalize).new(
+          get_path(path),
+          get_headers(headers, body, audit_log_reason),
+          **kwargs,
+        )
         data = [
           ["payload_json", get_body(body)],
         ]
         files&.each_with_index do |file, i|
           next if file.nil?
+
           if file.created_by == :discord
             request_io = StringIO.new(
               cdn_http.get(URI.parse(file.url).path, {
-                "Content-Type" => nil,
-                "User-Agent" => Discorb::USER_AGENT,
-              }).body
+                             "Content-Type" => nil,
+                             "User-Agent" => Discorb::USER_AGENT,
+                           }).body
             )
             data << ["files[#{i}]", request_io, { filename: file.filename, content_type: file.content_type }]
           else
@@ -125,10 +131,10 @@ module Discorb
 
     def get_headers(headers, body = "", audit_log_reason = nil)
       ret = if body.nil? || body == ""
-          { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}" }
+              { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}" }
         else
           { "User-Agent" => USER_AGENT, "authorization" => "Bot #{@client.token}",
-            "content-type" => "application/json" }
+            "content-type" => "application/json", }
         end
       ret.merge!(headers) if !headers.nil? && headers.length.positive?
       ret["X-Audit-Log-Reason"] = audit_log_reason unless audit_log_reason.nil?
@@ -147,7 +153,7 @@ module Discorb
 
     def get_path(path)
       full_path = if path.url.start_with?("https://")
-          path.url
+                    path.url
         else
           API_BASE_URL + path.url
         end
@@ -160,12 +166,13 @@ module Discorb
         data = JSON.parse(resp.body, symbolize_names: true)
       rescue JSON::ParserError, TypeError
         data = if resp.body.nil? || resp.body.empty?
-            nil
+                 nil
           else
             resp.body
           end
       end
       raise CloudFlareBanError.new(resp, @client) if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
+
       data
     end
 

data/lib/discorb/integration.rb

@@ -74,7 +74,10 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.request(Route.new("/guilds/#{@guild}/integrations/#{@id}", "//guilds/:guild_id/integrations/:integration_id", :delete), audit_log_reason: reason).wait
+        @client.http.request(
+          Route.new("/guilds/#{@guild}/integrations/#{@id}", "//guilds/:guild_id/integrations/:integration_id",
+                    :delete), {}, audit_log_reason: reason
+        ).wait
       end
     end
 

data/lib/discorb/intents.rb

@@ -47,7 +47,7 @@ module Discorb
     #
     # @note You must enable privileged intents to use `members` and/or `presences` intents.
     # @note Message Content Intent is not required to use `message_content` intents for now,
-    #   this will be required in April 30, 2022. [Learn More](https://support-dev.discord.com/hc/en-us/articles/4404772028055).
+    #   this will be required in September 1, 2022. [Learn More](https://support-dev.discord.com/hc/en-us/articles/4404772028055).
     #   You should specify `message_content` intent for preventing unexpected changes in the future.
     #
     def initialize(guilds: true,

data/lib/discorb/interaction/autocomplete.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents auto complete interaction.
@@ -12,35 +13,46 @@ module Discorb
     def _set_data(data)
       super
       Sync do
-        name, options = Discorb::CommandInteraction::SlashCommand.get_command_data(data)
+        name, options = Discorb::CommandInteraction::ChatInputCommand.get_command_data(data)
 
-        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+        unless (command = @client.callable_commands.find { |c| c.to_s == name && c.type_raw == 1 })
           @client.logger.warn "Unknown command name #{name}, ignoring"
           next
         end
 
         option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
-        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild, {}, {})
+        Discorb::CommandInteraction::ChatInputCommand.modify_option_map(option_map, options, guild, {}, {})
         focused_index = options.find_index { |o| o[:focused] }
-        val = command.options.values.filter { |option| option[:type] != :attachment }[focused_index][:autocomplete]&.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
+        val = command.options.values.filter do |option|
+          option[:type] != :attachment
+        end[focused_index][:autocomplete]&.call(self, *command.options.map do |k, _v|
+          option_map[k.to_s]
+        end)
         send_complete_result(val)
       end
     end
 
     def send_complete_result(val)
-      @client.http.request(Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post), {
-        type: 8,
-        data: {
-          choices: val.map do |vk, vv|
-            {
-              name: vk,
-              value: vv,
-            }
-          end,
-        },
-      }).wait
+      @client.http.request(
+        Route.new(
+          "/interactions/#{@id}/#{@token}/callback",
+          "//interactions/:interaction_id/:token/callback",
+          :post
+        ), {
+          type: 8,
+          data: {
+            choices: val.map do |vk, vv|
+              {
+                name: vk,
+                value: vv,
+              }
+            end,
+          },
+        }
+      ).wait
     rescue Discorb::NotFoundError
-      @client.logger.warn "Failed to send auto complete result, This may be caused by the suggestion is taking too long (over 3 seconds) to respond", fallback: $stderr
+      @client.logger.warn "Failed to send auto complete result, " \
+                          "This may be caused by the suggestion is taking too long (over 3 seconds) to respond"
     end
 
     class << self

data/lib/discorb/interaction/command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Discorb
   #
   # Represents a command interaction.
@@ -12,7 +13,7 @@ module Discorb
     #
     # Represents a slash command interaction.
     #
-    class SlashCommand < CommandInteraction
+    class ChatInputCommand < CommandInteraction
       @command_type = 1
       @event_name = :slash_command
 
@@ -21,15 +22,15 @@ module Discorb
       def _set_data(data)
         super
 
-        name, options = SlashCommand.get_command_data(data)
+        name, options = ChatInputCommand.get_command_data(data)
 
-        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+        unless (command = @client.callable_commands.find { |c| c.to_s == name && c.type_raw == 1 })
           @client.logger.warn "Unknown command name #{name}, ignoring"
           return
         end
 
         option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
-        SlashCommand.modify_option_map(option_map, options, guild, @members, @attachments)
+        ChatInputCommand.modify_option_map(option_map, options, guild, @members, @attachments)
 
         command.block.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
       end
@@ -84,11 +85,19 @@ module Discorb
               when 6
                 members[option[:value]] || guild.members[option[:value]] || guild.fetch_member(option[:value]).wait
               when 7
-                guild.channels[option[:value]] || guild.fetch_channels.wait.find { |channel| channel.id == option[:value] }
+                guild.channels[option[:value]] || guild.fetch_channels.wait.find do |channel|
+                  channel.id == option[:value]
+                end
               when 8
                 guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
               when 9
-                members[option[:value]] || guild.members[option[:value]] || guild.roles[option[:value]] || guild.fetch_member(option[:value]).wait || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
+                members[option[:value]] ||
+                guild.members[option[:value]] ||
+                guild.roles[option[:value]] ||
+                guild.fetch_member(option[:value]).wait ||
+                guild.fetch_roles.wait.find do |role|
+                  role.id == option[:value]
+                end
               when 11
                 attachments[option[:value]]
               end
@@ -112,8 +121,17 @@ module Discorb
 
       def _set_data(data)
         super
-        @target = guild.members[data[:target_id]] || Discorb::Member.new(@client, @guild_id, data[:resolved][:users][data[:target_id].to_sym], data[:resolved][:members][data[:target_id].to_sym])
-        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 2 }.block.call(self, @target)
+        @target = guild.members[data[:target_id]] || Discorb::Member.new(
+          @client, @guild_id,
+          data[:resolved][:users][data[:target_id].to_sym],
+          data[:resolved][:members][data[:target_id].to_sym]
+        )
+        command = @client.commands.find { |c| c.name["default"] == data[:name] && c.type_raw == 2 }
+        if command
+          command.block.call(self, @target)
+        else
+          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
+        end
       end
     end
 
@@ -132,7 +150,12 @@ module Discorb
       def _set_data(data)
         super
         @target = @messages[data[:target_id]]
-        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
+        command = @client.commands.find { |c| c.name["default"] == data[:name] && c.type_raw == 3 }
+        if command
+          command.block.call(self, @target)
+        else
+          @client.logger.warn "Unknown command name #{data[:name]}, ignoring"
+        end
       end
     end
 
@@ -152,10 +175,11 @@ module Discorb
             @client, @guild_id, data[:resolved][:users][id], member
           )
         end
-        data[:resolved][:messages]&.to_h do |id, _message|
-          @messages[id.to_i] = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge(guild_id: @guild_id.to_s)).merge(guild_id: @guild_id.to_s)
+
+        data[:resolved][:messages]&.each do |id, message|
+          @messages[id.to_s] = Message.new(@client, message.merge(guild_id: @guild_id.to_s))
         end
-        data[:resolved][:attachments]&.to_h do |id, attachment|
+        data[:resolved][:attachments]&.each do |id, attachment|
           @attachments[id.to_s] = Attachment.new(attachment)
         end
       end

data/lib/discorb/interaction/components.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Discorb
 
+module Discorb
   #
   # Represents a message component interaction.
   # @abstract
@@ -41,7 +41,10 @@ module Discorb
       #
       def make_interaction(client, data)
         nested_classes.each do |klass|
-          return klass.new(client, data) if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
+          if !klass.component_type.nil? && klass.component_type == data[:data][:component_type]
+            return klass.new(client,
+                             data)
+          end
         end
         client.logger.warn("Unknown component type #{data[:component_type]}, initialized Interaction")
         MessageComponentInteraction.new(client, data)

data/lib/discorb/interaction/modal.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Discorb
-
   #
   # Represents a modal interaction.
   #

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
@@ -118,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
 
@@ -133,7 +161,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
 
@@ -157,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
 
@@ -192,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
@@ -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

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