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

Moved to resolve destination

Browse Source
This commit is contained in:
hydrabolt
2015-08-26 13:01:59 +01:00
parent 07ad0db114
commit 2971eccbd2
2 changed files with 220 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/Client.js
View File

@@ -72,7 +72,7 @@ class Client {
get users() {
return this.userCache;
}
get PMChannels() {
return this.pmChannelCache;
}
@@ -543,6 +543,10 @@ class Client {
}
sendFile(destination) {
}
sendMessage(destination, message, callback = function (err, msg) { }, premessage = "") {
var self = this;
@@ -551,7 +555,7 @@ class Client {
message = premessage + resolveMessage(message);
var mentions = resolveMentions();
destination = resolveDestination(destination);
destination = self.resolveDestination(destination);
if (destination)
send();
@@ -593,37 +597,6 @@ class Client {
}
function resolveDestination() {
var channId = false;
if (destination instanceof Server) {
channId = destination.id; //general is the same as server id
} else if (destination instanceof Channel) {
channId = destination.id;
} else if (destination instanceof Message) {
channId = destination.channel.id;
} else if (destination instanceof User) {
//check if we have a PM
for (var pmc of self.pmChannelCache) {
if (pmc.user.equals(destination)) {
return pmc.id;
}
}
//we don't, at this point we're late
self.startPM(destination).then(function (pmc) {
destination = pmc.id;
send();
});
} else {
channId = destination;
}
return channId;
}
function resolveMessage() {
var msg = message;
if (message instanceof Array) {
@@ -1049,6 +1022,39 @@ class Client {
}
resolveDestination(destination) {
var channId = false;
var self = this;
return new Promise(function (resolve, reject) {
if (destination instanceof Server) {
channId = destination.id; //general is the same as server id
} else if (destination instanceof Channel) {
channId = destination.id;
} else if (destination instanceof Message) {
channId = destination.channel.id;
} else if (destination instanceof User) {
//check if we have a PM
for (var pmc of self.pmChannelCache) {
if (pmc.user.equals(destination)) {
return pmc.id;
}
}
//we don't, at this point we're late
self.startPM(destination).then(function (pmc) {
resolve(pmc.id);
}).catch(reject);
} else {
channId = destination;
}
if(channId)
resolve(channId);
});
}
}
module.exports = Client;