discordrb 1.8.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a817886abdced3f0f96221e3b286feadc093e8f
-  data.tar.gz: 8d4cbf89664f16b80d2aa800f13c8ffc565938db
+  metadata.gz: ca5ae97de9345328dac0b9f9e8c14f38e2d70bc9
+  data.tar.gz: fe60d3642cecec76594a3356d93c923be5f27997
 SHA512:
-  metadata.gz: c2a51f5fc08c7803625df60cca4ce53e84a95041086085761ded3175d4b4287cda6b90381ac49b9605fa2a539e7b3a23bd097f01feefe0f1c71f227215900349
-  data.tar.gz: 192d176ba53f01de7b1c24ad68e36c9317caf25665a432c24096344ddc51e15c48e52ce395bd054bc19e8a7a926750e52dcce863c4f1d89fe05ca3eb27c1220a
+  metadata.gz: fa6c978e90c0f5338a9f6b67f0cf1fafd6d2c847c76b1fb6aadacfb820c95248ecdb8962ab84d63c2811b0bd28dd6913b72ae1463b671822f8716d526d04e9dc
+  data.tar.gz: b0eab7396be2942e2c7f9370c49fa1b45e70c2836d1281bf31e9fc98bc44919ac276c6a453000758b90a502cbde65ced78782a5b5b82c5472a20f429dc710bb7

data/.overcommit.yml

@@ -0,0 +1,7 @@
+PreCommit:
+  RuboCop:
+    enabled: true
+    on_warn: fail # Treat all warnings as failures
+
+  AuthorName:
+    enabled: false

data/.rubocop.yml

@@ -41,10 +41,11 @@ Lint/RescueException:
 AllCops:
   TargetRubyVersion: 2.1
 
-# Apparently setting the target version to 2.1 is not enough to prevent this cop...
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # http://stackoverflow.com/questions/4763121/should-i-use-alias-or-alias-method
 Style/Alias:
   Enabled: false
+
+# So RuboCop doesn't complain about application IDs
+Style/NumericLiterals:
+  Exclude:
+    - examples/*

data/CHANGELOG.md

@@ -1,5 +1,82 @@
 # Changelog
 
+## 2.0.0
+
+This is the first major update with some breaking changes! Those are highlighted in bold with migration advice after them. Ask in the Discord channel (see the README) if you have questions.
+
+- **Bot initializers now only use named parameters.** This shouldn't be a hard change to adjust to, but everyone will have to do it. Here's some examples:
+ ```rb
+ # Previously
+ bot = Discordrb::Bot.new 'email@example.com', 'hunter2', true
+
+ # Now
+ bot = Discordrb::Bot.new email: 'email@example.com', password: 'hunter2', log_mode: :debug
+ ```
+ ```rb
+ # Previously
+ bot = Discordrb::Bot.new :token, 'TOKEN HERE'
+
+ # Now
+ bot = Discordrb::Bot.new token: 'TOKEN HERE', application_id: 163456789123456789
+ ```
+ ```rb
+ # Previously
+ bot = Discordrb::Commands::CommandBot.new :token, 'TOKEN HERE', '!', nil, {advanced_functionality: false}
+
+ # Now
+ bot = Discordrb::Commands::CommandBot.new token: 'TOKEN HERE', application_id: 163456789123456789, prefix: '!', advanced_functionality: false
+ ```
+ - Connecting to multiple voice channels at once (only available with bot accounts) is now supported. **This means `bot.voice` now takes the server ID as the parameter**. For a seamless switch, the utility method `MessageEvent#voice` was added - simply replace `bot.voice` with `event.voice` in all instances.
+ - **The `Member` and `Recipient` classes were split off from `User`**. Members are users on servers and recipients are partners in private messages. Since both are delegates to `User`, most things will work as before, but most notably roles were changed to no longer be by ID (for example, instead of `event.author.roles(event.server.id)`, you'd just use `event.author.roles` instead).
+ - **All previously deprecated methods were removed.** This includes:
+   - `Server#afk_channel_id=` (use `afk_channel=`, it works with the ID too)
+   - `Channel#is_private` (use `private?` instead, it's more reliable with edge cases like Twitch subscriber-only channels)
+   - `Bot#find` (use `find_channel` instead, it does the exact same thing without confusion with `find_user`)
+ - **`Server` is now used instead of `Guild` in all external methods and classes.** Previously, all the events regarding roles and such were called `GuildRoleXYZEvent`, now they're all called `ServerRoleXYZEvent` for consistency with other attributes and methods.
+ - **`advanced_functionality` is now disabled by default.** If you absolutely need it, you can easily re-enable it by just setting that parameter in the CommandBot initializer, but for most people that didn't need it this will fix some bugs with mentions in commands and such.
+ - **`User#bot?` was renamed to `User#current_bot?`** with the addition of the `User#bot_account?` reader to check for bot account-ness (the "BOT" tag visible on Discord)
+ - Member chunks will no longer automatically be requested on startup, but rather once they're actually needed (`event.server.members`). This is both a performance change (much faster startup for large bots especially) and an important API compliance one - this is what the Discord devs have requested.
+ - Initial support for bots that have no WebSocket connection was started. This is useful for web apps that need to get information on something without having to run something in the background all the time. A tutorial on these will be coming soon, in the meantime, use this short example:
+```rb
+require 'discordrb'
+require 'discordrb/light'
+
+bot = Discordrb::Light::LightBot.new 'token here'
+puts bot.profile.username
+```
+ - OAuth bot accounts are now better supported using a method `Bot#invite_url` to get a bot's invite URL and sending tokens using the new `Bot` prefix.
+ - discordrb now fully uses [websocket-client-simple](https://github.com/shokai/websocket-client-simple) (a.k.a. WSCS) instead of Faye::WebSocket, this means that the annoying OpenSSL library thing won't have to be done anymore.
+ - The new version of the Discord gateway (v4) is supported and used by default. This should bring more stability and possibly slight performance improvements.
+ - Some older v3 features that weren't supported before are now:
+   - Compressed ready packets (should decrease network overhead for very large bots)
+ - Discord rate limits are now supported better - the client will never send a message if it knows it's going to be rate limited, instead it's going to wait for the correct time.
+ - Requests will now automatically be retried if a 502 (cloudflare error) is received.
+ - `MessageEditEvent`s now have a whole message instead of just the ID to allow for checking the content of edited messages.
+ - `Message`s now have an `attachments` array with files attached to the message.
+ - `ReadyEvent` and `DisconnectEvent` now have the bot as a readable attribute - useful for container-based bots that don't have a way to get them otherwise.
+ - `Bot#find_channel` can now parse channel mentions and search for specific types of channels (text or voice).
+ - `Server#create_channel` can now create voice channels.
+ - A utility function `User#distinct` was added to get the distinct representation of a user (i.e. name + discrim, for example "meew0#9811")
+ - The `User#discriminator` attribute now has more aliases (`#tag`, `#discord_tag`, `#discrim`)
+ - `Permission` objects can now be created or set even without a role writer, useful to quickly get byte representations of permissions
+ - Permission overwrites can now be defined more easily using the utility method `Channel#define_overwrite`
+ - `Message`s returned at the end of commands (for example using `User#pm` or `Message#edit`) will now no longer be sent ([#66](https://github.com/meew0/discordrb/issues/66))
+ - The `:with_text` event attribute is now aliased to `:exact_text` ([#65](https://github.com/meew0/discordrb/issues/65))
+ - Server icons (`Server#icon=`) can now be set just like avatars (`Profile#avatar=`)
+ - Lots of comments were added to the examples and some bugs fixed
+ - The overall performance and memory usage was improved, especially on Ruby 2.3 (using the new frozen string literal comment)
+ - The documentation was slightly improved.
+
+**Bugfixes**:
+ - A *lot* of latent bugs with caching were fixed. This doesn't really have a noticeable effect, it just means better stability and reliability as a whole.
+ - **Command bots no longer respond when there are spaces between the prefix and the command.** Because this behaviour may be desirable, a `spaces_allowed` attribute was added to the CommandBot initializer that can be set to true to re-enable this behaviour.
+ - Permission calculation (`User#permission?`) has been thoroughly rewritten and should now account for edge cases like server owners and Manage Permissions.
+ - The gateway reconnect logic now uses a correct falloff system - before it would start at 1 second between attempts and immediately jump to 120. Now the transition is more smooth.
+ - Commands with aliases now show up correctly in the auto-generated help command ([#72](https://github.com/meew0/discordrb/issues/72))
+ - The auto-generated help command can now actually be disabled by setting the corresponding attribute to nil ([#73](https://github.com/meew0/discordrb/issues/73))
+ - Including empty containers now does nothing instead of raising an error
+ - Command bots now obey `should_parse_self`
+
 ## 1.8.1
 
 ### Bugfixes

data/README.md

@@ -1,18 +1,36 @@
+[![Gem](https://img.shields.io/gem/v/discordrb.svg)](https://rubygems.org/gems/discordrb)
+[![Gem](https://img.shields.io/gem/dt/discordrb.svg)](https://rubygems.org/gems/discordrb)
 [![Build Status](https://travis-ci.org/meew0/discordrb.svg?branch=master)](https://travis-ci.org/meew0/discordrb)
-
+[![Inline docs](http://inch-ci.org/github/meew0/discordrb.svg?branch=master&style=shields)](http://inch-ci.org/github/meew0/discordrb)
+[![Join Discord](https://img.shields.io/badge/discord-join-7289DA.svg)](https://discord.gg/0SBTUU1wZTWfFQL2)
 # discordrb
 
 An implementation of the [Discord](https://discordapp.com/) API using Ruby.
 
+**News**: Please help test version 2 of discordrb with a lot of changes! A preliminary changelog can be found [here](https://gist.github.com/meew0/ea120051da52604e7873b7cfaed4c40b). The code can be found on the `v2` branch; if you're using bundler you can change the gem reference to `gem 'discordrb', git: 'git://github.com/meew0/discordrb.git', branch: 'v2'`. A downloadable gem file for everybody else will follow here shortly.
+
 ## Quick links to sections
 
+* [Dependencies](https://github.com/meew0/discordrb#dependencies)
 * [Installation](https://github.com/meew0/discordrb#installation)
 * [Usage](https://github.com/meew0/discordrb#usage)
 * [Support](https://github.com/meew0/discordrb#support)
 * [Development](https://github.com/meew0/discordrb#development), [Contributing](https://github.com/meew0/discordrb#contributing)
 * [License](https://github.com/meew0/discordrb#license)
 
-See also: [Documentation](https://discord.gg/0SBTUU1wZTWfFQL2), [Tutorials](https://github.com/meew0/discordrb/wiki)
+See also: [Documentation](http://www.rubydoc.info/gems/discordrb), [Tutorials](https://github.com/meew0/discordrb/wiki)
+
+## Dependencies
+
+* Ruby 2.1+
+* An installed build system for native extensions (on Windows, try the [DevKit](http://rubyinstaller.org/downloads/); installation instructions [here](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit#quick-start))
+
+### Voice dependencies
+
+This section only applies to you if you want to use voice functionality.
+* [libsodium](https://github.com/meew0/discordrb/wiki/Installing-libsodium)
+* A compiled libopus distribution for your system, anywhere the script can find it (on Windows, make sure it's named `opus.dll`)
+* [FFmpeg](https://www.ffmpeg.org/download.html) installed and in your PATH
 
 ## Installation
 
@@ -49,16 +67,6 @@ Then reinstall discordrb:
     gem uninstall discordrb
     gem install discordrb
 
-**If you get an error like this when running the example**:
-
-    terminate called after throwing an instance of 'std::runtime_error'
-      what():  Encryption not available on this event-machine
-
-You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](https://slproweb.com/download/Win32OpenSSL-1_0_2f.exe), install them to their default location and reinstall EventMachine using these libraries:
-
-    gem uninstall eventmachine
-    gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
-
 **If you're having trouble getting voice playback to work**:
 
 Look here: https://github.com/meew0/discordrb/wiki/Voice-sending#troubleshooting
@@ -70,10 +78,10 @@ You can make a simple bot like this:
 ```ruby
 require 'discordrb'
 
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
+bot = Discordrb::Bot.new token: '<token here>'
 
-bot.message(with_text: "Ping!") do |event|
-  event.respond "Pong!"
+bot.message(with_text: 'Ping!') do |event|
+  event.respond 'Pong!'
 end
 
 bot.run
@@ -87,6 +95,8 @@ You can find me (@meew0, ID 66237334693085184) on the unofficial Discord API ser
 
 ## Development
 
+**This section is for developing discordrb itself! If you just want to make a bot, see the [Installation](https://github.com/meew0/discordrb#installation) section.**
+
 After checking out the repo, run `bin/setup` to install dependencies. You can then run tests via `bundle exec rspec spec`. Make sure to run rubocop also: `bundle exec rubocop`. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/discordrb.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faye-websocket'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'opus-ruby'
-  spec.add_dependency 'websocket-client-simple'
+  spec.add_dependency 'websocket-client-simple', '>= 0.3.0'
   spec.add_dependency 'rbnacl'
 
   spec.required_ruby_version = '>= 2.1.0'
@@ -32,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'yard', '~> 0.8.7.6'
   spec.add_development_dependency 'rspec', '~> 3.4.0'
-  spec.add_development_dependency 'rubocop', '0.37.2'
+  spec.add_development_dependency 'rubocop', '0.39.0'
 end

data/examples/commands.rb

@@ -2,25 +2,35 @@
 
 require 'discordrb'
 
-bot = Discordrb::Commands::CommandBot.new 'email@example.com', 'hunter2', '!'
+bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
 
 bot.command :user do |event|
+  # Commands send whatever is returned from the block to the channel. This allows for compact commands like this,
+  # but you have to be aware of this so you don't accidentally return something you didn't intend to.
+  # To prevent the return value to be sent to the channel, you can just return `nil`.
   event.user.name
 end
 
 bot.command :bold do |_event, *args|
+  # Again, the return value of the block is sent to the channel
   "**#{args.join(' ')}**"
 end
 
 bot.command :italic do |_event, *args|
-  "**#{args.join(' ')}**"
+  "*#{args.join(' ')}*"
 end
 
 bot.command(:join, permission_level: 1, chain_usable: false) do |event, invite|
   event.bot.join invite
+
+  # The `join` call above returns the data Discord sends as a response to joining the server. We don't want that
+  # in the channel so here we're just returning `nil` afterwards
+  nil
 end
 
 bot.command(:random, min_args: 0, max_args: 2, description: 'Generates a random number between 0 and 1, 0 and max or min and max.', usage: 'random [min/max] [max]') do |_event, min, max|
+  # The `if` statement returns one of multiple different things based on the condition. Its return value
+  # is then returned from the block and sent to the channel
   if max
     rand(min.to_i..max.to_i)
   elsif min
@@ -35,6 +45,8 @@ bot.command :long do |event|
   event << 'It has multiple lines that are each sent by doing `event << line`.'
   event << 'This is an easy way to do such long messages, or to create lines that should only be sent conditionally.'
   event << 'Anyway, have a nice day.'
+
+  # Here we don't have to worry about the return value because the `event << line` statement automatically returns nil.
 end
 
 bot.run

data/examples/ping.rb

@@ -2,7 +2,7 @@
 
 require 'discordrb'
 
-bot = Discordrb::Bot.new 'email@example.com', 'hunter2'
+bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
 bot.message(with_text: 'Ping!') do |event|
   event.respond 'Pong!'

data/examples/pm_send.rb

@@ -2,7 +2,7 @@
 
 require 'discordrb'
 
-bot = Discordrb::Bot.new 'email@example.com', 'hunter2'
+bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
 bot.mention do |event|
   event.user.pm('You have mentioned me!')

data/lib/discordrb.rb

@@ -1,3 +1,12 @@
+# frozen_string_literal: true
+
+unless ENV['DISCORDRB_V2_MESSAGE']
+  puts "You're using version 2 of discordrb which has some breaking changes!"
+  puts "Don't worry if your bot crashes, you can find a list and migration advice here:"
+  puts ' https://github.com/meew0/discordrb/blob/master/CHANGELOG.md#200'
+  puts 'This message will go away in version 2.1 or can be disabled by setting the DISCORDRB_V2_MESSAGE environment variable.'
+end
+
 require 'discordrb/version'
 require 'discordrb/bot'
 require 'discordrb/commands/command_bot'

data/lib/discordrb/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require 'json'
 
@@ -10,6 +12,16 @@ module Discordrb::API
 
   module_function
 
+  # @return [String] the currently used API base URL.
+  def api_base
+    @api_base || APIBASE
+  end
+
+  # Sets the API base URL to something.
+  def api_base=(value)
+    @api_base = value
+  end
+
   # @return [String] the bot name, previously specified using #bot_name=.
   def bot_name
     @bot_name
@@ -29,6 +41,13 @@ module Discordrb::API
     "rest-client/#{RestClient::VERSION} #{RUBY_ENGINE}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} discordrb/#{Discordrb::VERSION} #{required} #{@bot_name}"
   end
 
+  # Resets all rate limit mutexes
+  def reset_mutexes
+    @mutexes = {
+      message: Mutex.new
+    }
+  end
+
   # Performs a RestClient request.
   # @param type [Symbol] The type of HTTP request to use.
   # @param attributes [Array] The attributes for the request.
@@ -36,20 +55,39 @@ module Discordrb::API
     RestClient.send(type, *attributes)
   rescue RestClient::Forbidden
     raise Discordrb::Errors::NoPermission, "The bot doesn't have the required permission to do this!"
+  rescue RestClient::BadGateway
+    Discordrb::LOGGER.warn('Got a 502 while sending a request! Not a big deal, retrying the request')
+    retry
   end
 
   # Make an API request. Utility function to implement message queueing
   # in the future
-  def request(type, *attributes)
+  def request(key, type, *attributes)
     # Add a custom user agent
     attributes.last[:user_agent] = user_agent if attributes.last.is_a? Hash
-    response = raw_request(type, attributes)
 
-    while response.code == 429
-      wait_seconds = response[:retry_after].to_i / 1000.0
-      LOGGER.debug("WARNING: Discord rate limiting will cause a delay of #{wait_seconds} seconds for the request: #{type} #{attributes}")
-      sleep wait_seconds / 1000.0
+    begin
+      if key
+        # Lock and unlock, i. e. wait for the mutex to unlock and don't do anything with it afterwards
+        @mutexes[key].lock
+        @mutexes[key].unlock
+      end
+
       response = raw_request(type, attributes)
+    rescue RestClient::TooManyRequests => e
+      raise "Got an HTTP 429 for an untracked API call! Please report this bug together with the following information: #{type} #{attributes}" unless key
+
+      unless @mutexes[key].locked?
+        response = JSON.parse(e.response)
+        wait_seconds = response['retry_after'].to_i / 1000.0
+        Discordrb::LOGGER.warn("Locking RL mutex (key: #{key}) for #{wait_seconds} seconds due to Discord rate limiting")
+
+        # Wait the required time synchronized by the mutex (so other incoming requests have to wait) but only do it if
+        # the mutex isn't locked already so it will only ever wait once
+        @mutexes[key].synchronize { sleep wait_seconds }
+      end
+
+      retry
     end
 
     response
@@ -57,14 +95,20 @@ module Discordrb::API
 
   # Make an avatar URL from the user and avatar IDs
   def avatar_url(user_id, avatar_id)
-    "#{APIBASE}/users/#{user_id}/avatars/#{avatar_id}.jpg"
+    "#{api_base}/users/#{user_id}/avatars/#{avatar_id}.jpg"
+  end
+
+  # Make an icon URL from server and icon IDs
+  def icon_url(server_id, icon_id)
+    "#{api_base}/guilds/#{server_id}/icons/#{icon_id}.jpg"
   end
 
   # Ban a user from a server and delete their messages from the last message_days days
   def ban_user(token, server_id, user_id, message_days)
     request(
+      nil,
       :put,
-      "#{APIBASE}/guilds/#{server_id}/bans/#{user_id}?delete-message-days=#{message_days}",
+      "#{api_base}/guilds/#{server_id}/bans/#{user_id}?delete-message-days=#{message_days}",
       nil,
       Authorization: token
     )
@@ -73,8 +117,9 @@ module Discordrb::API
   # Unban a user from a server
   def unban_user(token, server_id, user_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/guilds/#{server_id}/bans/#{user_id}",
+      "#{api_base}/guilds/#{server_id}/bans/#{user_id}",
       Authorization: token
     )
   end
@@ -82,8 +127,9 @@ module Discordrb::API
   # Kick a user from a server
   def kick_user(token, server_id, user_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
+      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
       Authorization: token
     )
   end
@@ -91,8 +137,9 @@ module Discordrb::API
   # Move a user to a different voice channel
   def move_user(token, server_id, user_id, channel_id)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
+      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
       { channel_id: channel_id }.to_json,
       Authorization: token,
       content_type: :json
@@ -102,8 +149,9 @@ module Discordrb::API
   # Get a server's banned users
   def bans(token, server_id)
     request(
+      nil,
       :get,
-      "#{APIBASE}/guilds/#{server_id}/bans",
+      "#{api_base}/guilds/#{server_id}/bans",
       Authorization: token
     )
   end
@@ -111,8 +159,9 @@ module Discordrb::API
   # Login to the server
   def login(email, password)
     request(
+      nil,
       :post,
-      "#{APIBASE}/auth/login",
+      "#{api_base}/auth/login",
       email: email,
       password: password
     )
@@ -121,8 +170,9 @@ module Discordrb::API
   # Logout from the server
   def logout(token)
     request(
+      nil,
       :post,
-      "#{APIBASE}/auth/logout",
+      "#{api_base}/auth/logout",
       nil,
       Authorization: token
     )
@@ -131,8 +181,9 @@ module Discordrb::API
   # Create an OAuth application
   def create_oauth_application(token, name, redirect_uris)
     request(
+      nil,
       :post,
-      "#{APIBASE}/oauth2/applications",
+      "#{api_base}/oauth2/applications",
       { name: name, redirect_uris: redirect_uris }.to_json,
       Authorization: token,
       content_type: :json
@@ -142,8 +193,9 @@ module Discordrb::API
   # Change an OAuth application's properties
   def update_oauth_application(token, name, redirect_uris, description = '', icon = nil)
     request(
+      nil,
       :put,
-      "#{APIBASE}/oauth2/applications",
+      "#{api_base}/oauth2/applications",
       { name: name, redirect_uris: redirect_uris, description: description, icon: icon }.to_json,
       Authorization: token,
       content_type: :json
@@ -153,8 +205,9 @@ module Discordrb::API
   # Create a server
   def create_server(token, name, region = :london)
     request(
+      nil,
       :post,
-      "#{APIBASE}/guilds",
+      "#{api_base}/guilds",
       { name: name, region: region.to_s }.to_json,
       Authorization: token,
       content_type: :json
@@ -164,8 +217,9 @@ module Discordrb::API
   # Update a server
   def update_server(token, server_id, name, region, icon, afk_channel_id, afk_timeout)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/guilds/#{server_id}",
+      "#{api_base}/guilds/#{server_id}",
       { name: name, region: region, icon: icon, afk_channel_id: afk_channel_id, afk_timeout: afk_timeout }.to_json,
       Authorization: token,
       content_type: :json
@@ -175,8 +229,9 @@ module Discordrb::API
   # Transfer server ownership
   def transfer_ownership(token, server_id, user_id)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/guilds/#{server_id}",
+      "#{api_base}/guilds/#{server_id}",
       { owner_id: user_id }.to_json,
       Authorization: token,
       content_type: :json
@@ -186,8 +241,9 @@ module Discordrb::API
   # Delete a server
   def delete_server(token, server_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/guilds/#{server_id}",
+      "#{api_base}/guilds/#{server_id}",
       Authorization: token
     )
   end
@@ -195,8 +251,9 @@ module Discordrb::API
   # Leave a server
   def leave_server(token, server_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/users/@me/guilds/#{server_id}",
+      "#{api_base}/users/@me/guilds/#{server_id}",
       Authorization: token
     )
   end
@@ -204,8 +261,19 @@ module Discordrb::API
   # Get a channel's data
   def channel(token, channel_id)
     request(
+      nil,
       :get,
-      "#{APIBASE}/channels/#{channel_id}",
+      "#{api_base}/channels/#{channel_id}",
+      Authorization: token
+    )
+  end
+
+  # Get a server's data
+  def server(token, server_id)
+    request(
+      nil,
+      :get,
+      "#{api_base}/guilds/#{server_id}",
       Authorization: token
     )
   end
@@ -213,8 +281,9 @@ module Discordrb::API
   # Get a member's data
   def member(token, server_id, user_id)
     request(
+      nil,
       :get,
-      "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
+      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
       Authorization: token
     )
   end
@@ -222,8 +291,9 @@ module Discordrb::API
   # Create a channel
   def create_channel(token, server_id, name, type)
     request(
+      nil,
       :post,
-      "#{APIBASE}/guilds/#{server_id}/channels",
+      "#{api_base}/guilds/#{server_id}/channels",
       { name: name, type: type }.to_json,
       Authorization: token,
       content_type: :json
@@ -233,8 +303,9 @@ module Discordrb::API
   # Update a channel's data
   def update_channel(token, channel_id, name, topic, position = 0)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/channels/#{channel_id}",
+      "#{api_base}/channels/#{channel_id}",
       { name: name, position: position, topic: topic }.to_json,
       Authorization: token,
       content_type: :json
@@ -244,8 +315,9 @@ module Discordrb::API
   # Delete a channel
   def delete_channel(token, channel_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/channels/#{channel_id}",
+      "#{api_base}/channels/#{channel_id}",
       Authorization: token
     )
   end
@@ -253,8 +325,9 @@ module Discordrb::API
   # Join a server using an invite
   def join_server(token, invite_code)
     request(
+      nil,
       :post,
-      "#{APIBASE}/invite/#{invite_code}",
+      "#{api_base}/invite/#{invite_code}",
       nil,
       Authorization: token
     )
@@ -263,8 +336,9 @@ module Discordrb::API
   # Resolve an invite
   def resolve_invite(token, invite_code)
     request(
+      nil,
       :get,
-      "#{APIBASE}/invite/#{invite_code}",
+      "#{api_base}/invite/#{invite_code}",
       Authorization: token
     )
   end
@@ -272,19 +346,23 @@ module Discordrb::API
   # Create a private channel
   def create_private(token, bot_user_id, user_id)
     request(
+      nil,
       :post,
-      "#{APIBASE}/users/#{bot_user_id}/channels",
+      "#{api_base}/users/#{bot_user_id}/channels",
       { recipient_id: user_id }.to_json,
       Authorization: token,
       content_type: :json
     )
+  rescue RestClient::BadRequest
+    raise 'Attempted to PM the bot itself!'
   end
 
   # Create an instant invite from a server or a channel id
   def create_invite(token, channel_id, max_age = 0, max_uses = 0, temporary = false, xkcd = false)
     request(
+      nil,
       :post,
-      "#{APIBASE}/channels/#{channel_id}/invites",
+      "#{api_base}/channels/#{channel_id}/invites",
       { max_age: max_age, max_uses: max_uses, temporary: temporary, xkcdpass: xkcd }.to_json,
       Authorization: token,
       content_type: :json
@@ -294,8 +372,9 @@ module Discordrb::API
   # Delete an invite by code
   def delete_invite(token, code)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/invites/#{code}",
+      "#{api_base}/invites/#{code}",
       Authorization: token
     )
   end
@@ -303,23 +382,23 @@ module Discordrb::API
   # Send a message to a channel
   def send_message(token, channel_id, message, mentions = [], tts = false)
     request(
+      :message,
       :post,
-      "#{APIBASE}/channels/#{channel_id}/messages",
+      "#{api_base}/channels/#{channel_id}/messages",
       { content: message, mentions: mentions, tts: tts }.to_json,
       Authorization: token,
       content_type: :json
     )
   rescue RestClient::InternalServerError
     raise Discordrb::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)"
-  rescue RestClient::BadGateway
-    raise Discordrb::Errors::CloudflareError, "Discord's Cloudflare system encountered an error! Usually you can ignore this error and retry the request."
   end
 
   # Delete a message
   def delete_message(token, channel_id, message_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/channels/#{channel_id}/messages/#{message_id}",
+      "#{api_base}/channels/#{channel_id}/messages/#{message_id}",
       Authorization: token
     )
   end
@@ -327,8 +406,9 @@ module Discordrb::API
   # Edit a message
   def edit_message(token, channel_id, message_id, message, mentions = [])
     request(
+      :message,
       :patch,
-      "#{APIBASE}/channels/#{channel_id}/messages/#{message_id}",
+      "#{api_base}/channels/#{channel_id}/messages/#{message_id}",
       { content: message, mentions: mentions }.to_json,
       Authorization: token,
       content_type: :json
@@ -340,8 +420,9 @@ module Discordrb::API
   # so this is an easy way to catch up on messages
   def acknowledge_message(token, channel_id, message_id)
     request(
+      nil,
       :post,
-      "#{APIBASE}/channels/#{channel_id}/messages/#{message_id}/ack",
+      "#{api_base}/channels/#{channel_id}/messages/#{message_id}/ack",
       nil,
       Authorization: token
     )
@@ -350,8 +431,9 @@ module Discordrb::API
   # Send a file as a message to a channel
   def send_file(token, channel_id, file)
     request(
+      nil,
       :post,
-      "#{APIBASE}/channels/#{channel_id}/messages",
+      "#{api_base}/channels/#{channel_id}/messages",
       { file: file },
       Authorization: token
     )
@@ -360,8 +442,9 @@ module Discordrb::API
   # Create a role (parameters such as name and colour will have to be set by update_role afterwards)
   def create_role(token, server_id)
     request(
+      nil,
       :post,
-      "#{APIBASE}/guilds/#{server_id}/roles",
+      "#{api_base}/guilds/#{server_id}/roles",
       nil,
       Authorization: token
     )
@@ -373,8 +456,9 @@ module Discordrb::API
   # connecting to voice, speaking and voice activity (push-to-talk isn't mandatory)
   def update_role(token, server_id, role_id, name, colour, hoist = false, packed_permissions = 36_953_089)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/guilds/#{server_id}/roles/#{role_id}",
+      "#{api_base}/guilds/#{server_id}/roles/#{role_id}",
       { color: colour, name: name, hoist: hoist, permissions: packed_permissions }.to_json,
       Authorization: token,
       content_type: :json
@@ -384,8 +468,9 @@ module Discordrb::API
   # Delete a role
   def delete_role(token, server_id, role_id)
     request(
+      nil,
       :delete,
-      "#{APIBASE}/guilds/#{server_id}/roles/#{role_id}",
+      "#{api_base}/guilds/#{server_id}/roles/#{role_id}",
       Authorization: token
     )
   end
@@ -393,8 +478,9 @@ module Discordrb::API
   # Update a user's roles
   def update_user_roles(token, server_id, user_id, roles)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
+      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
       { roles: roles }.to_json,
       Authorization: token,
       content_type: :json
@@ -404,8 +490,9 @@ module Discordrb::API
   # Update a user's permission overrides in a channel
   def update_user_overrides(token, channel_id, user_id, allow, deny)
     request(
+      nil,
       :put,
-      "#{APIBASE}/channels/#{channel_id}/permissions/#{user_id}",
+      "#{api_base}/channels/#{channel_id}/permissions/#{user_id}",
       { type: 'member', id: user_id, allow: allow, deny: deny }.to_json,
       Authorization: token,
       content_type: :json
@@ -415,8 +502,9 @@ module Discordrb::API
   # Update a role's permission overrides in a channel
   def update_role_overrides(token, channel_id, role_id, allow, deny)
     request(
+      nil,
       :put,
-      "#{APIBASE}/channels/#{channel_id}/permissions/#{role_id}",
+      "#{api_base}/channels/#{channel_id}/permissions/#{role_id}",
       { type: 'role', id: role_id, allow: allow, deny: deny }.to_json,
       Authorization: token,
       content_type: :json
@@ -426,8 +514,9 @@ module Discordrb::API
   # Get the gateway to be used
   def gateway(token)
     request(
+      nil,
       :get,
-      "#{APIBASE}/gateway",
+      "#{api_base}/gateway",
       Authorization: token
     )
   end
@@ -435,8 +524,9 @@ module Discordrb::API
   # Validate a token (this request will fail if the token is invalid)
   def validate_token(token)
     request(
+      nil,
       :post,
-      "#{APIBASE}/auth/login",
+      "#{api_base}/auth/login",
       {}.to_json,
       Authorization: token,
       content_type: :json
@@ -446,8 +536,9 @@ module Discordrb::API
   # Start typing (needs to be resent every 5 seconds to keep up the typing)
   def start_typing(token, channel_id)
     request(
+      nil,
       :post,
-      "#{APIBASE}/channels/#{channel_id}/typing",
+      "#{api_base}/channels/#{channel_id}/typing",
       nil,
       Authorization: token
     )
@@ -456,8 +547,29 @@ module Discordrb::API
   # Get user data
   def user(token, user_id)
     request(
+      nil,
       :get,
-      "#{APIBASE}/users/#{user_id}",
+      "#{api_base}/users/#{user_id}",
+      Authorization: token
+    )
+  end
+
+  # Get profile data
+  def profile(token)
+    request(
+      nil,
+      :get,
+      "#{api_base}/users/@me",
+      Authorization: token
+    )
+  end
+
+  # Get information about a user's connections
+  def connections(token)
+    request(
+      nil,
+      :get,
+      "#{api_base}/users/@me/connections",
       Authorization: token
     )
   end
@@ -465,20 +577,34 @@ module Discordrb::API
   # Update user data
   def update_user(token, email, password, new_username, avatar, new_password = nil)
     request(
+      nil,
       :patch,
-      "#{APIBASE}/users/@me",
+      "#{api_base}/users/@me",
       { avatar: avatar, email: email, new_password: new_password, password: password, username: new_username }.to_json,
       Authorization: token,
       content_type: :json
     )
   end
 
+  # Get the servers a user is connected to
+  def servers(token)
+    request(
+      nil,
+      :get,
+      "#{api_base}/users/@me/guilds",
+      Authorization: token
+    )
+  end
+
   # Get a list of messages from a channel's history
   def channel_log(token, channel_id, amount, before = nil, after = nil)
     request(
+      nil,
       :get,
-      "#{APIBASE}/channels/#{channel_id}/messages?limit=#{amount}#{"&before=#{before}" if before}#{"&after=#{after}" if after}",
+      "#{api_base}/channels/#{channel_id}/messages?limit=#{amount}#{"&before=#{before}" if before}#{"&after=#{after}" if after}",
       Authorization: token
     )
   end
 end
+
+Discordrb::API.reset_mutexes