discorb 0.11.4 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3154cd1b844888bec798cdead182285e335733206758fddea8c2fd8e0015499e
-  data.tar.gz: 9d0ba163982a7676045dce791409227f2c99c3e28bce29cae25033b85f7485a5
+  metadata.gz: d57f5fd6920be7c5549687ec85d3012dede743981482fc806099789d3d9f4048
+  data.tar.gz: 513c3e45c0da27f8e509c4ed7238c5f6da3cd39b61a0681874a97d507068ffc6
 SHA512:
-  metadata.gz: 20ee7dd354fc5be471617ed61367ceb85bad364cd8e2afd95df9c46453665b61c15d387c2bafb36b295836f5cb02f699edfc3118af4fa6c39e30a52f72904e6d
-  data.tar.gz: c860a7fa1335a7be40dafa7e9bda5bbfd6a7d7e7790ece875db350b154f3e7ab7f523387b5be4a77f4cae7f43c01b3a726f2c917dd81c2b97502f0097b9b5ecc
+  metadata.gz: 7603b6c7017898fbd705ffaa602f370111c6d122a2e68a7b6c017c6fa622d9b6990e684bf574104844e8dc6601176a47894815cfb3756ae16305fe74709da118
+  data.tar.gz: 0fa148e0c26c45a8aa0c3a9e2dbdfb4995bc9e939c9588d93b575b711baccc906b20ba3f8edfe4906ae5838565bd0be6befc5cf7e6b2ca25f1f465e21fa6622a

data/Changelog.md

@@ -2,6 +2,14 @@
 
 # Changelog
 
+## v0.12
+
+### v0.12.0
+
+- Refactor: Refactor the code
+- Fix: Fix resuming gateway, finally
+- Fix: Fix `@client` in slash command handler in extension
+
 ## v0.11
 
 ### v0.11.4

data/README.md

@@ -4,7 +4,8 @@
 <a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/dt/discorb?logo=rubygems&logoColor=fff&label=Downloads&style=flat-square&labelColor=2f3136" alt="Gem"></a>
 <a href="https://rubygems.org/gems/discorb"><img src="https://img.shields.io/gem/v/discorb?logo=rubygems&logoColor=fff&label=Version&style=flat-square&labelColor=2f3136" alt="Gem"></a>
 <a href="https://discord.gg/hCP6zq8Vpj"><img src="https://img.shields.io/discord/863581274916913193?logo=discord&logoColor=fff&color=5865f2&label=Discord&style=flat-square&labelColor=2f3136" alt="Discord"></a>
-<a href="https://github.com/discorb-lib/discorb"><img src="https://img.shields.io/github/stars/discorb-lib/discorb?color=24292e&label=Stars&logo=GitHub&logoColor=fff&style=flat-square&labelColor=2f3136" alt="GitHub"></a></div>
+<a href="https://github.com/discorb-lib/discorb"><img src="https://img.shields.io/github/stars/discorb-lib/discorb?color=24292e&label=Stars&logo=GitHub&logoColor=fff&style=flat-square&labelColor=2f3136" alt="GitHub"></a>
+<a href="https://codeclimate.com/github/discorb-lib/discorb"><img alt="Code Climate maintainability" src="https://img.shields.io/codeclimate/maintainability/discorb-lib/discorb?logo=Code%20Climate&logoColor=ffffff&style=flat-square&labelColor=2f3136&label=Maintainability"></a></div>
 
 ----
 

data/lib/discorb/app_command.rb

@@ -172,6 +172,14 @@ module Discorb
         @id_map = Discorb::Dictionary.new
       end
 
+      # @private
+      def replace_block(instance)
+        current_block = @block.dup
+        @block = Proc.new do |*args|
+          instance.instance_exec(*args, &current_block)
+        end
+      end
+
       # @private
       def to_hash
         {
@@ -314,6 +322,12 @@ module Discorb
           @name
         end
 
+        # @private
+        def block_replace(instance)
+          super
+          @commands.each { |c| c.replace_block(instance) }
+        end
+
         # @private
         def to_hash
           options_payload = @commands.map do |command|

data/lib/discorb/client.rb

@@ -395,10 +395,11 @@ module Discorb
         end
       end
       @commands.delete_if do |cmd|
-        cmd.respond_to? :extension and cmd.extension == ins.name
+        cmd.respond_to? :extension and cmd.extension == ins.class.name
       end
       ins.class.commands.each do |cmd|
-        cmd.define_singleton_method(:extension) { ins.name }
+        cmd.define_singleton_method(:extension) { ins.class.name }
+        cmd.replace_block(ins)
         @commands << cmd
       end
 
@@ -428,41 +429,10 @@ module Discorb
       when nil
         start_client(token)
       when "run"
-        require "json"
-        options = JSON.parse(ENV["DISCORB_CLI_OPTIONS"], symbolize_names: true)
-        @daemon = options[:daemon]
-
-        setup_commands(token) if options[:setup]
-        if options[:log_level]
-          if options[:log_level] == "none"
-            @log.out = nil
-          else
-            @log.out = case options[:log_file]
-              when nil, "stderr"
-                $stderr
-              when "stdout"
-                $stdout
-              else
-                ::File.open(options[:log_file], "a")
-              end
-            @log.level = options[:log_level].to_sym
-            @log.colorize_log = options[:log_color] == nil ? @log.out.isatty : options[:log_color]
-          end
-        end
+        before_run(token)
         start_client(token)
       when "setup"
-        guild_ids = "global"
-        if guilds = ENV["DISCORB_SETUP_GUILDS"]
-          guild_ids = guilds.split(",")
-        end
-        if guild_ids == ["global"]
-          guild_ids = false
-        end
-        setup_commands(token, guild_ids: guild_ids).wait
-        @events[:setup]&.each do |event|
-          event.call
-        end
-        self.on_setup if respond_to? :on_setup
+        run_setup(token)
       end
     end
 
@@ -478,10 +448,48 @@ module Discorb
 
     private
 
+    def before_run(token)
+      require "json"
+      options = JSON.parse(ENV["DISCORB_CLI_OPTIONS"], symbolize_names: true)
+      setup_commands(token) if options[:setup]
+      if options[:log_level]
+        if options[:log_level] == "none"
+          @log.out = nil
+        else
+          @log.out = case options[:log_file]
+            when nil, "stderr"
+              $stderr
+            when "stdout"
+              $stdout
+            else
+              ::File.open(options[:log_file], "a")
+            end
+          @log.level = options[:log_level].to_sym
+          @log.colorize_log = options[:log_color] == nil ? @log.out.isatty : options[:log_color]
+        end
+      end
+    end
+
+    def run_setup(token)
+      guild_ids = "global"
+      if guilds = ENV["DISCORB_SETUP_GUILDS"]
+        guild_ids = guilds.split(",")
+      end
+      if guild_ids == ["global"]
+        guild_ids = false
+      end
+      setup_commands(token, guild_ids: guild_ids).wait
+      @events[:setup]&.each do |event|
+        event.call
+      end
+      self.on_setup if respond_to? :on_setup
+    end
+
     def start_client(token)
       Async do |task|
-        trap(:SIGINT) {
+        Signal.trap(:SIGINT) {
           @log.info "SIGINT received, closing..."
+          Signal.trap(:SIGINT, "DEFAULT")
           close!
         }
         @token = token.to_s

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.11.4"
+  VERSION = "0.12.0"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/error.rb

@@ -38,7 +38,8 @@ module Discorb
   # @abstract
   #
   class HTTPError < DiscorbError
-    # @return [String] the HTTP response code.
+    # @return [String] the JSON response code.
+    # @see https://discord.com/developers/docs/topics/opcodes-and-status-codes#json-json-error-codes
     attr_reader :code
     # @return [Net::HTTPResponse] the HTTP response.
     attr_reader :response
@@ -47,7 +48,7 @@ module Discorb
     def initialize(resp, data)
       @code = data[:code]
       @response = resp
-      super(data[:message])
+      super(data[:message] + " (#{@code})")
     end
   end
 
@@ -60,9 +61,11 @@ module Discorb
       @code = data[:code]
       @response = resp
       DiscorbError.instance_method(:initialize).bind(self).call(
-        [data[:message], enumerate_errors(data[:errors]).map do |ek, ev|
-          "#{ek}=>#{ev}"
-        end.join("\n")].join("\n")
+        [
+          data[:message] + " (#{@code})", enumerate_errors(data[:errors])
+            .map { |ek, ev| "#{ek}=>#{ev}" }
+            .join("\n"),
+        ].join("\n")
       )
     end
   end

data/lib/discorb/gateway.rb

@@ -482,38 +482,44 @@ module Discorb
       private
 
       def connect_gateway(reconnect)
-        @log.info "Connecting to gateway."
+        if reconnect
+          @log.info "Reconnecting to gateway..."
+        else
+          @log.info "Connecting to gateway..."
+        end
         Async do
+          @connection&.close
           @http = HTTP.new(self)
           _, gateway_response = @http.get("/gateway").wait
           gateway_url = gateway_response[:url]
           endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
                                                  alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
-            Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection) do |connection|
-              @connection = connection
-              @zlib_stream = Zlib::Inflate.new(Zlib::MAX_WBITS)
-              @buffer = +""
-              begin
-                while (message = @connection.read)
-                  @buffer << message
-                  if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
-                    begin
-                      data = @zlib_stream.inflate(@buffer)
-                      @buffer = +""
-                      message = JSON.parse(data, symbolize_names: true)
-                    rescue JSON::ParserError
-                      @buffer = +""
-                      @log.error "Received invalid JSON from gateway."
-                      @log.debug "#{data}"
-                    else
-                      handle_gateway(message, reconnect)
-                    end
+            @connection = Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection)
+            @zlib_stream = Zlib::Inflate.new(Zlib::MAX_WBITS)
+            buffer = +""
+            begin
+              while (message = @connection.read)
+                buffer << message
+                if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
+                  begin
+                    data = @zlib_stream.inflate(buffer)
+                    buffer = +""
+                    message = JSON.parse(data, symbolize_names: true)
+                  rescue JSON::ParserError
+                    buffer = +""
+                    @log.error "Received invalid JSON from gateway."
+                    @log.debug "#{data}"
+                  else
+                    handle_gateway(message, reconnect)
                   end
                 end
-              rescue EOFError, Async::Wrapper::Cancelled, Async::Wrapper::WaitError
-                # Ignore
               end
+            rescue Async::Wrapper::Cancelled, OpenSSL::SSL::SSLError, Async::Wrapper::WaitError, EOFError => e
+              @log.error "Gateway connection closed: #{e.class}: #{e.message}"
+              connect_gateway(true)
+            else # should never happen
+              connect_gateway(true)
             end
           rescue Protocol::WebSocket::ClosedError => e
             @tasks.map(&:stop)
@@ -542,7 +548,7 @@ module Discorb
               connect_gateway(false)
             end
           rescue => e
-            @log.error "Discord WebSocket error: #{e.message}"
+            @log.error "Discord WebSocket error: #{e.full_message}"
             connect_gateway(false)
           end
         end
@@ -1034,6 +1040,7 @@ module Discorb
           dispatch(interaction.class.event_name, interaction)
         when "RESUMED"
           @log.info("Successfully resumed connection")
+          @tasks << handle_heartbeat
           dispatch(:resumed)
         else
           if respond_to?("event_" + event_name.downcase)

data/lib/discorb/interaction/autocomplete.rb

@@ -0,0 +1,49 @@
+module Discorb
+  #
+  # Represents auto complete interaction.
+  #
+  class AutoComplete < Interaction
+    @interaction_type = 4
+    @interaction_name = :auto_complete
+
+    # @private
+    def _set_data(data)
+      super
+      Sync do
+        name, options = Discorb::CommandInteraction::SlashCommand.get_command_data(data)
+
+        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+          @client.log.warn "Unknown command name #{name}, ignoring"
+          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)
+        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] })
+        send_complete_result(val)
+      end
+    end
+
+    # @private
+    def send_complete_result(val)
+      @client.http.post("/interactions/#{@id}/#{@token}/callback", {
+        type: 8,
+        data: {
+          choices: val.map do |vk, vv|
+            {
+              name: vk,
+              value: vv,
+            }
+          end,
+        },
+      }).wait
+    rescue Discorb::NotFoundError
+      @client.log.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
+    end
+
+    class << self
+      alias make_interaction new
+    end
+  end
+end

data/lib/discorb/interaction/command.rb

@@ -0,0 +1,142 @@
+module Discorb
+  #
+  # Represents a command interaction.
+  #
+  class CommandInteraction < Interaction
+    @interaction_type = 2
+    @interaction_name = :application_command
+    include Interaction::SourceResponse
+
+    #
+    # Represents a slash command interaction.
+    #
+    class SlashCommand < CommandInteraction
+      @command_type = 1
+
+      private
+
+      def _set_data(data)
+        super
+
+        name, options = SlashCommand.get_command_data(data)
+
+        unless (command = @client.bottom_commands.find { |c| c.to_s == name && c.type_raw == 1 })
+          @client.log.warn "Unknown command name #{name}, ignoring"
+          return
+        end
+
+        option_map = command.options.map { |k, v| [k.to_s, v[:default]] }.to_h
+        SlashCommand.modify_option_map(option_map, options)
+
+        command.block.call(self, *command.options.map { |k, v| option_map[k.to_s] })
+      end
+
+      class << self
+        # @private
+        def get_command_data(data)
+          name = data[:name]
+          options = nil
+          return name, options unless (option = data[:options]&.first)
+
+          case option[:type]
+          when 1
+            name += " #{option[:name]}"
+            options = option[:options]
+          when 2
+            name += " #{option[:name]}"
+            unless option[:options]&.first&.[](:type) == 1
+              options = option[:options]
+              return name, options
+            end
+            option_sub = option[:options]&.first
+            name += " #{option_sub[:name]}"
+            options = option_sub[:options]
+          else
+            options = data[:options]
+          end
+
+          return name, options
+        end
+
+        # @private
+        def modify_option_map(option_map, options)
+          options ||= []
+          options.each_with_index do |option|
+            val = case option[:type]
+              when 3, 4, 5, 10
+                option[:value]
+              when 6
+                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] }
+              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] }
+              end
+            option_map[option[:name]] = val
+          end
+        end
+      end
+    end
+
+    #
+    # Represents a user context menu interaction.
+    #
+    class UserMenuCommand < CommandInteraction
+      @command_type = 2
+
+      # @return [Discorb::Member, Discorb::User] The target user.
+      attr_reader :target
+
+      private
+
+      def _set_data(data)
+        @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
+    end
+
+    #
+    # Represents a message context menu interaction.
+    #
+    class MessageMenuCommand < CommandInteraction
+      @command_type = 3
+
+      # @return [Discorb::Message] The target message.
+      attr_reader :target
+
+      private
+
+      def _set_data(data)
+        @target = Message.new(@client, data[:resolved][:messages][data[:target_id].to_sym].merge(guild_id: @guild_id.to_s))
+        @client.commands.find { |c| c.name == data[:name] && c.type_raw == 3 }.block.call(self, @target)
+      end
+    end
+
+    private
+
+    def _set_data(data)
+      @name = data[:name]
+    end
+
+    class << self
+      # @private
+      attr_reader :command_type
+
+      # @private
+      def make_interaction(client, data)
+        nested_classes.each do |klass|
+          return klass.new(client, data) if !klass.command_type.nil? && klass.command_type == data[:data][:type]
+        end
+        client.log.warn("Unknown command type #{data[:type]}, initialized CommandInteraction")
+        CommandInteraction.new(client, data)
+      end
+
+      # @private
+      def nested_classes
+        constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
+      end
+    end
+  end
+end

data/lib/discorb/interaction/components.rb

@@ -0,0 +1,85 @@
+module Discorb
+
+  #
+  # Represents a message component interaction.
+  # @abstract
+  #
+  class MessageComponentInteraction < Interaction
+    include Interaction::SourceResponse
+    include Interaction::UpdateResponse
+    # @return [String] The content of the response.
+    attr_reader :custom_id
+    # @return [Discorb::Message] The target message.
+    attr_reader :message
+
+    @interaction_type = 3
+    @interaction_name = :message_component
+
+    # @private
+    def initialize(client, data)
+      super
+      @message = Message.new(@client, data[:message].merge({ member: data[:member] }))
+    end
+
+    class << self
+      # @private
+      attr_reader :component_type
+
+      # @private
+      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]
+        end
+        client.log.warn("Unknown component type #{data[:component_type]}, initialized Interaction")
+        MessageComponentInteraction.new(client, data)
+      end
+
+      # @private
+      def nested_classes
+        constants.select { |c| const_get(c).is_a? Class }.map { |c| const_get(c) }
+      end
+    end
+
+    #
+    # Represents a button interaction.
+    #
+    class Button < MessageComponentInteraction
+      @component_type = 2
+      @event_name = :button_click
+      # @return [String] The custom id of the button.
+      attr_reader :custom_id
+
+      private
+
+      def _set_data(data)
+        @custom_id = data[:custom_id]
+      end
+    end
+
+    #
+    # Represents a select menu interaction.
+    #
+    class SelectMenu < MessageComponentInteraction
+      @component_type = 3
+      @event_name = :select_menu_select
+      # @return [String] The custom id of the select menu.
+      attr_reader :custom_id
+      # @return [Array<String>] The selected options.
+      attr_reader :values
+
+      # @!attribute [r] value
+      #   @return [String] The first selected value.
+
+      def value
+        @values[0]
+      end
+
+      private
+
+      def _set_data(data)
+        @custom_id = data[:custom_id]
+        @values = data[:values]
+      end
+    end
+  end
+end