discordrb 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e493737a94960682725acf9687de8219edac74a
-  data.tar.gz: ea16d4b131834bbc0a6c040e6632a0296d5c1b26
+  metadata.gz: 8f012d4df7d5f6beac41402044ddc9f597aef8b7
+  data.tar.gz: 1b75879a95b4be99a0faef8617e1b019c3b7bb81
 SHA512:
-  metadata.gz: 369259ee5a1536ab978068f4d726d1c2257ab16f1174ec4939e9b67e3268263e8bf20e1ed804745851d0e52cb5bed69e40c42d9e13282334b8006b19d2388b74
-  data.tar.gz: 8e8c09b5f222675d62f8b2126cf1e97168d0c1b0dc0bf384f4162ddd1f90d79c33d54ac13c26498436488b831872def2f2b3aa554bc9aa950a3c1ea450da1d20
+  metadata.gz: eb0e782b340e2fa53f2b93618594332f2b8c0025cad5756072f9792786f0f79c9768e0938cd934f2c289ec36edd8025c6c6e90e15dbe98a36e20eb82d09a5bf3
+  data.tar.gz: 4d75ececf380101a0f7dd9b3e8f748c658446f0b54d5a5f19fbadc4aa6edc7c9671174723ea792d56527b60c21c4543c0ef69fc822630a930331d4fb63c0e5b4

data/.rubocop.yml

@@ -37,3 +37,14 @@ Style/ConstantName:
 # Allow 'Pokémon-style' exception handling
 Lint/RescueException:
   Enabled: false
+
+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

data/.yardopts

@@ -1 +1 @@
---markup markdown
+--markup markdown --hide-tag todo

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.6.0
+
+* The inline documentation using YARD was greatly improved and is now mostly usable, at least for the data classes and voice classes. It's still not complete enough to be released on GitHub, but you can build it yourself using [YARD](http://yardoc.org/).
+* It's now possible to encrypt sent voice data using an optional parameter in `voice_connect`. The encryption uses RbNaCl's [SecretBox](https://github.com/cryptosphere/rbnacl/wiki/Secret-Key-Encryption#algorithm-details) and is enabled by default.
+* The [new library comparison](https://discordapi.com/unofficial/comparison.html) is now fully supported, barring voice receive and multi-send: (#39)
+  * `bot.invite` will create an `Invite` object from a code containing information about it.
+  * `server.move(user, channel)` will move a user to a different voice channel.
+  * The events `bot.message_edit` and `bot.message_delete` are now available for message editing and deletion. Note that Discord doesn't provide the content of edited/deleted messages, so you'll have to implement message caching yourself if you really need it.
+  * The events `bot.user_ban` and `bot.user_unban` are now available for users getting banned/unbanned from servers.
+* A bot's name can now be sent using `bot.name=`. This data will be sent to Discord with the user-agent and it might be used for cool statistics in the future.
+* Discord server ownership transfer is now implemented using the writer `server.owner=`.
+* `CommandBot`s can now have command aliases by simply using an array of symbols as the command name.
+* A utility method `server.default_channel` was implemented that returns the default text channel of a server, usually called #general. (An alias `general_channel` is available too.)
+* Tokens will no longer appear in debug output, so you're safe sending output logs to other people.
+* A reader `server.owner` that returns the server's owner as a `User` was added. Previously, users had to manually get the `User` object using `bot.user`.
+* Most methods that accept IDs or data objects now also accept `Integer`s or `String`s containing the IDs now. This is implemented by adding a method `resolve_id` to all objects that could potentially contain an ID. (Note that this change is not complete yet and I might have missed some methods.)
+* The writer `server.afk_channel_id=` is now deprecated as its functionality is now covered by `server.afk_channel=`.
+* A new reader `user.avatar_url` was added that returns the full image URL to a user's avatar.
+* To avoid confusion with `avatar_url`, the reader `user.avatar` was renamed to `avatar_id`. (`user.avatar` still exists but is now deprecated.)
+* Symbols are now used instead of strings as hash keys in all methods that send JSON data to somewhere. This might improve performance slightly.
+
+### Bugfixes
+* Fixed the reader `server.afk_channel_id` not containing a value sometimes.
+* An issue was fixed where attempting to create a `Server` object from a stub server that didn't contain any role data would cause an exception.
+* The `Invite` `server` property will now be initialized directly from the invite data instead of the channel the invite is to, to prevent it being `nil` when the invite channel was stubbed.
+* The `inviter` of an `Invite` will now be `nil` instead of causing an exception when it doesn't exist in the invite data.
+
 ## 1.5.4
 * The `opus-ruby` and `levenshtein` dependencies are now optional - if you don't need them, it won't crash immediately (only when you try to use voice / `find` with a threshold > 0, respectively)
 

data/README.md

@@ -49,6 +49,10 @@ You're missing the OpenSSL libraries that EventMachine, a dependency of discordr
     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
+
 ## Usage
 
 You can make a simple bot like this:

data/discordrb.gemspec

@@ -24,9 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'opus-ruby'
   spec.add_dependency 'websocket-client-simple'
+  spec.add_dependency 'rbnacl-libsodium'
 
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'yard', '~> 0.8.7.6'
 end

data/lib/discordrb.rb

@@ -7,5 +7,22 @@ require 'discordrb/logger'
 module Discordrb
   Thread.current[:discordrb_name] = 'main'
 
+  # The default debug logger used by discordrb.
   LOGGER = Logger.new
 end
+
+# In discordrb, Integer and {String} are monkey-patched to allow for easy resolution of IDs
+class Integer
+  # @return [Integer] The Discord ID represented by this integer, i. e. the integer itself
+  def resolve_id
+    self
+  end
+end
+
+# In discordrb, {Integer} and String are monkey-patched to allow for easy resolution of IDs
+class String
+  # @return [Integer] The Discord ID represented by this string, i. e. the string converted to an integer
+  def resolve_id
+    to_i
+  end
+end

data/lib/discordrb/api.rb

@@ -4,26 +4,25 @@ require 'json'
 # 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'
+  APIBASE = 'https://discordapp.com/api'.freeze
 
   module_function
 
-  # Generate a user agent identifying this requester as discordrb.
-  def user_agent
-    libraries = [
-      # rest-client
-      "rest-client/#{RestClient::VERSION}",
-
-      # ruby
-      "#{RUBY_ENGINE}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+  def bot_name
+    @bot_name
+  end
 
-      # discordrb
-      "discordrb/#{Discordrb::VERSION}"
-    ]
+  def bot_name=(value)
+    @bot_name = value
+  end
 
-    # Required by Discord devs
+  # Generate a user agent identifying this requester as discordrb.
+  def user_agent
+    # This particular string is required by the Discord devs.
     required = "DiscordBot (https://github.com/meew0/discordrb, v#{Discordrb::VERSION})"
-    "#{libraries.join(' ')} #{required}"
+    @bot_name ||= ''
+
+    "rest-client/#{RestClient::VERSION} #{RUBY_ENGINE}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} discordrb/#{Discordrb::VERSION} #{required} #{@bot_name}"
   end
 
   def raw_request(type, attributes)
@@ -47,6 +46,11 @@ module Discordrb::API
     response
   end
 
+  # 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"
+  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(
@@ -74,6 +78,17 @@ module Discordrb::API
     )
   end
 
+  # Move a user to a different voice channel
+  def move_user(token, server_id, user_id, channel_id)
+    request(
+      :patch,
+      "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
+      { channel_id: channel_id }.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
   # Get a server's banned users
   def bans(token, server_id)
     request(
@@ -96,10 +111,10 @@ module Discordrb::API
   # Logout from the server
   def logout(token)
     request(
-      :post,
-      "#{APIBASE}/auth/logout",
-      nil,
-      Authorization: token
+        :post,
+        "#{APIBASE}/auth/logout",
+        nil,
+        Authorization: token
     )
   end
 
@@ -108,7 +123,7 @@ module Discordrb::API
     request(
       :post,
       "#{APIBASE}/guilds",
-      { 'name' => name, 'region' => region.to_s }.to_json,
+      { name: name, region: region.to_s }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -119,7 +134,18 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/guilds/#{server_id}",
-      { 'name' => name, 'region' => region, 'icon' => icon, 'afk_channel_id' => afk_channel_id, 'afk_timeout' => afk_timeout }.to_json,
+      { 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(
+      :patch,
+      "#{APIBASE}/guilds/#{server_id}",
+      { owner_id: user_id }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -150,7 +176,7 @@ module Discordrb::API
     request(
       :post,
       "#{APIBASE}/guilds/#{server_id}/channels",
-      { 'name' => name, 'type' => type }.to_json,
+      { name: name, type: type }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -161,7 +187,7 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/channels/#{channel_id}",
-      { 'name' => name, 'position' => position, 'topic' => topic }.to_json,
+      { name: name, position: position, topic: topic }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -200,7 +226,7 @@ module Discordrb::API
     request(
       :post,
       "#{APIBASE}/users/#{bot_user_id}/channels",
-      { 'recipient_id' => user_id }.to_json,
+      { recipient_id: user_id }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -211,7 +237,7 @@ module Discordrb::API
     request(
       :post,
       "#{APIBASE}/channels/#{channel_id}/invites",
-      { 'max_age' => max_age, 'max_uses' => max_uses, 'temporary' => temporary, 'xkcdpass' => xkcd }.to_json,
+      { max_age: max_age, max_uses: max_uses, temporary: temporary, xkcdpass: xkcd }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -231,7 +257,7 @@ module Discordrb::API
     request(
       :post,
       "#{APIBASE}/channels/#{channel_id}/messages",
-      { 'content' => message, 'mentions' => mentions, tts => tts }.to_json,
+      { content: message, mentions: mentions, tts => tts }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -251,7 +277,7 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/channels/#{channel_id}/messages/#{message_id}",
-      { 'content' => message, 'mentions' => mentions }.to_json,
+      { content: message, mentions: mentions }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -297,7 +323,7 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/guilds/#{server_id}/roles/#{role_id}",
-      { 'color' => colour, 'name' => name, 'hoist' => hoist, 'permissions' => packed_permissions }.to_json,
+      { color: colour, name: name, hoist: hoist, permissions: packed_permissions }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -317,7 +343,7 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/guilds/#{server_id}/members/#{user_id}",
-      { 'roles' => roles }.to_json,
+      { roles: roles }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -328,7 +354,7 @@ module Discordrb::API
     request(
       :put,
       "#{APIBASE}/channels/#{channel_id}/permissions/#{user_id}",
-      { 'type' => 'member', 'id' => user_id, 'allow' => allow, 'deny' => deny }.to_json,
+      { type: 'member', id: user_id, allow: allow, deny: deny }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -339,7 +365,7 @@ module Discordrb::API
     request(
       :put,
       "#{APIBASE}/channels/#{channel_id}/permissions/#{role_id}",
-      { 'type' => 'role', 'id' => role_id, 'allow' => allow, 'deny' => deny }.to_json,
+      { type: 'role', id: role_id, allow: allow, deny: deny }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -378,7 +404,7 @@ module Discordrb::API
     request(
       :patch,
       "#{APIBASE}/users/@me",
-      { 'avatar' => avatar, 'email' => email, 'new_password' => new_password, 'password' => password, 'username' => new_username }.to_json,
+      { avatar: avatar, email: email, new_password: new_password, password: password, username: new_username }.to_json,
       Authorization: token,
       content_type: :json
     )

data/lib/discordrb/await.rb

@@ -7,7 +7,7 @@ module Discordrb
   # If no block is present, the await will also be deleted. This is an easy way to make
   # temporary events that are only temporary under certain conditions.
   #
-  # Besides the given block, an {AwaitEvent} will also be executed with the key and
+  # Besides the given block, an {Discordrb::Events::AwaitEvent} will also be executed with the key and
   # the type of the await that was triggered. It's possible to register multiple events
   # that trigger on the same await.
   class Await
@@ -40,6 +40,7 @@ module Discordrb
       dummy_handler = @bot.handler_class(@type).new(@attributes, @bot)
       return [nil, nil] unless dummy_handler.matches?(event)
 
+      should_delete = nil
       should_delete = true if (@block && @block.call(event) != false) || !@block
 
       [@key, should_delete]

data/lib/discordrb/bot.rb

@@ -16,6 +16,7 @@ require 'discordrb/events/guild_role_delete'
 require 'discordrb/events/guild_role_update'
 require 'discordrb/events/guilds'
 require 'discordrb/events/await'
+require 'discordrb/events/bans'
 
 require 'discordrb/api'
 require 'discordrb/exceptions'
@@ -35,11 +36,6 @@ module Discordrb
     # @return [User] The bot user.
     attr_reader :bot_user
 
-    # The Discord API token received when logging in. Useful to explicitly call
-    # {API} methods.
-    # @return [String] The API token.
-    attr_reader :token
-
     # The list of users the bot shares a server with.
     # @return [Array<User>] The users.
     attr_reader :users
@@ -63,6 +59,10 @@ module Discordrb
     # Whether or not the bot should parse its own messages. Off by default.
     attr_accessor :should_parse_self
 
+    # The bot's name which discordrb sends to Discord when making any request, so Discord can identify bots with the
+    # same codebase. Not required but I recommend setting it anyway.
+    attr_accessor :name
+
     # Makes a new bot with the given email and password. It will be ready to be added event handlers to and can eventually be run with {#run}.
     # @param email [String] The email for your (or the bot's) Discord account.
     # @param password [String] The valid password that should be used to log in to the account.
@@ -80,6 +80,8 @@ module Discordrb
       @email = email
       @password = password
 
+      @name = ''
+
       debug('Creating token cache')
       @token_cache = Discordrb::TokenCache.new
       debug('Token cache created successfully')
@@ -96,6 +98,14 @@ module Discordrb
       @current_thread = 0
     end
 
+    # The Discord API token received when logging in. Useful to explicitly call
+    # {API} methods.
+    # @return [String] The API token.
+    def token
+      API.bot_name = @name
+      @token
+    end
+
     # Runs the bot, which logs into Discord and connects the WebSocket. This prevents all further execution unless it is executed with `async` = `:async`.
     # @param async [Symbol] If it is `:async`, then the bot will allow further execution.
     #   It doesn't necessarily have to be that, anything truthy will work,
@@ -153,10 +163,11 @@ module Discordrb
     # @param id [Integer] The channel ID for which to search for.
     # @return [Channel] The channel identified by the ID.
     def channel(id)
+      id = id.resolve_id
       debug("Obtaining data for channel with id #{id}")
       return @channels[id] if @channels[id]
 
-      response = API.channel(@token, id)
+      response = API.channel(token, id)
       channel = Channel.new(JSON.parse(response), self)
       @channels[id] = channel
     end
@@ -167,10 +178,11 @@ module Discordrb
     # @param id [Integer] The user ID to generate a private channel for.
     # @return [Channel] A private channel for that user.
     def private_channel(id)
+      id = id.resolve_id
       debug("Creating private channel with user id #{id}")
       return @private_channels[id] if @private_channels[id]
 
-      response = API.create_private(@token, @bot_user.id, id)
+      response = API.create_private(token, @bot_user.id, id)
       channel = Channel.new(JSON.parse(response), self)
       @private_channels[id] = channel
     end
@@ -186,29 +198,44 @@ module Discordrb
     # @return [String] Only the code for the invite.
     def resolve_invite_code(invite)
       invite = invite.code if invite.is_a? Discordrb::Invite
-      invite = invite[invite.rindex('/') + 1..-1] if invite.start_with?('http') || invite.start_with?('discord.gg')
+      invite = invite[invite.rindex('/') + 1..-1] if invite.start_with?('http', 'discord.gg')
       invite
     end
 
+    # Gets information about an invite.
+    # @param invite [String, Invite] The invite to join. For possible formats see {#resolve_invite_code}.
+    # @return [Invite] The invite with information about the given invite URL.
+    def invite(invite)
+      code = resolve_invite_code(invite)
+      Invite.new(JSON.parse(API.resolve_invite(token, code)), self)
+    end
+
     # Makes the bot join an invite to a server.
     # @param invite [String, Invite] The invite to join. For possible formats see {#resolve_invite_code}.
     def join(invite)
-      invite = resolve_invite_code(invite)
-      resolved = JSON.parse(API.resolve_invite(@token, invite))['code']
-      API.join_server(@token, resolved)
+      resolved = invite(invite)['code']
+      API.join_server(token, resolved)
     end
 
     attr_reader :voice
 
-    def voice_connect(chan)
+    # Connects to a voice channel, initializes network connections and returns the {Voice::VoiceBot} over which audio
+    # data can then be sent. After connecting, the bot can also be accessed using {#voice}.
+    # @param chan [Channel] The voice channel to connect to.
+    # @param encrypted [true, false] Whether voice communication should be encrypted using RbNaCl's SecretBox
+    #   (uses an XSalsa20 stream cipher for encryption and Poly1305 for authentication)
+    # @return [Voice::VoiceBot] the initialized bot over which audio data can then be sent.
+    def voice_connect(chan, encrypted = true)
       if @voice
         debug('Voice bot exists already! Destroying it')
         @voice.destroy
         @voice = nil
       end
 
-      chan = channel(chan) if chan.is_a? Integer
+      chan = channel(chan.resolve_id)
       @voice_channel = chan
+      @should_encrypt_voice = encrypted
+
       debug("Got voice channel: #{@voice_channel}")
 
       data = {
@@ -236,7 +263,7 @@ module Discordrb
     # @param code [String, Invite] The invite to revoke. For possible formats see {#resolve_invite_code}.
     def delete_invite(code)
       invite = resolve_invite_code(code)
-      API.delete_invite(@token, invite)
+      API.delete_invite(token, invite)
     end
 
     # Gets a user by its ID.
@@ -244,6 +271,7 @@ module Discordrb
     # @param id [Integer] The user ID that should be resolved.
     # @return [User, nil] The user identified by the ID, or `nil` if it couldn't be found.
     def user(id)
+      id = id.resolve_id
       @users[id]
     end
 
@@ -252,6 +280,7 @@ module Discordrb
     # @param id [Integer] The server ID that should be resolved.
     # @return [Server, nil] The server identified by the ID, or `nil` if it couldn't be found.
     def server(id)
+      id = id.resolve_id
       @servers[id]
     end
 
@@ -334,7 +363,7 @@ module Discordrb
     def send_message(channel_id, content)
       debug("Sending message to #{channel_id} with content '#{content}'")
 
-      response = API.send_message(@token, channel_id, content)
+      response = API.send_message(token, channel_id, content)
       Message.new(JSON.parse(response), self)
     end
 
@@ -343,7 +372,8 @@ module Discordrb
     # @param channel_id [Integer] The ID that identifies the channel to send something to.
     # @param file [File] The file that should be sent.
     def send_file(channel_id, file)
-      API.send_file(@token, channel_id, file)
+      response = API.send_file(token, channel_id, file)
+      Message.new(JSON.parse(response), self)
     end
 
     # Add an await the bot should listen to. For information on awaits, see {Await}.
@@ -374,7 +404,7 @@ module Discordrb
     #   * `:sydney`
     # @return [Server] The server that was created.
     def create_server(name, region = :london)
-      response = API.create_server(@token, name, region)
+      response = API.create_server(token, name, region)
       id = JSON.parse(response)['id'].to_i
       sleep 0.1 until @servers[id]
       server = @servers[id]
@@ -387,7 +417,7 @@ module Discordrb
     # @return [User] The user identified by the mention, or `nil` if none exists.
     def parse_mention(mention)
       # Mention format: <@id>
-      return nil unless /\<@(?<id>\d+)\>?/ =~ mention
+      return nil unless /<@(?<id>\d+)>?/ =~ mention
       user(id.to_i)
     end
 
@@ -398,10 +428,10 @@ module Discordrb
       @game = name
 
       data = {
-        'op' => 3,
-        'd' => {
-          'idle_since' => nil,
-          'game' => name ? { 'name' => name } : nil
+        op: 3,
+        d: {
+          idle_since: nil,
+          game: name ? { name: name } : nil
         }
       }
 
@@ -453,6 +483,14 @@ module Discordrb
       register_event(TypingEvent, attributes, block)
     end
 
+    def message_edit(attributes = {}, &block)
+      register_event(MessageEditEvent, attributes, block)
+    end
+
+    def message_delete(attributes = {}, &block)
+      register_event(MessageDeleteEvent, attributes, block)
+    end
+
     def presence(attributes = {}, &block)
       register_event(PresenceEvent, attributes, block)
     end
@@ -514,6 +552,14 @@ module Discordrb
       register_event(GuildMemberDeleteEvent, attributes, block)
     end
 
+    def user_ban(attributes = {}, &block)
+      register_event(UserBanEvent, attributes, block)
+    end
+
+    def user_unban(attributes = {}, &block)
+      register_event(UserUnbanEvent, attributes, block)
+    end
+
     def server_create(attributes = {}, &block)
       register_event(GuildCreateEvent, attributes, block)
     end
@@ -623,11 +669,7 @@ module Discordrb
         end
       end
       user.status = status
-      if data['game']
-        user.game = data['game']['name']
-      else
-        user.game = nil
-      end
+      user.game = data['game'] ? data['game']['name'] : nil
       user
     end
 
@@ -664,8 +706,7 @@ module Discordrb
       channel = @voice_channel
 
       debug('Got data, now creating the bot.')
-      @voice = Discordrb::Voice::VoiceBot.new(channel, self, token, @session_id, endpoint)
-      @voice
+      @voice = Discordrb::Voice::VoiceBot.new(channel, self, token, @session_id, endpoint, @should_encrypt_voice)
     end
 
     # Internal handler for CHANNEL_CREATE
@@ -798,6 +839,18 @@ module Discordrb
     # Internal handler for TYPING_START
     def start_typing(data); end
 
+    # Internal handler for MESSAGE_UPDATE
+    def update_message(data); end
+
+    # Internal handler for MESSAGE_DELETE
+    def delete_message(data); end
+
+    # Internal handler for GUILD_BAN_ADD
+    def add_user_ban(data); end
+
+    # Internal handler for GUILD_BAN_REMOVE
+    def remove_user_ban(data); end
+
     ##        #######   ######   #### ##    ##
     ##       ##     ## ##    ##   ##  ###   ##
     ##       ##     ## ##         ##  ####  ##
@@ -813,7 +866,7 @@ module Discordrb
       # First, attempt to get the token from the cache
       token = @token_cache.token(@email, @password)
       if token
-        debug("Token successfully obtained from cache: #{token}")
+        debug('Token successfully obtained from cache!')
         return token
       end
 
@@ -825,7 +878,7 @@ module Discordrb
       login_response_object = JSON.parse(login_response)
       fail InvalidAuthenticationException unless login_response_object['token']
 
-      debug("Received token: #{login_response_object['token']}")
+      debug('Received token from Discord!')
 
       # Cache the token
       @token_cache.store_token(@email, @password, login_response_object['token'])
@@ -851,7 +904,7 @@ module Discordrb
 
     def find_gateway
       # Get updated websocket_hub
-      response = API.gateway(@token)
+      response = API.gateway(token)
       JSON.parse(response)['url']
     end
 
@@ -942,6 +995,16 @@ module Discordrb
           event = PrivateMessageEvent.new(message, self)
           raise_event(event)
         end
+      when 'MESSAGE_UPDATE'
+        update_message(data)
+
+        event = MessageEditEvent.new(data, self)
+        raise_event(event)
+      when 'MESSAGE_DELETE'
+        delete_message(data)
+
+        event = MessageDeleteEvent.new(data, self)
+        raise_event(event)
       when 'TYPING_START'
         start_typing(data)
 
@@ -952,11 +1015,11 @@ module Discordrb
         played_before = user(data['user']['id'].to_i).game
         update_presence(data)
 
-        if now_playing != played_before
-          event = PlayingEvent.new(data, self)
-        else
-          event = PresenceEvent.new(data, self)
-        end
+        event = if now_playing != played_before
+                  PlayingEvent.new(data, self)
+                else
+                  PresenceEvent.new(data, self)
+                end
 
         raise_event(event)
       when 'VOICE_STATE_UPDATE'
@@ -998,6 +1061,16 @@ module Discordrb
 
         event = GuildMemberDeleteEvent.new(data, self)
         raise_event(event)
+      when 'GUILD_BAN_ADD'
+        add_user_ban(data)
+
+        event = UserBanEvent.new(data, self)
+        raise_event(event)
+      when 'GUILD_BAN_REMOVE'
+        remove_user_ban(data)
+
+        event = UserUnbanEvent.new(data, self)
+        raise_event(event)
       when 'GUILD_ROLE_UPDATE'
         update_guild_role(data)
 
@@ -1028,6 +1101,9 @@ module Discordrb
 
         event = GuildDeleteEvent.new(data, self)
         raise_event(event)
+      else
+        # another event that we don't support yet
+        debug "Event #{packet['t']} has been received but is unsupported, ignoring"
       end
     rescue Exception => e
       log_exception(e)
@@ -1044,16 +1120,16 @@ module Discordrb
     def websocket_open(_)
       # Send the initial packet
       packet = {
-        'op' => 2,    # Packet identifier
-        'd' => {      # Packet data
-          'v' => 2,   # Another identifier
-          'token' => @token,
-          'properties' => { # I'm unsure what these values are for exactly, but they don't appear to impact bot functionality in any way.
-            '$os' => "#{RUBY_PLATFORM}",
-            '$browser' => 'discordrb',
-            '$device' => 'discordrb',
-            '$referrer' => '',
-            '$referring_domain' => ''
+        op: 2,    # Packet identifier
+        d: {      # Packet data
+          v: 2,   # Another identifier
+          token: @token,
+          properties: { # I'm unsure what these values are for exactly, but they don't appear to impact bot functionality in any way.
+            '$os': RUBY_PLATFORM.to_s,
+            '$browser': 'discordrb',
+            '$device': 'discordrb',
+            '$referrer': '',
+            '$referring_domain': ''
           }
         }
       }
@@ -1111,8 +1187,8 @@ module Discordrb
       millis = Time.now.strftime('%s%L').to_i
       debug("Sending heartbeat at #{millis}")
       data = {
-        'op' => 1,
-        'd' => millis
+        op: 1,
+        d: millis
       }
 
       @ws.send(data.to_json)