discordrb 3.3.0 → 3.5.0

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)
@@ -134,6 +125,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)
@@ -155,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
@@ -176,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)
@@ -187,13 +193,13 @@ 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.
     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
 
@@ -219,7 +225,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 +254,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

data/lib/discordrb/commands/command_bot.rb

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

data/lib/discordrb/commands/container.rb

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

data/lib/discordrb/commands/parser.rb

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

data/lib/discordrb/commands/rate_limiter.rb

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