discordrb 3.1.1 → 3.2.0

data/lib/discordrb/commands/command_bot.rb

@@ -6,6 +6,7 @@ require 'discordrb/commands/parser'
 require 'discordrb/commands/events'
 require 'discordrb/commands/container'
 require 'discordrb/commands/rate_limiter'
+require 'time'
 
 # Specialized bot to run commands
 
@@ -66,11 +67,11 @@ module Discordrb::Commands
     #   :advanced_functionality). Default is '"'.
     # @option attributes [String] :quote_end Character that should end a quoted string (see
     #   :advanced_functionality). Default is '"'.
+    # @option attributes [true, false] :ignore_bots Whether the bot should ignore bot accounts or not. Default is false.
     def initialize(attributes = {})
       super(
         log_mode: attributes[:log_mode],
         token: attributes[:token],
-        application_id: attributes[:application_id],
         client_id: attributes[:client_id],
         type: attributes[:type],
         name: attributes[:name],
@@ -79,7 +80,8 @@ module Discordrb::Commands
         parse_self: attributes[:parse_self],
         shard_id: attributes[:shard_id],
         num_shards: attributes[:num_shards],
-        redact_token: attributes.key?(:redact_token) ? attributes[:redact_token] : true)
+        redact_token: attributes.key?(:redact_token) ? attributes[:redact_token] : true,
+        ignore_bots: attributes[:ignore_bots])
 
       @prefix = attributes[:prefix]
       @attributes = {
@@ -149,7 +151,9 @@ module Discordrb::Commands
           end
           result
         else
-          available_commands = @commands.values.reject { |c| !c.attributes[:help_available] }
+          available_commands = @commands.values.reject do |c|
+            !c.attributes[:help_available] || !required_roles?(event.user, c.attributes[:required_roles]) || !required_permissions?(event.user, c.attributes[:required_permissions], event.channel)
+          end
           case available_commands.length
           when 0..5
             available_commands.reduce "**List of commands:**\n" do |memo, c|
@@ -160,8 +164,8 @@ module Discordrb::Commands
               memo + "`#{c.name}`, "
             end)[0..-3]
           else
-            event.user.pm(available_commands.reduce("**List of commands:**\n") { |a, e| a + "`#{e.name}`, " })[0..-3]
-            'Sending list in PM!'
+            event.user.pm(available_commands.reduce("**List of commands:**\n") { |m, e| m + "`#{e.name}`, " }[0..-3])
+            event.channel.pm? ? '' : 'Sending list in PM!'
           end
         end
       end
@@ -187,6 +191,7 @@ module Discordrb::Commands
         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) &&
          required_permissions?(event.author, command.attributes[:required_permissions], event.channel) &&
@@ -204,6 +209,85 @@ module Discordrb::Commands
       raise
     end
 
+    # Transforms an array of string arguments based on types array.
+    # 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)
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == Float
+          begin
+            Float(arg)
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == Time
+          begin
+            Time.parse arg
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == TrueClass || types[i] == FalseClass
+          if arg.casecmp('true').zero? || arg.downcase.start_with?('y')
+            true
+          elsif arg.casecmp('false').zero? || arg.downcase.start_with?('n')
+            false
+          end
+        elsif types[i] == Symbol
+          arg.to_sym
+        elsif types[i] == Encoding
+          begin
+            Encoding.find arg
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == Regexp
+          begin
+            Regexp.new arg
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == Rational
+          begin
+            Rational(arg)
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == Range
+          begin
+            if arg.include? '...'
+              Range.new(*arg.split('...').map(&:to_i), true)
+            elsif arg.include? '..'
+              Range.new(*arg.split('..').map(&:to_i))
+            end
+          rescue ArgumentError
+            nil
+          end
+        elsif types[i] == NilClass
+          nil
+        elsif [Discordrb::User, Discordrb::Role, Discordrb::Emoji].include? types[i]
+          result = parse_mention arg, server
+          result if result.instance_of? types[i]
+        elsif types[i] == Discordrb::Invite
+          resolve_invite_code arg
+        elsif types[i].respond_to?(:from_argument)
+          begin
+            types[i].from_argument arg
+          rescue
+            nil
+          end
+        else
+          raise ArgumentError, "#{type} doesn't implement from_argument"
+        end
+      end
+    end
+
     # Executes a command in a simple manner, without command chains or permissions.
     # @param chain [String] The command with its arguments separated by spaces.
     # @param event [CommandEvent] The event to pass to the command.
@@ -285,7 +369,7 @@ module Discordrb::Commands
       if @prefix.is_a? String
         standard_prefix_trigger(message.content, @prefix)
       elsif @prefix.is_a? Array
-        @prefix.map { |e| standard_prefix_trigger(message.content, e) }.reduce { |a, e| a || e }
+        @prefix.map { |e| standard_prefix_trigger(message.content, e) }.reduce { |m, e| m || e }
       elsif @prefix.respond_to? :call
         @prefix.call(message)
       end
@@ -298,12 +382,12 @@ module Discordrb::Commands
 
     def required_permissions?(member, required, channel = nil)
       required.reduce(true) do |a, action|
-        a && !member.webhook? && member.permission?(action, channel)
+        a && !member.webhook? && !member.is_a?(Discordrb::Recipient) && member.permission?(action, channel)
       end
     end
 
     def required_roles?(member, required)
-      return (required.nil? || required.empty?) if member.webhook?
+      return (required.nil? || required.empty?) if member.webhook? || member.is_a?(Discordrb::Recipient)
       if required.is_a? Array
         required.all? do |role|
           member.role?(role)
@@ -319,7 +403,7 @@ module Discordrb::Commands
         if c.is_a? String
           # Make sure to remove the "#" from channel names in case it was specified
           c.delete('#') == channel.name
-        elsif c.is_a? Fixnum
+        elsif c.is_a? Integer
           c == channel.id
         else
           c == channel

data/lib/discordrb/commands/container.rb

@@ -33,6 +33,9 @@ module Discordrb::Commands
     #   command if the user asks for it.
     # @option attributes [String] :usage A short description of how this command should be used. Will be displayed in
     #   the help command or if the user uses it wrong.
+    # @option attributes [Array<Class>] :arg_types An array of argument classes which will be used for type-checking.
+    #   Hard-coded for some native classes, but can be used with any class that implements static
+    #   method `from_argument`.
     # @option attributes [Integer] :min_args The minimum number of arguments this command should have. If a user
     #   attempts to call the command with fewer arguments, the usage information will be displayed, if it exists.
     # @option attributes [Integer] :max_args The maximum number of arguments the command should have.

data/lib/discordrb/commands/parser.rb

@@ -40,6 +40,9 @@ module Discordrb::Commands
         # Usage description (for help command and error messages)
         usage: attributes[:usage] || nil,
 
+        # Array of arguments (for type-checking)
+        arg_types: attributes[:arg_types] || nil,
+
         # Parameter list (for help command and error messages)
         parameters: attributes[:parameters] || nil,
 
@@ -123,39 +126,52 @@ module Discordrb::Commands
       b_level = 0
       result = ''
       quoted = false
-      hacky_delim, hacky_space, hacky_prev = [0xe001, 0xe002, 0xe003].pack('U*').chars
+      escaped = false
+      hacky_delim, hacky_space, hacky_prev, hacky_newline = [0xe001, 0xe002, 0xe003, 0xe004].pack('U*').chars
 
       @chain.each_char.each_with_index do |char, index|
-        # Quote begin
-        if char == @attributes[:quote_start] && !quoted
-          quoted = true
-          next
-        end
-
-        # Quote end
-        if char == @attributes[:quote_end] && quoted
-          quoted = false
-          next
-        end
-
-        if char == @attributes[:chain_delimiter] && quoted
-          result += hacky_delim
+        # Escape character
+        if char == '\\' && !escaped
+          escaped = true
           next
-        end
-
-        if char == @attributes[:previous] && quoted
-          result += hacky_prev
+        elsif escaped && b_level <= 0
+          result += char
+          escaped = false
           next
         end
 
-        if char == ' ' && quoted
-          result += hacky_space
-          next
-        end
+        if quoted
+          # Quote end
+          if char == @attributes[:quote_end]
+            quoted = false
+            next
+          end
 
-        if char == @attributes[:sub_chain_start] && !quoted
-          b_start = index if b_level.zero?
-          b_level += 1
+          if b_level <= 0
+            case char
+            when @attributes[:chain_delimiter]
+              result += hacky_delim
+              next
+            when @attributes[:previous]
+              result += hacky_prev
+              next
+            when ' '
+              result += hacky_space
+              next
+            when "\n"
+              result += hacky_newline
+              next
+            end
+          end
+        else
+          case char
+          when @attributes[:quote_start] # Quote begin
+            quoted = true
+            next
+          when @attributes[:sub_chain_start]
+            b_start = index if b_level.zero?
+            b_level += 1
+          end
         end
 
         result += char if b_level <= 0
@@ -179,7 +195,7 @@ module Discordrb::Commands
       chain_to_split = @chain
 
       # Don't break if a command is called the same thing as the chain delimiter
-      chain_to_split.slice!(1..-1) if chain_to_split.start_with?(@attributes[:chain_delimiter])
+      chain_to_split = chain_to_split.slice(1..-1) if chain_to_split.start_with?(@attributes[:chain_delimiter])
 
       first = true
       split_chain = chain_to_split.split(@attributes[:chain_delimiter])
@@ -205,9 +221,9 @@ module Discordrb::Commands
 
         arguments = arguments.split ' '
 
-        # Replace the hacky spaces with actual spaces
+        # Replace the hacky spaces/newlines with actual ones
         arguments.map! do |elem|
-          elem.gsub hacky_space, ' '
+          elem.gsub(hacky_space, ' ').gsub(hacky_newline, "\n")
         end
 
         # Finally execute the command

data/lib/discordrb/commands/rate_limiter.rb

@@ -57,15 +57,13 @@ module Discordrb::Commands
       rate_limit_time ||= Time.now
 
       if @limit && (limit_hash[:count] + 1) > @limit
-        if @time_span && rate_limit_time < (limit_hash[:set_time] + @time_span)
-          # Second case: Count is over the limit and the time has not run out yet
-          return (limit_hash[:set_time] + @time_span) - rate_limit_time
-        else
-          # Third case: Count is over the limit but the time has run out
-          # Don't return anything here because there may still be delay-based limiting
-          limit_hash[:set_time] = rate_limit_time
-          limit_hash[:count] = 0
-        end
+        # Second case: Count is over the limit and the time has not run out yet
+        return (limit_hash[:set_time] + @time_span) - rate_limit_time if @time_span && rate_limit_time < (limit_hash[:set_time] + @time_span)
+
+        # Third case: Count is over the limit but the time has run out
+        # Don't return anything here because there may still be delay-based limiting
+        limit_hash[:set_time] = rate_limit_time
+        limit_hash[:count] = 0
       end
 
       if @delay && rate_limit_time < (limit_hash[:last_time] + @delay)

data/lib/discordrb/container.rb

@@ -11,6 +11,7 @@ require 'discordrb/events/roles'
 require 'discordrb/events/guilds'
 require 'discordrb/events/await'
 require 'discordrb/events/bans'
+require 'discordrb/events/reactions'
 
 require 'discordrb/await'
 
@@ -31,7 +32,7 @@ module Discordrb
     # @option attributes [Boolean] :private Matches whether or not the channel is private.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [MessageEvent] The event that was raised.
-    # @return [MessageEventHandler] The event handler that was registered.
+    # @return [MessageEventHandler] the event handler that was registered.
     def message(attributes = {}, &block)
       register_event(MessageEvent, attributes, block)
     end
@@ -41,7 +42,7 @@ module Discordrb
     # @param attributes [Hash] Event attributes, none in this particular case
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ReadyEvent] The event that was raised.
-    # @return [ReadyEventHandler] The event handler that was registered.
+    # @return [ReadyEventHandler] the event handler that was registered.
     def ready(attributes = {}, &block)
       register_event(ReadyEvent, attributes, block)
     end
@@ -51,7 +52,7 @@ module Discordrb
     # @param attributes [Hash] Event attributes, none in this particular case
     # @yield The block is executed when the event is raised.
     # @yieldparam event [DisconnectEvent] The event that was raised.
-    # @return [DisconnectEventHandler] The event handler that was registered.
+    # @return [DisconnectEventHandler] the event handler that was registered.
     def disconnected(attributes = {}, &block)
       register_event(DisconnectEvent, attributes, block)
     end
@@ -66,7 +67,7 @@ module Discordrb
     # @param attributes [Hash] Event attributes, none in this particular case
     # @yield The block is executed when the event is raised.
     # @yieldparam event [HeartbeatEvent] The event that was raised.
-    # @return [HeartbeatEventHandler] The event handler that was registered.
+    # @return [HeartbeatEventHandler] the event handler that was registered.
     def heartbeat(attributes = {}, &block)
       register_event(HeartbeatEvent, attributes, block)
     end
@@ -81,7 +82,7 @@ module Discordrb
     # @option attributes [Time] :before Matches a time before the time the typing started.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [TypingEvent] The event that was raised.
-    # @return [TypingEventHandler] The event handler that was registered.
+    # @return [TypingEventHandler] the event handler that was registered.
     def typing(attributes = {}, &block)
       register_event(TypingEvent, attributes, block)
     end
@@ -92,7 +93,7 @@ module Discordrb
     # @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.
-    # @return [MessageEditEventHandler] The event handler that was registered.
+    # @return [MessageEditEventHandler] the event handler that was registered.
     def message_edit(attributes = {}, &block)
       register_event(MessageEditEvent, attributes, block)
     end
@@ -103,18 +104,48 @@ module Discordrb
     # @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.
-    # @return [MessageDeleteEventHandler] The event handler that was registered.
+    # @return [MessageDeleteEventHandler] the event handler that was registered.
     def message_delete(attributes = {}, &block)
       register_event(MessageDeleteEvent, 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.
+    # @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.
+    def reaction_add(attributes = {}, &block)
+      register_event(ReactionAddEvent, attributes, block)
+    end
+
+    # 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
+    #   its name.
+    # @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.
+    def reaction_remove(attributes = {}, &block)
+      register_event(ReactionRemoveEvent, attributes, block)
+    end
+
+    # This **event** is raised when somebody removes all reactions from a message.
+    # @param attributes [Hash] The event's attributes.
+    # @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.
+    def reaction_remove_all(attributes = {}, &block)
+      register_event(ReactionRemoveAllEvent, attributes, block)
+    end
+
     # This **event** is raised when a user's status (online/offline/idle) changes.
     # @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.
     # @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.
+    # @return [PresenceEventHandler] the event handler that was registered.
     def presence(attributes = {}, &block)
       register_event(PresenceEvent, attributes, block)
     end
@@ -126,7 +157,7 @@ module Discordrb
     # @option attributes [Integer] :type Matches the type of game object (0 game, 1 Twitch stream)
     # @yield The block is executed when the event is raised.
     # @yieldparam event [PlayingEvent] The event that was raised.
-    # @return [PlayingEventHandler] The event handler that was registered.
+    # @return [PlayingEventHandler] the event handler that was registered.
     def playing(attributes = {}, &block)
       register_event(PlayingEvent, attributes, block)
     end
@@ -144,7 +175,7 @@ module Discordrb
     # @option attributes [Boolean] :private Matches whether or not the channel is private.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [MentionEvent] The event that was raised.
-    # @return [MentionEventHandler] The event handler that was registered.
+    # @return [MentionEventHandler] the event handler that was registered.
     def mention(attributes = {}, &block)
       register_event(MentionEvent, attributes, block)
     end
@@ -155,7 +186,7 @@ module Discordrb
     # @option attributes [String] :name Matches the name of the created channel.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ChannelCreateEvent] The event that was raised.
-    # @return [ChannelCreateEventHandler] The event handler that was registered.
+    # @return [ChannelCreateEventHandler] the event handler that was registered.
     def channel_create(attributes = {}, &block)
       register_event(ChannelCreateEvent, attributes, block)
     end
@@ -166,7 +197,7 @@ module Discordrb
     # @option attributes [String] :name Matches the new name of the channel.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ChannelUpdateEvent] The event that was raised.
-    # @return [ChannelUpdateEventHandler] The event handler that was registered.
+    # @return [ChannelUpdateEventHandler] the event handler that was registered.
     def channel_update(attributes = {}, &block)
       register_event(ChannelUpdateEvent, attributes, block)
     end
@@ -177,7 +208,7 @@ module Discordrb
     # @option attributes [String] :name Matches the name of the deleted channel.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ChannelDeleteEvent] The event that was raised.
-    # @return [ChannelDeleteEventHandler] The event handler that was registered.
+    # @return [ChannelDeleteEventHandler] the event handler that was registered.
     def channel_delete(attributes = {}, &block)
       register_event(ChannelDeleteEvent, attributes, block)
     end
@@ -189,7 +220,7 @@ module Discordrb
     # @option attributes [#resolve_id] :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.
+    # @return [ChannelRecipientAddHandler] the event handler that was registered.
     def channel_recipient_add(attributes = {}, &block)
       register_event(ChannelRecipientAddEvent, attributes, block)
     end
@@ -201,7 +232,7 @@ module Discordrb
     # @option attributes [#resolve_id] :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.
+    # @return [ChannelRecipientRemoveHandler] the event handler that was registered.
     def channel_recipient_remove(attributes = {}, &block)
       register_event(ChannelRecipientRemoveEvent, attributes, block)
     end
@@ -210,13 +241,14 @@ module Discordrb
     # @param attributes [Hash] The event's attributes.
     # @option attributes [String, Integer, User] :from Matches the user that sent the message.
     # @option attributes [String, Integer, Channel] :channel Matches the voice channel the user has joined.
+    # @option attributes [String, Integer, Channel] :old_channel Matches the voice channel the user was in previously.
     # @option attributes [true, false] :mute Matches whether or not the user is muted server-wide.
     # @option attributes [true, false] :deaf Matches whether or not the user is deafened server-wide.
     # @option attributes [true, false] :self_mute Matches whether or not the user is muted by the bot.
     # @option attributes [true, false] :self_deaf Matches whether or not the user is deafened by the bot.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [VoiceStateUpdateEvent] The event that was raised.
-    # @return [VoiceStateUpdateEventHandler] The event handler that was registered.
+    # @return [VoiceStateUpdateEventHandler] the event handler that was registered.
     def voice_state_update(attributes = {}, &block)
       register_event(VoiceStateUpdateEvent, attributes, block)
     end
@@ -226,7 +258,7 @@ module Discordrb
     # @option attributes [String] :username Matches the username of the joined user.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerMemberAddEvent] The event that was raised.
-    # @return [ServerMemberAddEventHandler] The event handler that was registered.
+    # @return [ServerMemberAddEventHandler] the event handler that was registered.
     def member_join(attributes = {}, &block)
       register_event(ServerMemberAddEvent, attributes, block)
     end
@@ -236,7 +268,7 @@ module Discordrb
     # @option attributes [String] :username Matches the username of the updated user.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerMemberUpdateEvent] The event that was raised.
-    # @return [ServerMemberUpdateEventHandler] The event handler that was registered.
+    # @return [ServerMemberUpdateEventHandler] the event handler that was registered.
     def member_update(attributes = {}, &block)
       register_event(ServerMemberUpdateEvent, attributes, block)
     end
@@ -246,7 +278,7 @@ module Discordrb
     # @option attributes [String] :username Matches the username of the member.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerMemberDeleteEvent] The event that was raised.
-    # @return [ServerMemberDeleteEventHandler] The event handler that was registered.
+    # @return [ServerMemberDeleteEventHandler] the event handler that was registered.
     def member_leave(attributes = {}, &block)
       register_event(ServerMemberDeleteEvent, attributes, block)
     end
@@ -257,7 +289,7 @@ module Discordrb
     # @option attributes [String, Integer, Server] :server Matches the server from which the user was banned.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [UserBanEvent] The event that was raised.
-    # @return [UserBanEventHandler] The event handler that was registered.
+    # @return [UserBanEventHandler] the event handler that was registered.
     def user_ban(attributes = {}, &block)
       register_event(UserBanEvent, attributes, block)
     end
@@ -268,7 +300,7 @@ module Discordrb
     # @option attributes [String, Integer, Server] :server Matches the server from which the user was unbanned.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [UserUnbanEvent] The event that was raised.
-    # @return [UserUnbanEventHandler] The event handler that was registered.
+    # @return [UserUnbanEventHandler] the event handler that was registered.
     def user_unban(attributes = {}, &block)
       register_event(UserUnbanEvent, attributes, block)
     end
@@ -280,7 +312,7 @@ module Discordrb
     # @option attributes [String, Integer, Server] :server Matches the server that was created.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerCreateEvent] The event that was raised.
-    # @return [ServerCreateEventHandler] The event handler that was registered.
+    # @return [ServerCreateEventHandler] the event handler that was registered.
     def server_create(attributes = {}, &block)
       register_event(ServerCreateEvent, attributes, block)
     end
@@ -290,7 +322,7 @@ module Discordrb
     # @option attributes [String, Integer, Server] :server Matches the server that was updated.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerUpdateEvent] The event that was raised.
-    # @return [ServerUpdateEventHandler] The event handler that was registered.
+    # @return [ServerUpdateEventHandler] the event handler that was registered.
     def server_update(attributes = {}, &block)
       register_event(ServerUpdateEvent, attributes, block)
     end
@@ -301,11 +333,58 @@ module Discordrb
     # @option attributes [String, Integer, Server] :server Matches the server that was deleted.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [ServerDeleteEvent] The event that was raised.
-    # @return [ServerDeleteEventHandler] The event handler that was registered.
+    # @return [ServerDeleteEventHandler] the event handler that was registered.
     def server_delete(attributes = {}, &block)
       register_event(ServerDeleteEvent, attributes, block)
     end
 
+    # This **event** is raised when an emoji or collection of emojis is created/deleted/updated.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Integer, Server] :server Matches the server.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [ServerEmojiChangeEvent] The event that was raised.
+    # @return [ServerEmojiChangeEventHandler] the event handler that was registered.
+    def server_emoji(attributes = {}, &block)
+      register_event(ServerEmojiChangeEvent, attributes, block)
+    end
+
+    # 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] :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.
+    # @return [ServerEmojiCreateEventHandler] the event handler that was registered.
+    def server_emoji_create(attributes = {}, &block)
+      register_event(ServerEmojiCreateEvent, attributes, block)
+    end
+
+    # 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] :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.
+    # @return [ServerEmojiDeleteEventHandler] the event handler that was registered.
+    def server_emoji_delete(attributes = {}, &block)
+      register_event(ServerEmojiDeleteEvent, attributes, block)
+    end
+
+    # 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] :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.
+    # @yieldparam event [ServerEmojiUpdateEvent] The event that was raised.
+    # @return [ServerEmojiUpdateEventHandler] the event handler that was registered.
+    def server_emoji_update(attributes = {}, &block)
+      register_event(ServerEmojiUpdateEvent, attributes, block)
+    end
+
     # This **event** is raised when an {Await} is triggered. It provides an easy way to execute code
     # on an await without having to rely on the await's block.
     # @param attributes [Hash] The event's attributes.
@@ -313,7 +392,7 @@ module Discordrb
     # @option attributes [Class] :type Exactly matches the event's type.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [AwaitEvent] The event that was raised.
-    # @return [AwaitEventHandler] The event handler that was registered.
+    # @return [AwaitEventHandler] the event handler that was registered.
     def await(attributes = {}, &block)
       register_event(AwaitEvent, attributes, block)
     end
@@ -331,7 +410,7 @@ module Discordrb
     # @option attributes [Boolean] :private Matches whether or not the channel is private.
     # @yield The block is executed when the event is raised.
     # @yieldparam event [PrivateMessageEvent] The event that was raised.
-    # @return [PrivateMessageEventHandler] The event handler that was registered.
+    # @return [PrivateMessageEventHandler] the event handler that was registered.
     def pm(attributes = {}, &block)
       register_event(PrivateMessageEvent, attributes, block)
     end
@@ -340,6 +419,27 @@ module Discordrb
     alias_method :direct_message, :pm
     alias_method :dm, :pm
 
+    # 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.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [RawEvent] The event that was raised.
+    # @return [RawEventHandler] The event handler that was registered.
+    def raw(attributes = {}, &block)
+      register_event(RawEvent, attributes, block)
+    end
+
+    # This **event** is raised for a dispatch received over the gateway that is not currently handled otherwise by
+    # discordrb.
+    # @param attributes [Hash] The event's attributes.
+    # @option attributes [String, Symbol, Regexp] :type Matches the event type of the dispatch.
+    # @yield The block is executed when the event is raised.
+    # @yieldparam event [UnknownEvent] The event that was raised.
+    # @return [UnknownEventHandler] The event handler that was registered.
+    def unknown(attributes = {}, &block)
+      register_event(UnknownEvent, attributes, block)
+    end
+
     # Removes an event handler from this container. If you're looking for a way to do temporary events, I recommend
     # {Await}s instead of this.
     # @param handler [Discordrb::Events::EventHandler] The handler to remove.