From 8ca30b813a5237764afa5d8e83d047d156a237f9 Mon Sep 17 00:00:00 2001 From: ITOH Date: Sun, 23 May 2021 18:20:46 +0200 Subject: [PATCH 1/3] fix always false if check --- src/helpers/members/edit_member.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts index 448bc4de9..c84c98242 100644 --- a/src/helpers/members/edit_member.ts +++ b/src/helpers/members/edit_member.ts @@ -26,8 +26,8 @@ export async function editMember(guildId: bigint, memberId: bigint, options: Mod if ( typeof options.mute !== "undefined" || typeof options.deaf !== "undefined" || - typeof options.channelId !== "undefined" || - "null" + // "object" to do simple null check + (typeof options.channelId !== "undefined" && typeof options.channelId !== "object") ) { const memberVoiceState = (await cacheHandlers.get("guilds", guildId))?.voiceStates.get(memberId); From eb9cb57414c55bf8b1cf7bc2a07d2f00bb2455f6 Mon Sep 17 00:00:00 2001 From: ITOH Date: Sun, 23 May 2021 18:27:33 +0200 Subject: [PATCH 2/3] fix wrong if logic again --- src/helpers/members/edit_member.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts index c84c98242..d042ffcbd 100644 --- a/src/helpers/members/edit_member.ts +++ b/src/helpers/members/edit_member.ts @@ -23,12 +23,7 @@ export async function editMember(guildId: bigint, memberId: bigint, options: Mod if (options.roles) requiredPerms.add("MANAGE_ROLES"); - if ( - typeof options.mute !== "undefined" || - typeof options.deaf !== "undefined" || - // "object" to do simple null check - (typeof options.channelId !== "undefined" && typeof options.channelId !== "object") - ) { + if (options.mute !== undefined || options.deaf !== undefined || options.channelId || options.channelId === null) { const memberVoiceState = (await cacheHandlers.get("guilds", guildId))?.voiceStates.get(memberId); if (!memberVoiceState?.channelId) { From 619a3b7c1b14a1386acaa523e12f501deb24ebbd Mon Sep 17 00:00:00 2001 From: ITOH Date: Sun, 23 May 2021 18:29:28 +0200 Subject: [PATCH 3/3] remove typeof --- src/helpers/members/edit_member.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts index d042ffcbd..a6802068d 100644 --- a/src/helpers/members/edit_member.ts +++ b/src/helpers/members/edit_member.ts @@ -30,11 +30,11 @@ export async function editMember(guildId: bigint, memberId: bigint, options: Mod throw new Error(Errors.MEMBER_NOT_IN_VOICE_CHANNEL); } - if (typeof options.mute !== "undefined") { + if (options.mute !== undefined) { requiredPerms.add("MUTE_MEMBERS"); } - if (typeof options.deaf !== "undefined") { + if (options.deaf !== undefined) { requiredPerms.add("DEAFEN_MEMBERS"); }