From f613f57e8b3161f335a46cb30bef9bd3eb600450 Mon Sep 17 00:00:00 2001 From: VAKiliner Date: Fri, 24 Oct 2025 16:50:21 +0300 Subject: [PATCH 1/4] Add check overwrite id --- packages/discord.js/src/structures/GuildChannel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/discord.js/src/structures/GuildChannel.js b/packages/discord.js/src/structures/GuildChannel.js index 6e30ee0b0034..4f5c02d6fde7 100644 --- a/packages/discord.js/src/structures/GuildChannel.js +++ b/packages/discord.js/src/structures/GuildChannel.js @@ -130,14 +130,14 @@ class GuildChannel extends BaseChannel { const parentVal = this.parent.permissionOverwrites.cache.get(key); // Handle empty overwrite - if ( + if (key === this.guildId && ( (!channelVal && parentVal.deny.bitfield === PermissionsBitField.DefaultBit && parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || (!parentVal && channelVal.deny.bitfield === PermissionsBitField.DefaultBit && channelVal.allow.bitfield === PermissionsBitField.DefaultBit) - ) { + )) { return true; } From 39edaf2985c62961b8dd8606795923bd219244fa Mon Sep 17 00:00:00 2001 From: VAKiliner Date: Mon, 27 Oct 2025 17:11:00 +0300 Subject: [PATCH 2/4] Update GuildChannel.js --- .../discord.js/src/structures/GuildChannel.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/discord.js/src/structures/GuildChannel.js b/packages/discord.js/src/structures/GuildChannel.js index 4f5c02d6fde7..fcfbad462ae5 100644 --- a/packages/discord.js/src/structures/GuildChannel.js +++ b/packages/discord.js/src/structures/GuildChannel.js @@ -130,14 +130,17 @@ class GuildChannel extends BaseChannel { const parentVal = this.parent.permissionOverwrites.cache.get(key); // Handle empty overwrite - if (key === this.guildId && ( - (!channelVal && - parentVal.deny.bitfield === PermissionsBitField.DefaultBit && - parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || - (!parentVal && - channelVal.deny.bitfield === PermissionsBitField.DefaultBit && - channelVal.allow.bitfield === PermissionsBitField.DefaultBit) - )) { + if ( + key === this.guildId && + ( + (!channelVal && + parentVal.deny.bitfield === PermissionsBitField.DefaultBit && + parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || + (!parentVal && + channelVal.deny.bitfield === PermissionsBitField.DefaultBit && + channelVal.allow.bitfield === PermissionsBitField.DefaultBit) + ) + ) { return true; } From fa613080a7fa6b60c6bf83827bfa2aad00bc0b1d Mon Sep 17 00:00:00 2001 From: VAKiliner Date: Mon, 27 Oct 2025 18:39:39 +0300 Subject: [PATCH 3/4] Update GuildChannel.js --- .../discord.js/src/structures/GuildChannel.js | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/discord.js/src/structures/GuildChannel.js b/packages/discord.js/src/structures/GuildChannel.js index fcfbad462ae5..b35b95ddfa1c 100644 --- a/packages/discord.js/src/structures/GuildChannel.js +++ b/packages/discord.js/src/structures/GuildChannel.js @@ -116,30 +116,29 @@ class GuildChannel extends BaseChannel { * @readonly */ get permissionsLocked() { - if (!this.parent) return null; + const { parent } = this; + if (!parent) return null; // Get all overwrites const overwriteIds = new Set([ ...this.permissionOverwrites.cache.keys(), - ...this.parent.permissionOverwrites.cache.keys(), + ...parent.permissionOverwrites.cache.keys(), ]); // Compare all overwrites return [...overwriteIds].every(key => { const channelVal = this.permissionOverwrites.cache.get(key); - const parentVal = this.parent.permissionOverwrites.cache.get(key); + const parentVal = parent.permissionOverwrites.cache.get(key); // Handle empty overwrite if ( key === this.guildId && - ( - (!channelVal && - parentVal.deny.bitfield === PermissionsBitField.DefaultBit && - parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || - (!parentVal && - channelVal.deny.bitfield === PermissionsBitField.DefaultBit && - channelVal.allow.bitfield === PermissionsBitField.DefaultBit) - ) + ((!channelVal && + parentVal.deny.bitfield === PermissionsBitField.DefaultBit && + parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || + (!parentVal && + channelVal.deny.bitfield === PermissionsBitField.DefaultBit && + channelVal.allow.bitfield === PermissionsBitField.DefaultBit)) ) { return true; } From 6b23cee8d140fe6661825bb5605eb265ebd7491c Mon Sep 17 00:00:00 2001 From: VAKiliner Date: Mon, 27 Oct 2025 19:13:01 +0300 Subject: [PATCH 4/4] chore: fmt --- packages/discord.js/src/structures/GuildChannel.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/discord.js/src/structures/GuildChannel.js b/packages/discord.js/src/structures/GuildChannel.js index b35b95ddfa1c..9ea414632706 100644 --- a/packages/discord.js/src/structures/GuildChannel.js +++ b/packages/discord.js/src/structures/GuildChannel.js @@ -136,9 +136,9 @@ class GuildChannel extends BaseChannel { ((!channelVal && parentVal.deny.bitfield === PermissionsBitField.DefaultBit && parentVal.allow.bitfield === PermissionsBitField.DefaultBit) || - (!parentVal && - channelVal.deny.bitfield === PermissionsBitField.DefaultBit && - channelVal.allow.bitfield === PermissionsBitField.DefaultBit)) + (!parentVal && + channelVal.deny.bitfield === PermissionsBitField.DefaultBit && + channelVal.allow.bitfield === PermissionsBitField.DefaultBit)) ) { return true; }