From e4641fe7011f5a55288e1d29c5ce517c315ea6c5 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Wed, 17 Feb 2016 08:24:11 -0800 Subject: [PATCH] resolveChannel should take PM channel IDs --- lib/Client/Resolver/Resolver.js | 4 ++-- src/Client/Resolver/Resolver.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js index c3cf76f0c..670d5b68b 100644 --- a/lib/Client/Resolver/Resolver.js +++ b/lib/Client/Resolver/Resolver.js @@ -277,10 +277,10 @@ var Resolver = (function () { return Promise.resolve(resource); } if (resource instanceof _StructuresServer2["default"]) { - return Promise.resolve(resource.channels.get("id", resource.id)); + return Promise.resolve(resource.defaultChannel); } if (resource instanceof String || typeof resource === "string") { - return Promise.resolve(this.internal.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"]) { // see if a PM exists diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js index 515791a56..37a805a72 100644 --- a/src/Client/Resolver/Resolver.js +++ b/src/Client/Resolver/Resolver.js @@ -207,10 +207,10 @@ export default class Resolver { return Promise.resolve(resource); } if (resource instanceof Server) { - return Promise.resolve(resource.channels.get("id", resource.id)); + return Promise.resolve(resource.defaultChannel); } if (resource instanceof String || typeof resource === "string") { - return Promise.resolve(this.internal.channels.get("id", resource)); + 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