discordrb 2.1.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9854234e0127b9b2bd32b57c4e342e24911dc2
-  data.tar.gz: 965f0876a53079a4a088f42e7a585262d8aef148
+  metadata.gz: eae3c0ee1c9f49e7e8c498ce1db7361a9e812053
+  data.tar.gz: ed4937a0c6c8a4c1c084fa684c78e5b8f11ace7b
 SHA512:
-  metadata.gz: de1878554378580ab9de645ca98f999b3860c92e29930d46728cea22903b192202b72ace7090a632206cf0b4838d0c764fcbeb611a138d7b3ff6131e9ece54c7
-  data.tar.gz: e974aed5669570e2ea03cbd85748b96d3b024eb66395d8005747311fd312e85a71906f17fd6936cefc208d1a1889e542936441a0d41b6ca69e093bcf022ae921
+  metadata.gz: 6b1fddaa771f734968bc3d0172b8fe87a95a442d9d6ee3ace91ad8e9a182a94c8b1829d333272d01dcad6a8a0cfad676d0c7f1018b34ba9afa66acdca58cf32e
+  data.tar.gz: d1fe90193e8abd77d749a5982bb8ba4bb23b88625acd80f80fbdb0a37ab99127af5574cd3284c187258b254dbb863e235d9d85c313ec8ff5e71253a12bca0923

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /.idea/
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## 3.0.0
+
+I didn't think there could possibly be a release larger than 2.0.0 was, but here it is! Including the respective release commit, there were 540 commits from 1.8.1 to 2.0.0, but a whopping 734 commits from 2.1.3 to 3.0.0.
+
+As with 2.0.0, there are some breaking changes! They are, as always, highlighted in bold.
+
+- **The `application_id` parameter has been renamed to `client_id`**. With the changes to how bot applications work, it would just be confusing to have it be called `application_id` any longer. If you try to use `application_id` now, it will raise a descriptive exception; with 3.1.0 that will be removed too (you'll get a less descriptive exception).
+- The gateway implementation has been completely rewritten, for more performance, stability and maintainability. This means that **to call some internal methods like `inject_reconnect`, a `Gateway` instance (available as `Bot#gateway`) now needs to be used.**
+- **User login using email and password has been removed**. Use a user token instead, see also [here](https://github.com/hammerandchisel/discord-api-docs/issues/69#issuecomment-223886862).
+- In addition to the rewrite, the gateway version has also been upgraded to protocol version 6 (the rewrite was for v5). **With this, the way channel types are handled has been changed a bit!** If you've been using the abstraction methods like `Channel#voice?`, you should be fine though. This also includes support for group chats on user accounts, as that was the only real functionality change on v6. ([#211](https://github.com/meew0/discordrb/pull/211), thanks @Daniel-Worrall)
+- **Custom prefix handlers for `CommandBot`s now get the full message object as their parameter rather than only the content**, for even more flexibility.
+- For internal consistency, **the `UnknownGuild` error was renamed to `UnknownServer`**. I doubt this change affects anyone, but if you handle that error specifically in your bot, make sure to change it.
+- **The API module has undergone a refactor**, if you were using any manual API calls you will have to update them to the new format. Specifically, endpoints dealing with channels have been moved to `API::Channel`, ones dealing with users to `API::User` and so on. ([#203](https://github.com/meew0/discordrb/pull/203), thanks @depl0y)
+- **Calling `users` on a text channel will now only return users who have permission to read it** ([#186](https://github.com/meew0/discordrb/issues/186))
+- A variety of new fields have been added to `Message` objects, specifically embeds (`Message#embeds`), when it was last edited (`#edited_timestamp`), whether it uses TTS (`#tts?`), its nonce (`#nonce`), whether it was ever edited (`#edited?`), and whether it mentions everyone (`mention_everyone?`) ([#206](https://github.com/meew0/discordrb/pull/206), thanks @SnazzyPine25)
+- A variety of new functionality has been added to `Server` and `Channel` objects ([#181](https://github.com/meew0/discordrb/pull/181), thanks @SnazzyPine25):
+  - Bitrate and user limit can now be read and set for voice channels
+  - Server integrations can now be read
+  - Server features and verification level can now be read
+  - Utility functions to generate widget, widget banner and splash URLs
+- Message pinning is now supported, both reading pin status and pinning existing messages ([#145](https://github.com/meew0/discordrb/issues/145) / [#146](https://github.com/meew0/discordrb/pull/146), thanks @hlaaftana)
+- Support for the new available statuses:
+  - `Bot#dnd` to make the bot show up as DnD (red dot)
+  - `Bot#invisible` to make the bot show up as offline
+- Setting the bot's status to streaming is now supported ([#128](https://github.com/meew0/discordrb/pull/128) and [#143](https://github.com/meew0/discordrb/pull/143), thanks @SnazzyPine25 and @barkerja)
+- You can now set a message to be sent when a `CommandBot`'s command fails with a `NoPermission` error ([#200](https://github.com/meew0/discordrb/pull/200), thanks @PoVa)
+- There is now an optional field to list the parameters a command can accept ([#201](https://github.com/meew0/discordrb/pull/201), thanks @FormalHellhound)
+- Commands can now have an array of roles set that are required to be able to use it ([#178](https://github.com/meew0/discordrb/pull/178), thanks @PoVa)
+- Methods like `CommandEvent#<<` for quickly responding to an event are now available in `MessageEvent` too ([#154](https://github.com/meew0/discordrb/pull/154), thanks @hlaaftana)
+- Temporary messages, that automatically delete after some time, can now be sent to channels ([#136](https://github.com/meew0/discordrb/issues/136) / [#139](https://github.com/meew0/discordrb/pull/139), thanks @unleashy)
+- Captions can now be sent together with files, and files can be attached to events to be sent on completion ([#130](https://github.com/meew0/discordrb/pull/130), thanks @SnazzyPine25)
+- There is now a `Channel#load_message` method to get a single message by its ID ([#174](https://github.com/meew0/discordrb/pull/174), thanks @z64)
+- `Channel#define_overwrite` can now be used with a `Profile` object, together with some internal changes ([#232](https://github.com/meew0/discordrb/issues/232))
+- There are now endpoint methods to list a server's channels and channel invites ([#197](https://github.com/meew0/discordrb/pull/197))
+- Two methods, `Member#roles=` and `Member#modify_roles` to manipulate a member's roles in a more advanced way have been added ([#223](https://github.com/meew0/discordrb/pull/223), thanks @z64)
+- Role mentionability can now be set using `Role#mentionable=`
+- The current bot's OAuth application can now be read ([#175](https://github.com/meew0/discordrb/pull/175), thanks @SnazzyPine25)
+- You can now mute and deafen other members ([#157](https://github.com/meew0/discordrb/pull/157), thanks @SnazzyPine25)
+- The internal `Logger` now supports writing to a file instead of STDOUT ([#171](https://github.com/meew0/discordrb/issues/171))
+  - Building on top of that, you can also write to multiple streams at the same time now, in case you want to have input on both a file and STDOUT, or even more advanced setups. ([#217](https://github.com/meew0/discordrb/pull/217), thanks @PoVa)
+- Roles can now have their permissions bitfield set directly ([#177](https://github.com/meew0/discordrb/issues/177))
+- The `Bot#invite_url` method now supports adding permission bits into the generated URL ([#218](https://github.com/meew0/discordrb/pull/218), thanks @PoVa)
+- A utility method `User#send_file` has been added to directly send a file to a user in PM ([#168](https://github.com/meew0/discordrb/issues/168) / [#172](https://github.com/meew0/discordrb/pull/172), thanks @SnazzyPine25)
+- You can now get the list of members that have a particular role assigned using `Role#members` ([#147](https://github.com/meew0/discordrb/pull/147), thanks @hlaaftana)
+- You can now check whether a `VoiceBot` is playing right now using `#playing?` ([#137](https://github.com/meew0/discordrb/pull/137), thanks @SnazzyPine25)
+- You can now get the channel a `VoiceBot` is playing on ([#138](https://github.com/meew0/discordrb/pull/138), thanks @snapcase)
+- The permissions bit map has been updated for emoji, "Administrator" and nickname changes ([#180](https://github.com/meew0/discordrb/pull/180), thanks @megumisonoda)
+- A method `Bot#connected?` has been added to check whether the bot is currently connected to the gateway.
+- The indescriptive error message that was previously sent when calling methods like `Bot#game=` without an active gateway connection has been replaced with a more descriptive one.
+- The bot's token is now, by default, redacted from any logging output; this can be turned off if desired using the `redact_token` initialization parameter. ([#225](https://github.com/meew0/discordrb/issues/225) / [#231](https://github.com/meew0/discordrb/pull/231), thanks @Daniel-Worrall)
+- The new rate limit headers are now supported. This will have no real impact on any code using discordrb, but it means discordrb is now considered compliant again. See also [here](https://github.com/hammerandchisel/discord-api-docs/issues/108).
+- Rogue presences, i.e. presences without an associated cached member, now print a log message instead of being completely ignored
+- A variety of aliases have been added to existing methods.
+- An example to show off voice sending has been added to the repo, and existing examples have been improved.
+- A large amount of fixes and clarifications have been made to the docs.
+
+### Bugfixes
+
+- The almost a year old bug where changing the own user's username would reset its avatar has finally been fixed.
+- The issue where resolving a large server with the owner offline would sometimes cause a stack overflow has been fixed ([#169](https://github.com/meew0/discordrb/issues/169) / [#170](https://github.com/meew0/discordrb/issues/170) / [#191](https://github.com/meew0/discordrb/pull/191), thanks @stoodfarback)
+- Fixed an issue where if a server had an AFK channel set, but that AFK channel couldn't be connected to, resolving the server (and in turn all objects depending on it) would fail. This likely fixes any random `NoPermission` errors you've ever encountered in your log.
+- A message's author will be resolved over the REST API like other objects in case it's not cached yet. This should fix all instances of "Member not cached even thought it should be". ([#210](https://github.com/meew0/discordrb/pull/210), thanks @megumisonoda)
+- Voice state handling has been completely redone, fixing a variety of caching issues. ([#159](https://github.com/meew0/discordrb/issues/159))
+- Getting a voice channel's users no longer does a chunk request ([#142](https://github.com/meew0/discordrb/issues/142))
+- `Channel#define_overwrite` can now be used to define user overwrites, apparently that didn't work at all before
+- Nested command chains where an inner command doesn't exist now no longer crash the command chain handler ([#215](https://github.com/meew0/discordrb/issues/215))
+- Gateway errors should no longer spam the console ([#141](https://github.com/meew0/discordrb/issues/141) / [#148](https://github.com/meew0/discordrb/pull/148), thanks @meew0)
+- Role hoisting (both setting and reading it) should now work properly
+- The `VoiceBot#stop_playing` method should now work more predictably
+- Voice states with a nil channel should no longer crash when accessed ([#183](https://github.com/meew0/discordrb/pull/183), thanks @Apexal)
+- A latent bug in how PM channels were cached is fixed, previously they were cached twice - once by channel ID and once by recipient ID. Now they're only cached by recipient ID.
+- Two problems in how Discord outages are handled are now fixed; the bot should now no longer break when one happens. Specifically, the fixed problems are:
+  - `GUILD_DELETE` events for unavailable servers are now ignored
+  - Opcode 9 packets which are received while no session currently exists are handled correctly
+- A possible regression in PM channel creation was fixed. ([#227](https://github.com/meew0/discordrb/issues/227) / [#228](https://github.com/meew0/discordrb/pull/228), thanks @heimidal)
+
 ## 2.1.3
 
 *Bugfix-only release.*

data/README.md

@@ -30,6 +30,8 @@ This section only applies to you if you want to use voice functionality.
 * 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
 
+In addition to this, if you're on Windows and want to use voice functionality, your installed Ruby version **needs to be 32 bit**, as otherwise Opus won't work.
+
 ## Installation
 
 ### Linux
@@ -40,9 +42,9 @@ On Linux, it should be as simple as running:
 
 ### Windows
 
-On Windows, to install discordrb, run this in a shell:
+On Windows, to install discordrb, run this in a shell **(make sure you have the DevKit installed! See the [Dependencies](https://github.com/meew0/discordrb#dependencies) section)**:
 
-    gem install discordrb
+    gem install discordrb --platform=ruby
 
 Run the [ping example](https://github.com/meew0/discordrb/blob/master/examples/ping.rb) to verify that the installation works (make sure to replace the username and password in there with your own or your bots'!):
 

data/discordrb.gemspec

@@ -31,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.39.0'
+  spec.add_development_dependency 'rubocop', '0.42.0'
 end

data/examples/commands.rb

@@ -2,6 +2,8 @@
 
 require 'discordrb'
 
+# Here we instantiate a `CommandBot` instead of a regular `Bot`, which has the functionality to add commands using the
+# `command` method. We have to set a `prefix` here, which will be the character that triggers command execution.
 bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
 
 bot.command :user do |event|

data/examples/eval.rb

@@ -1,16 +1,19 @@
-# Gives you the ability to execute code on the fly
+# Eval bots are useful for developers because they give you a way to execute code directly from your Discord channel,
+# e.g. to quickly check something, demonstrate something to other, or something else entirely. Special care must be
+# taken since anyone with access to the command can execute arbitrary code on your system which may potentially be
+# malicious.
 
 require 'discordrb'
 
 bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
 
 bot.command(:eval, help_available: false) do |event, *code|
-  break unless event.user.id == 000000 # Replace number with your ID
+  break unless event.user.id == 66237334693085184 # Replace number with your ID
 
   begin
     eval code.join(' ')
   rescue
-    "An error occured 😞"
+    'An error occured 😞'
   end
 end
 

data/examples/ping.rb

@@ -2,6 +2,15 @@
 
 require 'discordrb'
 
+# This statement creates a bot with the specified token and application ID. After this line, you can add events to the
+# created bot, and eventually run it.
+#
+# If you don't yet have a token and application ID to put in here, you will need to create a bot account here:
+#   https://discordapp.com/developers/applications/me
+# If you're wondering about what redirect URIs and RPC origins, you can ignore those for now. If that doesn't satisfy
+# you, look here: https://github.com/meew0/discordrb/wiki/Redirect-URIs-and-RPC-origins
+# After creating the bot, simply copy the token (*not* the OAuth2 secret) and the client ID and put it into the
+# respective places.
 bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
 # Here we output the invite URL to the console so the bot account can be invited to the channel. This only has to be
@@ -9,8 +18,12 @@ bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 16012345678987
 puts "This bot's invite URL is #{bot.invite_url}."
 puts 'Click on it to invite it to your server.'
 
-bot.message(with_text: 'Ping!') do |event|
+# This method call adds an event handler that will be called on any message that exactly contains the string "Ping!".
+# The code inside it will be executed, and a "Pong!" response will be sent to the channel.
+bot.message(content: 'Ping!') do |event|
   event.respond 'Pong!'
 end
 
+# This method call has to be put at the end of your script, it is what makes the bot actually connect to Discord. If you
+# leave it out (try it!) the script will simply stop and the bot will not appear online.
 bot.run

data/examples/ping_with_respond_time.rb

@@ -1,13 +1,15 @@
-# Pinging the bot will also tell you the time it takes the bot to send the message
+# This example is nearly the same as the normal ping example, but rather than simply responding with "Pong!", it also
+# responds with the time it took to send the message.
 
 require 'discordrb'
 
-bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
+bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
-bot.command(:ping) do |event|
+bot.message(content: 'Ping!') do |event|
+  # The `respond` method returns a `Message` object, which is stored in a variable `m`. The `edit` method is then called
+  # to edit the message with the time difference between when the event was received and after the message was sent.
   m = event.respond('Pong!')
   m.edit "Pong! Time taken: #{Time.now - event.timestamp} seconds."
-  nil
 end
 
 bot.run

data/examples/pm_send.rb

@@ -4,7 +4,10 @@ require 'discordrb'
 
 bot = Discordrb::Bot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543
 
+# The `mention` event is called if the bot is *directly mentioned*, i.e. not using a role mention or @everyone/@here.
 bot.mention do |event|
+  # The `pm` method is used to send a private message (also called a DM or direct message) to the user who sent the
+  # initial message.
   event.user.pm('You have mentioned me!')
 end
 

data/examples/shutdown.rb

@@ -1,11 +1,16 @@
-# This script allows you to shutdown the bot on command
+# This bot doesn't do anything except for letting a specifically authorised user shutdown the bot on command.
 
 require 'discordrb'
 
 bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
 
+# Here we can see the `help_available` property used, which can determine whether a command shows up in the default
+# generated `help` command. It is true by default but it can be set to false to hide internal commands that only
+# specific people can use.
 bot.command(:exit, help_available: false) do |event|
-  break unless event.user.id == 000000 # Replace number with your ID
+  # This is a check that only allows a user with a specific ID to execute this command. Otherwise, everyone would be
+  # able to shut your bot down whenever they wanted.
+  break unless event.user.id == 66237334693085184 # Replace number with your ID
 
   bot.send_message(event.channel.id, 'Bot is shutting down')
   exit

data/examples/voice_send.rb

@@ -0,0 +1,51 @@
+# discordrb can send music or other audio data to voice channels. This example exists to show that off.
+#
+# To avoid copyright infringement, the example music I will be using is a self-composed piece of highly debatable
+# quality. If you want something better you can replace the files in the data/ directory. Make sure to execute this
+# example from the appropriate place, so that it has access to the files in that directory.
+
+require 'discordrb'
+
+bot = Discordrb::Commands::CommandBot.new token: 'B0T.T0KEN.here', application_id: 160123456789876543, prefix: '!'
+
+bot.command(:connect) do |event|
+  # The `voice_channel` method returns the voice channel the user is currently in, or `nil` if the user is not in a
+  # voice channel.
+  channel = event.user.voice_channel
+
+  # Here we return from the command unless the channel is not nil (i. e. the user is in a voice channel). The `next`
+  # construct can be used to exit a command prematurely, and even send a message while we're at it.
+  next "You're not in any voice channel!" unless channel
+
+  # The `voice_connect` method does everything necessary for the bot to connect to a voice channel. Afterwards the bot
+  # will be connected and ready to play stuff back.
+  bot.voice_connect(channel)
+  "Connected to voice channel: #{channel.name}"
+end
+
+# A simple command that plays back an mp3 file.
+bot.command(:play_mp3) do |event|
+  # `event.voice` is a helper method that gets the correct voice bot on the server the bot is currently in. Since a
+  # bot may be connected to more than one voice channel (never more than one on the same server, though), this is
+  # necessary to allow the differentiation of servers.
+  #
+  # It returns a `VoiceBot` object that methods such as `play_file` can be called on.
+  voice_bot = event.voice
+  voice_bot.play_file('data/music.mp3')
+end
+
+# DCA is a custom audio format developed by a couple people from the Discord API community (including myself, meew0).
+# It represents the audio data exactly as Discord wants it in a format that is very simple to parse, so libraries can
+# very easily add support for it. It has the advantage that absolutely no transcoding has to be done, so it is very
+# light on CPU in comparison to `play_file`.
+#
+# A conversion utility that converts existing audio files to DCA can be found here: https://github.com/nstafie/dca-rs
+bot.command(:play_dca) do |event|
+  voice_bot = event.voice
+
+  # Since the DCA format is non-standard (i.e. ffmpeg doesn't support it), a separate method other than `play_file` has
+  # to be used to play DCA files back. `play_dca` fulfills that role.
+  voice_bot.play_dca('data/music.dca')
+end
+
+bot.run

data/lib/discordrb/api.rb

@@ -2,13 +2,14 @@
 
 require 'rest-client'
 require 'json'
+require 'time'
 
 require 'discordrb/errors'
 
 # List of methods representing endpoints in Discord's API
 module Discordrb::API
   # The base URL of the Discord REST API.
-  APIBASE = 'https://discordapp.com/api'.freeze
+  APIBASE = 'https://discordapp.com/api/v6'.freeze
 
   module_function
 
@@ -44,6 +45,18 @@ module Discordrb::API
   # Resets all rate limit mutexes
   def reset_mutexes
     @mutexes = {}
+    @global_mutex = Mutex.new
+  end
+
+  # Wait a specified amount of time synchronised with the specified mutex.
+  def sync_wait(time, mutex)
+    mutex.synchronize { sleep time }
+  end
+
+  # Wait for a specified mutex to unlock and do nothing with it afterwards.
+  def mutex_wait(mutex)
+    mutex.lock
+    mutex.unlock
   end
 
   # Performs a RestClient request.
@@ -58,33 +71,49 @@ module Discordrb::API
     retry
   end
 
-  # Make an API request. Utility function to implement message queueing
-  # in the future
-  def request(key, type, *attributes)
+  # Make an API request, including rate limit handling.
+  def request(key, major_parameter, type, *attributes)
     # Add a custom user agent
     attributes.last[:user_agent] = user_agent if attributes.last.is_a? Hash
 
+    # The most recent Discord rate limit requirements require the support of major parameters, where a particular route
+    # and major parameter combination (*not* the HTTP method) uniquely identifies a RL bucket.
+    key = [key, major_parameter].freeze
+
     begin
-      if key
-        @mutexes[key] = Mutex.new unless @mutexes[key]
+      mutex = @mutexes[key] ||= Mutex.new
 
-        # 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
+      # Lock and unlock, i. e. wait for the mutex to unlock and don't do anything with it afterwards
+      mutex_wait(mutex)
+
+      # If the global mutex happens to be locked right now, wait for that as well.
+      mutex_wait(@global_mutex) if @global_mutex.locked?
 
       response = raw_request(type, attributes)
+
+      if response.headers[:x_ratelimit_remaining] == '0' && !mutex.locked?
+        Discordrb::LOGGER.debug "RL bucket depletion detected! Date: #{response.headers[:date]} Reset: #{response.headers[:x_ratelimit_reset]}"
+
+        now = Time.rfc2822(response.headers[:date])
+        reset = Time.at(response.headers[:x_ratelimit_reset].to_i)
+
+        delta = reset - now
+
+        Discordrb::LOGGER.warn("Locking RL mutex (key: #{key}) for #{delta} seconds preemptively")
+        sync_wait(delta, mutex)
+      end
     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
+      # If the 429 is from the global RL, then we have to use the global mutex instead.
+      mutex = @global_mutex if e.response.headers[:x_ratelimit_global] == 'true'
 
-      unless @mutexes[key].locked?
+      unless mutex.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 }
+        sync_wait(wait_seconds, mutex)
       end
 
       retry
@@ -93,85 +122,26 @@ module Discordrb::API
     response
   end
 
-  # Make an avatar URL from the user and avatar IDs
-  def avatar_url(user_id, avatar_id)
-    "#{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(
-      __method__,
-      :put,
-      "#{api_base}/guilds/#{server_id}/bans/#{user_id}?delete-message-days=#{message_days}",
-      nil,
-      Authorization: token
-    )
-  end
-
-  # Unban a user from a server
-  def unban_user(token, server_id, user_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/guilds/#{server_id}/bans/#{user_id}",
-      Authorization: token
-    )
-  end
-
-  # Kick a user from a server
-  def kick_user(token, server_id, user_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
-      Authorization: token
-    )
-  end
-
-  # Move a user to a different voice channel
-  def move_user(token, server_id, user_id, channel_id)
-    request(
-      __method__,
-      :patch,
-      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
-      { channel_id: channel_id }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Change a user's nickname on a server
-  def change_nickname(token, server_id, user_id, nick)
-    request(
-      __method__,
-      :patch,
-      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
-      { nick: nick }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
+  # Make an icon URL from application and icon IDs
+  def app_icon_url(app_id, icon_id)
+    "https://cdn.discordapp.com/app-icons/#{app_id}/#{icon_id}.jpg"
   end
 
-  # Get a server's banned users
-  def bans(token, server_id)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/guilds/#{server_id}/bans",
-      Authorization: token
-    )
+  # Make a widget picture URL from server ID
+  def widget_url(server_id, style = 'shield')
+    "#{api_base}/guilds/#{server_id}/widget.png?style=#{style}"
   end
 
   # Login to the server
   def login(email, password)
     request(
-      __method__,
+      :auth_login,
+      nil,
       :post,
       "#{api_base}/auth/login",
       email: email,
@@ -182,7 +152,8 @@ module Discordrb::API
   # Logout from the server
   def logout(token)
     request(
-      __method__,
+      :auth_logout,
+      nil,
       :post,
       "#{api_base}/auth/logout",
       nil,
@@ -193,7 +164,8 @@ module Discordrb::API
   # Create an OAuth application
   def create_oauth_application(token, name, redirect_uris)
     request(
-      __method__,
+      :oauth2_applications,
+      nil,
       :post,
       "#{api_base}/oauth2/applications",
       { name: name, redirect_uris: redirect_uris }.to_json,
@@ -205,7 +177,8 @@ module Discordrb::API
   # Change an OAuth application's properties
   def update_oauth_application(token, name, redirect_uris, description = '', icon = nil)
     request(
-      __method__,
+      :oauth2_applications,
+      nil,
       :put,
       "#{api_base}/oauth2/applications",
       { name: name, redirect_uris: redirect_uris, description: description, icon: icon }.to_json,
@@ -214,237 +187,24 @@ module Discordrb::API
     )
   end
 
-  # Create a server
-  def create_server(token, name, region = :london)
-    request(
-      __method__,
-      :post,
-      "#{api_base}/guilds",
-      { name: name, region: region.to_s }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Update a server
-  def update_server(token, server_id, name, region, icon, afk_channel_id, afk_timeout)
+  # Get the bot's OAuth application's information
+  def oauth_application(token)
     request(
-      __method__,
-      :patch,
-      "#{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
-    )
-  end
-
-  # Transfer server ownership
-  def transfer_ownership(token, server_id, user_id)
-    request(
-      __method__,
-      :patch,
-      "#{api_base}/guilds/#{server_id}",
-      { owner_id: user_id }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Delete a server
-  def delete_server(token, server_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/guilds/#{server_id}",
-      Authorization: token
-    )
-  end
-
-  # Leave a server
-  def leave_server(token, server_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/users/@me/guilds/#{server_id}",
-      Authorization: token
-    )
-  end
-
-  # Get a channel's data
-  def channel(token, channel_id)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/channels/#{channel_id}",
-      Authorization: token
-    )
-  end
-
-  # Get a server's data
-  def server(token, server_id)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/guilds/#{server_id}",
-      Authorization: token
-    )
-  end
-
-  # Get a member's data
-  def member(token, server_id, user_id)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
-      Authorization: token
-    )
-  end
-
-  # Create a channel
-  def create_channel(token, server_id, name, type)
-    request(
-      __method__,
-      :post,
-      "#{api_base}/guilds/#{server_id}/channels",
-      { name: name, type: type }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Update a channel's data
-  def update_channel(token, channel_id, name, topic, position = 0)
-    request(
-      __method__,
-      :patch,
-      "#{api_base}/channels/#{channel_id}",
-      { name: name, position: position, topic: topic }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Delete a channel
-  def delete_channel(token, channel_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/channels/#{channel_id}",
-      Authorization: token
-    )
-  end
-
-  # Join a server using an invite
-  def join_server(token, invite_code)
-    request(
-      __method__,
-      :post,
-      "#{api_base}/invite/#{invite_code}",
+      :oauth2_applications_me,
       nil,
-      Authorization: token
-    )
-  end
-
-  # Resolve an invite
-  def resolve_invite(token, invite_code)
-    request(
-      __method__,
       :get,
-      "#{api_base}/invite/#{invite_code}",
+      "#{api_base}/oauth2/applications/@me",
       Authorization: token
     )
   end
 
-  # Create a private channel
-  def create_private(token, bot_user_id, user_id)
-    request(
-      __method__,
-      :post,
-      "#{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(
-      __method__,
-      :post,
-      "#{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
-    )
-  end
-
-  # Delete an invite by code
-  def delete_invite(token, code)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/invites/#{code}",
-      Authorization: token
-    )
-  end
-
-  # Send a message to a channel
-  def send_message(token, channel_id, message, mentions = [], tts = false, guild_id = nil)
-    request(
-      "message-#{guild_id}".to_sym,
-      :post,
-      "#{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)"
-  end
-
-  # Delete a message
-  def delete_message(token, channel_id, message_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/channels/#{channel_id}/messages/#{message_id}",
-      Authorization: token
-    )
-  end
-
-  # Delete messages in bulk
-  def bulk_delete(token, channel_id, messages = [])
-    request(
-      __method__,
-      :post,
-      "#{api_base}/channels/#{channel_id}/messages/bulk_delete",
-      { messages: messages }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Edit a message
-  def edit_message(token, channel_id, message_id, message, mentions = [])
-    request(
-      :message,
-      :patch,
-      "#{api_base}/channels/#{channel_id}/messages/#{message_id}",
-      { content: message, mentions: mentions }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
   # Acknowledge that a message has been received
   # The last acknowledged message will be sent in the ready packet,
   # so this is an easy way to catch up on messages
   def acknowledge_message(token, channel_id, message_id)
     request(
-      __method__,
+      :channels_cid_messages_mid_ack,
+      nil, # This endpoint is unavailable for bot accounts and thus isn't subject to its rate limit requirements.
       :post,
       "#{api_base}/channels/#{channel_id}/messages/#{message_id}/ack",
       nil,
@@ -452,93 +212,11 @@ module Discordrb::API
     )
   end
 
-  # Send a file as a message to a channel
-  def send_file(token, channel_id, file)
-    request(
-      __method__,
-      :post,
-      "#{api_base}/channels/#{channel_id}/messages",
-      { file: file },
-      Authorization: token
-    )
-  end
-
-  # 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(
-      __method__,
-      :post,
-      "#{api_base}/guilds/#{server_id}/roles",
-      nil,
-      Authorization: token
-    )
-  end
-
-  # Update a role
-  # Permissions are the Discord defaults; allowed: invite creation, reading/sending messages,
-  # sending TTS messages, embedding links, sending files, reading the history, mentioning everybody,
-  # 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(
-      __method__,
-      :patch,
-      "#{api_base}/guilds/#{server_id}/roles/#{role_id}",
-      { color: colour, name: name, hoist: hoist, permissions: packed_permissions }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Delete a role
-  def delete_role(token, server_id, role_id)
-    request(
-      __method__,
-      :delete,
-      "#{api_base}/guilds/#{server_id}/roles/#{role_id}",
-      Authorization: token
-    )
-  end
-
-  # Update a user's roles
-  def update_user_roles(token, server_id, user_id, roles)
-    request(
-      __method__,
-      :patch,
-      "#{api_base}/guilds/#{server_id}/members/#{user_id}",
-      { roles: roles }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Update a user's permission overrides in a channel
-  def update_user_overrides(token, channel_id, user_id, allow, deny)
-    request(
-      __method__,
-      :put,
-      "#{api_base}/channels/#{channel_id}/permissions/#{user_id}",
-      { type: 'member', id: user_id, allow: allow, deny: deny }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
-  # Update a role's permission overrides in a channel
-  def update_role_overrides(token, channel_id, role_id, allow, deny)
-    request(
-      __method__,
-      :put,
-      "#{api_base}/channels/#{channel_id}/permissions/#{role_id}",
-      { type: 'role', id: role_id, allow: allow, deny: deny }.to_json,
-      Authorization: token,
-      content_type: :json
-    )
-  end
-
   # Get the gateway to be used
   def gateway(token)
     request(
-      __method__,
+      :gateway,
+      nil,
       :get,
       "#{api_base}/gateway",
       Authorization: token
@@ -548,7 +226,8 @@ module Discordrb::API
   # Validate a token (this request will fail if the token is invalid)
   def validate_token(token)
     request(
-      __method__,
+      :auth_login,
+      nil,
       :post,
       "#{api_base}/auth/login",
       {}.to_json,
@@ -556,79 +235,6 @@ module Discordrb::API
       content_type: :json
     )
   end
-
-  # Start typing (needs to be resent every 5 seconds to keep up the typing)
-  def start_typing(token, channel_id)
-    request(
-      __method__,
-      :post,
-      "#{api_base}/channels/#{channel_id}/typing",
-      nil,
-      Authorization: token
-    )
-  end
-
-  # Get user data
-  def user(token, user_id)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/users/#{user_id}",
-      Authorization: token
-    )
-  end
-
-  # Get profile data
-  def profile(token)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/users/@me",
-      Authorization: token
-    )
-  end
-
-  # Get information about a user's connections
-  def connections(token)
-    request(
-      __method__,
-      :get,
-      "#{api_base}/users/@me/connections",
-      Authorization: token
-    )
-  end
-
-  # Update user data
-  def update_user(token, email, password, new_username, avatar, new_password = nil)
-    request(
-      __method__,
-      :patch,
-      "#{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(
-      __method__,
-      :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(
-      __method__,
-      :get,
-      "#{api_base}/channels/#{channel_id}/messages?limit=#{amount}#{"&before=#{before}" if before}#{"&after=#{after}" if after}",
-      Authorization: token
-    )
-  end
 end
 
 Discordrb::API.reset_mutexes