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

feat: GuildEmoji & Invite to GuildResolvable (#3637)

Browse Source 
* Add GuildEmoji to GuildResolvable

* Add GuildEmoji to GuildResolvable

* Add Invite to GuildResolvable

* Add Invite to GuildResolvable

* oops

* oops x2

* Add Guild#fetchBan and an error for not resolving the ID

* typings

* Revert "Add Guild#fetchBan and an error for not resolving the ID"

This reverts commit a4d0ed16e7.

* Revert "typings"

This reverts commit 5a54e88785.

* fix jsdoc

* add trailing comma
This commit is contained in:
Sugden
2020-02-24 17:27:34 +00:00
committed by GitHub
parent 02807347e7
commit 91a025caaa
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/managers/GuildManager.js
View File

@@ -6,6 +6,8 @@ const { Events } = require('../util/Constants');
const Guild = require('../structures/Guild'); const Guild = require('../structures/Guild');
const GuildChannel = require('../structures/GuildChannel'); const GuildChannel = require('../structures/GuildChannel');
const GuildMember = require('../structures/GuildMember'); const GuildMember = require('../structures/GuildMember');
const GuildEmoji = require('../structures/GuildEmoji');
const Invite = require('../structures/Invite');
const Role = require('../structures/Role'); const Role = require('../structures/Role');
/** /**
@@ -27,9 +29,11 @@ class GuildManager extends BaseManager {
* Data that resolves to give a Guild object. This can be: * Data that resolves to give a Guild object. This can be:
* * A Guild object * * A Guild object
* * A GuildChannel object * * A GuildChannel object
* * A GuildEmoji object
* * A Role object * * A Role object
* * A Snowflake * * A Snowflake
* @typedef {Guild|GuildChannel|GuildMember|Role|Snowflake} GuildResolvable * * An Invite object
* @typedef {Guild|GuildChannel|GuildMember|GuildEmoji|Role|Snowflake|Invite} GuildResolvable
*/ */
/** /**
@@ -43,7 +47,9 @@ class GuildManager extends BaseManager {
resolve(guild) { resolve(guild) {
if (guild instanceof GuildChannel || if (guild instanceof GuildChannel ||
guild instanceof GuildMember || guild instanceof GuildMember ||
guild instanceof Role) return super.resolve(guild.guild); guild instanceof GuildEmoji ||
guild instanceof Role ||
(guild instanceof Invite && guild.guild)) return super.resolve(guild.guild);
return super.resolve(guild); return super.resolve(guild);
} }
@@ -58,7 +64,9 @@ class GuildManager extends BaseManager {
resolveID(guild) { resolveID(guild) {
if (guild instanceof GuildChannel || if (guild instanceof GuildChannel ||
guild instanceof GuildMember || guild instanceof GuildMember ||
guild instanceof Role) return super.resolveID(guild.guild.id); guild instanceof GuildEmoji ||
guild instanceof Role ||
(guild instanceof Invite && guild.guild)) return super.resolveID(guild.guild.id);
return super.resolveID(guild); return super.resolveID(guild);
} }
@@ -92,7 +100,7 @@ class GuildManager extends BaseManager {
resolve(this.client.guilds.add(data)); resolve(this.client.guilds.add(data));
}, 10000); }, 10000);
return undefined; return undefined;
}, reject) }, reject),
); );
} }

2
typings/index.d.ts vendored
View File

@@ -2332,7 +2332,7 @@ declare module 'discord.js' {
type GuildMemberResolvable = GuildMember | UserResolvable; type GuildMemberResolvable = GuildMember | UserResolvable;
type GuildResolvable = Guild | GuildChannel | GuildMember | Role | Snowflake; type GuildResolvable = Guild | GuildChannel | GuildMember | GuildEmoji | Invite | Role | Snowflake;
interface GuildPruneMembersOptions { interface GuildPruneMembersOptions {
count?: boolean; count?: boolean;