discordrb 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002c1c37653e0e75bbe66c5727030a39f5eae9d8
-  data.tar.gz: e703d694a84d3fe9b738403aee0517fa250ae549
+  metadata.gz: 8c01b23a0f26aef256c77bec16db1cc3526d3f7b
+  data.tar.gz: 53240d527a39b8d49d8bb684af53ed168c0a7ba5
 SHA512:
-  metadata.gz: e43742e8e297e34d20892936267e1e60464945ee020b6c69c4b6d6f8277fb7256b32e3050a5af3696f0926f168e1e889e2dc9b0a7517d4ba04c62f38f1f1b24c
-  data.tar.gz: ce006992dd5bf162e19c32f0bca74980982023954ee448ec7b04916d153bf7bade1d5f6b182a108bb05e298160d3f8b73f25f84d7cc71dff28cdb88a7300813e
+  metadata.gz: a5fef38890173193ba99fa598b875f8fb6fb738676ee25d2d5d79cee32b7783099d95c566d9c497f9036e15c3d72f92bed72b3ed4e4cd995f698738071fe6389
+  data.tar.gz: 043e53d22977fb1ded5d8c32c45974a61e5a77f69f68c0d1eb7120f9dceb4820cb66e29c1672f86bb241e16d39781b11435ec98832c91d5e34193f2dcea669b6

data/.gitignore

@@ -1,9 +1,9 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -1,4 +1,4 @@
-language: ruby
-rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.10.6
+language: ruby
+rvm:
+  - 2.2.2
+before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in discordrb.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in discordrb.gemspec
+gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 meew0
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015 meew0
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,78 +1,78 @@
-[![Build Status](https://travis-ci.org/meew0/discordrb.svg?branch=master)](https://travis-ci.org/meew0/discordrb)
-
-# discordrb
-
-An implementation of the [Discord](https://discordapp.com/) API using Ruby.
-
-## Installation
-
-### Linux
-
-On Linux, it should be as simple as running:
-
-    $ gem install discordrb
-
-### Windows
-
-On Windows, to install discordrb, run this in a shell:
-
-    $ gem install discordrb
-
-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'!):
-
-    $ ruby ping.rb
-
-#### Troubleshooting
-
-**If you get an error like this when installing the gem**:
-
-    ERROR:  Error installing discordrb:
-            The 'websocket-driver' native gem requires installed build tools.
-
-You're missing the development kit required to build native extensions. Follow [these instructions](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit#installation-instructions) and reinstall discordrb:
-
-    $ gem uninstall discordrb
-    $ gem install discordrb
-
-**If you get an error like this when running the example**:
-
-    terminate called after throwing an instance of 'std::runtime_error'
-      what():  Encryption not available on this event-machine
-
-You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe), install them to their default location and reinstall EventMachine using these libraries:
-
-    $ gem uninstall eventmachine
-    $ gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
-
-## Usage
-
-You can make a simple bot like this:
-
-```ruby
-require 'discordrb'
-
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
-
-bot.message(with_text: "Ping!") do |event|
-  event.respond "Pong!"
-end
-
-bot.run
-```
-
-This bot responds to every "Ping!" with a "Pong!".
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/meew0/discordrb.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+[![Build Status](https://travis-ci.org/meew0/discordrb.svg?branch=master)](https://travis-ci.org/meew0/discordrb)
+
+# discordrb
+
+An implementation of the [Discord](https://discordapp.com/) API using Ruby.
+
+## Installation
+
+### Linux
+
+On Linux, it should be as simple as running:
+
+    $ gem install discordrb
+
+### Windows
+
+On Windows, to install discordrb, run this in a shell:
+
+    $ gem install discordrb
+
+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'!):
+
+    $ ruby ping.rb
+
+#### Troubleshooting
+
+**If you get an error like this when installing the gem**:
+
+    ERROR:  Error installing discordrb:
+            The 'websocket-driver' native gem requires installed build tools.
+
+You're missing the development kit required to build native extensions. Follow [these instructions](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit#installation-instructions) and reinstall discordrb:
+
+    $ gem uninstall discordrb
+    $ gem install discordrb
+
+**If you get an error like this when running the example**:
+
+    terminate called after throwing an instance of 'std::runtime_error'
+      what():  Encryption not available on this event-machine
+
+You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe), install them to their default location and reinstall EventMachine using these libraries:
+
+    $ gem uninstall eventmachine
+    $ gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
+
+## Usage
+
+You can make a simple bot like this:
+
+```ruby
+require 'discordrb'
+
+bot = Discordrb::Bot.new "email@example.com", "hunter2"
+
+bot.message(with_text: "Ping!") do |event|
+  event.respond "Pong!"
+end
+
+bot.run
+```
+
+This bot responds to every "Ping!" with a "Pong!".
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/meew0/discordrb.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
-
-# Make "build" the default task
-task :default => :build
+require "bundler/gem_tasks"
+
+# Make "build" the default task
+task :default => :build

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "discordrb"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "discordrb"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,7 +1,7 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/discordrb.gemspec

@@ -1,28 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'discordrb/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "discordrb"
-  spec.version       = Discordrb::VERSION
-  spec.authors       = ["meew0"]
-  spec.email         = [""]
-
-  spec.summary       = "Discord API for Ruby"
-  spec.description   = "A Ruby implementation of the Discord (https://discordapp.com) API."
-  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)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "faye-websocket"
-  spec.add_dependency "rest-client"
-  spec.add_dependency "activesupport"
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'discordrb/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "discordrb"
+  spec.version       = Discordrb::VERSION
+  spec.authors       = ["meew0"]
+  spec.email         = [""]
+
+  spec.summary       = "Discord API for Ruby"
+  spec.description   = "A Ruby implementation of the Discord (https://discordapp.com) API."
+  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)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "faye-websocket"
+  spec.add_dependency "rest-client"
+  spec.add_dependency "activesupport"
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

data/examples/ping.rb

@@ -1,11 +1,11 @@
-# This simple bot responds to every "Ping!" message with a "Pong!"
-
-require 'discordrb'
-
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
-
-bot.message(with_text: "Ping!") do |event|
-  event.respond "Pong!"
-end
-
-bot.run
+# This simple bot responds to every "Ping!" message with a "Pong!"
+
+require 'discordrb'
+
+bot = Discordrb::Bot.new "email@example.com", "hunter2"
+
+bot.message(with_text: "Ping!") do |event|
+  event.respond "Pong!"
+end
+
+bot.run

data/examples/pm.rb

@@ -1,11 +1,11 @@
-# This bot shows off PM functionality by sending a PM every time the bot is mentioned.
-
-require 'discordrb'
-
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
-
-bot.mention do |event|
-  event.user.pm("You have mentioned me!")
-end
-
-bot.run
+# This bot shows off PM functionality by sending a PM every time the bot is mentioned.
+
+require 'discordrb'
+
+bot = Discordrb::Bot.new "email@example.com", "hunter2"
+
+bot.mention do |event|
+  event.user.pm("You have mentioned me!")
+end
+
+bot.run

data/lib/discordrb.rb

@@ -1,6 +1,7 @@
-require "discordrb/version"
-require "discordrb/bot"
-
-module Discordrb
-  # Your code goes here...
-end
+require "discordrb/version"
+require "discordrb/bot"
+require "discordrb/commands/command-bot"
+
+module Discordrb
+  # Your code goes here...
+end

data/lib/discordrb/bot.rb

@@ -1,525 +1,550 @@
-require 'rest-client'
-require 'faye/websocket'
-require 'eventmachine'
-
-require 'discordrb/endpoints/endpoints'
-
-require 'discordrb/events/message'
-require 'discordrb/events/typing'
-require 'discordrb/events/lifetime'
-require 'discordrb/events/presence'
-require 'discordrb/events/voice-state-update'
-require 'discordrb/events/channel-create'
-require 'discordrb/events/channel-update'
-require 'discordrb/events/channel-delete'
-require 'discordrb/events/guild-member-update'
-require 'discordrb/events/guild-role-create'
-require 'discordrb/events/guild-role-delete'
-require 'discordrb/events/guild-role-update'
-
-require 'discordrb/exceptions'
-require 'discordrb/data'
-
-module Discordrb
-  class Bot
-    include Discordrb::Events
-    def initialize(email, password, debug = false)
-      # Make sure people replace the login details in the example files...
-      if email.end_with? "example.com"
-        puts "You have to replace the login details in the example files with your own!"
-        exit
-      end
-
-      @debug = debug
-
-      @email = email
-      @password = password
-
-      @token = login
-
-      @event_handlers = {}
-
-      @channels = {}
-      @users = {}
-    end
-
-    def run
-      # Handle heartbeats
-      @heartbeat_interval = 1
-      @heartbeat_active = false
-      @heartbeat_thread = Thread.new do
-        while true do
-          sleep @heartbeat_interval
-          send_heartbeat if @heartbeat_active
-        end
-      end
-
-      while true do
-        websocket_connect
-        debug("Disconnected! Attempting to reconnect in 5 seconds.")
-        sleep 5
-        @token = login
-      end
-    end
-
-    def channel(id)
-      debug("Obtaining data for channel with id #{id}")
-      return @channels[id] if @channels[id]
-
-      response = RestClient.get Discordrb::Endpoints::CHANNELS + "/#{id}", {:Authorization => @token}
-      channel = Channel.new(JSON.parse(response), self)
-      @channels[id] = channel
-    end
-
-    def private_channel(id)
-      debug("Creating private channel with user id #{id}")
-      return @private_channels[id] if @private_channels[id]
-
-      data = {
-        'recipient_id' => id
-      }
-
-      response = RestClient.post Discordrb::Endpoints::USERS + "/#{@bot_user.id}/channels", data.to_json, {:Authorization => @token, :content_type => :json}
-      channel = Channel.new(JSON.parse(response), self)
-      @private_channels[id] = channel
-    end
-
-    def user(id)
-      @users[id]
-    end
-
-    def server(id)
-      @servers[id]
-    end
-
-    def send_message(channel_id, content)
-      debug("Sending message to #{channel_id} with content '#{content}'")
-      data = {
-        'content' => content.to_s,
-        'mentions' => []
-      }
-      RestClient.post Discordrb::Endpoints::CHANNELS + "/#{channel_id}/messages", data.to_json, {:Authorization => @token, :content_type => :json}
-    end
-
-    def debug=(debug)
-      @debug = debug
-    end
-
-    def message(attributes = {}, &block)
-      register_event(MessageEvent, attributes, block)
-    end
-
-    def ready(attributes = {}, &block)
-      register_event(ReadyEvent, attributes, block)
-    end
-
-    def disconnected(attributes = {}, &block)
-      register_event(DisconnectEvent, attributes, block)
-    end
-
-    def typing(attributes = {}, &block)
-      register_event(TypingEvent, attributes, block)
-    end
-
-    def presence(attributes = {}, &block)
-      register_event(PresenceEvent, attributes, block)
-    end
-
-    def mention(attributes = {}, &block)
-      register_event(MentionEvent, attributes, block)
-    end
-
-    # Handle channel creation
-    # Attributes:
-    # * type: Channel type ('text' or 'voice')
-    # * name: Channel name
-    def channel_create(attributes = {}, &block)
-      register_event(ChannelCreateEvent, attributes, block)
-    end
-
-    # Handle channel update
-    # Attributes:
-    # * type: Channel type ('text' or 'voice')
-    # * name: Channel name
-    def channel_update(attributes = {}, &block)
-      register_event(ChannelUpdateEvent, attributes, block)
-    end
-
-    # Handle channel deletion
-    # Attributes:
-    # * type: Channel type ('text' or 'voice')
-    # * name: Channel name
-    def channel_delete(attributes = {}, &block)
-      register_event(ChannelDeleteEvent, attributes, block)
-    end
-
-    # Handle a change to a voice state.
-    # This includes joining a voice channel or changing mute or deaf state.
-    # Attributes:
-    # * from: User whose voice state changed
-    # * mute: server mute status
-    # * deaf: server deaf status
-    # * self_mute: self mute status
-    # * self_deaf: self deaf status
-    # * channel: channel the user joined
-    def voice_state_update(attributes = {}, &block)
-      register_event(VoiceStateUpdateEvent, attributes, block)
-    end
-
-    def remove_handler(handler)
-      clazz = event_class(handler.class)
-      @event_handlers[clazz].delete(handler)
-    end
-
-    def add_handler(handler)
-      clazz = event_class(handler.class)
-      @event_handlers[clazz] << handler
-    end
-
-    alias_method :<<, :add_handler
-
-    private
-
-    # Internal handler for PRESENCE_UPDATE
-    def update_presence(data)
-      user_id = data['user']['id'].to_i
-      server_id = data['guild_id'].to_i
-      server = @servers[server_id]
-      return if !server
-
-      user = @users[user_id]
-      if !user
-        user = User.new(data['user'], self)
-        @users[user_id] = user
-      end
-
-      status = data['status'].to_sym
-      if status != :offline
-        if !(server.members.find {|u| u.id == user.id })
-          server.members << user
-        end
-      end
-      user.status = status
-      user.game_id = data['game_id']
-    end
-
-    # Internal handler for VOICE_STATUS_UPDATE
-    def update_voice_state(data)
-      user_id = data['user_id'].to_i
-      server_id = data['guild_id'].to_i
-      server = @servers[server_id]
-      return if !server
-
-      user = @users[user_id]
-      user.server_mute = data['mute']
-      user.server_deaf = data['deaf']
-      user.self_mute = data['self_mute']
-      user.self_deaf = data['self_deaf']
-
-      channel_id = data['channel_id']
-      channel = nil
-      if channel_id
-        channel = @channels[channel_id.to_i]
-      end
-      user.move(channel)
-    end
-
-    # Internal handler for CHANNEL_CREATE
-    def create_channel(data)
-      channel = Channel.new(data, self)
-      server = channel.server
-      server.channels << channel
-      @channels[channel.id] = channel
-    end
-
-    # Internal handler for CHANNEL_UPDATE
-    def update_channel(data)
-      channel = Channel.new(data, self)
-      server = channel.server
-      old_channel = @channels[channel.id]
-      return if !old_channel
-      old_channel.update_from(channel)
-    end
-
-    # Internal handler for CHANNEL_DELETE
-    def delete_channel(data)
-      channel = Channel.new(data, self)
-      server = channel.server
-      @channels[channel.id] = nil
-      server.channels.reject! {|c| c.id == channel.id}
-    end
-    
-    # Internal handler for GUILD_MEMBER_UPDATE
-    def update_guild_member(data)
-      user_data = data['user']
-      server_id = data['guild_id'].to_i
-      roles = []
-      data['roles'].each do |element|
-        role_id = element.to_i
-        roles << @servers[server_id].roles.find {|r| r.id == role_id}
-      end
-      user_id = user_data['id'].to_i
-      user = @users[user_id]
-      user.update_roles(roles)
-    end
-    
-    # Internal handler for GUILD_ROLE_UPDATE
-    def update_guild_role(data)
-      role_data = data['role']
-      server_id = data['guild_id'].to_i
-      server = @servers[server_id]
-      new_role = Role.new(role_data, self, server)
-      role_id = role_data['id'].to_i
-      old_role = server.roles.find {|r| r.id == role_id}
-      old_role.update_from(new_role)
-    end
-    
-    # Internal handler for GUILD_ROLE_CREATE
-    def create_guild_role(data)
-      role_data = data['role']
-      server_id = data['guild_id'].to_i
-      server = @servers[server_id]
-      new_role = Role.new(role_data, self, server)
-      server.add_role(new_role)
-    end
-    
-    # Internal handler for GUILD_ROLE_DELETE
-    def delete_guild_role(data)
-      role_data = data['role']
-      role_id = role_data['id'].to_i
-      server_id = data['guild_id'].to_i
-      server = @servers[server_id]
-      server.delete_role(role_id)
-    end
-
-    def debug(message)
-      puts "[DEBUG @ #{Time.now.to_s}] #{message}" if @debug
-    end
-
-    def login
-      debug("Logging in")
-      login_attempts = login_attempts || 0
-
-      # Login
-      login_response = RestClient.post Discordrb::Endpoints::LOGIN, :email => @email, :password => @password
-      raise HTTPStatusException.new(login_response.code) if login_response.code >= 400
-
-      # Parse response
-      login_response_object = JSON.parse(login_response)
-      raise InvalidAuthenticationException unless login_response_object['token']
-
-      debug("Received token: #{login_response_object['token']}")
-      login_response_object['token']
-    rescue Exception => e
-      response_code = login_response.nil? ? 0 : login_response.code ######## mackmm145
-      if login_attempts < 100 && (e.inspect.include?("No such host is known.") || response_code == 523)
-        debug("Login failed! Reattempting in 5 seconds. #{100 - login_attempts} attempts remaining.")
-        debug("Error was: #{e.inspect}")
-        sleep 5
-        login_attempts += 1
-        retry
-      else
-        debug("Login failed permanently after #{login_attempts + 1} attempts")
-
-        # Apparently we get a 400 if the password or username is incorrect. In that case, tell the user
-        debug("Are you sure you're using the correct username and password?") if e.class == RestClient::BadRequest
-        raise $!
-      end
-    end
-
-    def get_gateway
-      # Get updated websocket_hub
-      response = RestClient.get Discordrb::Endpoints::GATEWAY, :authorization => @token
-      JSON.parse(response)["url"]
-    end
-
-    def websocket_connect
-      debug("Attempting to get gateway URL...")
-      websocket_hub = get_gateway
-      debug("Success! Gateway URL is #{websocket_hub}.")
-      debug("Now running bot")
-
-      EM.run {
-        @ws = Faye::WebSocket::Client.new(websocket_hub)
-
-        @ws.on :open do |event|; websocket_open(event); end
-        @ws.on :message do |event|; websocket_message(event); end
-        @ws.on :error do |event|; debug(event.message); end
-        @ws.on :close do |event|; websocket_close(event); @ws = nil; end
-      }
-    end
-
-    def websocket_message(event)
-      begin
-      debug("Received packet #{event.data}")
-
-      # Parse packet
-      packet = JSON.parse(event.data)
-
-      raise "Invalid Packet" unless packet['op'] == 0   # TODO
-
-      data = packet['d']
-      case packet['t']
-      when "READY"
-        # Activate the heartbeats
-        @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0
-        @heartbeat_active = true
-        debug("Desired heartbeat_interval: #{@heartbeat_interval}")
-
-        bot_user_id = data['user']['id'].to_i
-
-        # Initialize servers
-        @servers = {}
-        data['guilds'].each do |element|
-          server = Server.new(element, self)
-          @servers[server.id] = server
-
-          # Initialize users
-          server.members.each do |element|
-            @users[element.id] = element
-          end
-          
-          # Save the bot user
-          @bot_user = @users[bot_user_id]
-        end
-
-        # Add private channels
-        @private_channels = {}
-        data['private_channels'].each do |element|
-          channel = Channel.new(element, self)
-          @channels[channel.id] = channel
-          @private_channels[channel.recipient.id] = channel
-        end
-
-        # Make sure to raise the event
-        raise_event(ReadyEvent.new)
-      when "MESSAGE_CREATE"
-        message = Message.new(data, self)
-        event = MessageEvent.new(message, self)
-        raise_event(event)
-
-        if message.mentions.any? { |user| user.id == @bot_user.id }
-          event = MentionEvent.new(message, self)
-          raise_event(event)
-        end
-      when "TYPING_START"
-        event = TypingEvent.new(data, self)
-        raise_event(event)
-      when "PRESENCE_UPDATE"
-        update_presence(data)
-        event = PresenceEvent.new(data, self)
-        raise_event(event)
-      when "VOICE_STATE_UPDATE"
-        update_voice_state(data)
-        event = VoiceStateUpdateEvent.new(data, self)
-        raise_event(event)
-      when "CHANNEL_CREATE"
-        create_channel(data)
-        event = ChannelCreateEvent.new(data, self)
-        raise_event(event)
-      when "CHANNEL_UPDATE"
-        update_channel(data)
-        event = ChannelUpdateEvent.new(data, self)
-        raise_event(event)
-      when "CHANNEL_DELETE"
-        delete_channel(data)
-        event = ChannelDeleteEvent.new(data, self)
-        raise_event(event)
-      when "GUILD_MEMBER_UPDATE"
-        update_guild_member(data)
-        event = GuildMemberUpdateEvent.new(data, self)
-        raise_event(event)
-      when "GUILD_ROLE_UPDATE"
-        update_guild_role(data)
-        event = GuildRoleUpdateEvent.new(data, self)
-        raise_event(event)
-      when "GUILD_ROLE_CREATE"
-        create_guild_role(data)
-        event = GuildRoleCreateEvent.new(data, self)
-        raise_event(event)
-      when "GUILD_ROLE_DELETE"
-        delete_guild_role(data)
-        event = GuildRoleDeleteEvent.new(data, self)
-        raise_event(event)
-      end
-      rescue Exception => e
-        debug("Exception: #{e.inspect}")
-        e.backtrace.each {|line| debug(line) }
-      end
-    end
-
-    def websocket_close(event)
-      debug("Disconnected from WebSocket!")
-      debug(" (Reason: #{event.reason})")
-      debug(" (Code: #{event.code})")
-      raise_event(DisconnectEvent.new)
-      EM.stop
-    end
-
-    def websocket_open(event)
-      # 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" => "Linux",
-            "$browser" => "",
-            "$device" => "discordrb",
-            "$referrer" => "",
-            "$referring_domain" => ""
-          }
-        }
-      }
-
-      @ws.send(packet.to_json)
-    end
-
-    def raise_event(event)
-      debug("Raised a #{event.class}")
-      handlers = @event_handlers[event.class]
-      (handlers || []).each do |handler|
-        handler.match(event)
-      end
-    end
-
-    def register_event(clazz, attributes, block)
-      handler = handler_class(clazz).new(attributes, block)
-
-      @event_handlers[clazz] ||= []
-      @event_handlers[clazz] << handler
-
-      # Return the handler so it can be removed later
-      handler
-    end
-
-    def send_heartbeat
-      millis = Time.now.strftime("%s%L").to_i
-      debug("Sending heartbeat at #{millis}")
-      data = {
-        'op' => 1,
-        'd' => millis
-      }
-
-      @ws.send(data.to_json)
-    end
-
-    def class_from_string(str)
-      str.split('::').inject(Object) do |mod, class_name|
-        mod.const_get(class_name)
-      end
-    end
-
-    def event_class(handler_class)
-      class_name = handler_class.to_s
-      return nil unless class_name.end_with? "Handler"
-
-      class_from_string(class_name[0..-8])
-    end
-
-    def handler_class(event_class)
-      class_from_string(event_class.to_s + "Handler")
-    end
-  end
-end
+require 'rest-client'
+require 'faye/websocket'
+require 'eventmachine'
+
+require 'discordrb/endpoints/endpoints'
+
+require 'discordrb/events/message'
+require 'discordrb/events/typing'
+require 'discordrb/events/lifetime'
+require 'discordrb/events/presence'
+require 'discordrb/events/voice-state-update'
+require 'discordrb/events/channel-create'
+require 'discordrb/events/channel-update'
+require 'discordrb/events/channel-delete'
+require 'discordrb/events/guild-member-update'
+require 'discordrb/events/guild-role-create'
+require 'discordrb/events/guild-role-delete'
+require 'discordrb/events/guild-role-update'
+
+require 'discordrb/exceptions'
+require 'discordrb/data'
+
+module Discordrb
+  class Bot
+    include Discordrb::Events
+    def initialize(email, password, debug = false)
+      # Make sure people replace the login details in the example files...
+      if email.end_with? "example.com"
+        puts "You have to replace the login details in the example files with your own!"
+        exit
+      end
+
+      @debug = debug
+
+      @email = email
+      @password = password
+
+      @token = login
+
+      @event_handlers = {}
+
+      @channels = {}
+      @users = {}
+    end
+
+    def run
+      # Handle heartbeats
+      @heartbeat_interval = 1
+      @heartbeat_active = false
+      @heartbeat_thread = Thread.new do
+        while true do
+          sleep @heartbeat_interval
+          send_heartbeat if @heartbeat_active
+        end
+      end
+
+      while true do
+        websocket_connect
+        debug("Disconnected! Attempting to reconnect in 5 seconds.")
+        sleep 5
+        @token = login
+      end
+    end
+
+    def channel(id)
+      debug("Obtaining data for channel with id #{id}")
+      return @channels[id] if @channels[id]
+
+      response = RestClient.get Discordrb::Endpoints::CHANNELS + "/#{id}", {:Authorization => @token}
+      channel = Channel.new(JSON.parse(response), self)
+      @channels[id] = channel
+    end
+
+    def private_channel(id)
+      debug("Creating private channel with user id #{id}")
+      return @private_channels[id] if @private_channels[id]
+
+      data = {
+        'recipient_id' => id
+      }
+
+      response = RestClient.post Discordrb::Endpoints::USERS + "/#{@bot_user.id}/channels", data.to_json, {:Authorization => @token, :content_type => :json}
+      channel = Channel.new(JSON.parse(response), self)
+      @private_channels[id] = channel
+    end
+
+    def user(id)
+      @users[id]
+    end
+
+    def server(id)
+      @servers[id]
+    end
+
+    def send_message(channel_id, content)
+      debug("Sending message to #{channel_id} with content '#{content}'")
+      data = {
+        'content' => content.to_s,
+        'mentions' => []
+      }
+      RestClient.post Discordrb::Endpoints::CHANNELS + "/#{channel_id}/messages", data.to_json, {:Authorization => @token, :content_type => :json}
+    end
+
+    def debug=(debug)
+      @debug = debug
+    end
+
+    def message(attributes = {}, &block)
+      register_event(MessageEvent, attributes, block)
+    end
+
+    def ready(attributes = {}, &block)
+      register_event(ReadyEvent, attributes, block)
+    end
+
+    def disconnected(attributes = {}, &block)
+      register_event(DisconnectEvent, attributes, block)
+    end
+
+    def typing(attributes = {}, &block)
+      register_event(TypingEvent, attributes, block)
+    end
+
+    def presence(attributes = {}, &block)
+      register_event(PresenceEvent, attributes, block)
+    end
+
+    def mention(attributes = {}, &block)
+      register_event(MentionEvent, attributes, block)
+    end
+
+    # Handle channel creation
+    # Attributes:
+    # * type: Channel type ('text' or 'voice')
+    # * name: Channel name
+    def channel_create(attributes = {}, &block)
+      register_event(ChannelCreateEvent, attributes, block)
+    end
+
+    # Handle channel update
+    # Attributes:
+    # * type: Channel type ('text' or 'voice')
+    # * name: Channel name
+    def channel_update(attributes = {}, &block)
+      register_event(ChannelUpdateEvent, attributes, block)
+    end
+
+    # Handle channel deletion
+    # Attributes:
+    # * type: Channel type ('text' or 'voice')
+    # * name: Channel name
+    def channel_delete(attributes = {}, &block)
+      register_event(ChannelDeleteEvent, attributes, block)
+    end
+
+    # Handle a change to a voice state.
+    # This includes joining a voice channel or changing mute or deaf state.
+    # Attributes:
+    # * from: User whose voice state changed
+    # * mute: server mute status
+    # * deaf: server deaf status
+    # * self_mute: self mute status
+    # * self_deaf: self deaf status
+    # * channel: channel the user joined
+    def voice_state_update(attributes = {}, &block)
+      register_event(VoiceStateUpdateEvent, attributes, block)
+    end
+
+    def remove_handler(handler)
+      clazz = event_class(handler.class)
+      @event_handlers[clazz].delete(handler)
+    end
+
+    def add_handler(handler)
+      clazz = event_class(handler.class)
+      @event_handlers[clazz] << handler
+    end
+
+    def debug(message)
+      puts "[DEBUG @ #{Time.now.to_s}] #{message}" if @debug
+    end
+
+    alias_method :<<, :add_handler
+
+    private
+
+    # Internal handler for PRESENCE_UPDATE
+    def update_presence(data)
+      user_id = data['user']['id'].to_i
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      return if !server
+
+      user = @users[user_id]
+      if !user
+        user = User.new(data['user'], self)
+        @users[user_id] = user
+      end
+
+      status = data['status'].to_sym
+      if status != :offline
+        if !(server.members.find {|u| u.id == user.id })
+          server.members << user
+        end
+      end
+      user.status = status
+      user.game_id = data['game_id']
+    end
+
+    # Internal handler for VOICE_STATUS_UPDATE
+    def update_voice_state(data)
+      user_id = data['user_id'].to_i
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      return if !server
+
+      user = @users[user_id]
+      user.server_mute = data['mute']
+      user.server_deaf = data['deaf']
+      user.self_mute = data['self_mute']
+      user.self_deaf = data['self_deaf']
+
+      channel_id = data['channel_id']
+      channel = nil
+      if channel_id
+        channel = @channels[channel_id.to_i]
+      end
+      user.move(channel)
+    end
+
+    # Internal handler for CHANNEL_CREATE
+    def create_channel(data)
+      channel = Channel.new(data, self)
+      server = channel.server
+      server.channels << channel
+      @channels[channel.id] = channel
+    end
+
+    # Internal handler for CHANNEL_UPDATE
+    def update_channel(data)
+      channel = Channel.new(data, self)
+      server = channel.server
+      old_channel = @channels[channel.id]
+      return if !old_channel
+      old_channel.update_from(channel)
+    end
+
+    # Internal handler for CHANNEL_DELETE
+    def delete_channel(data)
+      channel = Channel.new(data, self)
+      server = channel.server
+      @channels[channel.id] = nil
+      server.channels.reject! {|c| c.id == channel.id}
+    end
+
+    # Internal handler for GUILD_MEMBER_UPDATE
+    def update_guild_member(data)
+      user_data = data['user']
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      roles = []
+      data['roles'].each do |element|
+        role_id = element.to_i
+        roles << server.roles.find {|r| r.id == role_id}
+      end
+      user_id = user_data['id'].to_i
+      user = @users[user_id]
+      user.update_roles(server, roles)
+    end
+
+    # Internal handler for GUILD_ROLE_UPDATE
+    def update_guild_role(data)
+      role_data = data['role']
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      new_role = Role.new(role_data, self, server)
+      role_id = role_data['id'].to_i
+      old_role = server.roles.find {|r| r.id == role_id}
+      old_role.update_from(new_role)
+    end
+
+    # Internal handler for GUILD_ROLE_CREATE
+    def create_guild_role(data)
+      role_data = data['role']
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      new_role = Role.new(role_data, self, server)
+      server.add_role(new_role)
+    end
+
+    # Internal handler for GUILD_ROLE_DELETE
+    def delete_guild_role(data)
+      role_data = data['role']
+      role_id = role_data['id'].to_i
+      server_id = data['guild_id'].to_i
+      server = @servers[server_id]
+      server.delete_role(role_id)
+    end
+
+    # Internal handler for MESSAGE_CREATE
+    def create_message(data); end
+
+    # Internal handler for TYPING_START
+    def start_typing(data); end
+
+    def login
+      debug("Logging in")
+      login_attempts = login_attempts || 0
+
+      # Login
+      login_response = RestClient.post Discordrb::Endpoints::LOGIN, :email => @email, :password => @password
+      raise HTTPStatusException.new(login_response.code) if login_response.code >= 400
+
+      # Parse response
+      login_response_object = JSON.parse(login_response)
+      raise InvalidAuthenticationException unless login_response_object['token']
+
+      debug("Received token: #{login_response_object['token']}")
+      login_response_object['token']
+    rescue Exception => e
+      response_code = login_response.nil? ? 0 : login_response.code ######## mackmm145
+      if login_attempts < 100 && (e.inspect.include?("No such host is known.") || response_code == 523)
+        debug("Login failed! Reattempting in 5 seconds. #{100 - login_attempts} attempts remaining.")
+        debug("Error was: #{e.inspect}")
+        sleep 5
+        login_attempts += 1
+        retry
+      else
+        debug("Login failed permanently after #{login_attempts + 1} attempts")
+
+        # Apparently we get a 400 if the password or username is incorrect. In that case, tell the user
+        debug("Are you sure you're using the correct username and password?") if e.class == RestClient::BadRequest
+        raise $!
+      end
+    end
+
+    def get_gateway
+      # Get updated websocket_hub
+      response = RestClient.get Discordrb::Endpoints::GATEWAY, :authorization => @token
+      JSON.parse(response)["url"]
+    end
+
+    def websocket_connect
+      debug("Attempting to get gateway URL...")
+      websocket_hub = get_gateway
+      debug("Success! Gateway URL is #{websocket_hub}.")
+      debug("Now running bot")
+
+      EM.run {
+        @ws = Faye::WebSocket::Client.new(websocket_hub)
+
+        @ws.on :open do |event|; websocket_open(event); end
+        @ws.on :message do |event|; websocket_message(event); end
+        @ws.on :error do |event|; debug(event.message); end
+        @ws.on :close do |event|; websocket_close(event); @ws = nil; end
+      }
+    end
+
+    def websocket_message(event)
+      begin
+      debug("Received packet #{event.data}")
+
+      # Parse packet
+      packet = JSON.parse(event.data)
+
+      raise "Invalid Packet" unless packet['op'] == 0   # TODO
+
+      data = packet['d']
+      case packet['t']
+      when "READY"
+        # Activate the heartbeats
+        @heartbeat_interval = data['heartbeat_interval'].to_f / 1000.0
+        @heartbeat_active = true
+        debug("Desired heartbeat_interval: #{@heartbeat_interval}")
+
+        bot_user_id = data['user']['id'].to_i
+
+        # Initialize servers
+        @servers = {}
+        data['guilds'].each do |element|
+          server = Server.new(element, self)
+          @servers[server.id] = server
+
+          # Initialize users
+          server.members.each do |element|
+            unless @users[element.id]
+              @users[element.id] = element
+            else
+              # If the user is already cached, just add the new roles
+              @users[element.id].merge_roles(server, element.roles[server.id])
+            end
+          end
+
+          # Save the bot user
+          @bot_user = @users[bot_user_id]
+        end
+
+        # Add private channels
+        @private_channels = {}
+        data['private_channels'].each do |element|
+          channel = Channel.new(element, self)
+          @channels[channel.id] = channel
+          @private_channels[channel.recipient.id] = channel
+        end
+
+        # Make sure to raise the event
+        raise_event(ReadyEvent.new)
+      when "MESSAGE_CREATE"
+        create_message(data)
+
+        message = Message.new(data, self)
+        event = MessageEvent.new(message, self)
+        raise_event(event)
+
+        if message.mentions.any? { |user| user.id == @bot_user.id }
+          event = MentionEvent.new(message, self)
+          raise_event(event)
+        end
+      when "TYPING_START"
+        start_typing(data)
+
+        event = TypingEvent.new(data, self)
+        raise_event(event)
+      when "PRESENCE_UPDATE"
+        update_presence(data)
+
+        event = PresenceEvent.new(data, self)
+        raise_event(event)
+      when "VOICE_STATE_UPDATE"
+        update_voice_state(data)
+
+        event = VoiceStateUpdateEvent.new(data, self)
+        raise_event(event)
+      when "CHANNEL_CREATE"
+        create_channel(data)
+
+        event = ChannelCreateEvent.new(data, self)
+        raise_event(event)
+      when "CHANNEL_UPDATE"
+        update_channel(data)
+
+        event = ChannelUpdateEvent.new(data, self)
+        raise_event(event)
+      when "CHANNEL_DELETE"
+        delete_channel(data)
+
+        event = ChannelDeleteEvent.new(data, self)
+        raise_event(event)
+      when "GUILD_MEMBER_UPDATE"
+        update_guild_member(data)
+
+        event = GuildMemberUpdateEvent.new(data, self)
+        raise_event(event)
+      when "GUILD_ROLE_UPDATE"
+        update_guild_role(data)
+
+        event = GuildRoleUpdateEvent.new(data, self)
+        raise_event(event)
+      when "GUILD_ROLE_CREATE"
+        create_guild_role(data)
+
+        event = GuildRoleCreateEvent.new(data, self)
+        raise_event(event)
+      when "GUILD_ROLE_DELETE"
+        delete_guild_role(data)
+
+        event = GuildRoleDeleteEvent.new(data, self)
+        raise_event(event)
+      end
+      rescue Exception => e
+        debug("Exception: #{e.inspect}")
+        e.backtrace.each {|line| debug(line) }
+      end
+    end
+
+    def websocket_close(event)
+      debug("Disconnected from WebSocket!")
+      debug(" (Reason: #{event.reason})")
+      debug(" (Code: #{event.code})")
+      raise_event(DisconnectEvent.new)
+      EM.stop
+    end
+
+    def websocket_open(event)
+      # 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" => "Linux",
+            "$browser" => "",
+            "$device" => "discordrb",
+            "$referrer" => "",
+            "$referring_domain" => ""
+          }
+        }
+      }
+
+      @ws.send(packet.to_json)
+    end
+
+    def raise_event(event)
+      debug("Raised a #{event.class}")
+      handlers = @event_handlers[event.class]
+      (handlers || []).each do |handler|
+        handler.match(event)
+      end
+    end
+
+    def register_event(clazz, attributes, block)
+      handler = handler_class(clazz).new(attributes, block)
+
+      @event_handlers[clazz] ||= []
+      @event_handlers[clazz] << handler
+
+      # Return the handler so it can be removed later
+      handler
+    end
+
+    def send_heartbeat
+      millis = Time.now.strftime("%s%L").to_i
+      debug("Sending heartbeat at #{millis}")
+      data = {
+        'op' => 1,
+        'd' => millis
+      }
+
+      @ws.send(data.to_json)
+    end
+
+    def class_from_string(str)
+      str.split('::').inject(Object) do |mod, class_name|
+        mod.const_get(class_name)
+      end
+    end
+
+    def event_class(handler_class)
+      class_name = handler_class.to_s
+      return nil unless class_name.end_with? "Handler"
+
+      class_from_string(class_name[0..-8])
+    end
+
+    def handler_class(event_class)
+      class_from_string(event_class.to_s + "Handler")
+    end
+  end
+end