discorb 0.13.4 → 0.14.0

data/lib/discorb/gateway.rb

@@ -122,7 +122,7 @@ module Discorb
       #   @return [Discorb::User] The user associated with the integration.
 
       # @private
-      def initialize(client, data)
+      def initialize(_client, data)
         @id = Snowflake.new(data[:id])
         @guild_id = data[:guild_id]
         @user_id = data[:application_id]
@@ -261,7 +261,6 @@ module Discorb
     #
     # Represents a `MESSAGE_UPDATE` event.
     #
-
     class MessageUpdateEvent < GatewayEvent
       # @return [Discorb::Message] The message before update.
       attr_reader :before
@@ -393,6 +392,9 @@ module Discorb
       end
     end
 
+    #
+    # Represents a `GUILD_INTEGRATIONS_UPDATE` event.
+    #
     class GuildIntegrationsUpdateEvent < GatewayEvent
       def initialize(client, data)
         @client = client
@@ -528,20 +530,16 @@ 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)
@@ -578,7 +576,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 +592,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 +607,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 +622,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 +648,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 +673,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 +700,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"
@@ -905,7 +903,7 @@ module Discorb
         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]])
@@ -1096,7 +1094,7 @@ module Discorb
           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 +1112,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]])
@@ -1182,12 +1180,12 @@ module Discorb
       def close
         super
         @closed = true
-      rescue
+      rescue StandardError
         force_close
       end
 
       def force_close
-        @framer.instance_variable_get(:@stream).close
+        @framer.instance_variable_get(:@stream).instance_variable_get(:@io).instance_variable_get(:@io).instance_variable_get(:@io).close
         @closed = true
       end
 

data/lib/discorb/guild.rb

@@ -614,7 +614,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 +625,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
@@ -1099,7 +1097,7 @@ module Discorb
       def iframe(theme: "dark", width: 350, height: 500)
         [
           %(<iframe src="https://canary.discord.com/widget?id=#{@guild_id}&theme=#{theme}" width="#{width}" height="#{height}"),
-          %(allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>),
+          %(allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>)
         ].join
       end
     end
@@ -1152,9 +1150,9 @@ module Discorb
       @unavailable = false
       @name = data[:name]
       @members = Discorb::Dictionary.new
-      data[:members].each do |m|
-        Member.new(@client, @id, m[:user], m)
-      end if data[:members]
+      data[:members]&.each do |m|
+          Member.new(@client, @id, m[:user], m)
+        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]
@@ -1200,13 +1198,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

data/lib/discorb/guild_template.rb

@@ -187,9 +187,9 @@ module Discorb
           @nsfw = data[:nsfw]
           @rate_limit_per_user = data[:rate_limit_per_user]
           @parent_id = data[:parent_id]
-          @permission_overwrites = data[:permission_overwrites].map do |ow|
+          @permission_overwrites = data[:permission_overwrites].to_h do |ow|
             [Snowflake.new(ow[:id]), PermissionOverwrite.new(ow[:allow], ow[:deny])]
-          end.to_h
+          end
           @type = Discorb::Channel.descendants.find { |c| c.channel_type == data[:type] }
         end
       end

data/lib/discorb/http.rb

@@ -32,13 +32,13 @@ module Discorb
     # @raise [Discorb::HTTPError] The request was failed.
     #
     def request(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
+      Async do |_task|
         @ratelimit_handler.wait(path)
-        if %i[post patch put].include? path.method
-          resp = http.send(path.method, get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        else
-          resp = http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
-        end
+        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)
+          else
+            http.send(path.method, get_path(path), get_headers(headers, body, audit_log_reason), **kwargs)
+          end
         data = get_response_data(resp)
         @ratelimit_handler.save(path, resp)
         handle_response(resp, data, path, body, headers, audit_log_reason, kwargs)
@@ -61,12 +61,12 @@ module Discorb
     #
     # @raise [Discorb::HTTPError] The request was failed.
     #
-    def multipart_request(path, body = "", files, headers: nil, audit_log_reason: nil, **kwargs)
-      Async do |task|
+    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)
         data = [
-          ["payload_json", get_body(body)],
+          ["payload_json", get_body(body)]
         ]
         files&.each_with_index do |file, i|
           next if file.nil?
@@ -143,15 +143,13 @@ module Discorb
       begin
         data = JSON.parse(resp.body, symbolize_names: true)
       rescue JSON::ParserError, TypeError
-        if resp.body.nil? || resp.body.empty?
-          data = nil
-        else
-          data = resp.body
-        end
-      end
-      if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
-        raise CloudFlareBanError.new(resp, @client)
+        data = if resp.body.nil? || resp.body.empty?
+            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

@@ -44,7 +44,7 @@ module Discorb
     }
 
     # @private
-    def initialize(client, data, guild_id, no_cache: false)
+    def initialize(client, data, guild_id)
       @client = client
       @data = data
       @guild_id = guild_id

data/lib/discorb/intents.rb

@@ -86,7 +86,7 @@ module Discorb
       if @raw_value.key?(name)
         @raw_value[name]
       elsif name.end_with?("=") && @raw_value.key?(name[0..-2].to_sym)
-        raise ArgumentError, "true/false expected" unless args.is_a? TrueClass or args.is_a?(FalseClass)
+        raise ArgumentError, "true/false expected" unless args.is_a?(TrueClass) || args.is_a?(FalseClass)
 
         @raw_value[name[0..-2].to_sym] = args
       else

data/lib/discorb/interaction/autocomplete.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
   #
   # Represents auto complete interaction.
@@ -17,10 +18,10 @@ module Discorb
           next
         end
 
-        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild)
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        Discorb::CommandInteraction::SlashCommand.modify_option_map(option_map, options, guild, {}, {})
         focused_index = options.find_index { |o| o[:focused] }
-        val = command.options.values[focused_index][:autocomplete]&.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+        val = command.options.values.filter { |option| option[:type] != :attachment }[focused_index][:autocomplete]&.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
         send_complete_result(val)
       end
     end

data/lib/discorb/interaction/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
   #
   # Represents a command interaction.
@@ -5,7 +6,8 @@ module Discorb
   class CommandInteraction < Interaction
     @interaction_type = 2
     @interaction_name = :application_command
-    include Interaction::SourceResponse
+    include Interaction::SourceResponder
+    include Interaction::ModalResponder
 
     #
     # Represents a slash command interaction.
@@ -25,10 +27,10 @@ module Discorb
           return
         end
 
-        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
-        SlashCommand.modify_option_map(option_map, options, guild)
+        option_map = command.options.to_h { |k, v| [k.to_s, v[:default]] }
+        SlashCommand.modify_option_map(option_map, options, guild, @members, @attachments)
 
-        command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+        command.block.call(self, *command.options.map { |k, _v| option_map[k.to_s] })
       end
 
       class << self
@@ -55,13 +57,13 @@ module Discorb
             options = data[:options]
           end
 
-          return name, options
+          [name, options]
         end
 
         # @private
-        def modify_option_map(option_map, options, guild)
+        def modify_option_map(option_map, options, guild, members, attachments)
           options ||= []
-          options.each_with_index do |option|
+          options.each do |option|
             val = case option[:type]
               when 3, 4, 5, 10
                 option[:value]
@@ -72,7 +74,9 @@ module Discorb
               when 8
                 guild.roles[option[:value]] || guild.fetch_roles.wait.find { |role| role.id == option[:value] }
               when 9
-                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 { |role| role.id == option[:value] }
+              when 11
+                attachments[option[:value]]
               end
             option_map[option[:name]] = val
           end
@@ -92,6 +96,7 @@ module Discorb
       private
 
       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)
       end
@@ -109,7 +114,8 @@ module Discorb
       private
 
       def _set_data(data)
-        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge(guild_id: @guild_id.to_s))
+        super
+        @target = @messages[data[:target_id]]
         @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
       end
     end
@@ -117,7 +123,26 @@ module Discorb
     private
 
     def _set_data(data)
+      super
       @name = data[:name]
+      @messages, @attachments, @members = {}, {}, {}
+
+      if data[:resolved]
+        data[:resolved][:users]&.each do |id, user|
+          @client.users[id] = Discorb::User.new(@client, user)
+        end
+        data[:resolved][:members]&.each do |id, member|
+          @members[id] = Discorb::Member.new(
+            @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)
+        end
+        data[:resolved][:attachments]&.to_h do |id, attachment|
+          @attachments[id.to_s] = Attachment.new(attachment)
+        end
+      end
     end
 
     class << self

data/lib/discorb/interaction/components.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
 
   #
@@ -5,8 +6,10 @@ module Discorb
   # @abstract
   #
   class MessageComponentInteraction < Interaction
-    include Interaction::SourceResponse
-    include Interaction::UpdateResponse
+    include Interaction::SourceResponder
+    include Interaction::UpdateResponder
+    include Interaction::ModalResponder
+
     # @return [String] The content of the response.
     attr_reader :custom_id
     # @return [Discorb::Message] The target message.

data/lib/discorb/interaction/modal.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Discorb
+
+  #
+  # Represents a modal interaction.
+  #
+  class ModalInteraction < Interaction
+    include Interaction::SourceResponder
+
+    @interaction_type = 5
+    @interaction_name = :modal_submit
+    @event_name = :modal_submit
+
+    # @return [String] The custom id of the modal.
+    attr_reader :custom_id
+    # @return [{String => String}] The contents of the modal.
+    attr_reader :contents
+
+    private
+
+    def _set_data(data)
+      @custom_id = data[:custom_id]
+      @contents = data[:components].to_h do |component|
+        [component[:components][0][:custom_id], component[:components][0][:value]]
+      end
+    end
+
+    class << self
+      alias make_interaction new
+    end
+  end
+end

data/lib/discorb/interaction/response.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module Discorb
+  #
+  # Represents an interaction of Discord.
+  #
   class Interaction
     #
     # A module for response with source.
     #
-    module SourceResponse
+    module SourceResponder
       #
       # Response with `DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE`(`5`).
       #
@@ -38,14 +42,14 @@ 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::SourceResponse::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)
         Async do
           payload = {}
           payload[:content] = content if content
           payload[:tts] = tts
-          payload[:embeds] = (embeds || [embed])&.map { |e| e&.to_hash }.filter { _1 }
+          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[:components] = Component.to_payload(components) if components
           payload[:flags] = (ephemeral ? 1 << 6 : 0)
@@ -66,6 +70,9 @@ module Discorb
         end
       end
 
+      #
+      # Represents of a callback message of interaction.
+      #
       class CallbackMessage
         # @private
         def initialize(client, data, application_id, token)
@@ -127,7 +134,7 @@ module Discorb
     #
     # A module for response with update.
     #
-    module UpdateResponse
+    module UpdateResponder
       #
       # Response with `DEFERRED_UPDATE_MESSAGE`(`6`).
       # @async
@@ -181,6 +188,28 @@ module Discorb
       end
     end
 
+    #
+    # A module for response with modal.
+    #
+    module ModalResponder
+      #
+      # Response with `MODAL`(`9`).
+      #
+      # @param [String] title The title of the modal.
+      # @param [String] custom_id The custom id of the modal.
+      # @param [Array<Discorb::TextInput>] components The text inputs to send.
+      #
+      # @return [Async::Task<void>] The task.
+      #
+      def show_modal(title, custom_id, components)
+        payload = { title: title, custom_id: custom_id, components: Component.to_payload(components) }
+        @client.http.request(
+          Route.new("/interactions/#{@id}/#{@token}/callback", "//interactions/:interaction_id/:token/callback", :post),
+          { type: 9, data: payload }
+        ).wait
+      end
+    end
+
     private
 
     def _set_data(*)

data/lib/discorb/interaction/root.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Discorb
   #
   # Represents a user interaction with the bot.

data/lib/discorb/interaction.rb

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

data/lib/discorb/log.rb

@@ -64,7 +64,7 @@ module Discorb
 
     def write_output(name, color, message, fallback)
       unless @out
-        fallback.puts(message) if fallback
+        fallback&.puts(message)
 
         return
       end

data/lib/discorb/member.rb

@@ -105,9 +105,7 @@ module Discorb
     end
 
     def permissions
-      if owner?
-        return Permission.new((1 << 38) - 1)
-      end
+      return Permission.new((1 << 38) - 1) if owner?
       roles.map(&:permissions).sum(Permission.new(0))
     end