Merge branch 'master' into indev

This commit is contained in:
Amish Shah
2016-10-28 18:47:49 +01:00

View File

@@ -117,7 +117,7 @@ class ClientDataResolver {
if (channel instanceof Channel) return channel;
if (channel instanceof Message) return channel.channel;
if (channel instanceof Guild) return channel.channels.get(channel.id) || null;
if (typeof channel === 'string') return this.client.channels.get(channel.id) || null;
if (typeof channel === 'string') return this.client.channels.get(channel) || null;
return null;
}