Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-11 09:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in resolving members

Browse Source
This commit is contained in:
hydrabolt
2015-10-26 15:56:57 +00:00
parent 1d3c61333c
commit 5d22124c3d
3 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Client.js
View File

@@ -519,11 +519,17 @@ class Client {
var mentions = [];
for (var mention of message.mentions) {
var user = self.addUser(mention);
mentions.push(channel.server.getMember("id", user.id) || user);
if(channel.server)
mentions.push(channel.server.getMember("id", user.id) || user);
else
mentions.push(user);
}
var authorRaw = self.addUser(message.author);
var author = channel.server.getMember("id", authorRaw.id) || authorRaw;
var authorRaw = self.addUser(message.author), author;
if(channel.server)
author = channel.server.getMember("id", authorRaw.id) || authorRaw;
else
author = authorRaw;
logs.push(new Message(message, channel, mentions, author));
}
@@ -944,14 +950,16 @@ class Client {
data.mentions = data.mentions || []; //for some reason this was not defined at some point?
var channel = self.getChannel("id", data.channel_id);
for (var mention of data.mentions) {
var user = self.addUser(mention);
mentions.push(channel.server.getMember("id", user.id) || user);
if(channel.server)
mentions.push(channel.server.getMember("id", user.id) || user);
else
mentions.push(user);
}
if (channel) {
var msg = channel.addMessage(new Message(data, channel, mentions, channel.server.getMember("id", self.addUser(data.author).id)));
var msg = channel.addMessage(new Message(data, channel, mentions, data.author));
self.trigger("message", msg);
}
@@ -991,7 +999,10 @@ class Client {
var mentions = [];
for (var mention of data.mentions) {
var user = self.addUser(mention);
mentions.push(channel.server.getMember("id", user.id) || user);
if(channel.server)
mentions.push(channel.server.getMember("id", user.id) || user);
else
mentions.push(user);
}
var newMessage = new Message(info, channel, mentions, formerMessage.author);
@@ -1500,11 +1511,14 @@ class Client {
for (var mention of data.mentions) {
var user = self.addUser(mention);
mentions.push(channel.server.getMember("id", user.id) || user);
if(channel.server)
mentions.push(channel.server.getMember("id", user.id) || user);
else
mentions.push(user);
}
if (channel) {
var msg = channel.addMessage(new Message(data, channel, mentions, channel.server.getMember("id", data.author.id)));
var msg = channel.addMessage(new Message(data, channel, mentions, {id:data.author.id}));
resolve(msg);
}
}