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

Accept user IDs as channels

Browse Source
This commit is contained in:
abalabahaha
2016-03-12 21:11:21 -08:00
parent ea80677a79
commit 14fffb12af
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Client/Resolver/Resolver.js
View File

@@ -286,8 +286,13 @@ var Resolver = (function () {
return Promise.resolve(resource.defaultChannel); return Promise.resolve(resource.defaultChannel);
} }
if (resource instanceof String || typeof resource === "string") { if (resource instanceof String || typeof resource === "string") {
var user = this.internal.users.get("id", resource);
if (user) {
resource = user;
} else {
return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource)); return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
} }
}
if (resource instanceof _StructuresUser2["default"]) { if (resource instanceof _StructuresUser2["default"]) {
// see if a PM exists // see if a PM exists
for (var _iterator3 = this.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) { for (var _iterator3 = this.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {

5
src/Client/Resolver/Resolver.js
View File

@@ -216,8 +216,13 @@ export default class Resolver {
return Promise.resolve(resource.defaultChannel); return Promise.resolve(resource.defaultChannel);
} }
if (resource instanceof String || typeof resource === "string") { if (resource instanceof String || typeof resource === "string") {
var user = this.internal.users.get("id", resource);
if (user) {
resource = user;
} else {
return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource)); return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
} }
}
if (resource instanceof User) { if (resource instanceof User) {
// see if a PM exists // see if a PM exists
for (var pmchat of this.internal.private_channels) { for (var pmchat of this.internal.private_channels) {