From 7280d4e82eb47ce7cb3964057d7d56a62179cf18 Mon Sep 17 00:00:00 2001 From: Danial Raza Date: Sat, 4 Jan 2025 18:09:05 +0100 Subject: [PATCH] fix: use `resolve()` for `PermissionOverwrites` (#10686) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: use `resolve()` for `PermissionOverwrites` * fix: typo Co-authored-by: René --------- Co-authored-by: René --- packages/discord.js/src/managers/BaseGuildEmojiManager.js | 4 ++-- packages/discord.js/src/managers/GuildChannelManager.js | 2 +- packages/discord.js/src/managers/GuildMemberManager.js | 8 ++++---- .../discord.js/src/structures/PermissionOverwrites.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/discord.js/src/managers/BaseGuildEmojiManager.js b/packages/discord.js/src/managers/BaseGuildEmojiManager.js index fd02b13e4d61..94250e9ab8f6 100644 --- a/packages/discord.js/src/managers/BaseGuildEmojiManager.js +++ b/packages/discord.js/src/managers/BaseGuildEmojiManager.js @@ -36,8 +36,8 @@ class BaseGuildEmojiManager extends CachedManager { * @returns {?GuildEmoji} */ resolve(emoji) { - if (emoji instanceof ReactionEmoji) return super.cache.get(emoji.id) ?? null; - if (emoji instanceof ApplicationEmoji) return super.cache.get(emoji.id) ?? null; + if (emoji instanceof ReactionEmoji) return this.cache.get(emoji.id) ?? null; + if (emoji instanceof ApplicationEmoji) return this.cache.get(emoji.id) ?? null; return super.resolve(emoji); } diff --git a/packages/discord.js/src/managers/GuildChannelManager.js b/packages/discord.js/src/managers/GuildChannelManager.js index b3ac14a6bdcc..4f485aa780ea 100644 --- a/packages/discord.js/src/managers/GuildChannelManager.js +++ b/packages/discord.js/src/managers/GuildChannelManager.js @@ -84,7 +84,7 @@ class GuildChannelManager extends CachedManager { * @returns {?(GuildChannel|ThreadChannel)} */ resolve(channel) { - if (channel instanceof ThreadChannel) return super.cache.get(channel.id) ?? null; + if (channel instanceof ThreadChannel) return this.cache.get(channel.id) ?? null; return super.resolve(channel); } diff --git a/packages/discord.js/src/managers/GuildMemberManager.js b/packages/discord.js/src/managers/GuildMemberManager.js index 90df4516082e..4127993b0044 100644 --- a/packages/discord.js/src/managers/GuildMemberManager.js +++ b/packages/discord.js/src/managers/GuildMemberManager.js @@ -54,8 +54,8 @@ class GuildMemberManager extends CachedManager { resolve(member) { const memberResolvable = super.resolve(member); if (memberResolvable) return memberResolvable; - const userResolvable = this.client.users.resolveId(member); - if (userResolvable) return super.cache.get(userResolvable) ?? null; + const userId = this.client.users.resolveId(member); + if (userId) return this.cache.get(userId) ?? null; return null; } @@ -67,8 +67,8 @@ class GuildMemberManager extends CachedManager { resolveId(member) { const memberResolvable = super.resolveId(member); if (memberResolvable) return memberResolvable; - const userResolvable = this.client.users.resolveId(member); - return this.cache.has(userResolvable) ? userResolvable : null; + const userId = this.client.users.resolveId(member); + return this.cache.has(userId) ? userId : null; } /** diff --git a/packages/discord.js/src/structures/PermissionOverwrites.js b/packages/discord.js/src/structures/PermissionOverwrites.js index f8d81c87f5e5..3f3c286ff798 100644 --- a/packages/discord.js/src/structures/PermissionOverwrites.js +++ b/packages/discord.js/src/structures/PermissionOverwrites.js @@ -180,7 +180,7 @@ class PermissionOverwrites extends Base { }; } - const userOrRole = guild.roles.cache.get(overwrite.id) ?? guild.client.users.cache.get(overwrite.id); + const userOrRole = guild.roles.resolve(overwrite.id) ?? guild.client.users.resolve(overwrite.id); if (!userOrRole) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'parameter', 'User nor a Role'); const type = userOrRole instanceof Role ? OverwriteType.Role : OverwriteType.Member;