discordrb 3.4.3 → 3.5.0

data/lib/discordrb/bot.rb

@@ -19,11 +19,16 @@ require 'discordrb/events/raw'
 require 'discordrb/events/reactions'
 require 'discordrb/events/webhooks'
 require 'discordrb/events/invites'
+require 'discordrb/events/interactions'
+require 'discordrb/events/threads'
 
 require 'discordrb/api'
 require 'discordrb/api/channel'
 require 'discordrb/api/server'
 require 'discordrb/api/invite'
+require 'discordrb/api/interaction'
+require 'discordrb/api/application'
+
 require 'discordrb/errors'
 require 'discordrb/data'
 require 'discordrb/await'
@@ -93,23 +98,25 @@ module Discordrb
     # @param parse_self [true, false] Whether the bot should react on its own messages. It's best to turn this off
     #   unless you really need this so you don't inadvertently create infinite loops.
     # @param shard_id [Integer] The number of the shard this bot should handle. See
-    #   https://github.com/discordapp/discord-api-docs/issues/17 for how to do sharding.
+    #   https://github.com/discord/discord-api-docs/issues/17 for how to do sharding.
     # @param num_shards [Integer] The total number of shards that should be running. See
-    #   https://github.com/discordapp/discord-api-docs/issues/17 for how to do sharding.
+    #   https://github.com/discord/discord-api-docs/issues/17 for how to do sharding.
     # @param redact_token [true, false] Whether the bot should redact the token in logs. Default is true.
     # @param ignore_bots [true, false] Whether the bot should ignore bot accounts or not. Default is false.
     # @param compress_mode [:none, :large, :stream] Sets which compression mode should be used when connecting
     #   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.
+    # @param intents [:all, :unprivileged, Array<Symbol>, :none] Gateway intents that this bot requires. `:all` will
+    #   request all intents. `:unprivileged` will request only intents that are not defined as "Privileged". `:none`
+    #   will request no intents. An array of symbols will request only those intents specified.
+    # @see Discordrb::INTENTS
     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: :large, intents: nil
+      compress_mode: :large, intents: :all
     )
       LOGGER.mode = log_mode
       LOGGER.token = token if redact_token
@@ -130,7 +137,16 @@ module Discordrb
 
       raise 'Token string is empty or nil' if token.nil? || token.empty?
 
-      @intents = intents == :all ? INTENTS.values.reduce(&:|) : calculate_intents(intents) if intents
+      @intents = case intents
+                 when :all
+                   ALL_INTENTS
+                 when :unprivileged
+                   UNPRIVILEGED_INTENTS
+                 when :none
+                   NO_INTENTS
+                 else
+                   calculate_intents(intents)
+                 end
 
       @token = process_token(@type, token)
       @gateway = Gateway.new(self, @token, @shard_key, @compress_mode, @intents)
@@ -147,6 +163,8 @@ module Discordrb
       @current_thread = 0
 
       @status = :online
+
+      @application_commands = {}
     end
 
     # The list of users the bot shares a server with.
@@ -165,6 +183,14 @@ module Discordrb
       @servers
     end
 
+    # The list of members in threads the bot can see.
+    # @return [Hash<Integer => Hash<Integer => Hash<String => Object>>]
+    def thread_members
+      gateway_check
+      unavailable_servers_check
+      @thread_members
+    end
+
     # @overload emoji(id)
     #   Return an emoji by its ID
     #   @param id [String, Integer] The emoji's ID.
@@ -197,8 +223,10 @@ module Discordrb
     # to edit user data like the current username (see {Profile#username=}).
     # @return [Profile] The bot's profile that can be used to edit data.
     def profile
-      gateway_check
-      @profile
+      return @profile if @profile
+
+      response = Discordrb::API::User.profile(@token)
+      @profile = Profile.new(JSON.parse(response), self)
     end
 
     alias_method :bot_user, :profile
@@ -362,17 +390,19 @@ module Discordrb
     # @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 embeds [Hash, Discordrb::Webhooks::Embed, Array<Hash>, Array<Discordrb::Webhooks::Embed> nil] The rich embed(s) 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.
+    # @param components [View, Array<Hash>] Interaction components to associate with this message.
     # @return [Message] The message that was sent.
-    def send_message(channel, content, tts = false, embed = nil, attachments = nil, allowed_mentions = nil, message_reference = nil)
+    def send_message(channel, content, tts = false, embeds = nil, attachments = nil, allowed_mentions = nil, message_reference = nil, components = 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
+      message_reference = { message_id: message_reference.id } if message_reference.respond_to?(:id)
+      embeds = (embeds.instance_of?(Array) ? embeds.map(&:to_hash) : [embeds&.to_hash]).compact
 
-      response = API::Channel.create_message(token, channel, content, tts, embed&.to_hash, nil, attachments, allowed_mentions&.to_hash, message_reference)
+      response = API::Channel.create_message(token, channel, content, tts, embeds, nil, attachments, allowed_mentions&.to_hash, message_reference, components)
       Message.new(JSON.parse(response), self)
     end
 
@@ -382,15 +412,16 @@ module Discordrb
     # @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.
+    # @param embeds [Hash, Discordrb::Webhooks::Embed, Array<Hash>, Array<Discordrb::Webhooks::Embed> nil] The rich embed(s) to append to this message.
     # @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)
+    # @param components [View, Array<Hash>] Interaction components to associate with this message.
+    def send_temporary_message(channel, content, timeout, tts = false, embeds = nil, attachments = nil, allowed_mentions = nil, message_reference = nil, components = nil)
       Thread.new do
         Thread.current[:discordrb_name] = "#{@current_thread}-temp-msg"
 
-        message = send_message(channel, content, tts, embed, attachments, allowed_mentions, message_reference)
+        message = send_message(channel, content, tts, embeds, attachments, allowed_mentions, message_reference, components)
         sleep(timeout)
         message.delete
       end
@@ -416,6 +447,7 @@ module Discordrb
         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
+        file.define_singleton_method(:path) { filename } if filename
       end
 
       channel = channel.resolve_id
@@ -595,6 +627,36 @@ module Discordrb
       update_status(:invisible, @activity, nil)
     end
 
+    # Join a thread
+    # @param channel [Channel, Integer, String]
+    def join_thread(channel)
+      API::Channel.join_thread(@token, channel.resolve_id)
+      nil
+    end
+
+    # Leave a thread
+    # @param channel [Channel, Integer, String]
+    def leave_thread(channel)
+      API::Channel.leave_thread(@token, channel.resolve_id)
+      nil
+    end
+
+    # Add a member to a thread
+    # @param channel [Channel, Integer, String]
+    # @param member [Member, Integer, String]
+    def add_thread_member(channel, member)
+      API::Channel.add_thread_member(@token, channel.resolve_id, member.resolve_id)
+      nil
+    end
+
+    # Remove a member from a thread
+    # @param channel [Channel, Integer, String]
+    # @param member [Member, Integer, String]
+    def remove_thread_member(channel, member)
+      API::Channel.remove_thread_member(@token, channel.resolve_id, member.resolve_id)
+      nil
+    end
+
     # Sets debug mode. If debug mode is on, many things will be outputted to STDOUT.
     def debug=(new_debug)
       LOGGER.debug = new_debug
@@ -721,6 +783,118 @@ module Discordrb
       end
     end
 
+    # Get all application commands.
+    # @param server_id [String, Integer, nil] The ID of the server to get the commands from. Global if `nil`.
+    # @return [Array<ApplicationCommand>]
+    def get_application_commands(server_id: nil)
+      resp = if server_id
+               API::Application.get_guild_commands(@token, profile.id, server_id)
+             else
+               API::Application.get_global_commands(@token, profile.id)
+             end
+
+      JSON.parse(resp).map do |command_data|
+        ApplicationCommand.new(command_data, self, server_id)
+      end
+    end
+
+    # Get an application command by ID.
+    # @param command_id [String, Integer]
+    # @param server_id [String, Integer, nil] The ID of the server to get the command from. Global if `nil`.
+    def get_application_command(command_id, server_id: nil)
+      resp = if server_id
+               API::Application.get_guild_command(@token, profile.id, server_id, command_id)
+             else
+               API::Application.get_global_command(@token, profile.id, command_id)
+             end
+      ApplicationCommand.new(JSON.parse(resp), self, server_id)
+    end
+
+    # @yieldparam [OptionBuilder]
+    # @yieldparam [PermissionBuilder]
+    # @example
+    #   bot.register_application_command(:reddit, 'Reddit Commands') do |cmd|
+    #     cmd.subcommand_group(:subreddit, 'Subreddit Commands') do |group|
+    #       group.subcommand(:hot, "What's trending") do |sub|
+    #         sub.string(:subreddit, 'Subreddit to search')
+    #       end
+    #       group.subcommand(:new, "What's new") do |sub|
+    #         sub.string(:since, 'How long ago', choices: ['this hour', 'today', 'this week', 'this month', 'this year', 'all time'])
+    #         sub.string(:subreddit, 'Subreddit to search')
+    #       end
+    #     end
+    #   end
+    def register_application_command(name, description, server_id: nil, default_permission: nil, type: :chat_input)
+      type = ApplicationCommand::TYPES[type] || type
+
+      builder = Interactions::OptionBuilder.new
+      permission_builder = Interactions::PermissionBuilder.new
+      yield(builder, permission_builder) if block_given?
+
+      resp = if server_id
+               API::Application.create_guild_command(@token, profile.id, server_id, name, description, builder.to_a, default_permission, type)
+             else
+               API::Application.create_global_command(@token, profile.id, name, description, builder.to_a, default_permission, type)
+             end
+      cmd = ApplicationCommand.new(JSON.parse(resp), self, server_id)
+
+      if permission_builder.to_a.any?
+        raise ArgumentError, 'Permissions can only be set for guild commands' unless server_id
+
+        edit_application_command_permissions(cmd.id, server_id, permission_builder.to_a)
+      end
+
+      cmd
+    end
+
+    # @yieldparam [OptionBuilder]
+    # @yieldparam [PermissionBuilder]
+    def edit_application_command(command_id, server_id: nil, name: nil, description: nil, default_permission: nil, type: :chat_input)
+      type = ApplicationCommand::TYPES[type] || type
+
+      builder = Interactions::OptionBuilder.new
+      permission_builder = Interactions::PermissionBuilder.new
+
+      yield(builder, permission_builder) if block_given?
+
+      resp = if server_id
+               API::Application.edit_guild_command(@token, profile.id, server_id, command_id, name, description, builder.to_a, default_permission, type)
+             else
+               API::Application.edit_guild_command(@token, profile.id, command_id, name, description, builder.to_a, default_permission.type)
+             end
+      cmd = ApplicationCommand.new(JSON.parse(resp), self, server_id)
+
+      if permission_builder.to_a.any?
+        raise ArgumentError, 'Permissions can only be set for guild commands' unless server_id
+
+        edit_application_command_permissions(cmd.id, server_id, permission_builder.to_a)
+      end
+
+      cmd
+    end
+
+    # Remove an application command from the commands registered with discord.
+    # @param command_id [String, Integer] The ID of the command to remove.
+    # @param server_id [String, Integer] The ID of the server to delete this command from, global if `nil`.
+    def delete_application_command(command_id, server_id: nil)
+      if server_id
+        API::Application.delete_guild_command(@token, profile.id, server_id, command_id)
+      else
+        API::Application.delete_global_command(@token, profile.id, command_id)
+      end
+    end
+
+    # @param command_id [Integer, String]
+    # @param server_id [Integer, String]
+    # @param permissions [Array<Hash>] An array of objects formatted as `{ id: ENTITY_ID, type: 1 or 2, permission: true or false }`
+    def edit_application_command_permissions(command_id, server_id, permissions = [])
+      builder = Interactions::PermissionBuilder.new
+      yield builder if block_given?
+
+      permissions += builder.to_a
+      API::Application.edit_guild_command_permissions(@token, profile.id, server_id, command_id, permissions)
+    end
+
     private
 
     # Throws a useful exception if there's currently no gateway connection.
@@ -772,10 +946,16 @@ module Discordrb
 
       username = data['user']['username']
       if username && !member_is_new # Don't set the username for newly-cached members
-        debug "Implicitly updating presence-obtained information for member #{user_id}"
+        debug "Implicitly updating presence-obtained information username for member #{user_id}"
         member.update_username(username)
       end
 
+      global_name = data['user']['global_name']
+      if global_name && !member_is_new # Don't set the global_name for newly-cached members
+        debug "Implicitly updating presence-obtained information global_name for member #{user_id}"
+        member.update_global_name(global_name)
+      end
+
       member.update_presence(data)
 
       member.avatar_id = data['user']['avatar'] if data['user']['avatar']
@@ -836,14 +1016,14 @@ module Discordrb
 
     # Internal handler for CHANNEL_CREATE
     def create_channel(data)
-      channel = Channel.new(data, self)
+      channel = data.is_a?(Discordrb::Channel) ? data : Channel.new(data, self)
       server = channel.server
 
       # Handle normal and private channels separately
       if server
         server.add_channel(channel)
         @channels[channel.id] = channel
-      elsif channel.pm?
+      elsif channel.private?
         @pm_channels[channel.recipient.id] = channel
       elsif channel.group?
         @channels[channel.id] = channel
@@ -873,6 +1053,8 @@ module Discordrb
       elsif channel.group?
         @channels.delete(channel.id)
       end
+
+      @thread_members.delete(channel.id) if channel.thread?
     end
 
     # Internal handler for CHANNEL_RECIPIENT_ADD
@@ -912,7 +1094,9 @@ module Discordrb
       member = server.member(data['user']['id'].to_i)
       member.update_roles(data['roles'])
       member.update_nick(data['nick'])
+      member.update_global_name(data['user']['global_name']) if data['user']['global_name']
       member.update_boosting_since(data['premium_since'])
+      member.update_communication_disabled_until(data['communication_disabled_until'])
     end
 
     # Internal handler for GUILD_MEMBER_DELETE
@@ -929,7 +1113,7 @@ module Discordrb
 
     # Internal handler for GUILD_CREATE
     def create_guild(data)
-      ensure_server(data)
+      ensure_server(data, true)
     end
 
     # Internal handler for GUILD_UPDATE
@@ -1020,7 +1204,7 @@ module Discordrb
 
     def process_token(type, token)
       # Remove the "Bot " prefix if it exists
-      token = token[4..-1] if token.start_with? 'Bot '
+      token = token[4..] if token.start_with? 'Bot '
 
       token = "Bot #{token}" unless type == :user
       token
@@ -1057,14 +1241,14 @@ module Discordrb
         data['guilds'].each do |element|
           # Check for true specifically because unavailable=false indicates that a previously unavailable server has
           # come online
-          if element['unavailable'].is_a? TrueClass
+          if element['unavailable']
             @unavailable_servers += 1
 
             # Ignore any unavailable servers
             next
           end
 
-          ensure_server(element)
+          ensure_server(element, true)
         end
 
         # Add PM and group channels
@@ -1089,14 +1273,14 @@ module Discordrb
       when :GUILD_MEMBERS_CHUNK
         id = data['guild_id'].to_i
         server = server(id)
-        server.process_chunk(data['members'])
+        server.process_chunk(data['members'], data['chunk_index'], data['chunk_count'])
       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)
+        if ignored?(data['author']['id'])
           debug("Ignored author with ID #{data['author']['id']}")
           return
         end
@@ -1113,6 +1297,13 @@ module Discordrb
 
         return if message.from_bot? && !should_parse_self
 
+        # Dispatch a ChannelCreateEvent for channels we don't have cached
+        if message.channel.private? && @pm_channels[message.channel.recipient.id].nil?
+          create_channel(message.channel)
+
+          raise_event(ChannelCreateEvent.new(message.channel, self))
+        end
+
         event = MessageEvent.new(message, self)
         raise_event(event)
 
@@ -1195,18 +1386,28 @@ module Discordrb
         # Ignore friends list presences
         return unless data['guild_id']
 
-        now_playing = data['game'].nil? ? nil : data['game']['name']
+        new_activities = (data['activities'] || []).map { |act_data| Activity.new(act_data, self) }
         presence_user = @users[data['user']['id'].to_i]
-        played_before = presence_user.nil? ? nil : presence_user.game
+        old_activities = (presence_user&.activities || [])
         update_presence(data)
 
-        event = if now_playing == played_before
-                  PresenceEvent.new(data, self)
-                else
-                  PlayingEvent.new(data, self)
-                end
+        # Starting a new game
+        playing_change = new_activities.reject do |act|
+          old_activities.find { |old| old.name == act.name }
+        end
 
-        raise_event(event)
+        # Exiting an existing game
+        playing_change += old_activities.reject do |old|
+          new_activities.find { |act| act.name == old.name }
+        end
+
+        if playing_change.any?
+          playing_change.each do |act|
+            raise_event(PlayingEvent.new(data, act, self))
+          end
+        else
+          raise_event(PresenceEvent.new(data, self))
+        end
       when :VOICE_STATE_UPDATE
         old_channel_id = update_voice_state(data)
 
@@ -1343,9 +1544,93 @@ module Discordrb
           event = ServerEmojiUpdateEvent.new(server, old_emoji_data[e], new_emoji_data[e], self)
           raise_event(event)
         end
+      when :INTERACTION_CREATE
+        event = InteractionCreateEvent.new(data, self)
+        raise_event(event)
+
+        case data['type']
+        when Interaction::TYPES[:command]
+          event = ApplicationCommandEvent.new(data, self)
+
+          Thread.new do
+            Thread.current[:discordrb_name] = "it-#{event.interaction.id}"
+
+            begin
+              debug("Executing application command #{event.command_name}:#{event.command_id}")
+
+              @application_commands[event.command_name]&.call(event)
+            rescue StandardError => e
+              log_exception(e)
+            end
+          end
+        when Interaction::TYPES[:component]
+          case data['data']['component_type']
+          when Webhooks::View::COMPONENT_TYPES[:button]
+            event = ButtonEvent.new(data, self)
+
+            raise_event(event)
+          when Webhooks::View::COMPONENT_TYPES[:string_select]
+            event = StringSelectEvent.new(data, self)
+
+            raise_event(event)
+          when Webhooks::View::COMPONENT_TYPES[:user_select]
+            event = UserSelectEvent.new(data, self)
+
+            raise_event(event)
+          when Webhooks::View::COMPONENT_TYPES[:role_select]
+            event = RoleSelectEvent.new(data, self)
+
+            raise_event(event)
+          when Webhooks::View::COMPONENT_TYPES[:mentionable_select]
+            event = MentionableSelectEvent.new(data, self)
+
+            raise_event(event)
+          when Webhooks::View::COMPONENT_TYPES[:channel_select]
+            event = ChannelSelectEvent.new(data, self)
+
+            raise_event(event)
+          end
+        when Interaction::TYPES[:modal_submit]
+
+          event = ModalSubmitEvent.new(data, self)
+          raise_event(event)
+        end
       when :WEBHOOKS_UPDATE
         event = WebhookUpdateEvent.new(data, self)
         raise_event(event)
+      when :THREAD_CREATE
+        create_channel(data)
+
+        event = ThreadCreateEvent.new(data, self)
+        raise_event(event)
+      when :THREAD_UPDATE
+        update_channel(data)
+
+        event = ThreadUpdateEvent.new(data, self)
+        raise_event(event)
+      when :THREAD_DELETE
+        delete_channel(data)
+        @thread_members.delete(data['id']&.resolve_id)
+
+        # raise ThreadDeleteEvent
+      when :THREAD_LIST_SYNC
+        data['members'].map { |member| ensure_thread_member(member) }
+        data['threads'].map { |channel| ensure_channel(channel, data['guild_id']) }
+
+        # raise ThreadListSyncEvent?
+      when :THREAD_MEMBER_UPDATE
+        ensure_thread_member(data)
+      when :THREAD_MEMBERS_UPDATE
+        data['added_members']&.each do |added_member|
+          ensure_thread_member(added_member) if added_member['user_id']
+        end
+
+        data['removed_member_ids']&.each do |member_id|
+          @thread_members[data['id']&.resolve_id]&.delete(member_id&.resolve_id)
+        end
+
+        event = ThreadMembersUpdateEvent.new(data, self)
+        raise_event(event)
       else
         # another event that we don't support yet
         debug "Event #{type} has been received but is unsupported. Raising UnknownEvent"

data/lib/discordrb/cache.rb

@@ -21,8 +21,7 @@ module Discordrb
 
       @channels = {}
       @pm_channels = {}
-
-      @restricted_channels = []
+      @thread_members = {}
     end
 
     # Returns or caches the available voice regions
@@ -42,28 +41,21 @@ module Discordrb
     # @param id [Integer] The channel ID for which to search for.
     # @param server [Server] The server for which to search the channel for. If this isn't specified, it will be
     #   inferred using the API
-    # @return [Channel] The channel identified by the ID.
+    # @return [Channel, nil] The channel identified by the ID.
+    # @raise Discordrb::Errors::NoPermission
     def channel(id, server = nil)
       id = id.resolve_id
 
-      raise Discordrb::Errors::NoPermission if @restricted_channels.include? id
-
       debug("Obtaining data for channel with id #{id}")
       return @channels[id] if @channels[id]
 
       begin
-        begin
-          response = API::Channel.resolve(token, id)
-        rescue RestClient::ResourceNotFound
-          return nil
-        end
-        channel = Channel.new(JSON.parse(response), self, server)
-        @channels[id] = channel
-      rescue Discordrb::Errors::NoPermission
-        debug "Tried to get access to restricted channel #{id}, blacklisting it"
-        @restricted_channels << id
-        raise
+        response = API::Channel.resolve(token, id)
+      rescue Discordrb::Errors::UnknownChannel
+        return nil
       end
+      channel = Channel.new(JSON.parse(response), self, server)
+      @channels[id] = channel
     end
 
     alias_method :group_channel, :channel
@@ -79,7 +71,7 @@ module Discordrb
       LOGGER.out("Resolving user #{id}")
       begin
         response = API::User.resolve(token, id)
-      rescue RestClient::ResourceNotFound
+      rescue Discordrb::Errors::UnknownUser
         return nil
       end
       user = User.new(JSON.parse(response), self)
@@ -111,7 +103,6 @@ module Discordrb
     def member(server_or_id, user_id)
       server_id = server_or_id.resolve_id
       user_id = user_id.resolve_id
-
       server = server_or_id.is_a?(Server) ? server_or_id : self.server(server_id)
 
       return server.member(user_id) if server.member_cached?(user_id)
@@ -119,7 +110,7 @@ module Discordrb
       LOGGER.out("Resolving member #{server_id} on server #{user_id}")
       begin
         response = API::Server.resolve_member(token, server_id, user_id)
-      rescue RestClient::ResourceNotFound
+      rescue Discordrb::Errors::UnknownUser, Discordrb::Errors::UnknownMember
         return nil
       end
       member = Member.new(JSON.parse(response), server, self)
@@ -156,10 +147,14 @@ module Discordrb
 
     # Ensures a given server object is cached and if not, cache it from the given data hash.
     # @param data [Hash] A data hash representing a server.
+    # @param force_cache [true, false] Whether the object in cache should be updated with the given
+    #   data if it already exists.
     # @return [Server] the server represented by the data hash.
-    def ensure_server(data)
+    def ensure_server(data, force_cache = false)
       if @servers.include?(data['id'].to_i)
-        @servers[data['id'].to_i]
+        server = @servers[data['id'].to_i]
+        server.update_data(data) if force_cache
+        server
       else
         @servers[data['id'].to_i] = Server.new(data, self)
       end
@@ -177,6 +172,16 @@ module Discordrb
       end
     end
 
+    # Ensures a given thread member object is cached.
+    # @param data [Hash] Thread member data.
+    def ensure_thread_member(data)
+      thread_id = data['id'].to_i
+      user_id = data['user_id'].to_i
+
+      @thread_members[thread_id] ||= {}
+      @thread_members[thread_id][user_id] = data.slice('join_timestamp', 'flags')
+    end
+
     # Requests member chunks for a given server ID.
     # @param id [Integer] The server ID to request chunks for.
     def request_chunks(id)
@@ -194,7 +199,7 @@ module Discordrb
     # @return [String] Only the code for the invite.
     def resolve_invite_code(invite)
       invite = invite.code if invite.is_a? Discordrb::Invite
-      invite = invite[invite.rindex('/') + 1..-1] if invite.start_with?('http', 'discord.gg')
+      invite = invite[invite.rindex('/') + 1..] if invite.start_with?('http', 'discord.gg')
       invite
     end