discordrb 3.3.0 → 3.4.3

data/lib/discordrb/bot.rb

@@ -18,6 +18,7 @@ require 'discordrb/events/bans'
 require 'discordrb/events/raw'
 require 'discordrb/events/reactions'
 require 'discordrb/events/webhooks'
+require 'discordrb/events/invites'
 
 require 'discordrb/api'
 require 'discordrb/api/channel'
@@ -101,12 +102,14 @@ module Discordrb
     #   to Discord's gateway. `:none` will request that no payloads are received compressed (not recommended for
     #   production bots). `:large` will request that large payloads are received compressed. `:stream` will request
     #   that all data be received in a continuous compressed stream.
+    # @param intents [:all, Array<Symbol>, nil] Intents that this bot requires. See {Discordrb::INTENTS}. If `nil`, no intents
+    #   field will be passed.
     def initialize(
-        log_mode: :normal,
-        token: nil, client_id: nil,
-        type: nil, name: '', fancy_log: false, suppress_ready: false, parse_self: false,
-        shard_id: nil, num_shards: nil, redact_token: true, ignore_bots: false,
-        compress_mode: :stream
+      log_mode: :normal,
+      token: nil, client_id: nil,
+      type: nil, name: '', fancy_log: false, suppress_ready: false, parse_self: false,
+      shard_id: nil, num_shards: nil, redact_token: true, ignore_bots: false,
+      compress_mode: :large, intents: nil
     )
       LOGGER.mode = log_mode
       LOGGER.token = token if redact_token
@@ -125,8 +128,12 @@ module Discordrb
 
       @compress_mode = compress_mode
 
+      raise 'Token string is empty or nil' if token.nil? || token.empty?
+
+      @intents = intents == :all ? INTENTS.values.reduce(&:|) : calculate_intents(intents) if intents
+
       @token = process_token(@type, token)
-      @gateway = Gateway.new(self, @token, @shard_key, @compress_mode)
+      @gateway = Gateway.new(self, @token, @shard_key, @compress_mode, @intents)
 
       init_cache
 
@@ -160,16 +167,13 @@ module Discordrb
 
     # @overload emoji(id)
     #   Return an emoji by its ID
-    #   @param id [Integer, #resolve_id] The emoji's ID.
+    #   @param id [String, Integer] The emoji's ID.
     #   @return [Emoji, nil] the emoji object. `nil` if the emoji was not found.
     # @overload emoji
     #   The list of emoji the bot can use.
     #   @return [Array<Emoji>] the emoji available.
     def emoji(id = nil)
-      gateway_check
-      unavailable_servers_check
-
-      emoji_hash = @servers.values.map(&:emoji).reduce(&:merge)
+      emoji_hash = servers.values.map(&:emoji).reduce(&:merge)
       if id
         id = id.resolve_id
         emoji_hash[id]
@@ -203,6 +207,7 @@ module Discordrb
     # @return [Application, nil] The bot's application info. Returns `nil` if bot is not a bot account.
     def bot_application
       return unless @type == :bot
+
       response = API.oauth_application(token)
       Application.new(JSON.parse(response), self)
     end
@@ -225,7 +230,7 @@ module Discordrb
 
     # Runs the bot, which logs into Discord and connects the WebSocket. This
     # prevents all further execution unless it is executed with
-    # `backround` = `true`.
+    # `background` = `true`.
     # @param background [true, false] If it is `true`, then the bot will run in
     #   another thread to allow further execution. If it is `false`, this method
     #   will block until {#stop} is called. If the bot is run with `true`, make
@@ -254,9 +259,9 @@ module Discordrb
 
     # Stops the bot gracefully, disconnecting the websocket without immediately killing the thread. This means that
     # Discord is immediately aware of the closed connection and makes the bot appear offline instantly.
-    # @param no_sync [true, false] Whether or not to disable use of synchronize in the close method. This should be true if called from a trap context.
-    def stop(no_sync = false)
-      @gateway.stop(no_sync)
+    # @note This method no longer takes an argument as of 3.4.0
+    def stop(_no_sync = nil)
+      @gateway.stop
     end
 
     # @return [true, false] whether or not the bot is currently connected to Discord.
@@ -273,14 +278,14 @@ module Discordrb
 
     # Creates an OAuth invite URL that can be used to invite this bot to a particular server.
     # @param server [Server, nil] The server the bot should be invited to, or nil if a general invite should be created.
-    # @param permission_bits [Integer, String] Permission bits that should be appended to invite url.
+    # @param permission_bits [String, Integer] Permission bits that should be appended to invite url.
     # @return [String] the OAuth invite URL.
     def invite_url(server: nil, permission_bits: nil)
       @client_id ||= bot_application.id
 
       server_id_str = server ? "&guild_id=#{server.id}" : ''
       permission_bits_str = permission_bits ? "&permissions=#{permission_bits}" : ''
-      "https://discordapp.com/oauth2/authorize?&client_id=#{@client_id}#{server_id_str}#{permission_bits_str}&scope=bot"
+      "https://discord.com/oauth2/authorize?&client_id=#{@client_id}#{server_id_str}#{permission_bits_str}&scope=bot"
     end
 
     # @return [Hash<Integer => VoiceBot>] the voice connections this bot currently has, by the server ID to which they are connected.
@@ -299,22 +304,21 @@ module Discordrb
 
       server_id = channel.server.id
       return @voices[server_id] if @voices[server_id]
-
-      nil
     end
 
     # Connects to a voice channel, initializes network connections and returns the {Voice::VoiceBot} over which audio
     # data can then be sent. After connecting, the bot can also be accessed using {#voice}. If the bot is already
     # connected to voice, the existing connection will be terminated - you don't have to call
     # {Discordrb::Voice::VoiceBot#destroy} before calling this method.
-    # @param chan [Channel, Integer, #resolve_id] The voice channel to connect to.
-    # @param encrypted [true, false] Whether voice communication should be encrypted using RbNaCl's SecretBox
+    # @param chan [Channel, String, Integer] The voice channel, or its ID, to connect to.
+    # @param encrypted [true, false] Whether voice communication should be encrypted using
     #   (uses an XSalsa20 stream cipher for encryption and Poly1305 for authentication)
     # @return [Voice::VoiceBot] the initialized bot over which audio data can then be sent.
     def voice_connect(chan, encrypted = true)
+      raise ArgumentError, 'Unencrypted voice connections are no longer supported.' unless encrypted
+
       chan = channel(chan.resolve_id)
       server_id = chan.server.id
-      @should_encrypt_voice = encrypted
 
       if @voices[chan.id]
         debug('Voice bot exists already! Destroying it')
@@ -336,7 +340,7 @@ module Discordrb
 
     # Disconnects the client from a specific voice connection given the server ID. Usually it's more convenient to use
     # {Discordrb::Voice::VoiceBot#destroy} rather than this.
-    # @param server [Server, Integer, #resolve_id] The server the voice connection is on.
+    # @param server [Server, String, Integer] The server, or server ID, the voice connection is on.
     # @param destroy_vws [true, false] Whether or not the VWS should also be destroyed. If you're calling this method
     #   directly, you should leave it as true.
     def voice_destroy(server, destroy_vws = true)
@@ -355,31 +359,38 @@ module Discordrb
     end
 
     # Sends a text message to a channel given its ID and the message's content.
-    # @param channel [Channel, Integer, #resolve_id] The channel to send something to.
+    # @param channel [Channel, String, Integer] The channel, or its ID, to send something to.
     # @param content [String] The text that should be sent as a message. It is limited to 2000 characters (Discord imposed).
     # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
     # @param embed [Hash, Discordrb::Webhooks::Embed, nil] The rich embed to append to this message.
+    # @param allowed_mentions [Hash, Discordrb::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
+    # @param message_reference [Message, String, Integer, nil] The message, or message ID, to reply to if any.
     # @return [Message] The message that was sent.
-    def send_message(channel, content, tts = false, embed = nil)
+    def send_message(channel, content, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, message_reference = nil)
       channel = channel.resolve_id
       debug("Sending message to #{channel} with content '#{content}'")
+      allowed_mentions = { parse: [] } if allowed_mentions == false
+      message_reference = { message_id: message_reference.id } if message_reference
 
-      response = API::Channel.create_message(token, channel, content, tts, embed ? embed.to_hash : nil)
+      response = API::Channel.create_message(token, channel, content, tts, embed&.to_hash, nil, attachments, allowed_mentions&.to_hash, message_reference)
       Message.new(JSON.parse(response), self)
     end
 
     # Sends a text message to a channel given its ID and the message's content,
     # then deletes it after the specified timeout in seconds.
-    # @param channel [Channel, Integer, #resolve_id] The channel to send something to.
+    # @param channel [Channel, String, Integer] The channel, or its ID, to send something to.
     # @param content [String] The text that should be sent as a message. It is limited to 2000 characters (Discord imposed).
     # @param timeout [Float] The amount of time in seconds after which the message sent will be deleted.
     # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
     # @param embed [Hash, Discordrb::Webhooks::Embed, nil] The rich embed to append to this message.
-    def send_temporary_message(channel, content, timeout, tts = false, embed = nil)
+    # @param attachments [Array<File>] Files that can be referenced in embeds via `attachment://file.png`
+    # @param allowed_mentions [Hash, Discordrb::AllowedMentions, false, nil] Mentions that are allowed to ping on this message. `false` disables all pings
+    # @param message_reference [Message, String, Integer, nil] The message, or message ID, to reply to if any.
+    def send_temporary_message(channel, content, timeout, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, message_reference = nil)
       Thread.new do
         Thread.current[:discordrb_name] = "#{@current_thread}-temp-msg"
 
-        message = send_message(channel, content, tts, embed)
+        message = send_message(channel, content, tts, embed, attachments, allowed_mentions, message_reference)
         sleep(timeout)
         message.delete
       end
@@ -389,13 +400,24 @@ module Discordrb
 
     # Sends a file to a channel. If it is an image, it will automatically be embedded.
     # @note This executes in a blocking way, so if you're sending long files, be wary of delays.
-    # @param channel [Channel, Integer, #resolve_id] The channel to send something to.
+    # @param channel [Channel, String, Integer] The channel, or its ID, to send something to.
     # @param file [File] The file that should be sent.
     # @param caption [string] The caption for the file.
     # @param tts [true, false] Whether or not this file's caption should be sent using Discord text-to-speech.
+    # @param filename [String] Overrides the filename of the uploaded file
+    # @param spoiler [true, false] Whether or not this file should appear as a spoiler.
     # @example Send a file from disk
     #   bot.send_file(83281822225530880, File.open('rubytaco.png', 'r'))
-    def send_file(channel, file, caption: nil, tts: false)
+    def send_file(channel, file, caption: nil, tts: false, filename: nil, spoiler: nil)
+      if file.respond_to?(:read)
+        if spoiler
+          filename ||= File.basename(file.path)
+          filename = "SPOILER_#{filename}" unless filename.start_with? 'SPOILER_'
+        end
+        # https://github.com/rest-client/rest-client/blob/v2.0.2/lib/restclient/payload.rb#L160
+        file.define_singleton_method(:original_filename) { filename } if filename
+      end
+
       channel = channel.resolve_id
       response = API::Channel.upload_file(token, channel, file, caption: caption, tts: tts)
       Message.new(JSON.parse(response), self)
@@ -410,14 +432,13 @@ module Discordrb
     def create_server(name, region = :'eu-central')
       response = API::Server.create(token, name, region)
       id = JSON.parse(response)['id'].to_i
-      sleep 0.1 until @servers[id]
-      server = @servers[id]
+      sleep 0.1 until (server = @servers[id])
       debug "Successfully created server #{server.id} with name #{server.name}"
       server
     end
 
     # Creates a new application to do OAuth authorization with. This allows you to use OAuth to authorize users using
-    # Discord. For information how to use this, see the docs: https://discordapp.com/developers/docs/topics/oauth2
+    # Discord. For information how to use this, see the docs: https://discord.com/developers/docs/topics/oauth2
     # @param name [String] What your application should be called.
     # @param redirect_uris [Array<String>] URIs that Discord should redirect your users to after authorizing.
     # @return [Array(String, String)] your applications' client ID and client secret to be used in OAuth authorization.
@@ -436,28 +457,46 @@ module Discordrb
       API.update_oauth_application(@token, name, redirect_uris, description, icon)
     end
 
-    # Gets the user, channel, role or emoji from a mention of the user, channel, role or emoji.
+    # Gets the users, channels, roles and emoji from a string.
+    # @param mentions [String] The mentions, which should look like `<@12314873129>`, `<#123456789>`, `<@&123456789>` or `<:name:126328:>`.
+    # @param server [Server, nil] The server of the associated mentions. (recommended for role parsing, to speed things up)
+    # @return [Array<User, Channel, Role, Emoji>] The array of users, channels, roles and emoji identified by the mentions, or `nil` if none exists.
+    def parse_mentions(mentions, server = nil)
+      array_to_return = []
+      # While possible mentions may be in message
+      while mentions.include?('<') && mentions.include?('>')
+        # Removing all content before the next possible mention
+        mentions = mentions.split('<', 2)[1]
+        # Locate the first valid mention enclosed in `<...>`, otherwise advance to the next open `<`
+        next unless mentions.split('>', 2).first.length < mentions.split('<', 2).first.length
+
+        # Store the possible mention value to be validated with RegEx
+        mention = mentions.split('>', 2).first
+        if /@!?(?<id>\d+)/ =~ mention
+          array_to_return << user(id) unless user(id).nil?
+        elsif /#(?<id>\d+)/ =~ mention
+          array_to_return << channel(id, server) unless channel(id, server).nil?
+        elsif /@&(?<id>\d+)/ =~ mention
+          if server
+            array_to_return << server.role(id) unless server.role(id).nil?
+          else
+            @servers.each_value do |element|
+              array_to_return << element.role(id) unless element.role(id).nil?
+            end
+          end
+        elsif /(?<animated>^a|^${0}):(?<name>\w+):(?<id>\d+)/ =~ mention
+          array_to_return << (emoji(id) || Emoji.new({ 'animated' => !animated.nil?, 'name' => name, 'id' => id }, self, nil))
+        end
+      end
+      array_to_return
+    end
+
+    # Gets the user, channel, role or emoji from a string.
     # @param mention [String] The mention, which should look like `<@12314873129>`, `<#123456789>`, `<@&123456789>` or `<:name:126328:>`.
     # @param server [Server, nil] The server of the associated mention. (recommended for role parsing, to speed things up)
     # @return [User, Channel, Role, Emoji] The user, channel, role or emoji identified by the mention, or `nil` if none exists.
     def parse_mention(mention, server = nil)
-      # Mention format: <@id>
-      if /<@!?(?<id>\d+)>/ =~ mention
-        user(id)
-      elsif /<#(?<id>\d+)>/ =~ mention
-        channel(id, server)
-      elsif /<@&(?<id>\d+)>/ =~ mention
-        return server.role(id) if server
-        @servers.values.each do |element|
-          role = element.role(id)
-          return role unless role.nil?
-        end
-
-        # Return nil if no role is found
-        nil
-      elsif /<(?<animated>a)?:(?<name>\w+):(?<id>\d+)>/ =~ mention
-        emoji(id) || Emoji.new({ 'animated' => !animated.nil?, 'name' => name, 'id' => id }, self, nil)
-      end
+      parse_mentions(mention, server).first
     end
 
     # Updates presence status.
@@ -466,7 +505,8 @@ module Discordrb
     # @param url [String, nil] The Twitch URL to display as a stream. nil for no stream.
     # @param since [Integer] When this status was set.
     # @param afk [true, false] Whether the bot is AFK.
-    # @param activity_type [Integer] The type of activity status to display. Can be 0 (Playing), 1 (Streaming), 2 (Listening), 3 (Watching)
+    # @param activity_type [Integer] The type of activity status to display.
+    #   Can be 0 (Playing), 1 (Streaming), 2 (Listening), 3 (Watching), or 5 (Competing).
     # @see Gateway#send_status_update
     def update_status(status, activity, url, since = 0, afk = false, activity_type = 0)
       gateway_check
@@ -480,7 +520,7 @@ module Discordrb
       @gateway.send_status_update(status, since, activity_obj, afk)
 
       # Update the status in the cache
-      profile.update_presence('status' => status.to_s, 'game' => activity_obj)
+      profile.update_presence('status' => status.to_s, 'activities' => [activity_obj].compact)
     end
 
     # Sets the currently playing game to the specified game.
@@ -489,7 +529,6 @@ module Discordrb
     def game=(name)
       gateway_check
       update_status(@status, name, nil)
-      name
     end
 
     alias_method :playing=, :game=
@@ -500,7 +539,6 @@ module Discordrb
     def listening=(name)
       gateway_check
       update_status(@status, name, nil, nil, nil, 2)
-      name
     end
 
     # Sets the current watching status to the specified name.
@@ -509,7 +547,6 @@ module Discordrb
     def watching=(name)
       gateway_check
       update_status(@status, name, nil, nil, nil, 3)
-      name
     end
 
     # Sets the currently online stream to the specified name and Twitch URL.
@@ -522,6 +559,14 @@ module Discordrb
       name
     end
 
+    # Sets the currently competing status to the specified name.
+    # @param name [String] The name of the game to be competing in.
+    # @return [String] The game that is being competed in now.
+    def competing=(name)
+      gateway_check
+      update_status(@status, name, nil, nil, nil, 5)
+    end
+
     # Sets status to online.
     def online
       gateway_check
@@ -576,6 +621,7 @@ module Discordrb
     # @deprecated Will be changed to blocking behavior in v4.0. Use {#add_await!} instead.
     def add_await(key, type, attributes = {}, &block)
       raise "You can't await an AwaitEvent!" if type == Discordrb::Events::AwaitEvent
+
       await = Await.new(self, key, type, attributes, block)
       @awaits ||= {}
       @awaits[key] = await
@@ -583,14 +629,17 @@ module Discordrb
 
     # Awaits an event, blocking the current thread until a response is received.
     # @param type [Class] The event class that should be listened for.
-    # @option attributes [Numeric] :timeout the amount of time to wait for a response before returning `nil`. Waits forever if omitted.
+    # @option attributes [Numeric] :timeout the amount of time (in seconds) to wait for a response before returning `nil`. Waits forever if omitted.
+    # @yield Executed when a matching event is received.
+    # @yieldparam event [Event] The event object that was triggered.
+    # @yieldreturn [true, false] Whether the event matches extra await criteria described by the block
     # @return [Event, nil] The event object that was triggered, or `nil` if a `timeout` was set and no event was raised in time.
     # @raise [ArgumentError] if `timeout` is given and is not a positive numeric value
     def add_await!(type, attributes = {})
       raise "You can't await an AwaitEvent!" if type == Discordrb::Events::AwaitEvent
 
       timeout = attributes[:timeout]
-      raise ArgumentError, 'Timeout must be a number > 0' if timeout && timeout.is_a?(Numeric) && timeout <= 0
+      raise ArgumentError, 'Timeout must be a number > 0' if timeout.is_a?(Numeric) && !timeout.positive?
 
       mutex = Mutex.new
       cv = ConditionVariable.new
@@ -598,7 +647,12 @@ module Discordrb
       block = lambda do |event|
         mutex.synchronize do
           response = event
-          cv.signal
+          if block_given?
+            result = yield(event)
+            cv.signal if result.is_a?(TrueClass)
+          else
+            cv.signal
+          end
         end
       end
 
@@ -615,25 +669,26 @@ module Discordrb
 
       remove_handler(handler)
       raise 'ConditionVariable was signaled without returning an event!' if response.nil? && timeout.nil?
+
       response
     end
 
     # Add a user to the list of ignored users. Those users will be ignored in message events at event processing level.
     # @note Ignoring a user only prevents any message events (including mentions, commands etc.) from them! Typing and
     #   presence and any other events will still be received.
-    # @param user [User, Integer, #resolve_id] The user, or its ID, to be ignored.
+    # @param user [User, String, Integer] The user, or its ID, to be ignored.
     def ignore_user(user)
       @ignored_ids << user.resolve_id
     end
 
     # Remove a user from the ignore list.
-    # @param user [User, Integer, #resolve_id] The user, or its ID, to be unignored.
+    # @param user [User, String, Integer] The user, or its ID, to be unignored.
     def unignore_user(user)
       @ignored_ids.delete(user.resolve_id)
     end
 
     # Checks whether a user is being ignored.
-    # @param user [User, Integer, #resolve_id] The user, or its ID, to check.
+    # @param user [User, String, Integer] The user, or its ID, to check.
     # @return [true, false] whether or not the user is ignored.
     def ignored?(user)
       @ignored_ids.include?(user.resolve_id)
@@ -677,7 +732,8 @@ module Discordrb
     # e.g. due to a Discord outage or because the servers are large and taking a while to load.
     def unavailable_servers_check
       # Return unless there are servers that are unavailable.
-      return unless @unavailable_servers && @unavailable_servers > 0
+      return unless @unavailable_servers&.positive?
+
       LOGGER.warn("#{@unavailable_servers} servers haven't been cached yet.")
       LOGGER.warn('Servers may be unavailable due to an outage, or your bot is on very large servers that are taking a while to load.')
     end
@@ -737,10 +793,21 @@ module Discordrb
 
       user_id = data['user_id'].to_i
       old_voice_state = server.voice_states[user_id]
-      old_channel_id = old_voice_state.voice_channel.id if old_voice_state
+      old_channel_id = old_voice_state.voice_channel&.id if old_voice_state
 
       server.update_voice_state(data)
 
+      existing_voice = @voices[server_id]
+      if user_id == @profile.id && existing_voice
+        new_channel_id = data['channel_id']
+        if new_channel_id
+          new_channel = channel(new_channel_id)
+          existing_voice.channel = new_channel
+        else
+          voice_destroy(server_id)
+        end
+      end
+
       old_channel_id
     end
 
@@ -751,6 +818,7 @@ module Discordrb
 
       debug("Voice server update received! chan: #{channel.inspect}")
       return unless channel
+
       @should_connect_to_voice.delete(server_id)
       debug('Updating voice server!')
 
@@ -763,7 +831,7 @@ module Discordrb
       end
 
       debug('Got data, now creating the bot.')
-      @voices[server_id] = Discordrb::Voice::VoiceBot.new(channel, self, token, @session_id, endpoint, @should_encrypt_voice)
+      @voices[server_id] = Discordrb::Voice::VoiceBot.new(channel, self, token, @session_id, endpoint)
     end
 
     # Internal handler for CHANNEL_CREATE
@@ -787,6 +855,7 @@ module Discordrb
       channel = Channel.new(data, self)
       old_channel = @channels[channel.id]
       return unless old_channel
+
       old_channel.update_from(channel)
     end
 
@@ -843,12 +912,14 @@ module Discordrb
       member = server.member(data['user']['id'].to_i)
       member.update_roles(data['roles'])
       member.update_nick(data['nick'])
+      member.update_boosting_since(data['premium_since'])
     end
 
     # Internal handler for GUILD_MEMBER_DELETE
     def delete_guild_member(data)
       server_id = data['guild_id'].to_i
       server = self.server(server_id)
+      return unless server
 
       user_id = data['user']['id'].to_i
       server.delete_member(user_id)
@@ -951,13 +1022,13 @@ module Discordrb
       # Remove the "Bot " prefix if it exists
       token = token[4..-1] if token.start_with? 'Bot '
 
-      token = 'Bot ' + token unless type == :user
+      token = "Bot #{token}" unless type == :user
       token
     end
 
     def handle_dispatch(type, data)
       # Check whether there are still unavailable servers and there have been more than 10 seconds since READY
-      if @unavailable_servers && @unavailable_servers > 0 && (Time.now - @unavailable_timeout_time) > 10
+      if @unavailable_servers&.positive? && (Time.now - @unavailable_timeout_time) > 10 && !((@intents || 0) & INTENTS[:servers]).zero?
         # The server streaming timed out!
         LOGGER.debug("Server streaming timed out with #{@unavailable_servers} servers remaining")
         LOGGER.debug('Calling ready now because server loading is taking a long time. Servers may be unavailable due to an outage, or your bot is on very large servers.')
@@ -1019,6 +1090,11 @@ module Discordrb
         id = data['guild_id'].to_i
         server = server(id)
         server.process_chunk(data['members'])
+      when :INVITE_CREATE
+        invite = Invite.new(data, self)
+        raise_event(InviteCreateEvent.new(data, invite, self))
+      when :INVITE_DELETE
+        raise_event(InviteDeleteEvent.new(data, self))
       when :MESSAGE_CREATE
         if ignored?(data['author']['id'].to_i)
           debug("Ignored author with ID #{data['author']['id']}")
@@ -1053,6 +1129,10 @@ module Discordrb
         update_message(data)
 
         message = Message.new(data, self)
+
+        event = MessageUpdateEvent.new(message, self)
+        raise_event(event)
+
         return if message.from_bot? && !should_parse_self
 
         unless message.author
@@ -1120,10 +1200,10 @@ module Discordrb
         played_before = presence_user.nil? ? nil : presence_user.game
         update_presence(data)
 
-        event = if now_playing != played_before
-                  PlayingEvent.new(data, self)
-                else
+        event = if now_playing == played_before
                   PresenceEvent.new(data, self)
+                else
+                  PlayingEvent.new(data, self)
                 end
 
         raise_event(event)
@@ -1135,7 +1215,8 @@ module Discordrb
       when :VOICE_SERVER_UPDATE
         update_voice_server(data)
 
-        # no event as this is irrelevant to users
+        event = VoiceServerUpdateEvent.new(data, self)
+        raise_event(event)
       when :CHANNEL_CREATE
         create_channel(data)
 
@@ -1300,6 +1381,7 @@ module Discordrb
       @event_handlers ||= {}
       handlers = @event_handlers[event.class]
       return unless handlers
+
       handlers.dup.each do |handler|
         call_event(handler, event) if handler.matches?(event)
       end
@@ -1315,7 +1397,7 @@ module Discordrb
         begin
           handler.call(event)
           handler.after_call(event)
-        rescue => e
+        rescue StandardError => e
           log_exception(e)
         ensure
           @event_threads.delete(t)
@@ -1328,6 +1410,7 @@ module Discordrb
       @awaits.each do |_, await|
         key, should_delete = await.match(event)
         next unless key
+
         debug("should_delete: #{should_delete}")
         @awaits.delete(await.key) if should_delete
 
@@ -1335,5 +1418,24 @@ module Discordrb
         raise_event(await_event)
       end
     end
+
+    def calculate_intents(intents)
+      intents.reduce(0) do |sum, intent|
+        case intent
+        when Symbol
+          if INTENTS[intent]
+            sum | INTENTS[intent]
+          else
+            LOGGER.warn("Unknown intent: #{intent}")
+            sum
+          end
+        when Integer
+          sum | intent
+        else
+          LOGGER.warn("Invalid intent: #{intent}")
+          sum
+        end
+      end
+    end
   end
 end

data/lib/discordrb/cache.rb

@@ -134,6 +134,7 @@ module Discordrb
     def pm_channel(id)
       id = id.resolve_id
       return @pm_channels[id] if @pm_channels[id]
+
       debug("Creating pm channel with user id #{id}")
       response = API::User.create_pm(token, id)
       channel = Channel.new(JSON.parse(response), self)
@@ -187,7 +188,7 @@ module Discordrb
     #
     #    * An {Invite} object
     #    * The code for an invite
-    #    * A fully qualified invite URL (e.g. `https://discordapp.com/invite/0A37aN7fasF7n83q`)
+    #    * A fully qualified invite URL (e.g. `https://discord.com/invite/0A37aN7fasF7n83q`)
     #    * A short invite URL with protocol (e.g. `https://discord.gg/0A37aN7fasF7n83q`)
     #    * A short invite URL without protocol (e.g. `discord.gg/0A37aN7fasF7n83q`)
     # @return [String] Only the code for the invite.
@@ -219,7 +220,7 @@ module Discordrb
         return [channel(id)]
       end
 
-      @servers.values.each do |server|
+      @servers.each_value do |server|
         server.channels.each do |channel|
           results << channel if channel.name == channel_name && (server_name || server.name) == server.name && (!type || (channel.type == type))
         end
@@ -248,6 +249,7 @@ module Discordrb
     def find_user(username, discrim = nil)
       users = @users.values.find_all { |e| e.username == username }
       return users.find { |u| u.discrim == discrim } if discrim
+
       users
     end
   end

data/lib/discordrb/colour_rgb.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Discordrb
+  # A colour (red, green and blue values). Used for role colours. If you prefer the American spelling, the alias
+  # {ColorRGB} is also available.
+  class ColourRGB
+    # @return [Integer] the red part of this colour (0-255).
+    attr_reader :red
+
+    # @return [Integer] the green part of this colour (0-255).
+    attr_reader :green
+
+    # @return [Integer] the blue part of this colour (0-255).
+    attr_reader :blue
+
+    # @return [Integer] the colour's RGB values combined into one integer.
+    attr_reader :combined
+    alias_method :to_i, :combined
+
+    # Make a new colour from the combined value.
+    # @param combined [String, Integer] The colour's RGB values combined into one integer or a hexadecimal string
+    # @example Initialize a with a base 10 integer
+    #   ColourRGB.new(7506394) #=> ColourRGB
+    #   ColourRGB.new(0x7289da) #=> ColourRGB
+    # @example Initialize a with a hexadecimal string
+    #   ColourRGB.new('7289da') #=> ColourRGB
+    def initialize(combined)
+      @combined = combined.is_a?(String) ? combined.to_i(16) : combined
+      @red = (@combined >> 16) & 0xFF
+      @green = (@combined >> 8) & 0xFF
+      @blue = @combined & 0xFF
+    end
+
+    # @return [String] the colour as a hexadecimal.
+    def hex
+      @combined.to_s(16)
+    end
+    alias_method :hexadecimal, :hex
+  end
+
+  # Alias for the class {ColourRGB}
+  ColorRGB = ColourRGB
+end