From 14fffb12aff2172f751d2870d82c65b0264bae52 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Sat, 12 Mar 2016 21:11:21 -0800 Subject: [PATCH] Accept user IDs as channels --- lib/Client/Resolver/Resolver.js | 7 ++++++- src/Client/Resolver/Resolver.js | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js index 7e2aa6b95..4bb62f9bb 100644 --- a/lib/Client/Resolver/Resolver.js +++ b/lib/Client/Resolver/Resolver.js @@ -286,7 +286,12 @@ var Resolver = (function () { return Promise.resolve(resource.defaultChannel); } if (resource instanceof String || typeof resource === "string") { - return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource)); + 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)); + } } if (resource instanceof _StructuresUser2["default"]) { // see if a PM exists diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js index 0393ff269..1fe6ad759 100644 --- a/src/Client/Resolver/Resolver.js +++ b/src/Client/Resolver/Resolver.js @@ -216,7 +216,12 @@ export default class Resolver { return Promise.resolve(resource.defaultChannel); } if (resource instanceof String || typeof resource === "string") { - return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource)); + 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)); + } } if (resource instanceof User) { // see if a PM exists