discordrb 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7243dd69686cf52feecca4bfe214758c7c3341c5
-  data.tar.gz: 85afc41eb200b3229e71c885d849c89a5ff31a03
+  metadata.gz: 337ea47519caa85873b29fa6a7ac2a77157cbdb1
+  data.tar.gz: 3e605cffe66fa9e5604cc4fd0832f00de8648700
 SHA512:
-  metadata.gz: 18911b18d0f2fb58539211affc6c735c5a63656cc35764249a0fb12e57a764ba2c5ff521c17a3f60006d6e5a685300114b6837c30697a43d79959988d11d9814
-  data.tar.gz: 398fc6c56a8781e4a6d7cacfe9677d20c5bc9b78f92a9f45fc382d47a39bb8359d440452e0316f480d65a445059d655a5fdc33e625097b87f418d907dc3c87b2
+  metadata.gz: 938fcccefe4d46b647355c3500ca04bce24718aa01f60fabecdffec22801c17f9e3629629615682cd9ee2e070ad92858bcbac00cf76ce821fd88bab310baa7f5
+  data.tar.gz: c68a60e989731a168002f87bda571acdff25b8bda65cc2fea32f14fb05ed7056008b9c05428e1d9b844d3eeb1f049947d029c784aa7bce6a7678ceb9f2a6237a

data/.codeclimate.yml

@@ -0,0 +1,16 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- spec/

data/.gitignore

@@ -6,6 +6,7 @@
 /doc/
 /pkg/
 /spec/reports/
+/profiles/
 /tmp/
 /.idea/
 .DS_Store

data/.rubocop.yml

@@ -5,6 +5,9 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -38,6 +41,12 @@ Style/ConstantName:
 Lint/RescueException:
   Enabled: false
 
+# Prefer |m, e| for the `reduce` block arguments
+Style/SingleLineBlockParams:
+  Methods:
+    - reduce: [m, e]
+    - inject: [m, e]
+
 AllCops:
   TargetRubyVersion: 2.1
 

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.1.9
 before_install: gem install bundler -v 1.10.6
 script:
   - bundle exec rspec spec
+  - bundle exec codeclimate-test-reporter
   - bundle exec rubocop -c .rubocop.yml

data/CHANGELOG.md

@@ -1,5 +1,54 @@
 # Changelog
 
+## 3.2.0
+
+- Various parts of gateway error handling were improved, leading to significant stability improvements:
+  - A long standing bug was fixed that prevented resumes in most cases, which caused unnecessary reconnections.
+  - The error handler that handles problems with sending the raw data over TCP now catches errors more broadly.
+  - Heartbeat ACKs (opcode 11) are now checked, which allows the client to detect zombie connections early on. If this causes problems for you you can disable it using `bot.gateway.check_heartbeat_acks = false`.
+  - Received heartbeats are now properly handled again
+- Added a client for webhooks, implemented as a separate gem `discordrb-webhooks`. This allows the creation of applications that only use webhooks without the overhead provided by the rest of discordrb. The gem is added as a dependency by normal discordrb so you don't need to install it separately if you're already using that.
+- Adding, updating or deleting custom emoji is now supported ([#285](https://github.com/meew0/discordrb/pull/285), thanks @Daniel-Worrall)
+- Rich embeds can now be sent alongside messages, for example using the `embed` parameter in `send_message`, or with the new method `Channel#send_embed`
+- `advanced_functionality` bots now support escaping using backslashes ([#293](https://github.com/meew0/discordrb/issues/293) / [#304](https://github.com/meew0/discordrb/pull/304), thanks @LikeLakers2)
+- Added type checking and conversion for commands ([#298](https://github.com/meew0/discordrb/pull/298), thanks @ohtaavi)
+- Bulk deleting messages now checks for message age (see also [hammerandchisel/discord-api-docs#208](https://github.com/hammerandchisel/discord-api-docs/issues/208)). By default, it will ignore messages that are too old to be bulk deleted, but there is also a `strict` mode setting now that raises an exception in such a case.
+- Reactions can now be viewed for existing messages ([#262](https://github.com/meew0/discordrb/pull/262), thanks @z64), added to messages ([#266](https://github.com/meew0/discordrb/pull/266), thanks @z64), and listened for using gateway events as well as internal handlers ([#300](https://github.com/meew0/discordrb/issues/300)).
+- Game types and stream URLs are now cached ([#297](https://github.com/meew0/discordrb/issues/297))
+- The default non-streaming game was changed to be `0` instead of `nil` ([#277](https://github.com/meew0/discordrb/pull/277), thanks @zeyla) 
+- A method `Channel#delete_message` was added to support deleting single messages by ID without prior resolution.
+- Permission overwrites can now be deleted from channels ([#268](https://github.com/meew0/discordrb/pull/268), thanks @greenbigfrog)
+- There is now a utility method `IDObject.synthesise` that creates snowflakes with specific timestamps out of thin air.
+- Typing events are now respondable, so you can call `#respond` on them for example ([#270](https://github.com/meew0/discordrb/pull/270), thanks @VxJasonxV)
+- Message authors can now be `User` objects if a `Member` object could not be found or created ([#290](https://github.com/meew0/discordrb/issues/290))
+- Added two new events, `unknown` ([#288](https://github.com/meew0/discordrb/issues/288)) and `raw`, that are raised for unknown dispatches and all dispatches, respectively.
+- Bots can now be set to fully ignore other bots ([#257](https://github.com/meew0/discordrb/pull/257), thanks @greenbigfrog) 
+- Voice state update events now have an `old_channel` property/attribute that denotes the previous channel the user was in in case of joining/moving/leaving.
+- The default help command no longer shows commands the user can't use ([#275](https://github.com/meew0/discordrb/pull/275), thanks @FormalHellhound)
+- Updated the command example to no longer include user-specific stuff ([#260](https://github.com/meew0/discordrb/issues/260))
+- `Server#role` now resolves IDs, so they can be passed as strings if necessary.
+
+### Bugfixes
+
+- Fixed bots' shard settings being ignored in certain cases 
+- Parsing role mentions using `Bot#parse_mention` works properly now.
+- Fixed some specific REST methods that were broken by the API module refactor ([#302](https://github.com/meew0/discordrb/pull/302), thanks @LikeLakers2)
+- Cached channel data is now updated properly on change ([#272](https://github.com/meew0/discordrb/issues/272))
+- Users' avatars are now updated properly on change ([#265](https://github.com/meew0/discordrb/pull/265), thanks @Roughsketch)
+- Fixed voice state tracking for newly created channels ([#292](https://github.com/meew0/discordrb/issues/292))
+- Fixed event attribute handling for PlayingEvent ([#303](https://github.com/meew0/discordrb/pull/303), thanks @sven-strothoff)
+- Getting specific emoji by ID no longer fails to resolve non-cached emoji ([#283](https://github.com/meew0/discordrb/pull/283), thanks @greenbigfrog)
+- Voice state update events no longer fail to be raised for users leaving channels, if the event handler had a channel attribute set ([#301](https://github.com/meew0/discordrb/issues/301))
+- Bots that don't define any events should work properly again
+- Fixed error handling for messages over the character limit ([#276](https://github.com/meew0/discordrb/issues/276))
+- Fixed some specific log messages not being called properly ([#263](https://github.com/meew0/discordrb/pull/263), thanks @Roughsketch)
+- Fixed some edge case bugs in the default help command:
+  - In the case of too many commands to be sent in the channel, it no longer replies with "Sending help in PM!" when called from PM
+  - It no longer fails completely if called from PM if there are any commands that require server-specific checks ([#308](https://github.com/meew0/discordrb/issues/308))
+  - Fixed a slight formatting mistake
+- Quoted command arguments in `advanced_functionality` are no longer split by newline
+- Fixed a specific edge case in command chain handling where handling commands with the same name as the chain delimiter was broken 
+
 ## 3.1.1
 
 *Bugfix-only release.*

data/CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# Contributing guidelines
+
+Any contributions are very much appreciated! This project is relatively relaxed when it comes to guidelines, however
+there are still some things that would be nice to have considered.
+
+For bug reports, please try to include a code sample if at all appropriate for
+the issue, so we can reproduce it on our own machines.
+
+For PRs, please make sure that you tested your code before every push; it's a little annoying to keep having to get back
+to a PR because of small avoidable oversights. (Huge bonus points if you're adding specs for your code! This project
+has very few specs in places where it should have more so every added spec is very much appreciated.)
+
+If you have any questions at all, don't be afraid to ask in the [discordrb channel on Discord](https://discord.gg/0SBTUU1wZTWfFQL2).

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
+# Test coverage reporting for CodeClimate
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'simplecov', group: :test
+
 # Specify your gem's dependencies in discordrb.gemspec
-gemspec
+gemspec name: 'discordrb'
+gemspec name: 'discordrb-webhooks', development_group: 'webhooks'

data/README.md

@@ -2,6 +2,8 @@
 [![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)
+[![Code Climate](https://codeclimate.com/github/meew0/discordrb/badges/gpa.svg)](https://codeclimate.com/github/meew0/discordrb)
+[![Test Coverage](https://codeclimate.com/github/meew0/discordrb/badges/coverage.svg)](https://codeclimate.com/github/meew0/discordrb/coverage)
 [![Join Discord](https://img.shields.io/badge/discord-join-7289DA.svg)](https://discord.gg/0SBTUU1wZTWfFQL2)
 # discordrb
 

data/Rakefile

@@ -1,4 +1,15 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
+
+namespace :main do
+  Bundler::GemHelper.install_tasks(name: 'discordrb')
+end
+
+namespace :webhooks do
+  Bundler::GemHelper.install_tasks(name: 'discordrb-webhooks')
+end
+
+task build: [:'main:build', :'webhooks:build']
+task release: [:'main:release', :'webhooks:release']
 
 # Make "build" the default task
 task default: :build

data/discordrb-webhooks.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'discordrb/webhooks/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'discordrb-webhooks'
+  spec.version       = Discordrb::Webhooks::VERSION
+  spec.authors       = ['meew0']
+  spec.email         = ['']
+
+  spec.summary       = 'Webhook client for discordrb'
+  spec.description   = "A client for Discord's webhooks to fit alongside [discordrb](https://rubygems.org/gems/discordrb)."
+  spec.homepage      = 'https://github.com/meew0/discordrb'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files -z lib/discordrb/webhooks/`.split("\x0") + ['lib/discordrb/webhooks.rb']
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'rest-client'
+
+  spec.required_ruby_version = '>= 2.1.0'
+end

data/discordrb.gemspec

@@ -14,16 +14,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/meew0/discordrb'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples|lib/discordrb/webhooks)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'opus-ruby'
   spec.add_dependency 'websocket-client-simple', '>= 0.3.0'
-  spec.add_dependency 'rbnacl'
+  spec.add_dependency 'rbnacl', '~> 3.4.0' # 24: update
+
+  spec.add_dependency 'discordrb-webhooks'
 
   spec.required_ruby_version = '>= 2.1.0'
 
@@ -31,5 +32,6 @@ 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.42.0'
+  spec.add_development_dependency 'rspec-prof', '~> 0.0.7'
+  spec.add_development_dependency 'rubocop', '0.45.0'
 end

data/lib/discordrb/api.rb

@@ -137,6 +137,11 @@ module Discordrb::API
     "#{api_base}/guilds/#{server_id}/widget.png?style=#{style}"
   end
 
+  # Make a splash URL from server and splash IDs
+  def splash_url(server_id, splash_id)
+    "https://cdn.discordapp.com/splashes/#{server_id}/#{splash_id}.jpg"
+  end
+
   # Make an emoji icon URL from emoji ID
   def emoji_icon_url(emoji_id)
     "https://cdn.discordapp.com/emojis/#{emoji_id}.png"

data/lib/discordrb/api/channel.rb

@@ -66,18 +66,20 @@ module Discordrb::API::Channel
 
   # Send a message to a channel
   # https://discordapp.com/developers/docs/resources/channel#create-message
-  def create_message(token, channel_id, message, mentions = [], tts = false, _server_id = nil) # send message
+  def create_message(token, channel_id, message, mentions = [], tts = false, embed = nil) # send message
     Discordrb::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :post,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages",
-      { content: message, mentions: mentions, tts: tts }.to_json,
+      { content: message, mentions: mentions, tts: tts, embed: embed }.to_json,
       Authorization: token,
       content_type: :json
     )
-  rescue RestClient::InternalServerError
-    raise Discordrb::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)"
+  rescue RestClient::BadRequest => e
+    parsed = JSON.parse(e.response.body)
+    raise Discordrb::Errors::MessageTooLong, "Message over the character limit (#{message.length} > 2000)" if parsed['content'] && parsed['content'].is_a?(Array) && parsed['content'].first == 'Must be 2000 or less characters long.'
+    raise
   end
 
   # Send a file as a message to a channel
@@ -95,13 +97,13 @@ module Discordrb::API::Channel
 
   # Edit a message
   # https://discordapp.com/developers/docs/resources/channel#edit-message
-  def edit_message(token, channel_id, message_id, message, mentions = [])
+  def edit_message(token, channel_id, message_id, message, mentions = [], embed = nil)
     Discordrb::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :patch,
       "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}",
-      { content: message, mentions: mentions }.to_json,
+      { content: message, mentions: mentions, embed: embed }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -133,6 +135,72 @@ module Discordrb::API::Channel
     )
   end
 
+  # Create a reaction on a message using this client
+  # https://discordapp.com/developers/docs/resources/channel#create-reaction
+  def create_reaction(token, channel_id, message_id, emoji)
+    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions_emoji_me,
+      channel_id,
+      :put,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}/@me",
+      nil,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Delete this client's own reaction on a message
+  # https://discordapp.com/developers/docs/resources/channel#delete-own-reaction
+  def delete_own_reaction(token, channel_id, message_id, emoji)
+    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions_emoji_me,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}/@me",
+      Authorization: token
+    )
+  end
+
+  # Delete another client's reaction on a message
+  # https://discordapp.com/developers/docs/resources/channel#delete-user-reaction
+  def delete_user_reaction(token, channel_id, message_id, emoji, user_id)
+    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions_emoji_uid,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}/#{user_id}",
+      Authorization: token
+    )
+  end
+
+  # Get a list of clients who reacted with a specific reaction on a message
+  # https://discordapp.com/developers/docs/resources/channel#get-reactions
+  def get_reactions(token, channel_id, message_id, emoji)
+    emoji = URI.encode(emoji) unless emoji.ascii_only?
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions_emoji,
+      channel_id,
+      :get,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions/#{emoji}",
+      Authorization: token
+    )
+  end
+
+  # Deletes all reactions on a message from all clients
+  # https://discordapp.com/developers/docs/resources/channel#delete-all-reactions
+  def delete_all_reactions(token, channel_id, message_id)
+    Discordrb::API.request(
+      :channels_cid_messages_mid_reactions,
+      channel_id,
+      :delete,
+      "#{Discordrb::API.api_base}/channels/#{channel_id}/messages/#{message_id}/reactions",
+      Authorization: token
+    )
+  end
+
   # Update a channels permission for a role or member
   # https://discordapp.com/developers/docs/resources/channel#edit-channel-permissions
   def update_permission(token, channel_id, overwrite_id, allow, deny, type)

data/lib/discordrb/api/server.rb

@@ -354,4 +354,41 @@ module Discordrb::API::Server
       Authorization: token
     )
   end
+
+  # Adds a custom emoji
+  def add_emoji(token, server_id, image, name)
+    Discordrb::API.request(
+      :guilds_sid_emojis,
+      server_id,
+      :post,
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/emojis",
+      { image: image, name: name }.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Changes an emoji name
+  def edit_emoji(token, server_id, emoji_id, name)
+    Discordrb::API.request(
+      :guilds_sid_emojis_eid,
+      server_id,
+      :patch,
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/emojis/#{emoji_id}",
+      { name: name }.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Deletes a custom emoji
+  def delete_emoji(token, server_id, emoji_id)
+    Discordrb::API.request(
+      :guilds_sid_emojis_eid,
+      server_id,
+      :delete,
+      "#{Discordrb::API.api_base}/guilds/#{server_id}/emojis/#{emoji_id}",
+      Authorization: token
+    )
+  end
 end

data/lib/discordrb/bot.rb

@@ -15,6 +15,8 @@ require 'discordrb/events/roles'
 require 'discordrb/events/guilds'
 require 'discordrb/events/await'
 require 'discordrb/events/bans'
+require 'discordrb/events/raw'
+require 'discordrb/events/reactions'
 
 require 'discordrb/api'
 require 'discordrb/api/channel'
@@ -91,11 +93,12 @@ module Discordrb
     # @param num_shards [Integer] The total number of shards that should be running. See
     #   https://github.com/hammerandchisel/discord-api-docs/issues/17 for how to do sharding.
     # @param redact_token [true, false] Whether the bot should redact the token in logs. Default is true.
+    # @param ignore_bots [true, false] Whether the bot should ignore bot accounts or not. Default is false.
     def initialize(
         log_mode: :normal,
-        token: nil, client_id: nil, application_id: nil,
+        token: nil, client_id: nil,
         type: nil, name: '', fancy_log: false, suppress_ready: false, parse_self: false,
-        shard_id: nil, num_shards: nil, redact_token: true
+        shard_id: nil, num_shards: nil, redact_token: true, ignore_bots: false
     )
 
       LOGGER.mode = if log_mode.is_a? TrueClass # Specifically check for `true` because people might not have updated yet
@@ -108,10 +111,6 @@ module Discordrb
 
       @should_parse_self = parse_self
 
-      if application_id
-        raise ArgumentError, 'Starting with discordrb 3.0.0, the application_id parameter has been renamed to client_id! Make sure to change this in your bot. This check will be removed in 3.1.0.'
-      end
-
       @client_id = client_id
 
       @type = type || :bot
@@ -123,7 +122,7 @@ module Discordrb
       @prevent_ready = suppress_ready
 
       @token = process_token(@type, token)
-      @gateway = Gateway.new(self, @token)
+      @gateway = Gateway.new(self, @token, @shard_key)
 
       init_cache
 
@@ -131,6 +130,7 @@ module Discordrb
       @should_connect_to_voice = {}
 
       @ignored_ids = Set.new
+      @ignore_bots = ignore_bots
 
       @event_threads = []
       @current_thread = 0
@@ -162,7 +162,8 @@ module Discordrb
     def emoji(id = nil)
       gateway_check
       if id
-        emoji = @emoji.find { |sth| sth.id == id }
+        emoji
+        @emoji.find { |sth| sth.id == id }
       else
         emoji = {}
         @servers.each do |_, server|
@@ -170,7 +171,7 @@ module Discordrb
             emoji[element.name] = GlobalEmoji.new(element, self)
           end
         end
-        emoji.values
+        @emoji = emoji.values
       end
     end
 
@@ -265,7 +266,7 @@ module Discordrb
     # @param permission_bits [Integer, String] Permission bits that should be appended to invite url.
     # @return [String] the OAuth invite URL.
     def invite_url(server: nil, permission_bits: nil)
-      raise 'No application ID has been set during initialization! Add one as the `application_id` named parameter while creating your bot.' unless @client_id
+      raise 'No application ID has been set during initialization! Add one as the `client_id` named parameter while creating your bot.' unless @client_id
 
       server_id_str = server ? "&guild_id=#{server.id}" : ''
       permission_bits_str = permission_bits ? "&permissions=#{permission_bits}" : ''
@@ -346,13 +347,13 @@ module Discordrb
     # @param channel_id [Integer] The ID that identifies the channel to send something to.
     # @param content [String] The text that should be sent as a message. It is limited to 2000 characters (Discord imposed).
     # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
-    # @param server_id [Integer] The ID that identifies the server to send something to.
+    # @param embed [Hash, Discordrb::Webhooks::Embed, nil] The rich embed to append to this message.
     # @return [Message] The message that was sent.
-    def send_message(channel_id, content, tts = false, server_id = nil)
+    def send_message(channel_id, content, tts = false, embed = nil)
       channel_id = channel_id.resolve_id
       debug("Sending message to #{channel_id} with content '#{content}'")
 
-      response = API::Channel.create_message(token, channel_id, content, [], tts, server_id)
+      response = API::Channel.create_message(token, channel_id, content, [], tts, embed ? embed.to_hash : nil)
       Message.new(JSON.parse(response), self)
     end
 
@@ -362,10 +363,10 @@ module Discordrb
     # @param content [String] The text that should be sent as a message. It is limited to 2000 characters (Discord imposed).
     # @param timeout [Float] The amount of time in seconds after which the message sent will be deleted.
     # @param tts [true, false] Whether or not this message should be sent using Discord text-to-speech.
-    # @param server_id [Integer] The ID that identifies the server to send something to.
-    def send_temporary_message(channel_id, content, timeout, tts = false, server_id = nil)
+    # @param embed [Hash, Discordrb::Webhooks::Embed, nil] The rich embed to append to this message.
+    def send_temporary_message(channel_id, content, timeout, tts = false, embed = nil)
       Thread.new do
-        message = send_message(channel_id, content, tts, server_id)
+        message = send_message(channel_id, content, tts, embed)
 
         sleep(timeout)
 
@@ -440,11 +441,14 @@ module Discordrb
       if /<@!?(?<id>\d+)>?/ =~ mention
         user(id.to_i)
       elsif /<@&(?<id>\d+)>?/ =~ mention
-        return server.role(id) if server
-        servers.each do |element|
-          role = element.role(id)
+        return server.role(id.to_i) if server
+        @servers.values.each do |element|
+          role = element.role(id.to_i)
           return role unless role.nil?
         end
+
+        # Return nil if no role is found
+        nil
       elsif /<:(\w+):(?<id>\d+)>?/ =~ mention
         emoji.find { |element| element.id.to_i == id.to_i }
       end
@@ -463,7 +467,7 @@ module Discordrb
       @game = game
       @status = status
       @streamurl = url
-      type = url ? 1 : nil
+      type = url ? 1 : 0
 
       game_obj = game || url ? { name: game, url: url, type: type } : nil
       @gateway.send_status_update(status, since, game_obj, afk)
@@ -640,21 +644,28 @@ module Discordrb
         member.update_username(username)
       end
 
-      member.status = data['status'].to_sym
-      member.game = data['game'] ? data['game']['name'] : nil
+      member.update_presence(data)
+
+      member.avatar_id = data['user']['avatar'] if data['user']['avatar']
 
       server.cache_member(member)
     end
 
-    # Internal handler for VOICE_STATUS_UPDATE
+    # Internal handler for VOICE_STATE_UPDATE
     def update_voice_state(data)
+      @session_id = data['session_id']
+
       server_id = data['guild_id'].to_i
       server = server(server_id)
       return unless server
 
+      user_id = data['user_id'].to_i
+      old_voice_state = server.voice_states[user_id]
+      old_channel_id = old_voice_state.voice_channel.id if old_voice_state
+
       server.update_voice_state(data)
 
-      @session_id = data['session_id']
+      old_channel_id
     end
 
     # Internal handler for VOICE_SERVER_UPDATE
@@ -686,7 +697,7 @@ module Discordrb
 
       # Handle normal and private channels separately
       if server
-        server.channels << channel
+        server.add_channel(channel)
         @channels[channel.id] = channel
       elsif channel.pm?
         @pm_channels[channel.recipient.id] = channel
@@ -711,7 +722,7 @@ module Discordrb
       # Handle normal and private channels separately
       if server
         @channels.delete(channel.id)
-        server.channels.reject! { |c| c.id == channel.id }
+        server.delete_channel(channel.id)
       elsif channel.pm?
         @pm_channels.delete(channel.recipient.id)
       elsif channel.group?
@@ -813,6 +824,13 @@ module Discordrb
       server.delete_role(role_id)
     end
 
+    # Internal handler for GUILD_EMOJIS_UPDATE
+    def update_guild_emoji(data)
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      server.update_emoji_data(data)
+    end
+
     # Internal handler for MESSAGE_CREATE
     def create_message(data); end
 
@@ -825,6 +843,15 @@ module Discordrb
     # Internal handler for MESSAGE_DELETE
     def delete_message(data); end
 
+    # Internal handler for MESSAGE_REACTION_ADD
+    def add_message_reaction(data); end
+
+    # Internal handler for MESSAGE_REACTION_REMOVE
+    def remove_message_reaction(data); end
+
+    # Internal handler for MESSAGE_REACTION_REMOVE_ALL
+    def remove_all_message_reactions(data); end
+
     # Internal handler for GUILD_BAN_ADD
     def add_user_ban(data); end
 
@@ -917,6 +944,11 @@ module Discordrb
           return
         end
 
+        if @ignore_bots && data['author']['bot']
+          debug("Ignored Bot account with ID #{data['author']['id']}")
+          return
+        end
+
         # If create_message is overwritten with a method that returns the parsed message, use that instead, so we don't
         # parse the message twice (which is just thrown away performance)
         message = create_message(data)
@@ -979,6 +1011,21 @@ module Discordrb
         rescue Discordrb::Errors::NoPermission
           debug 'Typing started in channel the bot has no access to, ignoring'
         end
+      when :MESSAGE_REACTION_ADD
+        add_message_reaction(data)
+
+        event = ReactionAddEvent.new(data, self)
+        raise_event(event)
+      when :MESSAGE_REACTION_REMOVE
+        remove_message_reaction(data)
+
+        event = ReactionRemoveEvent.new(data, self)
+        raise_event(event)
+      when :MESSAGE_REACTION_REMOVE_ALL
+        remove_all_message_reactions(data)
+
+        event = ReactionRemoveAllEvent.new(data, self)
+        raise_event(event)
       when :PRESENCE_UPDATE
         # Ignore friends list presences
         return unless data['guild_id']
@@ -996,9 +1043,9 @@ module Discordrb
 
         raise_event(event)
       when :VOICE_STATE_UPDATE
-        update_voice_state(data)
+        old_channel_id = update_voice_state(data)
 
-        event = VoiceStateUpdateEvent.new(data, self)
+        event = VoiceStateUpdateEvent.new(data, old_channel_id, self)
         raise_event(event)
       when :VOICE_SERVER_UPDATE
         update_voice_server(data)
@@ -1100,9 +1147,49 @@ module Discordrb
 
         event = ServerDeleteEvent.new(data, self)
         raise_event(event)
+      when :GUILD_EMOJIS_UPDATE
+        server_id = data['guild_id'].to_i
+        server = @servers[server_id]
+        old_emoji_data = server.emoji.clone
+        update_guild_emoji(data)
+        new_emoji_data = server.emoji
+
+        created_ids = new_emoji_data.keys - old_emoji_data.keys
+        deleted_ids = old_emoji_data.keys - new_emoji_data.keys
+        updated_ids = old_emoji_data.select do |k, v|
+          new_emoji_data[k] && (v.name != new_emoji_data[k].name || v.roles != new_emoji_data[k].roles)
+        end.keys
+
+        event = ServerEmojiChangeEvent.new(server, data, self)
+        raise_event(event)
+
+        created_ids.each do |e|
+          event = ServerEmojiCreateEvent.new(server, new_emoji_data[e], self)
+          raise_event(event)
+        end
+
+        deleted_ids.each do |e|
+          event = ServerEmojiDeleteEvent.new(server, old_emoji_data[e], self)
+          raise_event(event)
+        end
+
+        updated_ids.each do |e|
+          event = ServerEmojiUpdateEvent.new(server, old_emoji_data[e], new_emoji_data[e], self)
+          raise_event(event)
+        end
       else
         # another event that we don't support yet
-        debug "Event #{type} has been received but is unsupported, ignoring"
+        debug "Event #{type} has been received but is unsupported. Raising UnknownEvent"
+
+        event = UnknownEvent.new(type, data, self)
+        raise_event(event)
+      end
+
+      # The existence of this array is checked before for performance reasons, since this has to be done for *every*
+      # dispatch.
+      if @event_handlers && @event_handlers[RawEvent]
+        event = RawEvent.new(type, data, self)
+        raise_event(event)
       end
     rescue Exception => e
       LOGGER.error('Gateway message error!')