diff --git a/.settings/settings.json b/.vscode/settings.json
similarity index 100%
rename from .settings/settings.json
rename to .vscode/settings.json
diff --git a/.settings/tasks.json b/.vscode/tasks.json
similarity index 100%
rename from .settings/tasks.json
rename to .vscode/tasks.json
diff --git a/lib/Client.js b/lib/Client.js
index 85119d53a..36ac902e0 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -1039,7 +1039,7 @@ var Client = (function () {
 								server.members.push(user);
 							}
 
-							self.trigger("serverNewMember", user);
+							self.trigger("serverNewMember", user, server);
 						}
 
 						break;
@@ -1056,7 +1056,7 @@ var Client = (function () {
 								server.members.splice(server.members.indexOf(user), 1);
 							}
 
-							self.trigger("serverRemoveMember", user);
+							self.trigger("serverRemoveMember", user, server);
 						}
 
 						break;
@@ -1396,6 +1396,7 @@ var Client = (function () {
 						}
 
 						self.startPM(destination).then(function (pmc) {
+							console.log(pmc);
 							resolve(pmc.id);
 						})["catch"](reject);
 					} else {
@@ -1507,6 +1508,7 @@ var Client = (function () {
 		value: function _deleteMessage(message) {
 			var self = this;
 			return new Promise(function (resolve, reject) {
+
 				request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
 					if (err) {
 						reject(err);
diff --git a/package.json b/package.json
index e1c2cc82f..0eddd6cfa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discord.js",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A way to interface with the Discord API",
   "main": "./lib/index.js",
   "scripts": {
diff --git a/src/Client.js b/src/Client.js
index 03cb6a577..f4c4c1287 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -943,7 +943,7 @@ class Client {
 							server.members.push(user);
 						}
 
-						self.trigger("serverNewMember", user);
+						self.trigger("serverNewMember", user, server);
 					}
 
 					break;
@@ -960,7 +960,7 @@ class Client {
 							server.members.splice(server.members.indexOf(user), 1);
 						}
 
-						self.trigger("serverRemoveMember", user);
+						self.trigger("serverRemoveMember", user, server);
 					}
 
 					break;
@@ -1155,6 +1155,7 @@ class Client {
 					
 				//we don't, at this point we're late
 				self.startPM(destination).then(function (pmc) {
+					console.log(pmc);
 					resolve(pmc.id);
 				}).catch(reject);
 
@@ -1260,6 +1261,7 @@ class Client {
 	_deleteMessage(message){
 		var self = this;
 		return new Promise(function(resolve, reject){
+			
 			request
 					.del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
 					.set("authorization", self.token)
diff --git a/test/bot.1.js b/test/bot.1.js
index 1230b9bb6..f99314baa 100644
--- a/test/bot.1.js
+++ b/test/bot.1.js
@@ -17,8 +17,7 @@ mybot.on("message", function (message) {
 	}
 
 	// we can go ahead :)
-	console.log(message.sender.username);
-	mybot.sendMessage(message.channel, message.sender.username);
+	mybot.sendMessage(message.author, message.sender.username);
 });
 
 mybot.on("ready", function () {
diff --git a/web-dist/discord.3.3.1.js b/web-dist/discord.3.3.1.js
new file mode 100644
index 000000000..9992d6869
--- /dev/null
+++ b/web-dist/discord.3.3.1.js
@@ -0,0 +1,3590 @@
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Discord = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+//discord.js modules
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Endpoints = require("./Endpoints.js");
+var User = require("./user.js");
+var Server = require("./server.js");
+var Channel = require("./channel.js");
+var Message = require("./message.js");
+var Invite = require("./invite.js");
+var PMChannel = require("./PMChannel.js");
+
+//node modules
+var request = require("superagent");
+var WebSocket = require("ws");
+var fs = require("fs");
+
+var defaultOptions = {
+	queue: false
+};
+
+var Client = (function () {
+	function Client() {
+		var options = arguments.length <= 0 || arguments[0] === undefined ? defaultOptions : arguments[0];
+		var token = arguments.length <= 1 || arguments[1] === undefined ? undefined : arguments[1];
+
+		_classCallCheck(this, Client);
+
+		/*
+  	When created, if a token is specified the Client will
+  	try connecting with it. If the token is incorrect, no
+  	further efforts will be made to connect.
+  */
+		this.options = options;
+		this.options.queue = this.options.queue;
+		this.token = token;
+		this.state = 0;
+		this.websocket = null;
+		this.events = {};
+		this.user = null;
+		this.alreadySentData = false;
+		this.serverCreateListener = new Map();
+
+		this.email = "abc";
+		this.password = "abc";
+
+		/*
+  	State values:
+  	0 - idle
+  	1 - logging in
+  	2 - logged in
+  	3 - ready
+  	4 - disconnected
+  */
+
+		this.userCache = [];
+		this.channelCache = [];
+		this.serverCache = [];
+		this.pmChannelCache = [];
+		this.readyTime = null;
+		this.checkingQueue = {};
+		this.queue = {};
+	}
+
+	_createClass(Client, [{
+		key: "sendPacket",
+		value: function sendPacket(JSONObject) {
+			if (this.websocket.readyState === 1) {
+				this.websocket.send(JSON.stringify(JSONObject));
+			}
+		}
+
+		//def debug
+	}, {
+		key: "debug",
+		value: function debug(message) {
+			this.trigger("debug", message);
+		}
+	}, {
+		key: "on",
+		value: function on(event, fn) {
+			this.events[event] = fn;
+		}
+	}, {
+		key: "off",
+		value: function off(event) {
+			this.events[event] = null;
+		}
+	}, {
+		key: "keepAlive",
+		value: function keepAlive() {
+			this.debug("keep alive triggered");
+			this.sendPacket({
+				op: 1,
+				d: Date.now()
+			});
+		}
+
+		//def trigger
+	}, {
+		key: "trigger",
+		value: function trigger(event) {
+			var args = [];
+			for (var arg in arguments) {
+				args.push(arguments[arg]);
+			}
+			var evt = this.events[event];
+			if (evt) {
+				evt.apply(this, args.slice(1));
+			}
+		}
+
+		//def login
+	}, {
+		key: "login",
+		value: function login() {
+			var email = arguments.length <= 0 || arguments[0] === undefined ? "foo@bar.com" : arguments[0];
+			var password = arguments.length <= 1 || arguments[1] === undefined ? "pass1234" : arguments[1];
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, token) {} : arguments[2];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				if (self.state === 0 || self.state === 4) {
+
+					self.state = 1; //set the state to logging in
+
+					self.email = email;
+					self.password = password;
+
+					request.post(Endpoints.LOGIN).send({
+						email: email,
+						password: password
+					}).end(function (err, res) {
+
+						if (err) {
+							self.state = 4; //set state to disconnected
+							self.trigger("disconnected");
+							if (self.websocket) {
+								self.websocket.close();
+							}
+							callback(err);
+							reject(err);
+						} else {
+							self.state = 2; //set state to logged in (not yet ready)
+							self.token = res.body.token; //set our token
+
+							getGateway().then(function (url) {
+								self.createws(url);
+								callback(null, self.token);
+								resolve(self.token);
+							})["catch"](function (err) {
+								callback(err);
+								reject(err);
+							});
+						}
+					});
+				} else {
+					reject(new Error("Client already logging in or ready"));
+				}
+			});
+		}
+	}, {
+		key: "logout",
+		value: function logout() {
+			var callback = arguments.length <= 0 || arguments[0] === undefined ? function (err) {} : arguments[0];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				request.post(Endpoints.LOGOUT).set("authorization", self.token).end(function (err, res) {
+
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						self.websocket.close();
+						self.state = 4;
+						callback();
+						resolve();
+					}
+				});
+			});
+		}
+	}, {
+		key: "createServer",
+		value: function createServer(name, region) {
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, server) {} : arguments[2];
+
+			var self = this;
+			return new Promise(function (resolve, reject) {
+
+				request.post(Endpoints.SERVERS).set("authorization", self.token).send({
+					name: name,
+					region: region
+				}).end(function (err, res) {
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						// potentially redundant in future
+						// creating here does NOT give us the channels of the server
+						// so we must wait for the guild_create event.
+						self.serverCreateListener.set(res.body.id, [resolve, callback]);
+						/*var srv = self.addServer(res.body);
+      callback(null, srv);
+      resolve(srv);*/
+					}
+				});
+			});
+		}
+	}, {
+		key: "createChannel",
+		value: function createChannel(server, channelName, channelType) {
+			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, chann) {} : arguments[3];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				request.post(Endpoints.SERVERS + "/" + self.resolveServerID(server) + "/channels").set("authorization", self.token).send({
+					name: channelName,
+					type: channelType
+				}).end(function (err, res) {
+
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						var server = self.getServer("id", res.body.guild_id);
+						var chann = self.addChannel(res.body, res.body.guild_id);
+						server.addChannel(chann);
+						callback(null, chann);
+						resolve(chann);
+					}
+				});
+			});
+		}
+	}, {
+		key: "leaveServer",
+		value: function leaveServer(server) {
+			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, server) {} : arguments[1];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				request.del(Endpoints.SERVERS + "/" + self.resolveServerID(server)).set("authorization", self.token).end(function (err, res) {
+
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						self.serverCache.splice(self.serverCache.indexOf(server), 1);
+						callback(null);
+						resolve();
+					}
+				});
+			});
+		}
+	}, {
+		key: "createInvite",
+		value: function createInvite(serverOrChannel, options) {
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, invite) {} : arguments[2];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				var destination;
+
+				if (serverOrChannel instanceof Server) {
+					destination = serverOrChannel.id;
+				} else if (serverOrChannel instanceof Channel) {
+					destination = serverOrChannel.id;
+				} else {
+					destination = serverOrChannel;
+				}
+
+				options = options || {};
+				options.max_age = options.maxAge || 0;
+				options.max_uses = options.maxUses || 0;
+				options.temporary = options.temporary || false;
+				options.xkcdpass = options.xkcd || false;
+
+				request.post(Endpoints.CHANNELS + "/" + destination + "/invites").set("authorization", self.token).send(options).end(function (err, res) {
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						var inv = new Invite(res.body, self);
+						callback(null, inv);
+						resolve(inv);
+					}
+				});
+			});
+		}
+	}, {
+		key: "startPM",
+		value: function startPM(user) {
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				var userId = user;
+				if (user instanceof User) {
+					userId = user.id;
+				}
+				request.post(Endpoints.USERS + "/" + self.user.id + "/channels").set("authorization", self.token).send({
+					recipient_id: userId
+				}).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve(self.addPMChannel(res.body));
+					}
+				});
+			});
+		}
+	}, {
+		key: "reply",
+		value: function reply(destination, message, tts) {
+			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+
+			var self = this;
+
+			return new Promise(function (response, reject) {
+
+				if (typeof tts === "function") {
+					// tts is a function, which means the developer wants this to be the callback
+					callback = tts;
+					tts = false;
+				}
+
+				var user = destination.sender;
+				self.sendMessage(destination, message, callback, user + ", ").then(response)["catch"](reject);
+			});
+		}
+	}, {
+		key: "deleteMessage",
+		value: function deleteMessage(message, timeout) {
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2];
+
+			var self = this;
+
+			var prom = new Promise(function (resolve, reject) {
+				if (timeout) {
+					setTimeout(remove, timeout);
+				} else {
+					remove();
+				}
+
+				function remove() {
+					if (self.options.queue) {
+						if (!self.queue[message.channel.id]) {
+							self.queue[message.channel.id] = [];
+						}
+						self.queue[message.channel.id].push({
+							action: "deleteMessage",
+							message: message,
+							then: good,
+							error: bad
+						});
+
+						self.checkQueue(message.channel.id);
+					} else {
+						self._deleteMessage(message).then(good)["catch"](bad);
+					}
+				}
+
+				function good() {
+					prom.success = true;
+					callback(null);
+					resolve();
+				}
+
+				function bad(err) {
+					prom.error = err;
+					callback(err);
+					reject(err);
+				}
+			});
+
+			return prom;
+		}
+	}, {
+		key: "updateMessage",
+		value: function updateMessage(message, content) {
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2];
+
+			var self = this;
+
+			var prom = new Promise(function (resolve, reject) {
+
+				content = content instanceof Array ? content.join("\n") : content;
+
+				if (self.options.queue) {
+					if (!self.queue[message.channel.id]) {
+						self.queue[message.channel.id] = [];
+					}
+					self.queue[message.channel.id].push({
+						action: "updateMessage",
+						message: message,
+						content: content,
+						then: good,
+						error: bad
+					});
+
+					self.checkQueue(message.channel.id);
+				} else {
+					self._updateMessage(message, content).then(good)["catch"](bad);
+				}
+
+				function good(msg) {
+					prom.message = msg;
+					callback(null, msg);
+					resolve(msg);
+				}
+
+				function bad(error) {
+					prom.error = error;
+					callback(error);
+					reject(error);
+				}
+			});
+
+			return prom;
+		}
+	}, {
+		key: "setUsername",
+		value: function setUsername(newName) {
+			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				request.patch(Endpoints.API + "/users/@me").set("authorization", self.token).send({
+					avatar: self.user.avatar,
+					email: self.email,
+					new_password: null,
+					password: self.password,
+					username: newName
+				}).end(function (err) {
+					callback(err);
+					if (err) reject(err);else resolve();
+				});
+			});
+		}
+	}, {
+		key: "getChannelLogs",
+		value: function getChannelLogs(channel) {
+			var amount = arguments.length <= 1 || arguments[1] === undefined ? 500 : arguments[1];
+			var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, logs) {} : arguments[2];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				var channelID = channel;
+				if (channel instanceof Channel) {
+					channelID = channel.id;
+				}
+
+				request.get(Endpoints.CHANNELS + "/" + channelID + "/messages?limit=" + amount).set("authorization", self.token).end(function (err, res) {
+
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						var logs = [];
+
+						var channel = self.getChannel("id", channelID);
+
+						var _iteratorNormalCompletion = true;
+						var _didIteratorError = false;
+						var _iteratorError = undefined;
+
+						try {
+							for (var _iterator = res.body[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+								var message = _step.value;
+
+								var mentions = [];
+								var _iteratorNormalCompletion2 = true;
+								var _didIteratorError2 = false;
+								var _iteratorError2 = undefined;
+
+								try {
+									for (var _iterator2 = message.mentions[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+										var mention = _step2.value;
+
+										mentions.push(self.addUser(mention));
+									}
+								} catch (err) {
+									_didIteratorError2 = true;
+									_iteratorError2 = err;
+								} finally {
+									try {
+										if (!_iteratorNormalCompletion2 && _iterator2["return"]) {
+											_iterator2["return"]();
+										}
+									} finally {
+										if (_didIteratorError2) {
+											throw _iteratorError2;
+										}
+									}
+								}
+
+								var author = self.addUser(message.author);
+
+								logs.push(new Message(message, channel, mentions, author));
+							}
+						} catch (err) {
+							_didIteratorError = true;
+							_iteratorError = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion && _iterator["return"]) {
+									_iterator["return"]();
+								}
+							} finally {
+								if (_didIteratorError) {
+									throw _iteratorError;
+								}
+							}
+						}
+
+						callback(null, logs);
+						resolve(logs);
+					}
+				});
+			});
+		}
+	}, {
+		key: "deleteChannel",
+		value: function deleteChannel(channel) {
+			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				var channelID = channel;
+				if (channel instanceof Channel) {
+					channelID = channel.id;
+				}
+
+				request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization", self.token).end(function (err) {
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						callback(null);
+						resolve();
+					}
+				});
+			});
+		}
+	}, {
+		key: "joinServer",
+		value: function joinServer(invite) {
+			var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, server) {} : arguments[1];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+
+				var id = invite instanceof Invite ? invite.code : invite;
+
+				request.post(Endpoints.API + "/invite/" + id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						callback(err);
+						reject(err);
+					} else {
+						if (self.getServer("id", res.body.guild.id)) {
+							resolve(self.getServer("id", res.body.guild.id));
+						} else {
+							self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
+						}
+					}
+				});
+			});
+		}
+	}, {
+		key: "sendFile",
+		value: function sendFile(destination, file) {
+			var fileName = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
+			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+
+			var self = this;
+
+			var prom = new Promise(function (resolve, reject) {
+
+				var fstream;
+
+				if (typeof file === "string" || file instanceof String) {
+					fstream = fs.createReadStream(file);
+					fileName = file;
+				} else {
+					fstream = file;
+				}
+
+				self.resolveDestination(destination).then(send)["catch"](bad);
+
+				function send(destination) {
+					if (self.options.queue) {
+						//queue send file too
+						if (!self.queue[destination]) {
+							self.queue[destination] = [];
+						}
+
+						self.queue[destination].push({
+							action: "sendFile",
+							attachment: fstream,
+							attachmentName: fileName,
+							then: good,
+							error: bad
+						});
+
+						self.checkQueue(destination);
+					} else {
+						//not queue
+						self._sendFile(destination, fstream, fileName).then(good)["catch"](bad);
+					}
+				}
+
+				function good(msg) {
+					prom.message = msg;
+					callback(null, msg);
+					resolve(msg);
+				}
+
+				function bad(err) {
+					prom.error = err;
+					callback(err);
+					reject(err);
+				}
+			});
+
+			return prom;
+		}
+	}, {
+		key: "sendMessage",
+		value: function sendMessage(destination, message, tts) {
+			var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
+			var premessage = arguments.length <= 4 || arguments[4] === undefined ? "" : arguments[4];
+
+			var self = this;
+
+			var prom = new Promise(function (resolve, reject) {
+
+				if (typeof tts === "function") {
+					// tts is a function, which means the developer wants this to be the callback
+					callback = tts;
+					tts = false;
+				}
+
+				message = premessage + resolveMessage(message);
+				var mentions = resolveMentions();
+				self.resolveDestination(destination).then(send)["catch"](error);
+
+				function error(err) {
+					callback(err);
+					reject(err);
+				}
+
+				function send(destination) {
+					if (self.options.queue) {
+						//we're QUEUEING messages, so sending them sequentially based on servers.
+						if (!self.queue[destination]) {
+							self.queue[destination] = [];
+						}
+
+						self.queue[destination].push({
+							action: "sendMessage",
+							content: message,
+							mentions: mentions,
+							tts: !!tts, //incase it's not a boolean
+							then: mgood,
+							error: mbad
+						});
+
+						self.checkQueue(destination);
+					} else {
+						self._sendMessage(destination, message, tts, mentions).then(mgood)["catch"](mbad);
+					}
+				}
+
+				function mgood(msg) {
+					prom.message = msg;
+					callback(null, msg);
+					resolve(msg);
+				}
+
+				function mbad(error) {
+					prom.error = error;
+					callback(error);
+					reject(error);
+				}
+
+				function resolveMessage() {
+					var msg = message;
+					if (message instanceof Array) {
+						msg = message.join("\n");
+					}
+					return msg;
+				}
+
+				function resolveMentions() {
+					var _mentions = [];
+					var _iteratorNormalCompletion3 = true;
+					var _didIteratorError3 = false;
+					var _iteratorError3 = undefined;
+
+					try {
+						for (var _iterator3 = (message.match(/<@[^>]*>/g) || [])[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+							var mention = _step3.value;
+
+							_mentions.push(mention.substring(2, mention.length - 1));
+						}
+					} catch (err) {
+						_didIteratorError3 = true;
+						_iteratorError3 = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
+								_iterator3["return"]();
+							}
+						} finally {
+							if (_didIteratorError3) {
+								throw _iteratorError3;
+							}
+						}
+					}
+
+					return _mentions;
+				}
+			});
+
+			return prom;
+		}
+
+		//def createws
+	}, {
+		key: "createws",
+		value: function createws(url) {
+			if (this.websocket) return false;
+
+			var self = this;
+
+			//good to go
+			this.websocket = new WebSocket(url);
+
+			//open
+			this.websocket.onopen = function () {
+				self.trySendConnData(); //try connecting
+			};
+
+			//close
+			this.websocket.onclose = function () {
+				self.trigger("disconnected");
+			};
+
+			//message
+			this.websocket.onmessage = function (e) {
+
+				var dat = false,
+				    data = {};
+
+				try {
+					dat = JSON.parse(e.data);
+					data = dat.d;
+				} catch (err) {
+					self.trigger("error", err, e);
+					return;
+				}
+
+				//valid message
+				switch (dat.t) {
+
+					case "READY":
+						self.debug("received ready packet");
+
+						self.user = self.addUser(data.user);
+
+						var _iteratorNormalCompletion4 = true;
+						var _didIteratorError4 = false;
+						var _iteratorError4 = undefined;
+
+						try {
+							for (var _iterator4 = data.guilds[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+								var _server = _step4.value;
+
+								var server = self.addServer(_server);
+							}
+						} catch (err) {
+							_didIteratorError4 = true;
+							_iteratorError4 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
+									_iterator4["return"]();
+								}
+							} finally {
+								if (_didIteratorError4) {
+									throw _iteratorError4;
+								}
+							}
+						}
+
+						var _iteratorNormalCompletion5 = true;
+						var _didIteratorError5 = false;
+						var _iteratorError5 = undefined;
+
+						try {
+							for (var _iterator5 = data.private_channels[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+								var _pmc = _step5.value;
+
+								var pmc = self.addPMChannel(_pmc);
+							}
+						} catch (err) {
+							_didIteratorError5 = true;
+							_iteratorError5 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion5 && _iterator5["return"]) {
+									_iterator5["return"]();
+								}
+							} finally {
+								if (_didIteratorError5) {
+									throw _iteratorError5;
+								}
+							}
+						}
+
+						self.trigger("ready");
+						self.readyTime = Date.now();
+						self.debug("cached " + self.serverCache.length + " servers, " + self.channelCache.length + " channels, " + self.pmChannelCache.length + " PMs and " + self.userCache.length + " users.");
+						self.state = 3;
+						setInterval(function () {
+							self.keepAlive.apply(self);
+						}, data.heartbeat_interval);
+
+						break;
+					case "MESSAGE_CREATE":
+						self.debug("received message");
+
+						var mentions = [];
+						data.mentions = data.mentions || []; //for some reason this was not defined at some point?
+						var _iteratorNormalCompletion6 = true;
+						var _didIteratorError6 = false;
+						var _iteratorError6 = undefined;
+
+						try {
+							for (var _iterator6 = data.mentions[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+								var mention = _step6.value;
+
+								mentions.push(self.addUser(mention));
+							}
+						} catch (err) {
+							_didIteratorError6 = true;
+							_iteratorError6 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion6 && _iterator6["return"]) {
+									_iterator6["return"]();
+								}
+							} finally {
+								if (_didIteratorError6) {
+									throw _iteratorError6;
+								}
+							}
+						}
+
+						var channel = self.getChannel("id", data.channel_id);
+						if (channel) {
+							var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
+							self.trigger("message", msg);
+						}
+
+						break;
+					case "MESSAGE_DELETE":
+						self.debug("message deleted");
+
+						var channel = self.getChannel("id", data.channel_id);
+						var message = channel.getMessage("id", data.id);
+						if (message) {
+							self.trigger("messageDelete", channel, message);
+							channel.messages.splice(channel.messages.indexOf(message), 1);
+						} else {
+							//don't have the cache of that message ;(
+							self.trigger("messageDelete", channel);
+						}
+						break;
+					case "MESSAGE_UPDATE":
+						self.debug("message updated");
+
+						var channel = self.getChannel("id", data.channel_id);
+						var formerMessage = channel.getMessage("id", data.id);
+
+						if (formerMessage) {
+
+							//new message might be partial, so we need to fill it with whatever the old message was.
+							var info = {};
+
+							for (var key in formerMessage) {
+								info[key] = formerMessage[key];
+							}
+
+							for (var key in data) {
+								info[key] = data[key];
+							}
+
+							var mentions = [];
+							var _iteratorNormalCompletion7 = true;
+							var _didIteratorError7 = false;
+							var _iteratorError7 = undefined;
+
+							try {
+								for (var _iterator7 = info.mentions[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+									var mention = _step7.value;
+
+									mentions.push(self.addUser(mention));
+								}
+							} catch (err) {
+								_didIteratorError7 = true;
+								_iteratorError7 = err;
+							} finally {
+								try {
+									if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
+										_iterator7["return"]();
+									}
+								} finally {
+									if (_didIteratorError7) {
+										throw _iteratorError7;
+									}
+								}
+							}
+
+							var newMessage = new Message(info, channel, mentions, formerMessage.author);
+
+							self.trigger("messageUpdate", newMessage, formerMessage);
+
+							channel.messages[channel.messages.indexOf(formerMessage)] = newMessage;
+						}
+
+						// message isn't in cache, and if it's a partial it could cause
+						// all hell to break loose... best to just act as if nothing happened
+
+						break;
+
+					case "GUILD_DELETE":
+
+						var server = self.getServer("id", data.id);
+
+						if (server) {
+							self.serverCache.splice(self.serverCache.indexOf(server), 1);
+							self.trigger("serverDelete", server);
+						}
+
+						break;
+
+					case "CHANNEL_DELETE":
+
+						var channel = self.getChannel("id", data.id);
+
+						if (channel) {
+
+							var server = channel.server;
+
+							if (server) {
+
+								server.channels.splice(server.channels.indexOf(channel), 1);
+							}
+
+							self.trigger("channelDelete", channel);
+
+							self.serverCache.splice(self.serverCache.indexOf(channel), 1);
+						}
+
+						break;
+
+					case "GUILD_CREATE":
+
+						var server = self.getServer("id", data.id);
+
+						if (!server) {
+							//if server doesn't already exist because duh
+							server = self.addServer(data);
+						} /*else if(server.channels.length === 0){
+        
+        var srv = new Server(data, self);
+        for(channel of data.channels){
+        	srv.channels.push(new Channel(channel, data.id));
+        }
+        self.serverCache[self.serverCache.indexOf(server)] = srv;
+        
+        }*/
+
+						if (self.serverCreateListener.get(data.id)) {
+							var cbs = self.serverCreateListener.get(data.id);
+							cbs[0](server); //promise then callback
+							cbs[1](null, server); //legacy callback
+							self.serverCreateListener["delete"](data.id);
+						}
+
+						self.trigger("serverCreate", server);
+
+						break;
+
+					case "CHANNEL_CREATE":
+
+						var channel = self.getChannel("id", data.id);
+
+						if (!channel) {
+
+							var chann = self.addChannel(data, data.guild_id);
+							var srv = self.getServer("id", data.guild_id);
+							if (srv) {
+								srv.addChannel(chann);
+							}
+							self.trigger("channelCreate", chann);
+						}
+
+						break;
+
+					case "GUILD_MEMBER_ADD":
+
+						var server = self.getServer("id", data.guild_id);
+
+						if (server) {
+
+							var user = self.addUser(data.user); //if for whatever reason it doesn't exist..
+
+							if (! ~server.members.indexOf(user)) {
+								server.members.push(user);
+							}
+
+							self.trigger("serverNewMember", user, server);
+						}
+
+						break;
+
+					case "GUILD_MEMBER_REMOVE":
+
+						var server = self.getServer("id", data.guild_id);
+
+						if (server) {
+
+							var user = self.addUser(data.user); //if for whatever reason it doesn't exist..
+
+							if (~server.members.indexOf(user)) {
+								server.members.splice(server.members.indexOf(user), 1);
+							}
+
+							self.trigger("serverRemoveMember", user, server);
+						}
+
+						break;
+
+					case "USER_UPDATE":
+
+						if (self.user && data.id === self.user.id) {
+
+							var newUser = new User(data); //not actually adding to the cache
+
+							self.trigger("userUpdate", newUser, self.user);
+
+							if (~self.userCache.indexOf(self.user)) {
+								self.userCache[self.userCache.indexOf(self.user)] = newUser;
+							}
+
+							self.user = newUser;
+						}
+
+						break;
+
+					case "PRESENCE_UPDATE":
+
+						var userInCache = self.getUser("id", data.user.id);
+
+						if (userInCache) {
+							//user exists
+							var presenceUser = new User(data.user);
+							if (presenceUser.equalsStrict(userInCache)) {
+								//they're exactly the same, an actual presence update
+								self.trigger("presence", {
+									user: userInCache,
+									status: data.status,
+									server: self.getServer("id", data.guild_id),
+									gameId: data.game_id
+								});
+							} else {
+								//one of their details changed.
+								self.trigger("userUpdate", userInCache, presenceUser);
+								self.userCache[self.userCache.indexOf(userInCache)] = presenceUser;
+							}
+						}
+
+						break;
+
+					default:
+						self.debug("received unknown packet");
+						self.trigger("unknown", dat);
+						break;
+
+				}
+			};
+		}
+
+		//def addUser
+	}, {
+		key: "addUser",
+		value: function addUser(data) {
+			if (!this.getUser("id", data.id)) {
+				this.userCache.push(new User(data));
+			}
+			return this.getUser("id", data.id);
+		}
+
+		//def addChannel
+	}, {
+		key: "addChannel",
+		value: function addChannel(data, serverId) {
+			if (!this.getChannel("id", data.id)) {
+				this.channelCache.push(new Channel(data, this.getServer("id", serverId)));
+			}
+			return this.getChannel("id", data.id);
+		}
+	}, {
+		key: "addPMChannel",
+		value: function addPMChannel(data) {
+			if (!this.getPMChannel("id", data.id)) {
+				this.pmChannelCache.push(new PMChannel(data, this));
+			}
+			return this.getPMChannel("id", data.id);
+		}
+
+		//def addServer
+	}, {
+		key: "addServer",
+		value: function addServer(data) {
+
+			var server = this.getServer("id", data.id);
+
+			if (!server) {
+				server = new Server(data, this);
+				this.serverCache.push(server);
+				if (data.channels) {
+					var _iteratorNormalCompletion8 = true;
+					var _didIteratorError8 = false;
+					var _iteratorError8 = undefined;
+
+					try {
+						for (var _iterator8 = data.channels[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
+							var channel = _step8.value;
+
+							server.channels.push(this.addChannel(channel, server.id));
+						}
+					} catch (err) {
+						_didIteratorError8 = true;
+						_iteratorError8 = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion8 && _iterator8["return"]) {
+								_iterator8["return"]();
+							}
+						} finally {
+							if (_didIteratorError8) {
+								throw _iteratorError8;
+							}
+						}
+					}
+				}
+			}
+
+			return server;
+		}
+
+		//def getUser
+	}, {
+		key: "getUser",
+		value: function getUser(key, value) {
+			var _iteratorNormalCompletion9 = true;
+			var _didIteratorError9 = false;
+			var _iteratorError9 = undefined;
+
+			try {
+				for (var _iterator9 = this.userCache[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+					var user = _step9.value;
+
+					if (user[key] === value) {
+						return user;
+					}
+				}
+			} catch (err) {
+				_didIteratorError9 = true;
+				_iteratorError9 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion9 && _iterator9["return"]) {
+						_iterator9["return"]();
+					}
+				} finally {
+					if (_didIteratorError9) {
+						throw _iteratorError9;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		//def getChannel
+	}, {
+		key: "getChannel",
+		value: function getChannel(key, value) {
+			var _iteratorNormalCompletion10 = true;
+			var _didIteratorError10 = false;
+			var _iteratorError10 = undefined;
+
+			try {
+				for (var _iterator10 = this.channelCache[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
+					var channel = _step10.value;
+
+					if (channel[key] === value) {
+						return channel;
+					}
+				}
+			} catch (err) {
+				_didIteratorError10 = true;
+				_iteratorError10 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion10 && _iterator10["return"]) {
+						_iterator10["return"]();
+					}
+				} finally {
+					if (_didIteratorError10) {
+						throw _iteratorError10;
+					}
+				}
+			}
+
+			return this.getPMChannel(key, value); //might be a PM
+		}
+	}, {
+		key: "getPMChannel",
+		value: function getPMChannel(key, value) {
+			var _iteratorNormalCompletion11 = true;
+			var _didIteratorError11 = false;
+			var _iteratorError11 = undefined;
+
+			try {
+				for (var _iterator11 = this.pmChannelCache[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
+					var channel = _step11.value;
+
+					if (channel[key] === value) {
+						return channel;
+					}
+				}
+			} catch (err) {
+				_didIteratorError11 = true;
+				_iteratorError11 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion11 && _iterator11["return"]) {
+						_iterator11["return"]();
+					}
+				} finally {
+					if (_didIteratorError11) {
+						throw _iteratorError11;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		//def getServer
+	}, {
+		key: "getServer",
+		value: function getServer(key, value) {
+			var _iteratorNormalCompletion12 = true;
+			var _didIteratorError12 = false;
+			var _iteratorError12 = undefined;
+
+			try {
+				for (var _iterator12 = this.serverCache[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
+					var server = _step12.value;
+
+					if (server[key] === value) {
+						return server;
+					}
+				}
+			} catch (err) {
+				_didIteratorError12 = true;
+				_iteratorError12 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion12 && _iterator12["return"]) {
+						_iterator12["return"]();
+					}
+				} finally {
+					if (_didIteratorError12) {
+						throw _iteratorError12;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		//def trySendConnData
+	}, {
+		key: "trySendConnData",
+		value: function trySendConnData() {
+
+			if (this.token && !this.alreadySentData) {
+
+				this.alreadySentData = true;
+
+				var data = {
+					op: 2,
+					d: {
+						token: this.token,
+						v: 2,
+						properties: {
+							"$os": "discord.js",
+							"$browser": "discord.js",
+							"$device": "discord.js",
+							"$referrer": "",
+							"$referring_domain": ""
+						}
+					}
+				};
+				this.websocket.send(JSON.stringify(data));
+			}
+		}
+	}, {
+		key: "resolveServerID",
+		value: function resolveServerID(resource) {
+
+			if (resource instanceof Server) {
+				return resource.id;
+			} else if (!isNaN(resource) && resource.length && resource.length === 17) {
+				return resource;
+			}
+		}
+	}, {
+		key: "resolveDestination",
+		value: function resolveDestination(destination) {
+			var channId = false;
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				if (destination instanceof Server) {
+					channId = destination.id; //general is the same as server id
+				} else if (destination instanceof Channel) {
+						channId = destination.id;
+					} else if (destination instanceof Message) {
+						channId = destination.channel.id;
+					} else if (destination instanceof User) {
+
+						//check if we have a PM
+						var _iteratorNormalCompletion13 = true;
+						var _didIteratorError13 = false;
+						var _iteratorError13 = undefined;
+
+						try {
+							for (var _iterator13 = self.pmChannelCache[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
+								var pmc = _step13.value;
+
+								if (pmc.user.equals(destination)) {
+									return pmc.id;
+								}
+							}
+
+							//we don't, at this point we're late
+						} catch (err) {
+							_didIteratorError13 = true;
+							_iteratorError13 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion13 && _iterator13["return"]) {
+									_iterator13["return"]();
+								}
+							} finally {
+								if (_didIteratorError13) {
+									throw _iteratorError13;
+								}
+							}
+						}
+
+						self.startPM(destination).then(function (pmc) {
+							resolve(pmc.id);
+						})["catch"](reject);
+					} else {
+						channId = destination;
+					}
+				if (channId) resolve(channId);
+			});
+		}
+	}, {
+		key: "_sendMessage",
+		value: function _sendMessage(destination, content, tts, mentions) {
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization", self.token).send({
+					content: content,
+					mentions: mentions,
+					tts: tts
+				}).end(function (err, res) {
+
+					if (err) {
+						reject(err);
+					} else {
+						var data = res.body;
+
+						var mentions = [];
+
+						data.mentions = data.mentions || []; //for some reason this was not defined at some point?
+
+						var _iteratorNormalCompletion14 = true;
+						var _didIteratorError14 = false;
+						var _iteratorError14 = undefined;
+
+						try {
+							for (var _iterator14 = data.mentions[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+								var mention = _step14.value;
+
+								mentions.push(self.addUser(mention));
+							}
+						} catch (err) {
+							_didIteratorError14 = true;
+							_iteratorError14 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion14 && _iterator14["return"]) {
+									_iterator14["return"]();
+								}
+							} finally {
+								if (_didIteratorError14) {
+									throw _iteratorError14;
+								}
+							}
+						}
+
+						var channel = self.getChannel("id", data.channel_id);
+						if (channel) {
+							var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
+							resolve(msg);
+						}
+					}
+				});
+			});
+		}
+	}, {
+		key: "_sendFile",
+		value: function _sendFile(destination, attachment) {
+			var attachmentName = arguments.length <= 2 || arguments[2] === undefined ? "DEFAULT BECAUSE YOU DIDN'T SPECIFY WHY.png" : arguments[2];
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {
+				request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization", self.token).attach("file", attachment, attachmentName).end(function (err, res) {
+
+					if (err) {
+						reject(err);
+					} else {
+
+						var chann = self.getChannel("id", destination);
+						if (chann) {
+							var msg = chann.addMessage(new Message(res.body, chann, [], self.user));
+							resolve(msg);
+						}
+					}
+				});
+			});
+		}
+	}, {
+		key: "_updateMessage",
+		value: function _updateMessage(message, content) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				request.patch(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).send({
+					content: content,
+					mentions: []
+				}).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						var msg = new Message(res.body, message.channel, message.mentions, message.sender);
+						resolve(msg);
+						message.channel.messages[message.channel.messages.indexOf(message)] = msg;
+					}
+				});
+			});
+		}
+	}, {
+		key: "_deleteMessage",
+		value: function _deleteMessage(message) {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			});
+		}
+	}, {
+		key: "checkQueue",
+		value: function checkQueue(channelID) {
+			var _this = this;
+
+			var self = this;
+
+			if (!this.checkingQueue[channelID]) {
+				(function () {
+					var doNext = function doNext() {
+						if (self.queue[channelID].length === 0) {
+							done();
+							return;
+						}
+						var queuedEvent = self.queue[channelID][0];
+						switch (queuedEvent.action) {
+							case "sendMessage":
+								var msgToSend = queuedEvent;
+								self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions).then(function (msg) {
+									msgToSend.then(msg);
+									self.queue[channelID].shift();
+									doNext();
+								})["catch"](function (err) {
+									msgToSend.error(err);
+									self.queue[channelID].shift();
+									doNext();
+								});
+								break;
+							case "sendFile":
+								var fileToSend = queuedEvent;
+								self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName).then(function (msg) {
+									fileToSend.then(msg);
+									self.queue[channelID].shift();
+									doNext();
+								})["catch"](function (err) {
+									fileToSend.error(err);
+									self.queue[channelID].shift();
+									doNext();
+								});
+								break;
+							case "updateMessage":
+								var msgToUpd = queuedEvent;
+								self._updateMessage(msgToUpd.message, msgToUpd.content).then(function (msg) {
+									msgToUpd.then(msg);
+									self.queue[channelID].shift();
+									doNext();
+								})["catch"](function (err) {
+									msgToUpd.error(err);
+									self.queue[channelID].shift();
+									doNext();
+								});
+								break;
+							case "deleteMessage":
+								var msgToDel = queuedEvent;
+								self._deleteMessage(msgToDel.message).then(function (msg) {
+									msgToDel.then(msg);
+									self.queue[channelID].shift();
+									doNext();
+								})["catch"](function (err) {
+									msgToDel.error(err);
+									self.queue[channelID].shift();
+									doNext();
+								});
+								break;
+							default:
+								done();
+								break;
+						}
+					};
+
+					var done = function done() {
+						self.checkingQueue[channelID] = false;
+						return;
+					};
+
+					//if we aren't already checking this queue.
+					_this.checkingQueue[channelID] = true;
+					doNext();
+				})();
+			}
+		}
+	}, {
+		key: "uptime",
+		get: function get() {
+
+			return this.readyTime ? Date.now() - this.readyTime : null;
+		}
+	}, {
+		key: "ready",
+		get: function get() {
+			return this.state === 3;
+		}
+	}, {
+		key: "servers",
+		get: function get() {
+			return this.serverCache;
+		}
+	}, {
+		key: "channels",
+		get: function get() {
+			return this.channelCache;
+		}
+	}, {
+		key: "users",
+		get: function get() {
+			return this.userCache;
+		}
+	}, {
+		key: "PMChannels",
+		get: function get() {
+			return this.pmChannelCache;
+		}
+	}, {
+		key: "messages",
+		get: function get() {
+
+			var msgs = [];
+			var _iteratorNormalCompletion15 = true;
+			var _didIteratorError15 = false;
+			var _iteratorError15 = undefined;
+
+			try {
+				for (var _iterator15 = this.channelCache[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
+					var channel = _step15.value;
+
+					msgs = msgs.concat(channel.messages);
+				}
+			} catch (err) {
+				_didIteratorError15 = true;
+				_iteratorError15 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion15 && _iterator15["return"]) {
+						_iterator15["return"]();
+					}
+				} finally {
+					if (_didIteratorError15) {
+						throw _iteratorError15;
+					}
+				}
+			}
+
+			return msgs;
+		}
+	}]);
+
+	return Client;
+})();
+
+function getGateway() {
+
+	var self = this;
+
+	return new Promise(function (resolve, reject) {
+		request.get(Endpoints.API + "/gateway").end(function (err, res) {
+			if (err) {
+				reject(err);
+			} else {
+				resolve(res.body.url);
+			}
+		});
+	});
+}
+
+module.exports = Client;
+},{"./Endpoints.js":2,"./PMChannel.js":3,"./channel.js":4,"./invite.js":6,"./message.js":7,"./server.js":8,"./user.js":9,"fs":10,"superagent":11,"ws":14}],2:[function(require,module,exports){
+"use strict";
+
+exports.BASE_DOMAIN = "discordapp.com";
+exports.BASE = "https://" + exports.BASE_DOMAIN;
+exports.WEBSOCKET_HUB = "wss://" + exports.BASE_DOMAIN + "/hub";
+
+exports.API = exports.BASE + "/api";
+exports.AUTH = exports.API + "/auth";
+exports.LOGIN = exports.AUTH + "/login";
+exports.LOGOUT = exports.AUTH + "/logout";
+exports.USERS = exports.API + "/users";
+exports.SERVERS = exports.API + "/guilds";
+exports.CHANNELS = exports.API + "/channels";
+},{}],3:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var PMChannel = (function () {
+	function PMChannel(data, client) {
+		_classCallCheck(this, PMChannel);
+
+		this.user = client.getUser("id", data.recipient.id);
+		this.id = data.id;
+		this.messages = [];
+	}
+
+	_createClass(PMChannel, [{
+		key: "addMessage",
+		value: function addMessage(data) {
+			if (!this.getMessage("id", data.id)) {
+				this.messages.push(data);
+			}
+			return this.getMessage("id", data.id);
+		}
+	}, {
+		key: "getMessage",
+		value: function getMessage(key, value) {
+			var _iteratorNormalCompletion = true;
+			var _didIteratorError = false;
+			var _iteratorError = undefined;
+
+			try {
+				for (var _iterator = this.messages[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var message = _step.value;
+
+					if (message[key] === value) {
+						return message;
+					}
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator["return"]) {
+						_iterator["return"]();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+
+			return null;
+		}
+	}, {
+		key: "isPrivate",
+		get: function get() {
+			return true;
+		}
+	}]);
+
+	return PMChannel;
+})();
+
+module.exports = PMChannel;
+},{}],4:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Channel = (function () {
+    function Channel(data, server) {
+        _classCallCheck(this, Channel);
+
+        this.server = server;
+        this.name = data.name;
+        this.type = data.type;
+        this.id = data.id;
+        this.messages = [];
+        //this.isPrivate = isPrivate; //not sure about the implementation of this...
+    }
+
+    _createClass(Channel, [{
+        key: "equals",
+        value: function equals(object) {
+            return object && object.id === this.id;
+        }
+    }, {
+        key: "addMessage",
+        value: function addMessage(data) {
+            if (!this.getMessage("id", data.id)) {
+                this.messages.push(data);
+            }
+            return this.getMessage("id", data.id);
+        }
+    }, {
+        key: "getMessage",
+        value: function getMessage(key, value) {
+            var _iteratorNormalCompletion = true;
+            var _didIteratorError = false;
+            var _iteratorError = undefined;
+
+            try {
+                for (var _iterator = this.messages[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                    var message = _step.value;
+
+                    if (message[key] === value) {
+                        return message;
+                    }
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally {
+                try {
+                    if (!_iteratorNormalCompletion && _iterator["return"]) {
+                        _iterator["return"]();
+                    }
+                } finally {
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
+
+            return null;
+        }
+    }, {
+        key: "toString",
+        value: function toString() {
+            return "#" + this.name;
+        }
+    }, {
+        key: "client",
+        get: function get() {
+            return this.server.client;
+        }
+    }, {
+        key: "isPrivate",
+        get: function get() {
+            return false;
+        }
+    }]);
+
+    return Channel;
+})();
+
+module.exports = Channel;
+},{}],5:[function(require,module,exports){
+"use strict";
+
+var request = require("superagent");
+var Endpoints = require("./Endpoints.js");
+var Client = require("./Client.js");
+
+var Discord = {
+	Endpoints: Endpoints,
+	Client: Client
+};
+
+module.exports = Discord;
+},{"./Client.js":1,"./Endpoints.js":2,"superagent":11}],6:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Invite = (function () {
+    function Invite(data, client) {
+        _classCallCheck(this, Invite);
+
+        this.max_age = data.max_age;
+        this.code = data.code;
+        this.server = client.getServer("id", data.guild.id);
+        this.revoked = data.revoked;
+        this.created_at = Date.parse(data.created_at);
+        this.temporary = data.temporary;
+        this.uses = data.uses;
+        this.max_uses = data.uses;
+        this.inviter = client.addUser(data.inviter);
+        this.xkcd = data.xkcdpass;
+        this.channel = client.getChannel("id", data.channel.id);
+    }
+
+    _createClass(Invite, [{
+        key: "URL",
+        get: function get() {
+            var code = this.xkcd ? this.xkcdpass : this.code;
+            return "https://discord.gg/" + code;
+        }
+    }]);
+
+    return Invite;
+})();
+
+module.exports = Invite;
+},{}],7:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var PMChannel = require("./PMChannel.js");
+
+var Message = (function () {
+	function Message(data, channel, mentions, author) {
+		_classCallCheck(this, Message);
+
+		this.tts = data.tts;
+		this.timestamp = Date.parse(data.timestamp);
+		this.nonce = data.nonce;
+		this.mentions = mentions;
+		this.everyoneMentioned = data.mention_everyone;
+		this.id = data.id;
+		this.embeds = data.embeds;
+		this.editedTimestamp = data.edited_timestamp;
+		this.content = data.content.trim();
+		this.channel = channel;
+		this.author = author;
+		this.attachments = data.attachments;
+	}
+
+	/*exports.Message.prototype.isPM = function() {
+ 	return ( this.channel instanceof PMChannel );
+ }*/
+
+	_createClass(Message, [{
+		key: "isMentioned",
+		value: function isMentioned(user) {
+			var id = user.id ? user.id : user;
+			var _iteratorNormalCompletion = true;
+			var _didIteratorError = false;
+			var _iteratorError = undefined;
+
+			try {
+				for (var _iterator = this.mentions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var mention = _step.value;
+
+					if (mention.id === id) {
+						return true;
+					}
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator["return"]) {
+						_iterator["return"]();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+
+			return false;
+		}
+	}, {
+		key: "sender",
+		get: function get() {
+			return this.author;
+		}
+	}, {
+		key: "isPrivate",
+		get: function get() {
+			return this.channel.isPrivate;
+		}
+	}]);
+
+	return Message;
+})();
+
+module.exports = Message;
+},{"./PMChannel.js":3}],8:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var Server = (function () {
+	function Server(data, client) {
+		_classCallCheck(this, Server);
+
+		this.client = client;
+		this.region = data.region;
+		this.ownerID = data.owner_id;
+		this.name = data.name;
+		this.id = data.id;
+		this.members = [];
+		this.channels = [];
+		this.icon = data.icon;
+		this.afkTimeout = data.afk_timeout;
+		this.afkChannelId = data.afk_channel_id;
+
+		if (!data.members) {
+			data.members = [client.user];
+			return;
+		}
+
+		var _iteratorNormalCompletion = true;
+		var _didIteratorError = false;
+		var _iteratorError = undefined;
+
+		try {
+			for (var _iterator = data.members[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+				var member = _step.value;
+
+				// first we cache the user in our Discord Client,
+				// then we add it to our list. This way when we
+				// get a user from this server's member list,
+				// it will be identical (unless an async change occurred)
+				// to the client's cache.
+				if (member.user) this.members.push(client.addUser(member.user));
+			}
+		} catch (err) {
+			_didIteratorError = true;
+			_iteratorError = err;
+		} finally {
+			try {
+				if (!_iteratorNormalCompletion && _iterator["return"]) {
+					_iterator["return"]();
+				}
+			} finally {
+				if (_didIteratorError) {
+					throw _iteratorError;
+				}
+			}
+		}
+	}
+
+	_createClass(Server, [{
+		key: "getChannel",
+
+		// get/set
+		value: function getChannel(key, value) {
+			var _iteratorNormalCompletion2 = true;
+			var _didIteratorError2 = false;
+			var _iteratorError2 = undefined;
+
+			try {
+				for (var _iterator2 = this.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+					var channel = _step2.value;
+
+					if (channel[key] === value) {
+						return channel;
+					}
+				}
+			} catch (err) {
+				_didIteratorError2 = true;
+				_iteratorError2 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion2 && _iterator2["return"]) {
+						_iterator2["return"]();
+					}
+				} finally {
+					if (_didIteratorError2) {
+						throw _iteratorError2;
+					}
+				}
+			}
+
+			return null;
+		}
+	}, {
+		key: "getMember",
+		value: function getMember(key, value) {
+			var _iteratorNormalCompletion3 = true;
+			var _didIteratorError3 = false;
+			var _iteratorError3 = undefined;
+
+			try {
+				for (var _iterator3 = this.members[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+					var member = _step3.value;
+
+					if (member[key] === value) {
+						return member;
+					}
+				}
+			} catch (err) {
+				_didIteratorError3 = true;
+				_iteratorError3 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
+						_iterator3["return"]();
+					}
+				} finally {
+					if (_didIteratorError3) {
+						throw _iteratorError3;
+					}
+				}
+			}
+
+			return null;
+		}
+	}, {
+		key: "addChannel",
+		value: function addChannel(chann) {
+			if (!this.getChannel("id", chann.id)) {
+				this.channels.push(chann);
+			}
+			return chann;
+		}
+	}, {
+		key: "addMember",
+		value: function addMember(member) {
+			if (!this.getMember("id", member.id)) {
+				this.members.push(member);
+			}
+			return member;
+		}
+	}, {
+		key: "toString",
+		value: function toString() {
+			return this.name;
+		}
+	}, {
+		key: "iconURL",
+		get: function get() {
+			if (!this.icon) return null;
+			return "https://discordapp.com/api/guilds/" + this.id + "/icons/" + this.icon + ".jpg";
+		}
+	}, {
+		key: "afkChannel",
+		get: function get() {
+			if (!this.afkChannelId) return false;
+
+			return this.getChannel("id", this.afkChannelId);
+		}
+	}, {
+		key: "defaultChannel",
+		get: function get() {
+			return this.getChannel("name", "general");
+		}
+	}, {
+		key: "owner",
+		get: function get() {
+			return this.client.getUser("id", this.ownerID);
+		}
+	}]);
+
+	return Server;
+})();
+
+module.exports = Server;
+},{}],9:[function(require,module,exports){
+"use strict";
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var User = (function () {
+	function User(data) {
+		_classCallCheck(this, User);
+
+		this.username = data.username;
+		this.discriminator = data.discriminator;
+		this.id = data.id;
+		this.avatar = data.avatar;
+	}
+
+	// access using user.avatarURL;
+
+	_createClass(User, [{
+		key: "mention",
+		value: function mention() {
+			return "<@" + this.id + ">";
+		}
+	}, {
+		key: "toString",
+		value: function toString() {
+			/*
+   	if we embed a user in a String - like so:
+   	"Yo " + user + " what's up?"
+   	It would generate something along the lines of:
+   	"Yo @hydrabolt what's up?"
+   */
+			return this.mention();
+		}
+	}, {
+		key: "equals",
+		value: function equals(object) {
+			return object.id === this.id;
+		}
+	}, {
+		key: "equalsStrict",
+		value: function equalsStrict(object) {
+			return object.id === this.id && object.avatar === this.avatar && object.username === this.username && object.discriminator === this.discriminator;
+		}
+	}, {
+		key: "avatarURL",
+		get: function get() {
+			if (!this.avatar) return null;
+			return "https://discordapp.com/api/users/" + this.id + "/avatars/" + this.avatar + ".jpg";
+		}
+	}]);
+
+	return User;
+})();
+
+module.exports = User;
+},{}],10:[function(require,module,exports){
+
+},{}],11:[function(require,module,exports){
+/**
+ * Module dependencies.
+ */
+
+var Emitter = require('emitter');
+var reduce = require('reduce');
+
+/**
+ * Root reference for iframes.
+ */
+
+var root = 'undefined' == typeof window
+  ? (this || self)
+  : window;
+
+/**
+ * Noop.
+ */
+
+function noop(){};
+
+/**
+ * Check if `obj` is a host object,
+ * we don't want to serialize these :)
+ *
+ * TODO: future proof, move to compoent land
+ *
+ * @param {Object} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+function isHost(obj) {
+  var str = {}.toString.call(obj);
+
+  switch (str) {
+    case '[object File]':
+    case '[object Blob]':
+    case '[object FormData]':
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Determine XHR.
+ */
+
+request.getXHR = function () {
+  if (root.XMLHttpRequest
+      && (!root.location || 'file:' != root.location.protocol
+          || !root.ActiveXObject)) {
+    return new XMLHttpRequest;
+  } else {
+    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}
+    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}
+    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}
+    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
+  }
+  return false;
+};
+
+/**
+ * Removes leading and trailing whitespace, added to support IE.
+ *
+ * @param {String} s
+ * @return {String}
+ * @api private
+ */
+
+var trim = ''.trim
+  ? function(s) { return s.trim(); }
+  : function(s) { return s.replace(/(^\s*|\s*$)/g, ''); };
+
+/**
+ * Check if `obj` is an object.
+ *
+ * @param {Object} obj
+ * @return {Boolean}
+ * @api private
+ */
+
+function isObject(obj) {
+  return obj === Object(obj);
+}
+
+/**
+ * Serialize the given `obj`.
+ *
+ * @param {Object} obj
+ * @return {String}
+ * @api private
+ */
+
+function serialize(obj) {
+  if (!isObject(obj)) return obj;
+  var pairs = [];
+  for (var key in obj) {
+    if (null != obj[key]) {
+      pairs.push(encodeURIComponent(key)
+        + '=' + encodeURIComponent(obj[key]));
+    }
+  }
+  return pairs.join('&');
+}
+
+/**
+ * Expose serialization method.
+ */
+
+ request.serializeObject = serialize;
+
+ /**
+  * Parse the given x-www-form-urlencoded `str`.
+  *
+  * @param {String} str
+  * @return {Object}
+  * @api private
+  */
+
+function parseString(str) {
+  var obj = {};
+  var pairs = str.split('&');
+  var parts;
+  var pair;
+
+  for (var i = 0, len = pairs.length; i < len; ++i) {
+    pair = pairs[i];
+    parts = pair.split('=');
+    obj[decodeURIComponent(parts[0])] = decodeURIComponent(parts[1]);
+  }
+
+  return obj;
+}
+
+/**
+ * Expose parser.
+ */
+
+request.parseString = parseString;
+
+/**
+ * Default MIME type map.
+ *
+ *     superagent.types.xml = 'application/xml';
+ *
+ */
+
+request.types = {
+  html: 'text/html',
+  json: 'application/json',
+  xml: 'application/xml',
+  urlencoded: 'application/x-www-form-urlencoded',
+  'form': 'application/x-www-form-urlencoded',
+  'form-data': 'application/x-www-form-urlencoded'
+};
+
+/**
+ * Default serialization map.
+ *
+ *     superagent.serialize['application/xml'] = function(obj){
+ *       return 'generated xml here';
+ *     };
+ *
+ */
+
+ request.serialize = {
+   'application/x-www-form-urlencoded': serialize,
+   'application/json': JSON.stringify
+ };
+
+ /**
+  * Default parsers.
+  *
+  *     superagent.parse['application/xml'] = function(str){
+  *       return { object parsed from str };
+  *     };
+  *
+  */
+
+request.parse = {
+  'application/x-www-form-urlencoded': parseString,
+  'application/json': JSON.parse
+};
+
+/**
+ * Parse the given header `str` into
+ * an object containing the mapped fields.
+ *
+ * @param {String} str
+ * @return {Object}
+ * @api private
+ */
+
+function parseHeader(str) {
+  var lines = str.split(/\r?\n/);
+  var fields = {};
+  var index;
+  var line;
+  var field;
+  var val;
+
+  lines.pop(); // trailing CRLF
+
+  for (var i = 0, len = lines.length; i < len; ++i) {
+    line = lines[i];
+    index = line.indexOf(':');
+    field = line.slice(0, index).toLowerCase();
+    val = trim(line.slice(index + 1));
+    fields[field] = val;
+  }
+
+  return fields;
+}
+
+/**
+ * Return the mime type for the given `str`.
+ *
+ * @param {String} str
+ * @return {String}
+ * @api private
+ */
+
+function type(str){
+  return str.split(/ *; */).shift();
+};
+
+/**
+ * Return header field parameters.
+ *
+ * @param {String} str
+ * @return {Object}
+ * @api private
+ */
+
+function params(str){
+  return reduce(str.split(/ *; */), function(obj, str){
+    var parts = str.split(/ *= */)
+      , key = parts.shift()
+      , val = parts.shift();
+
+    if (key && val) obj[key] = val;
+    return obj;
+  }, {});
+};
+
+/**
+ * Initialize a new `Response` with the given `xhr`.
+ *
+ *  - set flags (.ok, .error, etc)
+ *  - parse header
+ *
+ * Examples:
+ *
+ *  Aliasing `superagent` as `request` is nice:
+ *
+ *      request = superagent;
+ *
+ *  We can use the promise-like API, or pass callbacks:
+ *
+ *      request.get('/').end(function(res){});
+ *      request.get('/', function(res){});
+ *
+ *  Sending data can be chained:
+ *
+ *      request
+ *        .post('/user')
+ *        .send({ name: 'tj' })
+ *        .end(function(res){});
+ *
+ *  Or passed to `.send()`:
+ *
+ *      request
+ *        .post('/user')
+ *        .send({ name: 'tj' }, function(res){});
+ *
+ *  Or passed to `.post()`:
+ *
+ *      request
+ *        .post('/user', { name: 'tj' })
+ *        .end(function(res){});
+ *
+ * Or further reduced to a single call for simple cases:
+ *
+ *      request
+ *        .post('/user', { name: 'tj' }, function(res){});
+ *
+ * @param {XMLHTTPRequest} xhr
+ * @param {Object} options
+ * @api private
+ */
+
+function Response(req, options) {
+  options = options || {};
+  this.req = req;
+  this.xhr = this.req.xhr;
+  // responseText is accessible only if responseType is '' or 'text' and on older browsers
+  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')
+     ? this.xhr.responseText
+     : null;
+  this.statusText = this.req.xhr.statusText;
+  this.setStatusProperties(this.xhr.status);
+  this.header = this.headers = parseHeader(this.xhr.getAllResponseHeaders());
+  // getAllResponseHeaders sometimes falsely returns "" for CORS requests, but
+  // getResponseHeader still works. so we get content-type even if getting
+  // other headers fails.
+  this.header['content-type'] = this.xhr.getResponseHeader('content-type');
+  this.setHeaderProperties(this.header);
+  this.body = this.req.method != 'HEAD'
+    ? this.parseBody(this.text ? this.text : this.xhr.response)
+    : null;
+}
+
+/**
+ * Get case-insensitive `field` value.
+ *
+ * @param {String} field
+ * @return {String}
+ * @api public
+ */
+
+Response.prototype.get = function(field){
+  return this.header[field.toLowerCase()];
+};
+
+/**
+ * Set header related properties:
+ *
+ *   - `.type` the content type without params
+ *
+ * A response of "Content-Type: text/plain; charset=utf-8"
+ * will provide you with a `.type` of "text/plain".
+ *
+ * @param {Object} header
+ * @api private
+ */
+
+Response.prototype.setHeaderProperties = function(header){
+  // content-type
+  var ct = this.header['content-type'] || '';
+  this.type = type(ct);
+
+  // params
+  var obj = params(ct);
+  for (var key in obj) this[key] = obj[key];
+};
+
+/**
+ * Parse the given body `str`.
+ *
+ * Used for auto-parsing of bodies. Parsers
+ * are defined on the `superagent.parse` object.
+ *
+ * @param {String} str
+ * @return {Mixed}
+ * @api private
+ */
+
+Response.prototype.parseBody = function(str){
+  var parse = request.parse[this.type];
+  return parse && str && (str.length || str instanceof Object)
+    ? parse(str)
+    : null;
+};
+
+/**
+ * Set flags such as `.ok` based on `status`.
+ *
+ * For example a 2xx response will give you a `.ok` of __true__
+ * whereas 5xx will be __false__ and `.error` will be __true__. The
+ * `.clientError` and `.serverError` are also available to be more
+ * specific, and `.statusType` is the class of error ranging from 1..5
+ * sometimes useful for mapping respond colors etc.
+ *
+ * "sugar" properties are also defined for common cases. Currently providing:
+ *
+ *   - .noContent
+ *   - .badRequest
+ *   - .unauthorized
+ *   - .notAcceptable
+ *   - .notFound
+ *
+ * @param {Number} status
+ * @api private
+ */
+
+Response.prototype.setStatusProperties = function(status){
+  // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request
+  if (status === 1223) {
+    status = 204;
+  }
+
+  var type = status / 100 | 0;
+
+  // status / class
+  this.status = status;
+  this.statusType = type;
+
+  // basics
+  this.info = 1 == type;
+  this.ok = 2 == type;
+  this.clientError = 4 == type;
+  this.serverError = 5 == type;
+  this.error = (4 == type || 5 == type)
+    ? this.toError()
+    : false;
+
+  // sugar
+  this.accepted = 202 == status;
+  this.noContent = 204 == status;
+  this.badRequest = 400 == status;
+  this.unauthorized = 401 == status;
+  this.notAcceptable = 406 == status;
+  this.notFound = 404 == status;
+  this.forbidden = 403 == status;
+};
+
+/**
+ * Return an `Error` representative of this response.
+ *
+ * @return {Error}
+ * @api public
+ */
+
+Response.prototype.toError = function(){
+  var req = this.req;
+  var method = req.method;
+  var url = req.url;
+
+  var msg = 'cannot ' + method + ' ' + url + ' (' + this.status + ')';
+  var err = new Error(msg);
+  err.status = this.status;
+  err.method = method;
+  err.url = url;
+
+  return err;
+};
+
+/**
+ * Expose `Response`.
+ */
+
+request.Response = Response;
+
+/**
+ * Initialize a new `Request` with the given `method` and `url`.
+ *
+ * @param {String} method
+ * @param {String} url
+ * @api public
+ */
+
+function Request(method, url) {
+  var self = this;
+  Emitter.call(this);
+  this._query = this._query || [];
+  this.method = method;
+  this.url = url;
+  this.header = {};
+  this._header = {};
+  this.on('end', function(){
+    var err = null;
+    var res = null;
+
+    try {
+      res = new Response(self);
+    } catch(e) {
+      err = new Error('Parser is unable to parse the response');
+      err.parse = true;
+      err.original = e;
+      return self.callback(err);
+    }
+
+    self.emit('response', res);
+
+    if (err) {
+      return self.callback(err, res);
+    }
+
+    if (res.status >= 200 && res.status < 300) {
+      return self.callback(err, res);
+    }
+
+    var new_err = new Error(res.statusText || 'Unsuccessful HTTP response');
+    new_err.original = err;
+    new_err.response = res;
+    new_err.status = res.status;
+
+    self.callback(new_err, res);
+  });
+}
+
+/**
+ * Mixin `Emitter`.
+ */
+
+Emitter(Request.prototype);
+
+/**
+ * Allow for extension
+ */
+
+Request.prototype.use = function(fn) {
+  fn(this);
+  return this;
+}
+
+/**
+ * Set timeout to `ms`.
+ *
+ * @param {Number} ms
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.timeout = function(ms){
+  this._timeout = ms;
+  return this;
+};
+
+/**
+ * Clear previous timeout.
+ *
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.clearTimeout = function(){
+  this._timeout = 0;
+  clearTimeout(this._timer);
+  return this;
+};
+
+/**
+ * Abort the request, and clear potential timeout.
+ *
+ * @return {Request}
+ * @api public
+ */
+
+Request.prototype.abort = function(){
+  if (this.aborted) return;
+  this.aborted = true;
+  this.xhr.abort();
+  this.clearTimeout();
+  this.emit('abort');
+  return this;
+};
+
+/**
+ * Set header `field` to `val`, or multiple fields with one object.
+ *
+ * Examples:
+ *
+ *      req.get('/')
+ *        .set('Accept', 'application/json')
+ *        .set('X-API-Key', 'foobar')
+ *        .end(callback);
+ *
+ *      req.get('/')
+ *        .set({ Accept: 'application/json', 'X-API-Key': 'foobar' })
+ *        .end(callback);
+ *
+ * @param {String|Object} field
+ * @param {String} val
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.set = function(field, val){
+  if (isObject(field)) {
+    for (var key in field) {
+      this.set(key, field[key]);
+    }
+    return this;
+  }
+  this._header[field.toLowerCase()] = val;
+  this.header[field] = val;
+  return this;
+};
+
+/**
+ * Remove header `field`.
+ *
+ * Example:
+ *
+ *      req.get('/')
+ *        .unset('User-Agent')
+ *        .end(callback);
+ *
+ * @param {String} field
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.unset = function(field){
+  delete this._header[field.toLowerCase()];
+  delete this.header[field];
+  return this;
+};
+
+/**
+ * Get case-insensitive header `field` value.
+ *
+ * @param {String} field
+ * @return {String}
+ * @api private
+ */
+
+Request.prototype.getHeader = function(field){
+  return this._header[field.toLowerCase()];
+};
+
+/**
+ * Set Content-Type to `type`, mapping values from `request.types`.
+ *
+ * Examples:
+ *
+ *      superagent.types.xml = 'application/xml';
+ *
+ *      request.post('/')
+ *        .type('xml')
+ *        .send(xmlstring)
+ *        .end(callback);
+ *
+ *      request.post('/')
+ *        .type('application/xml')
+ *        .send(xmlstring)
+ *        .end(callback);
+ *
+ * @param {String} type
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.type = function(type){
+  this.set('Content-Type', request.types[type] || type);
+  return this;
+};
+
+/**
+ * Set Accept to `type`, mapping values from `request.types`.
+ *
+ * Examples:
+ *
+ *      superagent.types.json = 'application/json';
+ *
+ *      request.get('/agent')
+ *        .accept('json')
+ *        .end(callback);
+ *
+ *      request.get('/agent')
+ *        .accept('application/json')
+ *        .end(callback);
+ *
+ * @param {String} accept
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.accept = function(type){
+  this.set('Accept', request.types[type] || type);
+  return this;
+};
+
+/**
+ * Set Authorization field value with `user` and `pass`.
+ *
+ * @param {String} user
+ * @param {String} pass
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.auth = function(user, pass){
+  var str = btoa(user + ':' + pass);
+  this.set('Authorization', 'Basic ' + str);
+  return this;
+};
+
+/**
+* Add query-string `val`.
+*
+* Examples:
+*
+*   request.get('/shoes')
+*     .query('size=10')
+*     .query({ color: 'blue' })
+*
+* @param {Object|String} val
+* @return {Request} for chaining
+* @api public
+*/
+
+Request.prototype.query = function(val){
+  if ('string' != typeof val) val = serialize(val);
+  if (val) this._query.push(val);
+  return this;
+};
+
+/**
+ * Write the field `name` and `val` for "multipart/form-data"
+ * request bodies.
+ *
+ * ``` js
+ * request.post('/upload')
+ *   .field('foo', 'bar')
+ *   .end(callback);
+ * ```
+ *
+ * @param {String} name
+ * @param {String|Blob|File} val
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.field = function(name, val){
+  if (!this._formData) this._formData = new root.FormData();
+  this._formData.append(name, val);
+  return this;
+};
+
+/**
+ * Queue the given `file` as an attachment to the specified `field`,
+ * with optional `filename`.
+ *
+ * ``` js
+ * request.post('/upload')
+ *   .attach(new Blob(['<a id="a"><b id="b">hey!</b></a>'], { type: "text/html"}))
+ *   .end(callback);
+ * ```
+ *
+ * @param {String} field
+ * @param {Blob|File} file
+ * @param {String} filename
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.attach = function(field, file, filename){
+  if (!this._formData) this._formData = new root.FormData();
+  this._formData.append(field, file, filename);
+  return this;
+};
+
+/**
+ * Send `data`, defaulting the `.type()` to "json" when
+ * an object is given.
+ *
+ * Examples:
+ *
+ *       // querystring
+ *       request.get('/search')
+ *         .end(callback)
+ *
+ *       // multiple data "writes"
+ *       request.get('/search')
+ *         .send({ search: 'query' })
+ *         .send({ range: '1..5' })
+ *         .send({ order: 'desc' })
+ *         .end(callback)
+ *
+ *       // manual json
+ *       request.post('/user')
+ *         .type('json')
+ *         .send('{"name":"tj"})
+ *         .end(callback)
+ *
+ *       // auto json
+ *       request.post('/user')
+ *         .send({ name: 'tj' })
+ *         .end(callback)
+ *
+ *       // manual x-www-form-urlencoded
+ *       request.post('/user')
+ *         .type('form')
+ *         .send('name=tj')
+ *         .end(callback)
+ *
+ *       // auto x-www-form-urlencoded
+ *       request.post('/user')
+ *         .type('form')
+ *         .send({ name: 'tj' })
+ *         .end(callback)
+ *
+ *       // defaults to x-www-form-urlencoded
+  *      request.post('/user')
+  *        .send('name=tobi')
+  *        .send('species=ferret')
+  *        .end(callback)
+ *
+ * @param {String|Object} data
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.send = function(data){
+  var obj = isObject(data);
+  var type = this.getHeader('Content-Type');
+
+  // merge
+  if (obj && isObject(this._data)) {
+    for (var key in data) {
+      this._data[key] = data[key];
+    }
+  } else if ('string' == typeof data) {
+    if (!type) this.type('form');
+    type = this.getHeader('Content-Type');
+    if ('application/x-www-form-urlencoded' == type) {
+      this._data = this._data
+        ? this._data + '&' + data
+        : data;
+    } else {
+      this._data = (this._data || '') + data;
+    }
+  } else {
+    this._data = data;
+  }
+
+  if (!obj || isHost(data)) return this;
+  if (!type) this.type('json');
+  return this;
+};
+
+/**
+ * Invoke the callback with `err` and `res`
+ * and handle arity check.
+ *
+ * @param {Error} err
+ * @param {Response} res
+ * @api private
+ */
+
+Request.prototype.callback = function(err, res){
+  var fn = this._callback;
+  this.clearTimeout();
+  fn(err, res);
+};
+
+/**
+ * Invoke callback with x-domain error.
+ *
+ * @api private
+ */
+
+Request.prototype.crossDomainError = function(){
+  var err = new Error('Origin is not allowed by Access-Control-Allow-Origin');
+  err.crossDomain = true;
+  this.callback(err);
+};
+
+/**
+ * Invoke callback with timeout error.
+ *
+ * @api private
+ */
+
+Request.prototype.timeoutError = function(){
+  var timeout = this._timeout;
+  var err = new Error('timeout of ' + timeout + 'ms exceeded');
+  err.timeout = timeout;
+  this.callback(err);
+};
+
+/**
+ * Enable transmission of cookies with x-domain requests.
+ *
+ * Note that for this to work the origin must not be
+ * using "Access-Control-Allow-Origin" with a wildcard,
+ * and also must set "Access-Control-Allow-Credentials"
+ * to "true".
+ *
+ * @api public
+ */
+
+Request.prototype.withCredentials = function(){
+  this._withCredentials = true;
+  return this;
+};
+
+/**
+ * Initiate request, invoking callback `fn(res)`
+ * with an instanceof `Response`.
+ *
+ * @param {Function} fn
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.end = function(fn){
+  var self = this;
+  var xhr = this.xhr = request.getXHR();
+  var query = this._query.join('&');
+  var timeout = this._timeout;
+  var data = this._formData || this._data;
+
+  // store callback
+  this._callback = fn || noop;
+
+  // state change
+  xhr.onreadystatechange = function(){
+    if (4 != xhr.readyState) return;
+
+    // In IE9, reads to any property (e.g. status) off of an aborted XHR will
+    // result in the error "Could not complete the operation due to error c00c023f"
+    var status;
+    try { status = xhr.status } catch(e) { status = 0; }
+
+    if (0 == status) {
+      if (self.timedout) return self.timeoutError();
+      if (self.aborted) return;
+      return self.crossDomainError();
+    }
+    self.emit('end');
+  };
+
+  // progress
+  var handleProgress = function(e){
+    if (e.total > 0) {
+      e.percent = e.loaded / e.total * 100;
+    }
+    self.emit('progress', e);
+  };
+  if (this.hasListeners('progress')) {
+    xhr.onprogress = handleProgress;
+  }
+  try {
+    if (xhr.upload && this.hasListeners('progress')) {
+      xhr.upload.onprogress = handleProgress;
+    }
+  } catch(e) {
+    // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.
+    // Reported here:
+    // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context
+  }
+
+  // timeout
+  if (timeout && !this._timer) {
+    this._timer = setTimeout(function(){
+      self.timedout = true;
+      self.abort();
+    }, timeout);
+  }
+
+  // querystring
+  if (query) {
+    query = request.serializeObject(query);
+    this.url += ~this.url.indexOf('?')
+      ? '&' + query
+      : '?' + query;
+  }
+
+  // initiate request
+  xhr.open(this.method, this.url, true);
+
+  // CORS
+  if (this._withCredentials) xhr.withCredentials = true;
+
+  // body
+  if ('GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !isHost(data)) {
+    // serialize stuff
+    var contentType = this.getHeader('Content-Type');
+    var serialize = request.serialize[contentType ? contentType.split(';')[0] : ''];
+    if (serialize) data = serialize(data);
+  }
+
+  // set header fields
+  for (var field in this.header) {
+    if (null == this.header[field]) continue;
+    xhr.setRequestHeader(field, this.header[field]);
+  }
+
+  // send stuff
+  this.emit('request', this);
+  xhr.send(data);
+  return this;
+};
+
+/**
+ * Faux promise support
+ *
+ * @param {Function} fulfill
+ * @param {Function} reject
+ * @return {Request}
+ */
+
+Request.prototype.then = function (fulfill, reject) {
+  return this.end(function(err, res) {
+    err ? reject(err) : fulfill(res);
+  });
+}
+
+/**
+ * Expose `Request`.
+ */
+
+request.Request = Request;
+
+/**
+ * Issue a request:
+ *
+ * Examples:
+ *
+ *    request('GET', '/users').end(callback)
+ *    request('/users').end(callback)
+ *    request('/users', callback)
+ *
+ * @param {String} method
+ * @param {String|Function} url or callback
+ * @return {Request}
+ * @api public
+ */
+
+function request(method, url) {
+  // callback
+  if ('function' == typeof url) {
+    return new Request('GET', method).end(url);
+  }
+
+  // url first
+  if (1 == arguments.length) {
+    return new Request('GET', method);
+  }
+
+  return new Request(method, url);
+}
+
+/**
+ * GET `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} data or fn
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.get = function(url, data, fn){
+  var req = request('GET', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.query(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * HEAD `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} data or fn
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.head = function(url, data, fn){
+  var req = request('HEAD', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * DELETE `url` with optional callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.del = function(url, fn){
+  var req = request('DELETE', url);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * PATCH `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed} data
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.patch = function(url, data, fn){
+  var req = request('PATCH', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * POST `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed} data
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.post = function(url, data, fn){
+  var req = request('POST', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * PUT `url` with optional `data` and callback `fn(res)`.
+ *
+ * @param {String} url
+ * @param {Mixed|Function} data or fn
+ * @param {Function} fn
+ * @return {Request}
+ * @api public
+ */
+
+request.put = function(url, data, fn){
+  var req = request('PUT', url);
+  if ('function' == typeof data) fn = data, data = null;
+  if (data) req.send(data);
+  if (fn) req.end(fn);
+  return req;
+};
+
+/**
+ * Expose `request`.
+ */
+
+module.exports = request;
+
+},{"emitter":12,"reduce":13}],12:[function(require,module,exports){
+
+/**
+ * Expose `Emitter`.
+ */
+
+module.exports = Emitter;
+
+/**
+ * Initialize a new `Emitter`.
+ *
+ * @api public
+ */
+
+function Emitter(obj) {
+  if (obj) return mixin(obj);
+};
+
+/**
+ * Mixin the emitter properties.
+ *
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+function mixin(obj) {
+  for (var key in Emitter.prototype) {
+    obj[key] = Emitter.prototype[key];
+  }
+  return obj;
+}
+
+/**
+ * Listen on the given `event` with `fn`.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.on =
+Emitter.prototype.addEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+  (this._callbacks[event] = this._callbacks[event] || [])
+    .push(fn);
+  return this;
+};
+
+/**
+ * Adds an `event` listener that will be invoked a single
+ * time then automatically removed.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.once = function(event, fn){
+  var self = this;
+  this._callbacks = this._callbacks || {};
+
+  function on() {
+    self.off(event, on);
+    fn.apply(this, arguments);
+  }
+
+  on.fn = fn;
+  this.on(event, on);
+  return this;
+};
+
+/**
+ * Remove the given callback for `event` or all
+ * registered callbacks.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.off =
+Emitter.prototype.removeListener =
+Emitter.prototype.removeAllListeners =
+Emitter.prototype.removeEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+
+  // all
+  if (0 == arguments.length) {
+    this._callbacks = {};
+    return this;
+  }
+
+  // specific event
+  var callbacks = this._callbacks[event];
+  if (!callbacks) return this;
+
+  // remove all handlers
+  if (1 == arguments.length) {
+    delete this._callbacks[event];
+    return this;
+  }
+
+  // remove specific handler
+  var cb;
+  for (var i = 0; i < callbacks.length; i++) {
+    cb = callbacks[i];
+    if (cb === fn || cb.fn === fn) {
+      callbacks.splice(i, 1);
+      break;
+    }
+  }
+  return this;
+};
+
+/**
+ * Emit `event` with the given args.
+ *
+ * @param {String} event
+ * @param {Mixed} ...
+ * @return {Emitter}
+ */
+
+Emitter.prototype.emit = function(event){
+  this._callbacks = this._callbacks || {};
+  var args = [].slice.call(arguments, 1)
+    , callbacks = this._callbacks[event];
+
+  if (callbacks) {
+    callbacks = callbacks.slice(0);
+    for (var i = 0, len = callbacks.length; i < len; ++i) {
+      callbacks[i].apply(this, args);
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Return array of callbacks for `event`.
+ *
+ * @param {String} event
+ * @return {Array}
+ * @api public
+ */
+
+Emitter.prototype.listeners = function(event){
+  this._callbacks = this._callbacks || {};
+  return this._callbacks[event] || [];
+};
+
+/**
+ * Check if this emitter has `event` handlers.
+ *
+ * @param {String} event
+ * @return {Boolean}
+ * @api public
+ */
+
+Emitter.prototype.hasListeners = function(event){
+  return !! this.listeners(event).length;
+};
+
+},{}],13:[function(require,module,exports){
+
+/**
+ * Reduce `arr` with `fn`.
+ *
+ * @param {Array} arr
+ * @param {Function} fn
+ * @param {Mixed} initial
+ *
+ * TODO: combatible error handling?
+ */
+
+module.exports = function(arr, fn, initial){  
+  var idx = 0;
+  var len = arr.length;
+  var curr = arguments.length == 3
+    ? initial
+    : arr[idx++];
+
+  while (idx < len) {
+    curr = fn.call(null, curr, arr[idx], ++idx, arr);
+  }
+  
+  return curr;
+};
+},{}],14:[function(require,module,exports){
+
+/**
+ * Module dependencies.
+ */
+
+var global = (function() { return this; })();
+
+/**
+ * WebSocket constructor.
+ */
+
+var WebSocket = global.WebSocket || global.MozWebSocket;
+
+/**
+ * Module exports.
+ */
+
+module.exports = WebSocket ? ws : null;
+
+/**
+ * WebSocket constructor.
+ *
+ * The third `opts` options object gets ignored in web browsers, since it's
+ * non-standard, and throws a TypeError if passed to the constructor.
+ * See: https://github.com/einaros/ws/issues/227
+ *
+ * @param {String} uri
+ * @param {Array} protocols (optional)
+ * @param {Object) opts (optional)
+ * @api public
+ */
+
+function ws(uri, protocols, opts) {
+  var instance;
+  if (protocols) {
+    instance = new WebSocket(uri, protocols);
+  } else {
+    instance = new WebSocket(uri);
+  }
+  return instance;
+}
+
+if (WebSocket) ws.prototype = WebSocket.prototype;
+
+},{}]},{},[5])(5)
+});
\ No newline at end of file
diff --git a/web-dist/discord.min.3.3.1.js b/web-dist/discord.min.3.3.1.js
new file mode 100644
index 000000000..2079f39b6
--- /dev/null
+++ b/web-dist/discord.min.3.3.1.js
@@ -0,0 +1,2 @@
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.Discord=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(){return new Promise(function(a,b){n.get(g.API+"/gateway").end(function(c,d){c?b(c):a(d.body.url)})})}var f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),g=a("./Endpoints.js"),h=a("./user.js"),i=a("./server.js"),j=a("./channel.js"),k=a("./message.js"),l=a("./invite.js"),m=a("./PMChannel.js"),n=a("superagent"),o=a("ws"),p=a("fs"),q={queue:!1},r=function(){function a(){var b=arguments.length<=0||void 0===arguments[0]?q:arguments[0],c=arguments.length<=1||void 0===arguments[1]?void 0:arguments[1];d(this,a),this.options=b,this.options.queue=this.options.queue,this.token=c,this.state=0,this.websocket=null,this.events={},this.user=null,this.alreadySentData=!1,this.serverCreateListener=new Map,this.email="abc",this.password="abc",this.userCache=[],this.channelCache=[],this.serverCache=[],this.pmChannelCache=[],this.readyTime=null,this.checkingQueue={},this.queue={}}return f(a,[{key:"sendPacket",value:function(a){1===this.websocket.readyState&&this.websocket.send(JSON.stringify(a))}},{key:"debug",value:function(a){this.trigger("debug",a)}},{key:"on",value:function(a,b){this.events[a]=b}},{key:"off",value:function(a){this.events[a]=null}},{key:"keepAlive",value:function(){this.debug("keep alive triggered"),this.sendPacket({op:1,d:Date.now()})}},{key:"trigger",value:function(a){var b=[];for(var c in arguments)b.push(arguments[c]);var d=this.events[a];d&&d.apply(this,b.slice(1))}},{key:"login",value:function(){var a=arguments.length<=0||void 0===arguments[0]?"foo@bar.com":arguments[0],b=arguments.length<=1||void 0===arguments[1]?"pass1234":arguments[1],c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this;return new Promise(function(f,h){0===d.state||4===d.state?(d.state=1,d.email=a,d.password=b,n.post(g.LOGIN).send({email:a,password:b}).end(function(a,b){a?(d.state=4,d.trigger("disconnected"),d.websocket&&d.websocket.close(),c(a),h(a)):(d.state=2,d.token=b.body.token,e().then(function(a){d.createws(a),c(null,d.token),f(d.token)})["catch"](function(a){c(a),h(a)}))})):h(new Error("Client already logging in or ready"))})}},{key:"logout",value:function(){var a=arguments.length<=0||void 0===arguments[0]?function(a){}:arguments[0],b=this;return new Promise(function(c,d){n.post(g.LOGOUT).set("authorization",b.token).end(function(e,f){e?(a(e),d(e)):(b.websocket.close(),b.state=4,a(),c())})})}},{key:"createServer",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this;return new Promise(function(e,f){n.post(g.SERVERS).set("authorization",d.token).send({name:a,region:b}).end(function(a,b){a?(c(a),f(a)):d.serverCreateListener.set(b.body.id,[e,c])})})}},{key:"createChannel",value:function(a,b,c){var d=arguments.length<=3||void 0===arguments[3]?function(a,b){}:arguments[3],e=this;return new Promise(function(f,h){n.post(g.SERVERS+"/"+e.resolveServerID(a)+"/channels").set("authorization",e.token).send({name:b,type:c}).end(function(a,b){if(a)d(a),h(a);else{var c=e.getServer("id",b.body.guild_id),g=e.addChannel(b.body,b.body.guild_id);c.addChannel(g),d(null,g),f(g)}})})}},{key:"leaveServer",value:function(a){var b=arguments.length<=1||void 0===arguments[1]?function(a,b){}:arguments[1],c=this;return new Promise(function(d,e){n.del(g.SERVERS+"/"+c.resolveServerID(a)).set("authorization",c.token).end(function(f,g){f?(b(f),e(f)):(c.serverCache.splice(c.serverCache.indexOf(a),1),b(null),d())})})}},{key:"createInvite",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this;return new Promise(function(e,f){var h;h=a instanceof i?a.id:a instanceof j?a.id:a,b=b||{},b.max_age=b.maxAge||0,b.max_uses=b.maxUses||0,b.temporary=b.temporary||!1,b.xkcdpass=b.xkcd||!1,n.post(g.CHANNELS+"/"+h+"/invites").set("authorization",d.token).send(b).end(function(a,b){if(a)c(a),f(a);else{var g=new l(b.body,d);c(null,g),e(g)}})})}},{key:"startPM",value:function(a){var b=this;return new Promise(function(c,d){var e=a;a instanceof h&&(e=a.id),n.post(g.USERS+"/"+b.user.id+"/channels").set("authorization",b.token).send({recipient_id:e}).end(function(a,e){a?d(a):c(b.addPMChannel(e.body))})})}},{key:"reply",value:function(a,b,c){var d=arguments.length<=3||void 0===arguments[3]?function(a,b){}:arguments[3],e=this;return new Promise(function(f,g){"function"==typeof c&&(d=c,c=!1);var h=a.sender;e.sendMessage(a,b,d,h+", ").then(f)["catch"](g)})}},{key:"deleteMessage",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this,e=new Promise(function(f,g){function h(){d.options.queue?(d.queue[a.channel.id]||(d.queue[a.channel.id]=[]),d.queue[a.channel.id].push({action:"deleteMessage",message:a,then:i,error:j}),d.checkQueue(a.channel.id)):d._deleteMessage(a).then(i)["catch"](j)}function i(){e.success=!0,c(null),f()}function j(a){e.error=a,c(a),g(a)}b?setTimeout(h,b):h()});return e}},{key:"updateMessage",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this,e=new Promise(function(f,g){function h(a){e.message=a,c(null,a),f(a)}function i(a){e.error=a,c(a),g(a)}b=b instanceof Array?b.join("\n"):b,d.options.queue?(d.queue[a.channel.id]||(d.queue[a.channel.id]=[]),d.queue[a.channel.id].push({action:"updateMessage",message:a,content:b,then:h,error:i}),d.checkQueue(a.channel.id)):d._updateMessage(a,b).then(h)["catch"](i)});return e}},{key:"setUsername",value:function(a){var b=arguments.length<=1||void 0===arguments[1]?function(a){}:arguments[1],c=this;return new Promise(function(d,e){n.patch(g.API+"/users/@me").set("authorization",c.token).send({avatar:c.user.avatar,email:c.email,new_password:null,password:c.password,username:a}).end(function(a){b(a),a?e(a):d()})})}},{key:"getChannelLogs",value:function(a){var b=arguments.length<=1||void 0===arguments[1]?500:arguments[1],c=arguments.length<=2||void 0===arguments[2]?function(a,b){}:arguments[2],d=this;return new Promise(function(e,f){var h=a;a instanceof j&&(h=a.id),n.get(g.CHANNELS+"/"+h+"/messages?limit="+b).set("authorization",d.token).end(function(a,b){if(a)c(a),f(a);else{var g=[],i=d.getChannel("id",h),j=!0,l=!1,m=void 0;try{for(var n,o=b.body[Symbol.iterator]();!(j=(n=o.next()).done);j=!0){var p=n.value,q=[],r=!0,s=!1,t=void 0;try{for(var u,v=p.mentions[Symbol.iterator]();!(r=(u=v.next()).done);r=!0){var w=u.value;q.push(d.addUser(w))}}catch(a){s=!0,t=a}finally{try{!r&&v["return"]&&v["return"]()}finally{if(s)throw t}}var x=d.addUser(p.author);g.push(new k(p,i,q,x))}}catch(a){l=!0,m=a}finally{try{!j&&o["return"]&&o["return"]()}finally{if(l)throw m}}c(null,g),e(g)}})})}},{key:"deleteChannel",value:function(a){var b=arguments.length<=1||void 0===arguments[1]?function(a){}:arguments[1],c=this;return new Promise(function(d,e){var f=a;a instanceof j&&(f=a.id),n.del(g.CHANNELS+"/"+f).set("authorization",c.token).end(function(a){a?(b(a),e(a)):(b(null),d())})})}},{key:"joinServer",value:function(a){var b=arguments.length<=1||void 0===arguments[1]?function(a,b){}:arguments[1],c=this;return new Promise(function(d,e){var f=a instanceof l?a.code:a;n.post(g.API+"/invite/"+f).set("authorization",c.token).end(function(a,f){a?(b(a),e(a)):c.getServer("id",f.body.guild.id)?d(c.getServer("id",f.body.guild.id)):c.serverCreateListener.set(f.body.guild.id,[d,b])})})}},{key:"sendFile",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?"image.png":arguments[2],d=arguments.length<=3||void 0===arguments[3]?function(a,b){}:arguments[3],e=this,f=new Promise(function(g,h){function i(a){e.options.queue?(e.queue[a]||(e.queue[a]=[]),e.queue[a].push({action:"sendFile",attachment:l,attachmentName:c,then:j,error:k}),e.checkQueue(a)):e._sendFile(a,l,c).then(j)["catch"](k)}function j(a){f.message=a,d(null,a),g(a)}function k(a){f.error=a,d(a),h(a)}var l;"string"==typeof b||b instanceof String?(l=p.createReadStream(b),c=b):l=b,e.resolveDestination(a).then(i)["catch"](k)});return f}},{key:"sendMessage",value:function(a,b,c){var d=arguments.length<=3||void 0===arguments[3]?function(a,b){}:arguments[3],e=arguments.length<=4||void 0===arguments[4]?"":arguments[4],f=this,g=new Promise(function(h,i){function j(a){d(a),i(a)}function k(a){f.options.queue?(f.queue[a]||(f.queue[a]=[]),f.queue[a].push({action:"sendMessage",content:b,mentions:p,tts:!!c,then:l,error:m}),f.checkQueue(a)):f._sendMessage(a,b,c,p).then(l)["catch"](m)}function l(a){g.message=a,d(null,a),h(a)}function m(a){g.error=a,d(a),i(a)}function n(){var a=b;return b instanceof Array&&(a=b.join("\n")),a}function o(){var a=[],c=!0,d=!1,e=void 0;try{for(var f,g=(b.match(/<@[^>]*>/g)||[])[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;a.push(h.substring(2,h.length-1))}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return a}"function"==typeof c&&(d=c,c=!1),b=e+n(b);var p=o();f.resolveDestination(a).then(k)["catch"](j)});return g}},{key:"createws",value:function(a){if(this.websocket)return!1;var b=this;this.websocket=new o(a),this.websocket.onopen=function(){b.trySendConnData()},this.websocket.onclose=function(){b.trigger("disconnected")},this.websocket.onmessage=function(a){var c=!1,d={};try{c=JSON.parse(a.data),d=c.d}catch(e){return void b.trigger("error",e,a)}switch(c.t){case"READY":b.debug("received ready packet"),b.user=b.addUser(d.user);var f=!0,g=!1,i=void 0;try{for(var j,l=d.guilds[Symbol.iterator]();!(f=(j=l.next()).done);f=!0)var m=j.value,n=b.addServer(m)}catch(e){g=!0,i=e}finally{try{!f&&l["return"]&&l["return"]()}finally{if(g)throw i}}var o=!0,p=!1,q=void 0;try{for(var r,s=d.private_channels[Symbol.iterator]();!(o=(r=s.next()).done);o=!0){var t=r.value;b.addPMChannel(t)}}catch(e){p=!0,q=e}finally{try{!o&&s["return"]&&s["return"]()}finally{if(p)throw q}}b.trigger("ready"),b.readyTime=Date.now(),b.debug("cached "+b.serverCache.length+" servers, "+b.channelCache.length+" channels, "+b.pmChannelCache.length+" PMs and "+b.userCache.length+" users."),b.state=3,setInterval(function(){b.keepAlive.apply(b)},d.heartbeat_interval);break;case"MESSAGE_CREATE":b.debug("received message");var u=[];d.mentions=d.mentions||[];var v=!0,w=!1,x=void 0;try{for(var y,z=d.mentions[Symbol.iterator]();!(v=(y=z.next()).done);v=!0){var A=y.value;u.push(b.addUser(A))}}catch(e){w=!0,x=e}finally{try{!v&&z["return"]&&z["return"]()}finally{if(w)throw x}}var B=b.getChannel("id",d.channel_id);if(B){var C=B.addMessage(new k(d,B,u,b.addUser(d.author)));b.trigger("message",C)}break;case"MESSAGE_DELETE":b.debug("message deleted");var B=b.getChannel("id",d.channel_id),D=B.getMessage("id",d.id);D?(b.trigger("messageDelete",B,D),B.messages.splice(B.messages.indexOf(D),1)):b.trigger("messageDelete",B);break;case"MESSAGE_UPDATE":b.debug("message updated");var B=b.getChannel("id",d.channel_id),E=B.getMessage("id",d.id);if(E){var F={};for(var G in E)F[G]=E[G];for(var G in d)F[G]=d[G];var u=[],H=!0,I=!1,J=void 0;try{for(var K,L=F.mentions[Symbol.iterator]();!(H=(K=L.next()).done);H=!0){var A=K.value;u.push(b.addUser(A))}}catch(e){I=!0,J=e}finally{try{!H&&L["return"]&&L["return"]()}finally{if(I)throw J}}var M=new k(F,B,u,E.author);b.trigger("messageUpdate",M,E),B.messages[B.messages.indexOf(E)]=M}break;case"GUILD_DELETE":var n=b.getServer("id",d.id);n&&(b.serverCache.splice(b.serverCache.indexOf(n),1),b.trigger("serverDelete",n));break;case"CHANNEL_DELETE":var B=b.getChannel("id",d.id);if(B){var n=B.server;n&&n.channels.splice(n.channels.indexOf(B),1),b.trigger("channelDelete",B),b.serverCache.splice(b.serverCache.indexOf(B),1)}break;case"GUILD_CREATE":var n=b.getServer("id",d.id);if(n||(n=b.addServer(d)),b.serverCreateListener.get(d.id)){var N=b.serverCreateListener.get(d.id);N[0](n),N[1](null,n),b.serverCreateListener["delete"](d.id)}b.trigger("serverCreate",n);break;case"CHANNEL_CREATE":var B=b.getChannel("id",d.id);if(!B){var O=b.addChannel(d,d.guild_id),P=b.getServer("id",d.guild_id);P&&P.addChannel(O),b.trigger("channelCreate",O)}break;case"GUILD_MEMBER_ADD":var n=b.getServer("id",d.guild_id);if(n){var Q=b.addUser(d.user);~n.members.indexOf(Q)||n.members.push(Q),b.trigger("serverNewMember",Q,n)}break;case"GUILD_MEMBER_REMOVE":var n=b.getServer("id",d.guild_id);if(n){var Q=b.addUser(d.user);~n.members.indexOf(Q)&&n.members.splice(n.members.indexOf(Q),1),b.trigger("serverRemoveMember",Q,n)}break;case"USER_UPDATE":if(b.user&&d.id===b.user.id){var R=new h(d);b.trigger("userUpdate",R,b.user),~b.userCache.indexOf(b.user)&&(b.userCache[b.userCache.indexOf(b.user)]=R),b.user=R}break;case"PRESENCE_UPDATE":var S=b.getUser("id",d.user.id);if(S){var T=new h(d.user);T.equalsStrict(S)?b.trigger("presence",{user:S,status:d.status,server:b.getServer("id",d.guild_id),gameId:d.game_id}):(b.trigger("userUpdate",S,T),b.userCache[b.userCache.indexOf(S)]=T)}break;default:b.debug("received unknown packet"),b.trigger("unknown",c)}}}},{key:"addUser",value:function(a){return this.getUser("id",a.id)||this.userCache.push(new h(a)),this.getUser("id",a.id)}},{key:"addChannel",value:function(a,b){return this.getChannel("id",a.id)||this.channelCache.push(new j(a,this.getServer("id",b))),this.getChannel("id",a.id)}},{key:"addPMChannel",value:function(a){return this.getPMChannel("id",a.id)||this.pmChannelCache.push(new m(a,this)),this.getPMChannel("id",a.id)}},{key:"addServer",value:function(a){var b=this.getServer("id",a.id);if(!b&&(b=new i(a,this),this.serverCache.push(b),a.channels)){var c=!0,d=!1,e=void 0;try{for(var f,g=a.channels[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;b.channels.push(this.addChannel(h,b.id))}}catch(j){d=!0,e=j}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}}return b}},{key:"getUser",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.userCache[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"getChannel",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.channelCache[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return this.getPMChannel(a,b)}},{key:"getPMChannel",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.pmChannelCache[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"getServer",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.serverCache[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"trySendConnData",value:function(){if(this.token&&!this.alreadySentData){this.alreadySentData=!0;var a={op:2,d:{token:this.token,v:2,properties:{$os:"discord.js",$browser:"discord.js",$device:"discord.js",$referrer:"",$referring_domain:""}}};this.websocket.send(JSON.stringify(a))}}},{key:"resolveServerID",value:function(a){return a instanceof i?a.id:!isNaN(a)&&a.length&&17===a.length?a:void 0}},{key:"resolveDestination",value:function(a){var b=!1,c=this;return new Promise(function(d,e){if(a instanceof i)b=a.id;else if(a instanceof j)b=a.id;else if(a instanceof k)b=a.channel.id;else if(a instanceof h){var f=!0,g=!1,l=void 0;try{for(var m,n=c.pmChannelCache[Symbol.iterator]();!(f=(m=n.next()).done);f=!0){var o=m.value;if(o.user.equals(a))return o.id}}catch(p){g=!0,l=p}finally{try{!f&&n["return"]&&n["return"]()}finally{if(g)throw l}}c.startPM(a).then(function(a){d(a.id)})["catch"](e)}else b=a;b&&d(b)})}},{key:"_sendMessage",value:function(a,b,c,d){var e=this;return new Promise(function(f,h){n.post(g.CHANNELS+"/"+a+"/messages").set("authorization",e.token).send({content:b,mentions:d,tts:c}).end(function(a,b){if(a)h(a);else{var c=b.body,d=[];c.mentions=c.mentions||[];var g=!0,i=!1,j=void 0;try{for(var l,m=c.mentions[Symbol.iterator]();!(g=(l=m.next()).done);g=!0){var n=l.value;d.push(e.addUser(n))}}catch(a){i=!0,j=a}finally{try{!g&&m["return"]&&m["return"]()}finally{if(i)throw j}}var o=e.getChannel("id",c.channel_id);if(o){var p=o.addMessage(new k(c,o,d,e.addUser(c.author)));f(p)}}})})}},{key:"_sendFile",value:function(a,b){var c=arguments.length<=2||void 0===arguments[2]?"DEFAULT BECAUSE YOU DIDN'T SPECIFY WHY.png":arguments[2],d=this;return new Promise(function(e,f){n.post(g.CHANNELS+"/"+a+"/messages").set("authorization",d.token).attach("file",b,c).end(function(b,c){if(b)f(b);else{var g=d.getChannel("id",a);if(g){var h=g.addMessage(new k(c.body,g,[],d.user));e(h)}}})})}},{key:"_updateMessage",value:function(a,b){var c=this;return new Promise(function(d,e){n.patch(g.CHANNELS+"/"+a.channel.id+"/messages/"+a.id).set("authorization",c.token).send({content:b,mentions:[]}).end(function(b,c){if(b)e(b);else{var f=new k(c.body,a.channel,a.mentions,a.sender);d(f),a.channel.messages[a.channel.messages.indexOf(a)]=f}})})}},{key:"_deleteMessage",value:function(a){var b=this;return new Promise(function(c,d){n.del(g.CHANNELS+"/"+a.channel.id+"/messages/"+a.id).set("authorization",b.token).end(function(a,b){a?d(a):c()})})}},{key:"checkQueue",value:function(a){var b=this,c=this;this.checkingQueue[a]||!function(){var d=function f(){if(0===c.queue[a].length)return void e();var b=c.queue[a][0];switch(b.action){case"sendMessage":var d=b;c._sendMessage(a,d.content,d.tts,d.mentions).then(function(b){d.then(b),c.queue[a].shift(),f()})["catch"](function(b){d.error(b),c.queue[a].shift(),f()});break;case"sendFile":var g=b;c._sendFile(a,g.attachment,g.attachmentName).then(function(b){g.then(b),c.queue[a].shift(),f()})["catch"](function(b){g.error(b),c.queue[a].shift(),f()});break;case"updateMessage":var h=b;c._updateMessage(h.message,h.content).then(function(b){h.then(b),c.queue[a].shift(),f()})["catch"](function(b){h.error(b),c.queue[a].shift(),f()});break;case"deleteMessage":var i=b;c._deleteMessage(i.message).then(function(b){i.then(b),c.queue[a].shift(),f()})["catch"](function(b){i.error(b),c.queue[a].shift(),f()});break;default:e()}},e=function(){c.checkingQueue[a]=!1};b.checkingQueue[a]=!0,d()}()}},{key:"uptime",get:function(){return this.readyTime?Date.now()-this.readyTime:null}},{key:"ready",get:function(){return 3===this.state}},{key:"servers",get:function(){return this.serverCache}},{key:"channels",get:function(){return this.channelCache}},{key:"users",get:function(){return this.userCache}},{key:"PMChannels",get:function(){return this.pmChannelCache}},{key:"messages",get:function(){var a=[],b=!0,c=!1,d=void 0;try{for(var e,f=this.channelCache[Symbol.iterator]();!(b=(e=f.next()).done);b=!0){var g=e.value;a=a.concat(g.messages)}}catch(h){c=!0,d=h}finally{try{!b&&f["return"]&&f["return"]()}finally{if(c)throw d}}return a}}]),a}();b.exports=r},{"./Endpoints.js":2,"./PMChannel.js":3,"./channel.js":4,"./invite.js":6,"./message.js":7,"./server.js":8,"./user.js":9,fs:10,superagent:11,ws:14}],2:[function(a,b,c){"use strict";c.BASE_DOMAIN="discordapp.com",c.BASE="https://"+c.BASE_DOMAIN,c.WEBSOCKET_HUB="wss://"+c.BASE_DOMAIN+"/hub",c.API=c.BASE+"/api",c.AUTH=c.API+"/auth",c.LOGIN=c.AUTH+"/login",c.LOGOUT=c.AUTH+"/logout",c.USERS=c.API+"/users",c.SERVERS=c.API+"/guilds",c.CHANNELS=c.API+"/channels"},{}],3:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(){function a(b,c){d(this,a),this.user=c.getUser("id",b.recipient.id),this.id=b.id,this.messages=[]}return e(a,[{key:"addMessage",value:function(a){return this.getMessage("id",a.id)||this.messages.push(a),this.getMessage("id",a.id)}},{key:"getMessage",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.messages[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"isPrivate",get:function(){return!0}}]),a}();b.exports=f},{}],4:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(){function a(b,c){d(this,a),this.server=c,this.name=b.name,this.type=b.type,this.id=b.id,this.messages=[]}return e(a,[{key:"equals",value:function(a){return a&&a.id===this.id}},{key:"addMessage",value:function(a){return this.getMessage("id",a.id)||this.messages.push(a),this.getMessage("id",a.id)}},{key:"getMessage",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.messages[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"toString",value:function(){return"#"+this.name}},{key:"client",get:function(){return this.server.client}},{key:"isPrivate",get:function(){return!1}}]),a}();b.exports=f},{}],5:[function(a,b,c){"use strict";var d=(a("superagent"),a("./Endpoints.js")),e=a("./Client.js"),f={Endpoints:d,Client:e};b.exports=f},{"./Client.js":1,"./Endpoints.js":2,superagent:11}],6:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(){function a(b,c){d(this,a),this.max_age=b.max_age,this.code=b.code,this.server=c.getServer("id",b.guild.id),this.revoked=b.revoked,this.created_at=Date.parse(b.created_at),this.temporary=b.temporary,this.uses=b.uses,this.max_uses=b.uses,this.inviter=c.addUser(b.inviter),this.xkcd=b.xkcdpass,this.channel=c.getChannel("id",b.channel.id)}return e(a,[{key:"URL",get:function(){var a=this.xkcd?this.xkcdpass:this.code;return"https://discord.gg/"+a}}]),a}();b.exports=f},{}],7:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=(a("./PMChannel.js"),function(){function a(b,c,e,f){d(this,a),this.tts=b.tts,this.timestamp=Date.parse(b.timestamp),this.nonce=b.nonce,this.mentions=e,this.everyoneMentioned=b.mention_everyone,this.id=b.id,this.embeds=b.embeds,this.editedTimestamp=b.edited_timestamp,this.content=b.content.trim(),this.channel=c,this.author=f,this.attachments=b.attachments}return e(a,[{key:"isMentioned",value:function(a){var b=a.id?a.id:a,c=!0,d=!1,e=void 0;try{for(var f,g=this.mentions[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h.id===b)return!0}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return!1}},{key:"sender",get:function(){return this.author}},{key:"isPrivate",get:function(){return this.channel.isPrivate}}]),a}());b.exports=f},{"./PMChannel.js":3}],8:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(){function a(b,c){if(d(this,a),this.client=c,this.region=b.region,this.ownerID=b.owner_id,this.name=b.name,this.id=b.id,this.members=[],this.channels=[],this.icon=b.icon,this.afkTimeout=b.afk_timeout,this.afkChannelId=b.afk_channel_id,!b.members)return void(b.members=[c.user]);var e=!0,f=!1,g=void 0;try{for(var h,i=b.members[Symbol.iterator]();!(e=(h=i.next()).done);e=!0){var j=h.value;j.user&&this.members.push(c.addUser(j.user))}}catch(k){f=!0,g=k}finally{try{!e&&i["return"]&&i["return"]()}finally{if(f)throw g}}}return e(a,[{key:"getChannel",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.channels[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"getMember",value:function(a,b){var c=!0,d=!1,e=void 0;try{for(var f,g=this.members[Symbol.iterator]();!(c=(f=g.next()).done);c=!0){var h=f.value;if(h[a]===b)return h}}catch(i){d=!0,e=i}finally{try{!c&&g["return"]&&g["return"]()}finally{if(d)throw e}}return null}},{key:"addChannel",value:function(a){return this.getChannel("id",a.id)||this.channels.push(a),a}},{key:"addMember",value:function(a){return this.getMember("id",a.id)||this.members.push(a),a}},{key:"toString",value:function(){return this.name}},{key:"iconURL",get:function(){return this.icon?"https://discordapp.com/api/guilds/"+this.id+"/icons/"+this.icon+".jpg":null}},{key:"afkChannel",get:function(){return this.afkChannelId?this.getChannel("id",this.afkChannelId):!1}},{key:"defaultChannel",get:function(){return this.getChannel("name","general")}},{key:"owner",get:function(){return this.client.getUser("id",this.ownerID)}}]),a}();b.exports=f},{}],9:[function(a,b,c){"use strict";function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),f=function(){function a(b){d(this,a),this.username=b.username,this.discriminator=b.discriminator,this.id=b.id,this.avatar=b.avatar}return e(a,[{key:"mention",value:function(){return"<@"+this.id+">"}},{key:"toString",value:function(){return this.mention()}},{key:"equals",value:function(a){return a.id===this.id}},{key:"equalsStrict",value:function(a){return a.id===this.id&&a.avatar===this.avatar&&a.username===this.username&&a.discriminator===this.discriminator}},{key:"avatarURL",get:function(){return this.avatar?"https://discordapp.com/api/users/"+this.id+"/avatars/"+this.avatar+".jpg":null}}]),a}();b.exports=f},{}],10:[function(a,b,c){},{}],11:[function(a,b,c){function d(){}function e(a){var b={}.toString.call(a);switch(b){case"[object File]":case"[object Blob]":case"[object FormData]":return!0;default:return!1}}function f(a){return a===Object(a)}function g(a){if(!f(a))return a;var b=[];for(var c in a)null!=a[c]&&b.push(encodeURIComponent(c)+"="+encodeURIComponent(a[c]));return b.join("&")}function h(a){for(var b,c,d={},e=a.split("&"),f=0,g=e.length;g>f;++f)c=e[f],b=c.split("="),d[decodeURIComponent(b[0])]=decodeURIComponent(b[1]);return d}function i(a){var b,c,d,e,f=a.split(/\r?\n/),g={};f.pop();for(var h=0,i=f.length;i>h;++h)c=f[h],b=c.indexOf(":"),d=c.slice(0,b).toLowerCase(),e=r(c.slice(b+1)),g[d]=e;return g}function j(a){return a.split(/ *; */).shift()}function k(a){return p(a.split(/ *; */),function(a,b){var c=b.split(/ *= */),d=c.shift(),e=c.shift();return d&&e&&(a[d]=e),a},{})}function l(a,b){b=b||{},this.req=a,this.xhr=this.req.xhr,this.text="HEAD"!=this.req.method&&(""===this.xhr.responseType||"text"===this.xhr.responseType)||"undefined"==typeof this.xhr.responseType?this.xhr.responseText:null,this.statusText=this.req.xhr.statusText,this.setStatusProperties(this.xhr.status),this.header=this.headers=i(this.xhr.getAllResponseHeaders()),this.header["content-type"]=this.xhr.getResponseHeader("content-type"),this.setHeaderProperties(this.header),this.body="HEAD"!=this.req.method?this.parseBody(this.text?this.text:this.xhr.response):null}function m(a,b){var c=this;o.call(this),this._query=this._query||[],this.method=a,this.url=b,this.header={},this._header={},this.on("end",function(){var a=null,b=null;try{b=new l(c)}catch(d){return a=new Error("Parser is unable to parse the response"),a.parse=!0,a.original=d,c.callback(a)}if(c.emit("response",b),a)return c.callback(a,b);if(b.status>=200&&b.status<300)return c.callback(a,b);var e=new Error(b.statusText||"Unsuccessful HTTP response");e.original=a,e.response=b,e.status=b.status,c.callback(e,b)})}function n(a,b){return"function"==typeof b?new m("GET",a).end(b):1==arguments.length?new m("GET",a):new m(a,b)}var o=a("emitter"),p=a("reduce"),q="undefined"==typeof window?this||self:window;n.getXHR=function(){if(!(!q.XMLHttpRequest||q.location&&"file:"==q.location.protocol&&q.ActiveXObject))return new XMLHttpRequest;try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(a){}return!1};var r="".trim?function(a){return a.trim()}:function(a){return a.replace(/(^\s*|\s*$)/g,"")};n.serializeObject=g,n.parseString=h,n.types={html:"text/html",json:"application/json",xml:"application/xml",urlencoded:"application/x-www-form-urlencoded",form:"application/x-www-form-urlencoded","form-data":"application/x-www-form-urlencoded"},n.serialize={"application/x-www-form-urlencoded":g,"application/json":JSON.stringify},n.parse={"application/x-www-form-urlencoded":h,"application/json":JSON.parse},l.prototype.get=function(a){return this.header[a.toLowerCase()]},l.prototype.setHeaderProperties=function(a){var b=this.header["content-type"]||"";this.type=j(b);var c=k(b);for(var d in c)this[d]=c[d]},l.prototype.parseBody=function(a){var b=n.parse[this.type];return b&&a&&(a.length||a instanceof Object)?b(a):null},l.prototype.setStatusProperties=function(a){1223===a&&(a=204);var b=a/100|0;this.status=a,this.statusType=b,this.info=1==b,this.ok=2==b,this.clientError=4==b,this.serverError=5==b,this.error=4==b||5==b?this.toError():!1,this.accepted=202==a,this.noContent=204==a,this.badRequest=400==a,this.unauthorized=401==a,this.notAcceptable=406==a,this.notFound=404==a,this.forbidden=403==a},l.prototype.toError=function(){var a=this.req,b=a.method,c=a.url,d="cannot "+b+" "+c+" ("+this.status+")",e=new Error(d);return e.status=this.status,e.method=b,e.url=c,e},n.Response=l,o(m.prototype),m.prototype.use=function(a){return a(this),this},m.prototype.timeout=function(a){return this._timeout=a,this},m.prototype.clearTimeout=function(){return this._timeout=0,clearTimeout(this._timer),this},m.prototype.abort=function(){return this.aborted?void 0:(this.aborted=!0,this.xhr.abort(),
+this.clearTimeout(),this.emit("abort"),this)},m.prototype.set=function(a,b){if(f(a)){for(var c in a)this.set(c,a[c]);return this}return this._header[a.toLowerCase()]=b,this.header[a]=b,this},m.prototype.unset=function(a){return delete this._header[a.toLowerCase()],delete this.header[a],this},m.prototype.getHeader=function(a){return this._header[a.toLowerCase()]},m.prototype.type=function(a){return this.set("Content-Type",n.types[a]||a),this},m.prototype.accept=function(a){return this.set("Accept",n.types[a]||a),this},m.prototype.auth=function(a,b){var c=btoa(a+":"+b);return this.set("Authorization","Basic "+c),this},m.prototype.query=function(a){return"string"!=typeof a&&(a=g(a)),a&&this._query.push(a),this},m.prototype.field=function(a,b){return this._formData||(this._formData=new q.FormData),this._formData.append(a,b),this},m.prototype.attach=function(a,b,c){return this._formData||(this._formData=new q.FormData),this._formData.append(a,b,c),this},m.prototype.send=function(a){var b=f(a),c=this.getHeader("Content-Type");if(b&&f(this._data))for(var d in a)this._data[d]=a[d];else"string"==typeof a?(c||this.type("form"),c=this.getHeader("Content-Type"),"application/x-www-form-urlencoded"==c?this._data=this._data?this._data+"&"+a:a:this._data=(this._data||"")+a):this._data=a;return!b||e(a)?this:(c||this.type("json"),this)},m.prototype.callback=function(a,b){var c=this._callback;this.clearTimeout(),c(a,b)},m.prototype.crossDomainError=function(){var a=new Error("Origin is not allowed by Access-Control-Allow-Origin");a.crossDomain=!0,this.callback(a)},m.prototype.timeoutError=function(){var a=this._timeout,b=new Error("timeout of "+a+"ms exceeded");b.timeout=a,this.callback(b)},m.prototype.withCredentials=function(){return this._withCredentials=!0,this},m.prototype.end=function(a){var b=this,c=this.xhr=n.getXHR(),f=this._query.join("&"),g=this._timeout,h=this._formData||this._data;this._callback=a||d,c.onreadystatechange=function(){if(4==c.readyState){var a;try{a=c.status}catch(d){a=0}if(0==a){if(b.timedout)return b.timeoutError();if(b.aborted)return;return b.crossDomainError()}b.emit("end")}};var i=function(a){a.total>0&&(a.percent=a.loaded/a.total*100),b.emit("progress",a)};this.hasListeners("progress")&&(c.onprogress=i);try{c.upload&&this.hasListeners("progress")&&(c.upload.onprogress=i)}catch(j){}if(g&&!this._timer&&(this._timer=setTimeout(function(){b.timedout=!0,b.abort()},g)),f&&(f=n.serializeObject(f),this.url+=~this.url.indexOf("?")?"&"+f:"?"+f),c.open(this.method,this.url,!0),this._withCredentials&&(c.withCredentials=!0),"GET"!=this.method&&"HEAD"!=this.method&&"string"!=typeof h&&!e(h)){var k=this.getHeader("Content-Type"),l=n.serialize[k?k.split(";")[0]:""];l&&(h=l(h))}for(var m in this.header)null!=this.header[m]&&c.setRequestHeader(m,this.header[m]);return this.emit("request",this),c.send(h),this},m.prototype.then=function(a,b){return this.end(function(c,d){c?b(c):a(d)})},n.Request=m,n.get=function(a,b,c){var d=n("GET",a);return"function"==typeof b&&(c=b,b=null),b&&d.query(b),c&&d.end(c),d},n.head=function(a,b,c){var d=n("HEAD",a);return"function"==typeof b&&(c=b,b=null),b&&d.send(b),c&&d.end(c),d},n.del=function(a,b){var c=n("DELETE",a);return b&&c.end(b),c},n.patch=function(a,b,c){var d=n("PATCH",a);return"function"==typeof b&&(c=b,b=null),b&&d.send(b),c&&d.end(c),d},n.post=function(a,b,c){var d=n("POST",a);return"function"==typeof b&&(c=b,b=null),b&&d.send(b),c&&d.end(c),d},n.put=function(a,b,c){var d=n("PUT",a);return"function"==typeof b&&(c=b,b=null),b&&d.send(b),c&&d.end(c),d},b.exports=n},{emitter:12,reduce:13}],12:[function(a,b,c){function d(a){return a?e(a):void 0}function e(a){for(var b in d.prototype)a[b]=d.prototype[b];return a}b.exports=d,d.prototype.on=d.prototype.addEventListener=function(a,b){return this._callbacks=this._callbacks||{},(this._callbacks[a]=this._callbacks[a]||[]).push(b),this},d.prototype.once=function(a,b){function c(){d.off(a,c),b.apply(this,arguments)}var d=this;return this._callbacks=this._callbacks||{},c.fn=b,this.on(a,c),this},d.prototype.off=d.prototype.removeListener=d.prototype.removeAllListeners=d.prototype.removeEventListener=function(a,b){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var c=this._callbacks[a];if(!c)return this;if(1==arguments.length)return delete this._callbacks[a],this;for(var d,e=0;e<c.length;e++)if(d=c[e],d===b||d.fn===b){c.splice(e,1);break}return this},d.prototype.emit=function(a){this._callbacks=this._callbacks||{};var b=[].slice.call(arguments,1),c=this._callbacks[a];if(c){c=c.slice(0);for(var d=0,e=c.length;e>d;++d)c[d].apply(this,b)}return this},d.prototype.listeners=function(a){return this._callbacks=this._callbacks||{},this._callbacks[a]||[]},d.prototype.hasListeners=function(a){return!!this.listeners(a).length}},{}],13:[function(a,b,c){b.exports=function(a,b,c){for(var d=0,e=a.length,f=3==arguments.length?c:a[d++];e>d;)f=b.call(null,f,a[d],++d,a);return f}},{}],14:[function(a,b,c){function d(a,b,c){var d;return d=b?new f(a,b):new f(a)}var e=function(){return this}(),f=e.WebSocket||e.MozWebSocket;b.exports=f?d:null,f&&(d.prototype=f.prototype)},{}]},{},[5])(5)});
\ No newline at end of file