From d4b693c4b0f43c4a80ae324398db9be730e92620 Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Tue, 10 May 2016 21:54:42 -0700
Subject: [PATCH] deleteMessages docs, fixes

---
 docs/docs_client.rst         | 11 ++++++++++-
 lib/Client/InternalClient.js |  8 ++++----
 src/Client/InternalClient.js |  8 ++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/docs_client.rst b/docs/docs_client.rst
index ec9184d99..3d03f91b8 100644
--- a/docs/docs_client.rst
+++ b/docs/docs_client.rst
@@ -251,12 +251,21 @@ deleteMessage(message, `options`, `callback`)
 
 Attempts to delete a message
 
-- **message** - The Message_ to delete
+- **message** - The `Message Resolvable`_ to delete
 - **options** - `object` containing the following:
     - **wait** - Milliseconds as a `number` to wait before deleting the message
 - **callback** - `function` that takes the following parameters:
     - **error** - error object if any occurred
 
+deleteMessages(messages, `options`, `callback`)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Attempts to bulk delete messages from the same channel
+
+- **message** - Array of `Message Resolvable`_ to delete
+- **callback** - `function` that takes the following parameters:
+    - **error** - error object if any occurred
+
 getChannelLogs(channel, `limit`, `options`, `callback`)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 8ef6ffbf3..61bb45ec5 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -362,7 +362,7 @@ var InternalClient = (function () {
 
 			var joinVoice = function joinVoice() {
 				return new Promise(function (resolve, reject) {
-					var session,
+					var session = _this5.sessionID,
 					    token,
 					    server = channel.server,
 					    endpoint;
@@ -371,9 +371,7 @@ var InternalClient = (function () {
 						var data = JSON.parse(m);
 						if (data.d.guild_id !== server.id) return; // ensure it is the right server
 
-						if (data.t === "VOICE_STATE_UPDATE") {
-							session = data.d.session_id;
-						} else if (data.t === "VOICE_SERVER_UPDATE") {
+						if (data.t === "VOICE_SERVER_UPDATE") {
 							token = data.d.token;
 							endpoint = data.d.endpoint;
 							var chan = new _VoiceVoiceConnection2["default"](channel, _this5.client, session, token, server, endpoint);
@@ -383,6 +381,7 @@ var InternalClient = (function () {
 								return resolve(chan);
 							});
 							chan.on("error", reject);
+							chan.on("close", reject);
 
 							_this5.client.emit("debug", "removed temporary voice websocket listeners");
 							_this5.websocket.removeListener("message", check);
@@ -1731,6 +1730,7 @@ var InternalClient = (function () {
 					_this41.forceFetchQueue = [];
 					_this41.forceFetchLength = 1;
 					_this41.autoReconnectInterval = 1000;
+					_this41.sessionID = data.session_id;
 
 					data.guilds.forEach(function (server) {
 						if (!server.unavailable) {
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 0ce154f44..9e590a456 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -285,15 +285,13 @@ export default class InternalClient {
 
 			var joinVoice = () => {
 				return new Promise((resolve, reject) => {
-					var session, token, server = channel.server, endpoint;
+					var session = this.sessionID, token, server = channel.server, endpoint;
 
 					var check = m => {
 						var data = JSON.parse(m);
 						if (data.d.guild_id !== server.id) return // ensure it is the right server
 
-						if (data.t === "VOICE_STATE_UPDATE") {
-							session = data.d.session_id;
-						} else if (data.t === "VOICE_SERVER_UPDATE") {
+						if (data.t === "VOICE_SERVER_UPDATE") {
 							token = data.d.token;
 							endpoint = data.d.endpoint;
 							var chan = new VoiceConnection(
@@ -303,6 +301,7 @@ export default class InternalClient {
 
 							chan.on("ready", () => resolve(chan));
 							chan.on("error", reject);
+							chan.on("close", reject);
 
 							this.client.emit("debug", "removed temporary voice websocket listeners");
 							this.websocket.removeListener("message", check);
@@ -1467,6 +1466,7 @@ export default class InternalClient {
 					this.forceFetchQueue = [];
 					this.forceFetchLength = 1;
 					this.autoReconnectInterval = 1000;
+					this.sessionID = data.session_id;
 
 					data.guilds.forEach(server => {
 						if (!server.unavailable) {