From ee0ee61ae749fd1dacb5bcd40af1720f36f9a304 Mon Sep 17 00:00:00 2001 From: Jiralite <33201955+Jiralite@users.noreply.github.com> Date: Fri, 25 Feb 2022 15:26:43 +0000 Subject: [PATCH 1/2] feat: backport #7451 --- src/structures/AnonymousGuild.js | 8 ++++++++ src/structures/Guild.js | 8 -------- typings/index.d.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/structures/AnonymousGuild.js b/src/structures/AnonymousGuild.js index 5415e548550b..08fd2be291fc 100644 --- a/src/structures/AnonymousGuild.js +++ b/src/structures/AnonymousGuild.js @@ -64,6 +64,14 @@ class AnonymousGuild extends BaseGuild { */ this.nsfwLevel = NSFWLevels[data.nsfw_level]; } + + if ('premium_subscription_count' in data) { + /** + * The total number of boosts for this server + * @type {?number} + */ + this.premiumSubscriptionCount = data.premium_subscription_count; + } } /** diff --git a/src/structures/Guild.js b/src/structures/Guild.js index 4d0db2b0fb0f..18463120c0e1 100644 --- a/src/structures/Guild.js +++ b/src/structures/Guild.js @@ -286,14 +286,6 @@ class Guild extends AnonymousGuild { this.premiumTier = PremiumTiers[data.premium_tier]; } - if ('premium_subscription_count' in data) { - /** - * The total number of boosts for this server - * @type {?number} - */ - this.premiumSubscriptionCount = data.premium_subscription_count; - } - if ('widget_enabled' in data) { /** * Whether widget images are enabled on this guild diff --git a/typings/index.d.ts b/typings/index.d.ts index 89fd1c4a7d1e..465f89582b2c 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -184,6 +184,7 @@ export abstract class AnonymousGuild extends BaseGuild { public banner: string | null; public description: string | null; public nsfwLevel: NSFWLevel; + public premiumSubscriptionCount: number | null; public splash: string | null; public vanityURLCode: string | null; public verificationLevel: VerificationLevel; @@ -905,7 +906,6 @@ export class Guild extends AnonymousGuild { public mfaLevel: MFALevel; public ownerId: Snowflake; public preferredLocale: string; - public premiumSubscriptionCount: number | null; public premiumProgressBarEnabled: boolean; public premiumTier: PremiumTier; public presences: PresenceManager; From 6847213ecc2e656240d890ab192446248d347f7c Mon Sep 17 00:00:00 2001 From: Jiralite <33201955+Jiralite@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:28:23 +0000 Subject: [PATCH 2/2] fix: handle possibly missing property https://github.com/discordjs/discord.js/pull/7641 --- src/structures/AnonymousGuild.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/structures/AnonymousGuild.js b/src/structures/AnonymousGuild.js index 08fd2be291fc..963091092d82 100644 --- a/src/structures/AnonymousGuild.js +++ b/src/structures/AnonymousGuild.js @@ -71,6 +71,8 @@ class AnonymousGuild extends BaseGuild { * @type {?number} */ this.premiumSubscriptionCount = data.premium_subscription_count; + } else { + this.premiumSubscriptionCount ??= null; } }