From ba695380291781646a9b73671317406cb4fd3cd8 Mon Sep 17 00:00:00 2001
From: hydrabolt <amishshah.2k@gmail.com>
Date: Sat, 3 Oct 2015 15:00:57 +0100
Subject: [PATCH] cleaned up deleteMessage

---
 lib/Client.js | 43 ++++++++-----------------------------------
 src/Client.js | 49 ++++++++++++-------------------------------------
 2 files changed, 20 insertions(+), 72 deletions(-)

diff --git a/lib/Client.js b/lib/Client.js
index 7f9f5c523..8632319cc 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -352,7 +352,7 @@ var Client = (function () {
 
 			var self = this;
 
-			var prom = new Promise(function (resolve, reject) {
+			return new Promise(function (resolve, reject) {
 				if (timeout) {
 					setTimeout(remove, timeout);
 				} else {
@@ -360,37 +360,25 @@ var Client = (function () {
 				}
 
 				function remove() {
-					if (self.options.queue) {
-						if (!self.queue[message.channel.id]) {
-							self.queue[message.channel.id] = [];
+					request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
+						if (err) {
+							bad();
+						} else {
+							good();
 						}
-						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);
+					callback();
 					resolve();
 				}
 
 				function bad(err) {
-					prom.error = err;
 					callback(err);
 					reject(err);
 				}
 			});
-
-			return prom;
 		}
 	}, {
 		key: "updateMessage",
@@ -1598,21 +1586,6 @@ var Client = (function () {
 				});
 			});
 		}
-	}, {
-		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: "getGateway",
 		value: function getGateway() {
diff --git a/src/Client.js b/src/Client.js
index 4f6dbfe84..dcccddaa0 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -389,7 +389,7 @@ class Client {
 
 		var self = this;
 
-		var prom = new Promise(function (resolve, reject) {
+		return new Promise(function (resolve, reject) {
 			if (timeout) {
 				setTimeout(remove, timeout)
 			} else {
@@ -397,37 +397,29 @@ class Client {
 			}
 
 			function remove() {
-				if (self.options.queue) {
-					if (!self.queue[message.channel.id]) {
-						self.queue[message.channel.id] = [];
+				request
+				.del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
+				.set("authorization", self.token)
+				.end(function (err, res) {
+					if(err){
+						bad();
+					}else{
+						good();
 					}
-					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);
+				callback();
 				resolve();
 			}
 
 			function bad(err) {
-				prom.error = err;
 				callback(err);
 				reject(err);
 			}
 		});
-
-		return prom;
+		
 	}
 
 	updateMessage(message, content, callback = function (err, msg) { }) {
@@ -1338,23 +1330,6 @@ 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)
-				.end(function (err, res) {
-					if (err) {
-						reject(err);
-					} else {
-						resolve();
-					}
-				});
-		});
-	}
-
 	getGateway() {
 		var self = this;
 		return new Promise(function (resolve, reject) {