From 18e35d82e140d03cae8fa1c79ff9f4fa3499a51c Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Sun, 8 Nov 2015 20:46:20 +0000 Subject: [PATCH] Client can now receive PM messages properly --- lib/Client/InternalClient.js | 8 ++++---- src/Client/InternalClient.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index f7a7d25a7..5cc18dd06 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -967,7 +967,7 @@ var InternalClient = (function () { case PacketType.MESSAGE_CREATE: // format: https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format - var channel = self.channels.get("id", data.channel_id); + 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)); client.emit("message", msg); @@ -977,7 +977,7 @@ var InternalClient = (function () { break; case PacketType.MESSAGE_DELETE: // format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); @@ -991,7 +991,7 @@ var InternalClient = (function () { break; case PacketType.MESSAGE_UPDATE: // format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); @@ -1261,7 +1261,7 @@ var InternalClient = (function () { case PacketType.TYPING: var user = self.users.get("id", data.user_id); - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (user && channel) { if (user.typing.since) { diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index e50fbbb2e..405e0ff8f 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -1019,7 +1019,7 @@ class InternalClient { case PacketType.MESSAGE_CREATE: // format: https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format - var channel = self.channels.get("id", data.channel_id); + 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)); client.emit("message", msg); @@ -1029,7 +1029,7 @@ class InternalClient { break; case PacketType.MESSAGE_DELETE: // format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); @@ -1043,7 +1043,7 @@ class InternalClient { break; case PacketType.MESSAGE_UPDATE: // format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id)|| self.private_channels.get("id", data.channel_id); if (channel) { // potentially blank var msg = channel.messages.get("id", data.id); @@ -1311,7 +1311,7 @@ class InternalClient { case PacketType.TYPING: var user = self.users.get("id", data.user_id); - var channel = self.channels.get("id", data.channel_id); + var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); if (user && channel) { if (user.typing.since) {