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

Make resolve types stricter

Browse Source 
- UserResolvable no longer allows a guild
- ChannelResolvable no longer allows a message or a guild
- ChannelResolvable no longer allows a message or a guild
This commit is contained in:
Amish Shah
2017-08-25 23:10:05 +01:00
parent fbb1253b3f
commit 5f694d1149
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/ClientDataResolver.js
View File

@@ -31,7 +31,6 @@ class ClientDataResolver {
* * A User object * * A User object
* * A Snowflake * * A Snowflake
* * A Message object (resolves to the message author) * * A Message object (resolves to the message author)
* * A Guild object (owner of the guild)
* * A GuildMember object * * A GuildMember object
* @typedef {User|Snowflake|Message|Guild|GuildMember} UserResolvable * @typedef {User|Snowflake|Message|Guild|GuildMember} UserResolvable
*/ */
@@ -46,7 +45,6 @@ class ClientDataResolver {
if (typeof user === 'string') return this.client.users.get(user) || null; if (typeof user === 'string') return this.client.users.get(user) || null;
if (user instanceof GuildMember) return user.user; if (user instanceof GuildMember) return user.user;
if (user instanceof Message) return user.author; if (user instanceof Message) return user.author;
if (user instanceof Guild) return user.owner;
return null; return null;
} }
@@ -59,7 +57,6 @@ class ClientDataResolver {
if (user instanceof User || user instanceof GuildMember) return user.id; if (user instanceof User || user instanceof GuildMember) return user.id;
if (typeof user === 'string') return user || null; if (typeof user === 'string') return user || null;
if (user instanceof Message) return user.author.id; if (user instanceof Message) return user.author.id;
if (user instanceof Guild) return user.ownerID;
return null; return null;
} }
@@ -126,8 +123,6 @@ class ClientDataResolver {
/** /**
* Data that can be resolved to give a Channel object. This can be: * Data that can be resolved to give a Channel object. This can be:
* * A Channel object * * A Channel object
* * A Message object (the channel the message was sent in)
* * A Guild object (the #general channel)
* * A Snowflake * * A Snowflake
* @typedef {Channel|Guild|Message|Snowflake} ChannelResolvable * @typedef {Channel|Guild|Message|Snowflake} ChannelResolvable
*/ */
@@ -140,8 +135,6 @@ class ClientDataResolver {
resolveChannel(channel) { resolveChannel(channel) {
if (channel instanceof Channel) return channel; if (channel instanceof Channel) return channel;
if (typeof channel === 'string') return this.client.channels.get(channel) || null; if (typeof channel === 'string') return this.client.channels.get(channel) || null;
if (channel instanceof Message) return channel.channel;
if (channel instanceof Guild) return channel.channels.get(channel.id) || null;
return null; return null;
} }
@@ -153,8 +146,6 @@ class ClientDataResolver {
resolveChannelID(channel) { resolveChannelID(channel) {
if (channel instanceof Channel) return channel.id; if (channel instanceof Channel) return channel.id;
if (typeof channel === 'string') return channel; if (typeof channel === 'string') return channel;
if (channel instanceof Message) return channel.channel.id;
if (channel instanceof Guild) return channel.defaultChannel.id;
return null; return null;
} }