dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-06 08:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Client can now receive PM messages properly

Browse source
This commit is contained in:
hydrabolt 2015-11-08 20:46:20 +00:00
parent a36bc226fd
commit 18e35d82e1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Client/InternalClient.js
View file

@ -967,7 +967,7 @@ var InternalClient = (function () {
case PacketType.MESSAGE_CREATE: case PacketType.MESSAGE_CREATE:
// format: https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format // 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) { if (channel) {
var msg = channel.messages.add(new Message(data, channel, client)); var msg = channel.messages.add(new Message(data, channel, client));
client.emit("message", msg); client.emit("message", msg);
@ -977,7 +977,7 @@ var InternalClient = (function () {
break; break;
case PacketType.MESSAGE_DELETE: case PacketType.MESSAGE_DELETE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#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) { if (channel) {
// potentially blank // potentially blank
var msg = channel.messages.get("id", data.id); var msg = channel.messages.get("id", data.id);
@ -991,7 +991,7 @@ var InternalClient = (function () {
break; break;
case PacketType.MESSAGE_UPDATE: case PacketType.MESSAGE_UPDATE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format // 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) { if (channel) {
// potentially blank // potentially blank
var msg = channel.messages.get("id", data.id); var msg = channel.messages.get("id", data.id);
@ -1261,7 +1261,7 @@ var InternalClient = (function () {
case PacketType.TYPING: case PacketType.TYPING:
var user = self.users.get("id", data.user_id); 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 && channel) {
if (user.typing.since) { if (user.typing.since) {

8
src/Client/InternalClient.js
View file

@ -1019,7 +1019,7 @@ class InternalClient {
case PacketType.MESSAGE_CREATE: case PacketType.MESSAGE_CREATE:
// format: https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format // 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) { if (channel) {
var msg = channel.messages.add(new Message(data, channel, client)); var msg = channel.messages.add(new Message(data, channel, client));
client.emit("message", msg); client.emit("message", msg);
@ -1029,7 +1029,7 @@ class InternalClient {
break; break;
case PacketType.MESSAGE_DELETE: case PacketType.MESSAGE_DELETE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#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) { if (channel) {
// potentially blank // potentially blank
var msg = channel.messages.get("id", data.id); var msg = channel.messages.get("id", data.id);
@ -1043,7 +1043,7 @@ class InternalClient {
break; break;
case PacketType.MESSAGE_UPDATE: case PacketType.MESSAGE_UPDATE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-format // 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) { if (channel) {
// potentially blank // potentially blank
var msg = channel.messages.get("id", data.id); var msg = channel.messages.get("id", data.id);
@ -1311,7 +1311,7 @@ class InternalClient {
case PacketType.TYPING: case PacketType.TYPING:
var user = self.users.get("id", data.user_id); 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 && channel) {
if (user.typing.since) { if (user.typing.since) {