From 014d78638ecf1c5eadd00de8cc0fef3375729e79 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Sun, 22 Nov 2015 17:49:23 -0800 Subject: [PATCH] messageDeleted passes channel --- lib/Client/InternalClient.js | 2 +- src/Client/InternalClient.js | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index 4d9e5c9f9..0328c6c2e 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -1294,7 +1294,7 @@ var InternalClient = (function () { if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); - client.emit("messageDeleted", msg); + client.emit("messageDeleted", msg, channel); if (msg) { channel.messages.remove(msg); } diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index 0d51d6789..b826bf033 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -44,7 +44,7 @@ class InternalClient { this.voiceConnection = null; this.resolver = new Resolver(this); this.readyTime = null; - + this.messageAwaits = {}; } @@ -65,27 +65,27 @@ class InternalClient { } }); } - + //def awaitResponse awaitResponse(msg){ return new Promise((resolve, reject) => { - + msg = this.resolver.resolveMessage(msg); - + if(!msg){ reject(new Error("message undefined")); return; } - + var awaitID = msg.channel.id + msg.author.id; - + if( !this.messageAwaits[awaitID] ){ this.messageAwaits[awaitID] = []; } - + this.messageAwaits[awaitID].push(resolve); - - + + }); } @@ -999,7 +999,7 @@ class InternalClient { //def setStatus setStatus(idleStatus, gameID) { var self = this; - + self.idleStatus = idleStatus || self.idleStatus || null; if(idleStatus){ if(idleStatus == "online" || idleStatus == "here" || idleStatus == "available"){ @@ -1007,7 +1007,7 @@ class InternalClient { } } self.gameID = self.resolver.resolveGameID(gameID) || self.gameID || null; - + return new Promise((resolve, reject) => { var packet = { @@ -1350,7 +1350,7 @@ class InternalClient { var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (channel) { var msg = channel.messages.add(new Message(data, channel, client)); - + if(self.messageAwaits[channel.id + msg.author.id]){ self.messageAwaits[channel.id + msg.author.id].map( fn => fn(msg) ); self.messageAwaits[channel.id + msg.author.id] = null; @@ -1369,7 +1369,7 @@ class InternalClient { if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); - client.emit("messageDeleted", msg); + client.emit("messageDeleted", msg, channel); if (msg) { channel.messages.remove(msg); }