discorb 0.13.1 → 0.14.0

data/lib/discorb/embed.rb

@@ -79,11 +79,11 @@ module Discorb
     end
 
     def image=(value)
-      @image = (value.is_a?(String)) ? Image.new(value) : value
+      @image = value.is_a?(String) ? Image.new(value) : value
     end
 
     def thumbnail=(value)
-      @thumbnail = (value.is_a?(String)) ? Thumbnail.new(value) : value
+      @thumbnail = value.is_a?(String) ? Thumbnail.new(value) : value
     end
 
     def inspect

data/lib/discorb/emoji.rb

@@ -96,7 +96,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name != Discorb::Unset
         payload[:roles] = roles.map { |r| Discorb::Utils.try(r, :id) } if roles != Discorb::Unset
-        @client.http.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :patch), payload, audit_log_reason: reason)
         self
       end
     end
@@ -113,7 +113,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.http.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
+        @client.http.request(Route.new("/guilds/#{@guild.id}/emojis/#{@id}", "//guilds/:guild_id/emojis/:emoji_id", :delete), audit_log_reason: reason).wait
         @available = false
         self
       end
@@ -121,6 +121,15 @@ module Discorb
 
     alias destroy! delete!
 
+    # @private
+    def to_hash
+      {
+        name: @name,
+        id: @id,
+        animated: @animated,
+      }
+    end
+
     private
 
     def _set_data(data)
@@ -202,9 +211,7 @@ module Discorb
       else
         raise ArgumentError, "No such emoji: #{name}"
       end
-      if tone > 0
-        @value += EmojiTable::SKIN_TONES[tone]
-      end
+      @value += EmojiTable::SKIN_TONES[tone] if tone.positive?
     end
 
     # @return [String] The unicode string of the emoji.
@@ -225,6 +232,15 @@ module Discorb
       "#<#{self.class} :#{@name}:>"
     end
 
+    # @private
+    def to_hash
+      {
+        name: @value,
+        id: nil,
+        animated: false,
+      }
+    end
+
     class << self
       alias [] new
     end

data/lib/discorb/emoji_table.rb

@@ -3885,7 +3885,7 @@ module Discorb
       "\xf0\x9f\x8f\xbc",
       "\xf0\x9f\x8f\xbd",
       "\xf0\x9f\x8f\xbe",
-      "\xf0\x9f\x8f\xbf",
+      "\xf0\x9f\x8f\xbf"
     ].freeze
   end
 end

data/lib/discorb/error.rb

@@ -11,9 +11,7 @@ module Discorb
     def enumerate_errors(hash)
       res = {}
       _recr_items([], hash, res)
-      if res == { "" => nil }
-        res = {}
-      end
+      res = {} if res == { "" => nil }
       res
     end
 
@@ -64,7 +62,7 @@ module Discorb
         [
           data[:message] + " (#{@code})", enumerate_errors(data[:errors])
             .map { |ek, ev| "#{ek}=>#{ev}" }
-            .join("\n"),
+            .join("\n")
         ].join("\n")
       )
     end
@@ -92,14 +90,14 @@ module Discorb
   # Represents a error because of a cloudflare ban.
   #
   class CloudFlareBanError < HTTPError
-    def initialize(resp, client)
+    def initialize(_resp, client)
       @client = client
       @client.close!
       message = <<~MESSAGE
         The client is banned from CloudFlare.
         Hint: Try to decrease the number of requests per second, e.g. Use sleep in between requests.
       MESSAGE
-      $stderr.puts message
+      warn message
       DiscorbError.instance_method(:initialize).bind(self).call(message)
     end
   end

data/lib/discorb/event.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
 module Discorb
+  #
+  # Represents an event in guild.
+  #
   class ScheduledEvent < DiscordModel
     @privacy_level = {
       2 => :guild_only,
@@ -120,7 +124,7 @@ module Discorb
       status: Discorb::Unset
     )
       Async do
-        payload = case (type == Discorb::Unset) ? @entity_type : type
+        payload = case type == Discorb::Unset ? @entity_type : type
           when :stage_instance
             raise ArgumentError, "channel must be provided for stage_instance events" unless channel
             {
@@ -164,7 +168,7 @@ module Discorb
           else
             raise ArgumentError, "Invalid scheduled event type: #{type}"
           end
-        @client.http.patch("/guilds/#{@guild_id}/scheduled-events/#{@id}", payload).wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :patch), payload).wait
       end
     end
 
@@ -201,7 +205,7 @@ module Discorb
     #
     def delete!
       Async do
-        @client.http.delete("/guilds/#{@guild_id}/scheduled-events/#{@id}").wait
+        @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}", "//guilds/:guild_id/scheduled-events/:scheduled_event_id", :delete)).wait
       end
     end
 
@@ -226,11 +230,9 @@ module Discorb
         if limit.nil?
           after = 0
           res = []
-          while true
-            _resp, users = @client.http.get("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true").wait
-            if users.empty?
-              break
-            end
+          loop do
+            _resp, users = @client.http.request(Route.new("/guilds/#{@guild_id}/scheduled-events/#{@id}/users?limit=100&after=#{after}&with_member=true", "//guilds/:guild_id/scheduled-events/:scheduled_event_id/users", :get)).wait
+            break if users.empty?
             res += users.map { |u| Member.new(@client, @guild_id, u[:user], u[:member]) }
             after = users.last[:user][:id]
           end
@@ -238,11 +240,11 @@ module Discorb
         else
           params = {
             limit: limit,
-            before: Discorb::Utils.try(after, :id),
-            after: Discorb::Utils.try(around, :id),
+            before: Discorb::Utils.try(before, :id),
+            after: Discorb::Utils.try(after, :id),
             with_member: with_member,
           }.filter { |_k, v| !v.nil? }.to_h
-          _resp, messages = @client.http.get("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}").wait
+          _resp, messages = @client.http.request(Route.new("/channels/#{channel_id.wait}/messages?#{URI.encode_www_form(params)}", "//channels/:channel_id/messages", :get)).wait
           messages.map { |m| Message.new(@client, m.merge({ guild_id: @guild_id.to_s })) }
         end
       end

data/lib/discorb/exe/about.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Show information of discorb.
 
 puts "  disco\e[31mrb\e[m -  A new Discord API wrapper in Ruby.  \n\n"

data/lib/discorb/exe/irb.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # description: Connect to discord and start IRB.
 
@@ -31,13 +32,13 @@ client.on :standby do
   end
 
   def dirb_help
-    puts <<~EOS
+    puts <<~MESSAGE
            \e[96mDiscord-IRB\e[m
            This is a debug client for Discord.
            \e[90mmessage\e[m to get latest message.
 
            \e[36mhttps://discorb-lib.github.io/#{Discorb::VERSION}/file.irb.html\e[m for more information.
-         EOS
+         MESSAGE
   end
 
   puts <<~FIRST_MESSAGE
@@ -56,7 +57,7 @@ end
 
 token = ENV["DISCORD_BOT_TOKEN"] || ENV["DISCORD_TOKEN"]
 if token.nil?
-  if File.exists?(token_file)
+  if File.exist?(token_file)
     token = File.read(token_file)
   else
     print "\e[90mToken?\e[m : "

data/lib/discorb/exe/new.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Make files for the discorb project.
 
 require "optparse"
@@ -131,7 +132,7 @@ FILES = {
       https://rubygems.org/gems/license-cli may be useful.
 
   MARKDOWN
-}
+}.freeze
 
 # @private
 def create_file(name)
@@ -162,8 +163,8 @@ def git_init
   system "git init"
   system "git add ."
   system "git commit -m \"Initial commit\""
-  sputs "Initialized repository, use " +
-          "\e[32mgit commit --amend -m '...'\e[92m" +
+  sputs "Initialized repository, use " \
+          "\e[32mgit commit --amend -m '...'\e[92m" \
           " to change commit message of initial commit.\n"
 end
 
@@ -225,13 +226,11 @@ if (dir = ARGV[0])
   if Dir.exist?($path)
     if Dir.empty?($path)
       iputs "Found \e[30m#{dir}\e[90m and empty, using this directory."
-    else
-      if $values[:force]
-        iputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
+    elsif $values[:force]
+      iputs "Found \e[30m#{dir}\e[90m and not empty, but force is on, using this directory."
       else
         eputs "Directory \e[31m#{dir}\e[91m already exists and not empty. Use \e[31m-f\e[91m to force."
         exit
-      end
     end
   else
     Dir.mkdir($path)

data/lib/discorb/exe/run.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Run a client.
 require "optparse"
 require "json"
@@ -6,7 +7,7 @@ require "io/console"
 
 ARGV.delete_at 0
 # @private
-LOG_LEVELS = %w[none debug info warn error fatal]
+LOG_LEVELS = %w[none debug info warn error fatal].freeze
 
 opt = OptionParser.new <<~BANNER
                          This command will run a client.

data/lib/discorb/exe/setup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Setup application commands.
 require "optparse"
 require "discorb/utils/colored_puts"
@@ -6,6 +7,7 @@ ARGV.delete_at 0
 
 options = {
   guilds: nil,
+  script: true,
 }
 
 opt = OptionParser.new <<~BANNER
@@ -16,20 +18,21 @@ opt = OptionParser.new <<~BANNER
                                    script                     The script to setup.
                        BANNER
 opt.on("-g", "--guild ID", Array, "The guild ID to setup, use comma for setup commands in multiple guilds, or `global` for setup global commands.") { |v| options[:guilds] = v }
+opt.on("-s", "--[no-]script", "Whether to run `:setup` event. This may be useful if setup script includes operation that shouldn't run twice. Default to true.") { |v| options[:script] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
 script ||= "main.rb"
 ENV["DISCORB_CLI_FLAG"] = "setup"
 
-if options[:guilds] == ["global"]
-  ENV["DISCORB_SETUP_GUILDS"] = "global"
+ENV["DISCORB_SETUP_GUILDS"] = if options[:guilds] == ["global"]
+  "global"
 elsif options[:guilds]
-  ENV["DISCORB_SETUP_GUILDS"] = options[:guilds].join(",")
-else
-  ENV["DISCORB_SETUP_GUILDS"] = nil
+  options[:guilds].join(",")
 end
 
+ENV["DISCORB_SETUP_SCRIPT"] = options[:script].to_s if options[:script]
+
 begin
   load script
 rescue LoadError

data/lib/discorb/exe/show.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # description: Show information of your environment.
 
 require "etc"

data/lib/discorb/extend.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop: disable Style/Documentation
 
 class Time
   #
@@ -18,22 +19,26 @@ class Time
 end
 
 # @private
-class Async::Node
-  def description
-    @object_name ||= "#{self.class}:0x#{object_id.to_s(16)}#{@transient ? " transient" : nil}"
+module Async
+  class Node
+    def description
+      @object_name ||= "#{self.class}:0x#{object_id.to_s(16)}#{@transient ? " transient" : nil}"
 
-    if @annotation
-      "#{@object_name} #{@annotation}"
-    elsif line = self.backtrace(0, 1)&.first
-      "#{@object_name} #{line}"
-    else
-      @object_name
+      if @annotation
+        "#{@object_name} #{@annotation}"
+      elsif line = self.backtrace(0, 1)&.first
+        "#{@object_name} #{line}"
+      else
+        @object_name
+      end
     end
-  end
 
-  def to_s
-    "\#<#{self.description}>"
-  end
+    def to_s
+      "\#<#{self.description}>"
+    end
 
-  alias inspect to_s
+    alias inspect to_s
+  end
 end
+
+# rubocop: enable Style/Documentation

data/lib/discorb/extension.rb

@@ -17,7 +17,7 @@ module Discorb
       ret = {}
       self.class.events.each do |event, handlers|
         ret[event] = handlers.map do |handler|
-          Discorb::EventHandler.new(Proc.new { |*args, **kwargs| instance_exec(*args, **kwargs, &handler[2]) }, handler[0], handler[1])
+          Discorb::EventHandler.new(proc { |*args, **kwargs| instance_exec(*args, **kwargs, &handler[2]) }, handler[0], handler[1])
         end
       end
       @events = ret
@@ -27,6 +27,10 @@ module Discorb
       base.extend(ClassMethods)
     end
 
+    #
+    # @private
+    # Module for adding class methods to the extension class.
+    #
     module ClassMethods
       include Discorb::ApplicationCommand::Handler
       undef setup_commands

data/lib/discorb/gateway.rb

@@ -108,6 +108,35 @@ module Discorb
       end
     end
 
+    #
+    # Represents a `INTEGRATION_DELETE` event.
+    #
+    class IntegrationDeleteEvent < GatewayEvent
+      # @return [Discorb::Snowflake] The ID of the integration.
+      attr_reader :id
+      # @!attribute [r] guild
+      #   @macro client_cache
+      #   @return [Discorb::Guild] The guild of the integration.
+      # @!attribute [r] user
+      #   @macro client_cache
+      #   @return [Discorb::User] The user associated with the integration.
+
+      # @private
+      def initialize(_client, data)
+        @id = Snowflake.new(data[:id])
+        @guild_id = data[:guild_id]
+        @user_id = data[:application_id]
+      end
+
+      def guild
+        @client.guilds[@guild_id]
+      end
+
+      def user
+        @client.users[@user_id]
+      end
+    end
+
     #
     # Represents a `MESSAGE_REACTION_REMOVE_ALL` event.
     #
@@ -232,7 +261,6 @@ module Discorb
     #
     # Represents a `MESSAGE_UPDATE` event.
     #
-
     class MessageUpdateEvent < GatewayEvent
       # @return [Discorb::Message] The message before update.
       attr_reader :before
@@ -364,6 +392,9 @@ module Discorb
       end
     end
 
+    #
+    # Represents a `GUILD_INTEGRATIONS_UPDATE` event.
+    #
     class GuildIntegrationsUpdateEvent < GatewayEvent
       def initialize(client, data)
         @client = client
@@ -499,16 +530,20 @@ module Discorb
     module Handler
       private
 
-      def connect_gateway(reconnect, no_close: false)
+      def connect_gateway(reconnect)
         if reconnect
           @log.info "Reconnecting to gateway..."
         else
           @log.info "Connecting to gateway..."
         end
         Async do
-          @connection&.close unless no_close
+          if @connection && !@connection.closed?
+            Async do
+              @connection.close
+            end
+          end
           @http = HTTP.new(self)
-          _, gateway_response = @http.get("/gateway").wait
+          _, 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",
                                                  alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
@@ -533,9 +568,16 @@ module Discorb
                   end
                 end
               end
-            rescue Async::Wrapper::Cancelled, OpenSSL::SSL::SSLError, Async::Wrapper::WaitError, EOFError, Errno::EPIPE => e
+            rescue Async::Wrapper::Cancelled,
+                   OpenSSL::SSL::SSLError,
+                   Async::Wrapper::WaitError,
+                   EOFError,
+                   Errno::EPIPE,
+                   Errno::ECONNRESET,
+                   IOError => e
               @log.error "Gateway connection closed accidentally: #{e.class}: #{e.message}"
-              connect_gateway(true, no_close: true)
+              @connection.force_close
+              connect_gateway(true)
             else # should never happen
               connect_gateway(true)
             end
@@ -550,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)
@@ -565,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
@@ -579,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:"
@@ -605,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"
@@ -630,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
@@ -657,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"
@@ -862,13 +903,12 @@ 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]])
-          return @log.warn "Unknown integration id #{data[:id]}, ignoring" unless (integration = guild.integrations.delete(data[:id]))
 
-          dispatch(:integration_delete, integration)
+          dispatch(:integration_delete, IntegrationDeleteEvent.new(self, data))
         when "WEBHOOKS_UPDATE"
           dispatch(:webhooks_update, WebhooksUpdateEvent.new(self, data))
         when "INVITE_CREATE"
@@ -884,6 +924,7 @@ module Discorb
             current = VoiceState.new(self, data)
             guild.voice_states[data[:user_id]] = current
           else
+            guild.voice_states.remove(data[:user_id]) if data[:channel_id].nil?
             old = VoiceState.new(self, current.instance_variable_get(:@data))
             current.send(:_set_data, data)
           end
@@ -1007,7 +1048,7 @@ module Discorb
               message.instance_variable_set(:@deleted, true)
               messages.push(message)
             else
-              messages.push(UnknownDeleteBulkMessage.new(self, id))
+              messages.push(UnknownDeleteBulkMessage.new(self, id, data))
             end
           end
           dispatch(:message_delete_bulk, messages)
@@ -1053,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"
@@ -1071,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]])
@@ -1139,6 +1180,13 @@ module Discorb
       def close
         super
         @closed = true
+      rescue StandardError
+        force_close
+      end
+
+      def force_close
+        @framer.instance_variable_get(:@stream).instance_variable_get(:@io).instance_variable_get(:@io).instance_variable_get(:@io).close
+        @closed = true
       end
 
       def parse(buffer)