discordrb 3.3.0 → 3.4.3

data/lib/discordrb/commands/command_bot.rb

@@ -24,7 +24,7 @@ module Discordrb::Commands
 
     # Creates a new CommandBot and logs in to Discord.
     # @param attributes [Hash] The attributes to initialize the CommandBot with.
-    # @see {Discordrb::Bot#initialize} for other attributes that should be used to create the underlying regular bot.
+    # @see Discordrb::Bot#initialize Discordrb::Bot#initialize for other attributes that should be used to create the underlying regular bot.
     # @option attributes [String, Array<String>, #call] :prefix The prefix that should trigger this bot's commands. It
     #   can be:
     #
@@ -39,14 +39,15 @@ module Discordrb::Commands
     #     complicated dynamic prefixes (e. g. based on server), or even something else entirely (suffixes, or most
     #     adventurous, infixes).
     # @option attributes [true, false] :advanced_functionality Whether to enable advanced functionality (very powerful
-    #   way to nest commands into chains, see https://github.com/meew0/discordrb/wiki/Commands#command-chain-syntax
+    #   way to nest commands into chains, see https://github.com/shardlab/discordrb/wiki/Commands#command-chain-syntax
     #   for info. Default is false.
     # @option attributes [Symbol, Array<Symbol>, false] :help_command The name of the command that displays info for
     #   other commands. Use an array if you want to have aliases. Default is "help". If none should be created, use
     #   `false` as the value.
-    # @option attributes [String] :command_doesnt_exist_message The message that should be displayed if a user attempts
+    # @option attributes [String, #call] :command_doesnt_exist_message The message that should be displayed if a user attempts
     #   to use a command that does not exist. If none is specified, no message will be displayed. In the message, you
-    #   can use the string '%command%' that will be replaced with the name of the command.
+    #   can use the string '%command%' that will be replaced with the name of the command. Anything responding to call
+    #   such as a proc will be called with the event, and is expected to return a String or nil.
     # @option attributes [String] :no_permission_message The message to be displayed when `NoPermission` error is raised.
     # @option attributes [true, false] :spaces_allowed Whether spaces are allowed to occur between the prefix and the
     #   command. Default is false.
@@ -83,7 +84,9 @@ module Discordrb::Commands
         num_shards: attributes[:num_shards],
         redact_token: attributes.key?(:redact_token) ? attributes[:redact_token] : true,
         ignore_bots: attributes[:ignore_bots],
-        compress_mode: attributes[:compress_mode])
+        compress_mode: attributes[:compress_mode],
+        intents: attributes[:intents]
+      )
 
       @prefix = attributes[:prefix]
       @attributes = {
@@ -140,6 +143,7 @@ module Discordrb::Commands
       }
 
       return unless @attributes[:help_command]
+
       command(@attributes[:help_command], max_args: 1, description: 'Shows a list of all the commands available or displays help for a specific command.', usage: 'help [command name]') do |event, command_name|
         if command_name
           command = @commands[command_name.to_sym]
@@ -148,6 +152,7 @@ module Discordrb::Commands
             command_name = command.name
           end
           return "The command `#{command_name}` does not exist!" unless command
+
           desc = command.attributes[:description] || '*No description available*'
           usage = command.attributes[:usage]
           parameters = command.attributes[:parameters]
@@ -206,15 +211,22 @@ module Discordrb::Commands
     def execute_command(name, event, arguments, chained = false, check_permissions = true)
       debug("Executing command #{name} with arguments #{arguments}")
       return unless @commands
+
       command = @commands[name]
       command = command.aliased_command if command.is_a?(CommandAlias)
       return unless !check_permissions || channels?(event.channel, @attributes[:channels]) ||
                     (command && !command.attributes[:channels].nil?)
+
       unless command
-        event.respond @attributes[:command_doesnt_exist_message].gsub('%command%', name.to_s) if @attributes[:command_doesnt_exist_message]
+        if @attributes[:command_doesnt_exist_message]
+          message = @attributes[:command_doesnt_exist_message]
+          message = message.call(event) if message.respond_to?(:call)
+          event.respond message.gsub('%command%', name.to_s) if message
+        end
         return
       end
       return unless !check_permissions || channels?(event.channel, command.attributes[:channels])
+
       arguments = arg_check(arguments, command.attributes[:arg_types], event.server) if check_permissions
       if (check_permissions &&
          permission?(event.author, command.attributes[:permission_level], event.server) &&
@@ -238,11 +250,13 @@ module Discordrb::Commands
     # For example, `['1', '10..14']` with types `[Integer, Range]` would turn into `[1, 10..14]`.
     def arg_check(args, types = nil, server = nil)
       return args unless types
+
       args.each_with_index.map do |arg, i|
         next arg if types[i].nil? || types[i] == String
+
         if types[i] == Integer
           begin
-            Integer(arg)
+            Integer(arg, 10)
           rescue ArgumentError
             nil
           end
@@ -304,7 +318,7 @@ module Discordrb::Commands
         elsif types[i].respond_to?(:from_argument)
           begin
             types[i].from_argument arg
-          rescue
+          rescue StandardError
             nil
           end
         else
@@ -319,6 +333,7 @@ module Discordrb::Commands
     # @return [String, nil] the command's result, if there is any.
     def simple_execute(chain, event)
       return nil if chain.empty?
+
       args = chain.split(' ')
       execute_command(args[0].to_sym, event, args[1..-1])
     end
@@ -369,6 +384,7 @@ module Discordrb::Commands
     # @param channel [String, Integer, Channel] The channel name, integer ID, or `Channel` object to be added
     def add_channel(channel)
       return if @attributes[:channels].find { |c| channel.resolve_id == c.resolve_id }
+
       @attributes[:channels] << channel
     end
 
@@ -426,6 +442,7 @@ module Discordrb::Commands
 
     def standard_prefix_trigger(message, prefix)
       return nil unless message.start_with? prefix
+
       message[prefix.length..-1]
     end
 
@@ -437,11 +454,13 @@ module Discordrb::Commands
 
     def required_roles?(member, required)
       return true if member.webhook? || member.is_a?(Discordrb::Recipient) || required.nil? || required.empty?
+
       required.is_a?(Array) ? check_multiple_roles(member, required) : member.role?(role)
     end
 
     def allowed_roles?(member, required)
       return true if member.webhook? || member.is_a?(Discordrb::Recipient) || required.nil? || required.empty?
+
       required.is_a?(Array) ? check_multiple_roles(member, required, false) : member.role?(role)
     end
 
@@ -459,9 +478,11 @@ module Discordrb::Commands
 
     def channels?(channel, channels)
       return true if channels.nil? || channels.empty?
+
       channels.any? do |c|
         # if c is string, make sure to remove the "#" from channel names in case it was specified
         return true if c.is_a?(String) && c.delete('#') == channel.name
+
         c.resolve_id == channel.resolve_id
       end
     end
@@ -480,7 +501,7 @@ module Discordrb::Commands
           else
             event.respond result unless result.nil? || result.empty?
           end
-        rescue => e
+        rescue StandardError => e
           log_exception(e)
         ensure
           @event_threads.delete(t)

data/lib/discordrb/commands/container.rb

@@ -9,22 +9,25 @@ module Discordrb::Commands
   module CommandContainer
     include RateLimiter
 
-    # @return [Hash<Symbol, Command>] hash of command names and commands this container has.
+    # @return [Hash<Symbol, Command, CommandAlias>] hash of command names and commands this container has.
     attr_reader :commands
 
     # Adds a new command to the container.
-    # @param name [Symbol, Array<Symbol>] The name of the command to add, or an array of multiple names for the command
+    # @param name [Symbol] The name of the command to add.
     # @param attributes [Hash] The attributes to initialize the command with.
+    # @option attributes [Array<Symbol>] :aliases A list of additional names for this command. This in effect
+    #   creates {CommandAlias} objects in the container ({#commands}) that refer to the newly created command.
+    #   Additionally, the default help command will identify these command names as an alias where applicable.
     # @option attributes [Integer] :permission_level The minimum permission level that can use this command, inclusive.
     #   See {CommandBot#set_user_permission} and {CommandBot#set_role_permission}.
     # @option attributes [String, false] :permission_message Message to display when a user does not have sufficient
     #   permissions to execute a command. %name% in the message will be replaced with the name of the command. Disable
     #   the message by setting this option to false.
     # @option attributes [Array<Symbol>] :required_permissions Discord action permissions (e.g. `:kick_members`) that
-    #   should be required to use this command. See {Discordrb::Permissions::Flags} for a list.
-    # @option attributes [Array<Role>, Array<#resolve_id>] :required_roles Roles that user must have to use this command
+    #   should be required to use this command. See {Discordrb::Permissions::FLAGS} for a list.
+    # @option attributes [Array<Role>, Array<String, Integer>] :required_roles Roles, or their IDs, that user must have to use this command
     #   (user must have all of them).
-    # @option attributes [Array<Role>, Array<#resolve_id>] :allowed_roles Roles that user should have to use this command
+    # @option attributes [Array<Role>, Array<String, Integer>] :allowed_roles Roles, or their IDs, that user should have to use this command
     #   (user should have at least one of them).
     # @option attributes [Array<String, Integer, Channel>] :channels The channels that this command can be used on. An
     #   empty array indicates it can be used on any channel. Supersedes the command bot attribute.
@@ -55,26 +58,22 @@ module Discordrb::Commands
     # @note `LocalJumpError`s are rescued from internally, giving bots the opportunity to use `return` or `break` in
     #   their blocks without propagating an exception.
     # @return [Command] The command that was added.
-    # @deprecated The command name argument will no longer support arrays in the next release.
-    #   Use the `aliases` attribute instead.
     def command(name, attributes = {}, &block)
       @commands ||= {}
-      if name.is_a? Array
-        new_command = nil
 
-        name.each do |e|
-          new_command = Command.new(e, attributes, &block)
-          @commands[e] = new_command
-        end
+      # TODO: Remove in 4.0
+      if name.is_a?(Array)
+        name, *aliases = name
+        attributes[:aliases] = aliases if attributes[:aliases].nil?
+        Discordrb::LOGGER.warn("While registering command #{name.inspect}")
+        Discordrb::LOGGER.warn('Arrays for command aliases is removed. Please use `aliases` argument instead.')
+      end
 
-        new_command
-      else
-        new_command = Command.new(name, attributes, &block)
-        new_command.attributes[:aliases].each do |aliased_name|
-          @commands[aliased_name] = CommandAlias.new(aliased_name, new_command)
-        end
-        @commands[name] = new_command
+      new_command = Command.new(name, attributes, &block)
+      new_command.attributes[:aliases].each do |aliased_name|
+        @commands[aliased_name] = CommandAlias.new(aliased_name, new_command)
       end
+      @commands[name] = new_command
     end
 
     # Removes a specific command from this container.
@@ -100,9 +99,7 @@ module Discordrb::Commands
       container_modules = container.singleton_class.included_modules
 
       # If the container is an EventContainer and we can include it, then do that
-      if container_modules.include?(Discordrb::EventContainer) && respond_to?(:include_events)
-        include_events(container)
-      end
+      include_events(container) if container_modules.include?(Discordrb::EventContainer) && respond_to?(:include_events)
 
       if container_modules.include? Discordrb::Commands::CommandContainer
         include_commands(container)

data/lib/discordrb/commands/parser.rb

@@ -81,45 +81,43 @@ module Discordrb::Commands
     # @return [String] the result of the execution.
     def call(event, arguments, chained = false, check_permissions = true)
       if arguments.length < @attributes[:min_args]
-        event.respond "Too few arguments for command `#{name}`!"
-        event.respond "Usage: `#{@attributes[:usage]}`" if @attributes[:usage]
+        response = "Too few arguments for command `#{name}`!"
+        response += "\nUsage: `#{@attributes[:usage]}`" if @attributes[:usage]
+        event.respond(response)
         return
       end
       if @attributes[:max_args] >= 0 && arguments.length > @attributes[:max_args]
-        event.respond "Too many arguments for command `#{name}`!"
-        event.respond "Usage: `#{@attributes[:usage]}`" if @attributes[:usage]
+        response = "Too many arguments for command `#{name}`!"
+        response += "\nUsage: `#{@attributes[:usage]}`" if @attributes[:usage]
+        event.respond(response)
         return
       end
-      unless @attributes[:chain_usable]
-        if chained
-          event.respond "Command `#{name}` cannot be used in a command chain!"
-          return
-        end
+      unless @attributes[:chain_usable] && !chained
+        event.respond "Command `#{name}` cannot be used in a command chain!"
+        return
       end
 
       if check_permissions
         rate_limited = event.bot.rate_limited?(@attributes[:bucket], event.author)
         if @attributes[:bucket] && rate_limited
-          if @attributes[:rate_limit_message]
-            event.respond @attributes[:rate_limit_message].gsub('%time%', rate_limited.round(2).to_s)
-          end
+          event.respond @attributes[:rate_limit_message].gsub('%time%', rate_limited.round(2).to_s) if @attributes[:rate_limit_message]
           return
         end
       end
 
       result = @block.call(event, *arguments)
       event.drain_into(result)
-    rescue LocalJumpError => ex # occurs when breaking
-      result = ex.exit_value
+    rescue LocalJumpError => e # occurs when breaking
+      result = e.exit_value
       event.drain_into(result)
-    rescue => exception # Something went wrong inside our @block!
+    rescue StandardError => e # Something went wrong inside our @block!
       rescue_value = @attributes[:rescue] || event.bot.attributes[:rescue]
       if rescue_value
-        event.respond(rescue_value.gsub('%exception%', exception.message)) if rescue_value.is_a?(String)
-        rescue_value.call(event, exception) if rescue_value.respond_to?(:call)
+        event.respond(rescue_value.gsub('%exception%', e.message)) if rescue_value.is_a?(String)
+        rescue_value.call(event, e) if rescue_value.respond_to?(:call)
       end
 
-      raise exception
+      raise e
     end
   end
 
@@ -209,8 +207,10 @@ module Discordrb::Commands
         result += char if b_level <= 0
 
         next unless char == @attributes[:sub_chain_end] && !quoted
+
         b_level -= 1
         next unless b_level.zero?
+
         nested = @chain[b_start + 1..index - 1]
         subchain = CommandChain.new(nested, @bot, true)
         result += subchain.execute(event)

data/lib/discordrb/commands/rate_limiter.rb

@@ -35,7 +35,7 @@ module Discordrb::Commands
     end
 
     # Performs a rate limiting request
-    # @param thing [#resolve_id, Integer, Symbol] The particular thing that should be rate-limited (usually a user/channel, but you can also choose arbitrary integers or symbols)
+    # @param thing [String, Integer, Symbol] The particular thing that should be rate-limited (usually a user/channel, but you can also choose arbitrary integers or symbols)
     # @param rate_limit_time [Time] The time to base the rate limiting on, only useful for testing.
     # @param increment [Integer] How much to increment the rate-limit counter. Default is 1.
     # @return [Integer, false] the waiting time until the next request, in seconds, or false if the request succeeded
@@ -83,6 +83,7 @@ module Discordrb::Commands
     def resolve_key(thing)
       return thing.resolve_id if thing.respond_to?(:resolve_id) && !thing.is_a?(String)
       return thing if thing.is_a?(Integer) || thing.is_a?(Symbol)
+
       raise ArgumentError, "Cannot use a #{thing.class} as a rate limiting key!"
     end
   end
@@ -104,7 +105,7 @@ module Discordrb::Commands
 
     # Performs a rate limit request.
     # @param key [Symbol] Which bucket to perform the request for.
-    # @param thing [#resolve_id, Integer, Symbol] What should be rate-limited.
+    # @param thing [String, Integer, Symbol] What should be rate-limited.
     # @param increment (see Bucket#rate_limited?)
     # @see Bucket#rate_limited?
     # @return [Integer, false] How much time to wait or false if the request succeeded.

data/lib/discordrb/container.rb

@@ -5,6 +5,7 @@ require 'discordrb/events/typing'
 require 'discordrb/events/lifetime'
 require 'discordrb/events/presence'
 require 'discordrb/events/voice_state_update'
+require 'discordrb/events/voice_server_update'
 require 'discordrb/events/channels'
 require 'discordrb/events/members'
 require 'discordrb/events/roles'
@@ -89,7 +90,7 @@ module Discordrb
 
     # This **event** is raised when a message is edited in a channel.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [#resolve_id] :id Matches the ID of the message that was edited.
+    # @option attributes [String, Integer] :id Matches the ID of the message that was edited.
     # @option attributes [String, Integer, Channel] :in Matches the channel the message was edited in.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [MessageEditEvent] The event that was raised.
@@ -100,7 +101,7 @@ module Discordrb
 
     # This **event** is raised when a message is deleted in a channel.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [#resolve_id] :id Matches the ID of the message that was deleted.
+    # @option attributes [String, Integer] :id Matches the ID of the message that was deleted.
     # @option attributes [String, Integer, Channel] :in Matches the channel the message was deleted in.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [MessageDeleteEvent] The event that was raised.
@@ -109,9 +110,26 @@ module Discordrb
       register_event(MessageDeleteEvent, attributes, block)
     end
 
+    # This **event** is raised whenever a message is updated. Message updates can be triggered from
+    # a user editing their own message, or from Discord automatically attaching embeds to the
+    # user's message for URLs contained in the message's content. If you only want to listen
+    # for users editing their own messages, use the {message_edit} handler instead.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer] :id Matches the ID of the message that was updated.
+    # @option attributes [String, Integer, Channel] :in Matches the channel the message was updated in.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [MessageUpdateEvent] The event that was raised.
+    # @return [MessageUpdateEventHandler] the event handler that was registered.
+    def message_update(attributes = {}, &block)
+      register_event(MessageUpdateEvent, attributes, block)
+    end
+
     # This **event** is raised when somebody reacts to a message.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [Integer, String] :emoji Matches the ID of the emoji that was reacted with, or its name.
+    # @option attributes [String, Integer] :emoji Matches the ID of the emoji that was reacted with, or its name.
+    # @option attributes [String, Integer, User] :from Matches the user who added the reaction.
+    # @option attributes [String, Integer, Message] :message Matches the message to which the reaction was added.
+    # @option attributes [String, Integer, Channel] :in Matches the channel the reaction was added in.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ReactionAddEvent] The event that was raised.
     # @return [ReactionAddEventHandler] The event handler that was registered.
@@ -121,8 +139,11 @@ module Discordrb
 
     # This **event** is raised when somebody removes a reaction from a message.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [Integer, String] :emoji Matches the ID of the emoji that was removed from the reactions, or
+    # @option attributes [String, Integer] :emoji Matches the ID of the emoji that was removed from the reactions, or
     #   its name.
+    # @option attributes [String, Integer, User] :from Matches the user who removed the reaction.
+    # @option attributes [String, Integer, Message] :message Matches the message to which the reaction was removed.
+    # @option attributes [String, Integer, Channel] :in Matches the channel the reaction was removed in.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ReactionRemoveEvent] The event that was raised.
     # @return [ReactionRemoveEventHandler] The event handler that was registered.
@@ -132,6 +153,9 @@ module Discordrb
 
     # This **event** is raised when somebody removes all reactions from a message.
     # @param attributes [Hash] The event's attributes.
+    # @option attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer, Message] :message Matches the message to which the reactions were removed.
+    # @option attributes [String, Integer, Channel] :in Matches the channel the reactions were removed in.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ReactionRemoveAllEvent] The event that was raised.
     # @return [ReactionRemoveAllEventHandler] The event handler that was registered.
@@ -143,6 +167,8 @@ module Discordrb
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, User] :from Matches the user whose status changed.
     # @option attributes [:offline, :idle, :online] :status Matches the status the user has now.
+    # @option attributes [Hash<Symbol, Symbol>] :client_status Matches the current online status (`:online`, `:idle` or `:dnd`) of the user
+    #   on various device types (`:desktop`, `:mobile`, or `:web`). The value will be `nil` when the user is offline or invisible
     # @yield The block is executed when the event is raised.
     # @yieldparam event [PresenceEvent] The event that was raised.
     # @return [PresenceEventHandler] the event handler that was registered.
@@ -216,8 +242,8 @@ module Discordrb
     # This **event** is raised when a recipient is added to a group channel.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String] :name Matches the name of the group channel that the recipient is added to.
-    # @option attributes [#resolve_id] :owner_id Matches the id of the group channel's owner.
-    # @option attributes [#resolve_id] :id Matches the id of the recipient added to the group channel.
+    # @option attributes [String, Integer] :owner_id Matches the ID of the group channel's owner.
+    # @option attributes [String, Integer] :id Matches the ID of the recipient added to the group channel.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ChannelRecipientAddEvent] The event that was raised.
     # @return [ChannelRecipientAddHandler] the event handler that was registered.
@@ -228,8 +254,8 @@ module Discordrb
     # This **event** is raised when a recipient is removed from a group channel.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String] :name Matches the name of the group channel that the recipient is added to.
-    # @option attributes [#resolve_id] :owner_id Matches the id of the group channel's owner.
-    # @option attributes [#resolve_id] :id Matches the id of the recipient removed from the group channel.
+    # @option attributes [String, Integer] :owner_id Matches the ID of the group channel's owner.
+    # @option attributes [String, Integer] :id Matches the ID of the recipient removed from the group channel.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ChannelRecipientRemoveEvent] The event that was raised.
     # @return [ChannelRecipientRemoveHandler] the event handler that was registered.
@@ -254,6 +280,16 @@ module Discordrb
       register_event(VoiceStateUpdateEvent, attributes, block)
     end
 
+    # This **event** is raised when first connecting to a server's voice channel.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer, User] :from Matches the server that the update is for.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [VoiceServerUpdateEvent] The event that was raised.
+    # @return [VoiceServerUpdateEventHandler] The event handler that was registered.
+    def voice_server_update(attributes = {}, &block)
+      register_event(VoiceServerUpdateEvent, attributes, block)
+    end
+
     # This **event** is raised when a new user joins a server.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String] :username Matches the username of the joined user.
@@ -352,7 +388,7 @@ module Discordrb
     # This **event** is raised when an emoji is created.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server Matches the server.
-    # @option attributes [String, Integer] :id Matches the id of the emoji.
+    # @option attributes [String, Integer] :id Matches the ID of the emoji.
     # @option attributes [String] :name Matches the name of the emoji.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerEmojiCreateEvent] The event that was raised.
@@ -364,7 +400,7 @@ module Discordrb
     # This **event** is raised when an emoji is deleted.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server Matches the server.
-    # @option attributes [String, Integer] :id Matches the id of the emoji.
+    # @option attributes [String, Integer] :id Matches the ID of the emoji.
     # @option attributes [String] :name Matches the name of the emoji.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerEmojiDeleteEvent] The event that was raised.
@@ -376,7 +412,7 @@ module Discordrb
     # This **event** is raised when an emoji is updated.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, Server] :server Matches the server.
-    # @option attributes [String, Integer] :id Matches the id of the emoji.
+    # @option attributes [String, Integer] :id Matches the ID of the emoji.
     # @option attributes [String] :name Matches the name of the emoji.
     # @option attributes [String] :old_name Matches the name of the emoji before the update.
     # @yield The block is executed when the event is raised.
@@ -398,7 +434,7 @@ module Discordrb
 
     # This **event** is raised when a role is deleted.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [#resolve_id] :id Matches the role id.
+    # @option attributes [String, Integer] :id Matches the role ID.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerRoleDeleteEvent] The event that was raised.
     # @return [ServerRoleDeleteEventHandler] the event handler that was registered.
@@ -418,9 +454,9 @@ module Discordrb
 
     # This **event** is raised when a webhook is updated.
     # @param attributes [Hash] The event's attributes.
-    # @option attributes [String, Integer, Server] :server Matches the server by name, id or instance.
-    # @option attributes [String, Integer, Channel] :channel Matches the channel by name, id or instance.
-    # @option attribute [String, Integer, Webhook] :webhook Matches the webhook by name, id or instance.
+    # @option attributes [String, Integer, Server] :server Matches the server by name, ID or instance.
+    # @option attributes [String, Integer, Channel] :channel Matches the channel by name, ID or instance.
+    # @option attribute [String, Integer, Webhook] :webhook Matches the webhook by name, ID or instance.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [WebhookUpdateEvent] The event that was raised.
     # @return [WebhookUpdateEventHandler] the event handler that was registered.
@@ -462,6 +498,30 @@ module Discordrb
     alias_method :direct_message, :pm
     alias_method :dm, :pm
 
+    # This **event** is raised when an invite is created.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer, User] :inviter Matches the user that created the invite.
+    # @option attributes [String, Integer, Channel] :channel Matches the channel the invite was created for.
+    # @option attributes [String, Integer, Server] :server Matches the server the invite was created for.
+    # @option attributes [true, false] :temporary Matches whether the invite is temporary or not.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [InviteCreateEvent] The event that was raised.
+    # @return [InviteCreateEventHandler] The event handler that was registered.
+    def invite_create(attributes = {}, &block)
+      register_event(InviteCreateEvent, attributes, block)
+    end
+
+    # This **event** is raised when an invite is deleted.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer, Channel] :channel Matches the channel the deleted invite was for.
+    # @option attributes [String, Integer, Server] :server Matches the server the deleted invite was for.
+    # @yield The block is executed when the event is raised
+    # @yieldparam event [InviteDeleteEvent] The event that was raised.
+    # @return [InviteDeleteEventHandler] The event handler that was registered.
+    def invite_delete(attributes = {}, &block)
+      register_event(InviteDeleteEvent, attributes, block)
+    end
+
     # This **event** is raised for every dispatch received over the gateway, whether supported by discordrb or not.
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Symbol, Regexp] :type Matches the event type of the dispatch.
@@ -494,7 +554,7 @@ module Discordrb
 
     # Removes all events from this event handler.
     def clear!
-      @event_handlers.clear if @event_handlers
+      @event_handlers&.clear
     end
 
     # Adds an event handler to this container. Usually, it's more expressive to just use one of the shorthand adder
@@ -525,7 +585,7 @@ module Discordrb
     # @param event_class [Class] The event type
     # @return [Class] the handler type
     def self.handler_class(event_class)
-      class_from_string(event_class.to_s + 'Handler')
+      class_from_string("#{event_class}Handler")
     end
 
     # Returns the event class for a handler class type