From 2ca657ce8b8719982c5cb18948dffa5612319515 Mon Sep 17 00:00:00 2001 From: Idris Date: Fri, 14 Apr 2023 14:27:11 +0200 Subject: [PATCH 1/4] refactor(GuildMember): make _roles a getter and roles a normal prop --- .../discord.js/src/structures/GuildMember.js | 18 +++++++++--------- packages/discord.js/typings/index.d.ts | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/discord.js/src/structures/GuildMember.js b/packages/discord.js/src/structures/GuildMember.js index 7c2aec177895..90642a8e518f 100644 --- a/packages/discord.js/src/structures/GuildMember.js +++ b/packages/discord.js/src/structures/GuildMember.js @@ -55,11 +55,11 @@ class GuildMember extends Base { this.communicationDisabledUntilTimestamp = null; /** - * The role ids of the member - * @type {Snowflake[]} - * @private + * A manager for the roles belonging to this member + * @type {GuildMemberRoleManager} + * @readonly */ - this._roles = []; + this.roles = new GuildMemberRoleManager(this); if (data) this._patch(data); } @@ -127,12 +127,12 @@ class GuildMember extends Base { } /** - * A manager for the roles belonging to this member - * @type {GuildMemberRoleManager} - * @readonly + * The role ids of the member + * @type {Snowflake[]} + * @private */ - get roles() { - return new GuildMemberRoleManager(this); + get _roles() { + return []; } /** diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts index 5def0d151c20..ec32b7cf61c5 100644 --- a/packages/discord.js/typings/index.d.ts +++ b/packages/discord.js/typings/index.d.ts @@ -1532,7 +1532,7 @@ export class GuildMember extends PartialTextBasedChannel(Base) { public get premiumSince(): Date | null; public premiumSinceTimestamp: number | null; public get presence(): Presence | null; - public get roles(): GuildMemberRoleManager; + public readonly roles: GuildMemberRoleManager; public user: User; public get voice(): VoiceState; public avatarURL(options?: ImageURLOptions): string | null; From 5cd42fa057c6f811cfd02d41ad8394a27d5d94c1 Mon Sep 17 00:00:00 2001 From: Idris Date: Wed, 10 May 2023 20:48:38 +0200 Subject: [PATCH 2/4] fix: revert changes --- .../discord.js/src/structures/GuildMember.js | 18 +++++++++--------- packages/discord.js/typings/index.d.ts | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/discord.js/src/structures/GuildMember.js b/packages/discord.js/src/structures/GuildMember.js index 90642a8e518f..7c2aec177895 100644 --- a/packages/discord.js/src/structures/GuildMember.js +++ b/packages/discord.js/src/structures/GuildMember.js @@ -55,11 +55,11 @@ class GuildMember extends Base { this.communicationDisabledUntilTimestamp = null; /** - * A manager for the roles belonging to this member - * @type {GuildMemberRoleManager} - * @readonly + * The role ids of the member + * @type {Snowflake[]} + * @private */ - this.roles = new GuildMemberRoleManager(this); + this._roles = []; if (data) this._patch(data); } @@ -127,12 +127,12 @@ class GuildMember extends Base { } /** - * The role ids of the member - * @type {Snowflake[]} - * @private + * A manager for the roles belonging to this member + * @type {GuildMemberRoleManager} + * @readonly */ - get _roles() { - return []; + get roles() { + return new GuildMemberRoleManager(this); } /** diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts index 7860726a10de..6ddddbdcae1c 100644 --- a/packages/discord.js/typings/index.d.ts +++ b/packages/discord.js/typings/index.d.ts @@ -1540,7 +1540,7 @@ export class GuildMember extends PartialTextBasedChannel(Base) { public get premiumSince(): Date | null; public premiumSinceTimestamp: number | null; public get presence(): Presence | null; - public readonly roles: GuildMemberRoleManager; + public get roles(): GuildMemberRoleManager; public user: User; public get voice(): VoiceState; public avatarURL(options?: ImageURLOptions): string | null; From 466b8acd3b75f4e820e8602c261273551f3d944a Mon Sep 17 00:00:00 2001 From: Idris Date: Wed, 10 May 2023 20:56:14 +0200 Subject: [PATCH 3/4] fix: requested changes --- packages/discord.js/src/structures/GuildMember.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/GuildMember.js b/packages/discord.js/src/structures/GuildMember.js index 7c2aec177895..b3dec761d607 100644 --- a/packages/discord.js/src/structures/GuildMember.js +++ b/packages/discord.js/src/structures/GuildMember.js @@ -56,10 +56,12 @@ class GuildMember extends Base { /** * The role ids of the member + * @name GuildMember#_roles * @type {Snowflake[]} * @private */ - this._roles = []; + Object.defineProperty(this, '_roles', { value: [] }); + if (data) this._patch(data); } From 45980c2c4b9460f0019086dcb40b1a70e698d4a0 Mon Sep 17 00:00:00 2001 From: Idris <78701338+Idris1401@users.noreply.github.com> Date: Wed, 10 May 2023 22:35:50 +0200 Subject: [PATCH 4/4] fix: requested changes --- packages/discord.js/src/structures/GuildMember.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/GuildMember.js b/packages/discord.js/src/structures/GuildMember.js index b3dec761d607..3e71824f3f12 100644 --- a/packages/discord.js/src/structures/GuildMember.js +++ b/packages/discord.js/src/structures/GuildMember.js @@ -60,7 +60,7 @@ class GuildMember extends Base { * @type {Snowflake[]} * @private */ - Object.defineProperty(this, '_roles', { value: [] }); + Object.defineProperty(this, '_roles', { value: [], writable: true }); if (data) this._patch(data); }