From c76f9f42bd44d4d2119207c2e83e9c33706bd2b0 Mon Sep 17 00:00:00 2001 From: muchnameless Date: Sun, 26 Dec 2021 03:49:03 +0100 Subject: [PATCH 1/3] fix(GuildMemberManager): nick endpoint --- src/managers/GuildMemberManager.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js index 8e8e4ec07b96..1423bdff541e 100644 --- a/src/managers/GuildMemberManager.js +++ b/src/managers/GuildMemberManager.js @@ -263,8 +263,10 @@ class GuildMemberManager extends CachedManager { } _data.roles &&= _data.roles.map(role => (role instanceof Role ? role.id : role)); - _data.communication_disabled_until = - _data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString(); + if (typeof _data.communicationDisabledUntil !== 'undefined') { + _data.communication_disabled_until = + _data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString(); + } let endpoint = this.client.api.guilds(this.guild.id); if (id === this.client.user.id) { From d112e0136f3eeb2523e18ac23a7c9290213b6787 Mon Sep 17 00:00:00 2001 From: muchnameless Date: Sun, 26 Dec 2021 04:20:11 +0100 Subject: [PATCH 2/3] refactor: similar logic to _data.channel --- src/managers/GuildMemberManager.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js index 1423bdff541e..4b5855b986ed 100644 --- a/src/managers/GuildMemberManager.js +++ b/src/managers/GuildMemberManager.js @@ -263,9 +263,10 @@ class GuildMemberManager extends CachedManager { } _data.roles &&= _data.roles.map(role => (role instanceof Role ? role.id : role)); - if (typeof _data.communicationDisabledUntil !== 'undefined') { - _data.communication_disabled_until = - _data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString(); + if (_data.communicationDisabledUntil) { + _data.communication_disabled_until = new Date(_data.communicationDisabledUntil).toISOString(); + } else if (_data.communicationDisabledUntil === null) { + _data.communication_disabled_until = null; } let endpoint = this.client.api.guilds(this.guild.id); From 770aba48c69b51524a9790906e3eab49fdd16353 Mon Sep 17 00:00:00 2001 From: muchnameless Date: Sun, 26 Dec 2021 15:41:36 +0100 Subject: [PATCH 3/3] change to data --- src/managers/GuildMemberManager.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js index 4b5855b986ed..45c4d3f8a864 100644 --- a/src/managers/GuildMemberManager.js +++ b/src/managers/GuildMemberManager.js @@ -263,15 +263,12 @@ class GuildMemberManager extends CachedManager { } _data.roles &&= _data.roles.map(role => (role instanceof Role ? role.id : role)); - if (_data.communicationDisabledUntil) { - _data.communication_disabled_until = new Date(_data.communicationDisabledUntil).toISOString(); - } else if (_data.communicationDisabledUntil === null) { - _data.communication_disabled_until = null; - } + _data.communication_disabled_until = + _data.communicationDisabledUntil && new Date(_data.communicationDisabledUntil).toISOString(); let endpoint = this.client.api.guilds(this.guild.id); if (id === this.client.user.id) { - const keys = Object.keys(_data); + const keys = Object.keys(data); if (keys.length === 1 && keys[0] === 'nick') endpoint = endpoint.members('@me'); else endpoint = endpoint.members(id); } else {