Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 12:03:31 +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

18
lib/Client.js
View File

@@ -480,11 +480,12 @@ var Client = (function () {
var mention = _ref2; var mention = _ref2;
var user = self.addUser(mention); 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 authorRaw = self.addUser(message.author),
var author = channel.server.getMember("id", authorRaw.id) || authorRaw; author;
if (channel.server) author = channel.server.getMember("id", authorRaw.id) || authorRaw;else author = authorRaw;
logs.push(new Message(message, channel, mentions, author)); logs.push(new Message(message, channel, mentions, author));
} }
@@ -905,7 +906,6 @@ var Client = (function () {
data.mentions = data.mentions || []; //for some reason this was not defined at some point? data.mentions = data.mentions || []; //for some reason this was not defined at some point?
var channel = self.getChannel("id", data.channel_id); var channel = self.getChannel("id", data.channel_id);
for (var _iterator6 = data.mentions, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) { for (var _iterator6 = data.mentions, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
var _ref6; var _ref6;
@@ -921,11 +921,11 @@ var Client = (function () {
var mention = _ref6; var mention = _ref6;
var user = self.addUser(mention); 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) { 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); self.trigger("message", msg);
} }
@@ -978,7 +978,7 @@ var Client = (function () {
var mention = _ref7; var mention = _ref7;
var user = self.addUser(mention); 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); var newMessage = new Message(info, channel, mentions, formerMessage.author);
@@ -1578,11 +1578,11 @@ var Client = (function () {
var mention = _ref15; var mention = _ref15;
var user = self.addUser(mention); 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) { 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); resolve(msg);
} }
} }

32
src/Client.js
View File

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

5
test/bot.1.js
View File

@@ -26,12 +26,11 @@ mybot.on("message", function (message) {
user = message.sender; user = message.sender;
} }
var perms = JSON.stringify(message.channel.permissionsOf(user).serialise(), null, 4); var typea = message.content.split(" ")[1].toUpperCase();
perms = JSON.parse(perms);
mybot.createRole( mybot.createRole(
message.channel.server, { message.channel.server, {
color : Discord.Colors.BLUE, color : Discord.Colors[typea],
manageRoles : true manageRoles : true
}).then((perm) => { }).then((perm) => {
mybot.reply(message, message.sender.server.id) mybot.reply(message, message.sender.server.id)