fix: use resolve() for PermissionOverwrites

#10686 djs
This commit is contained in:
Elysia
2025-01-21 02:21:15 +07:00
parent f0d3584a2a
commit bb20d581eb
6 changed files with 9 additions and 9 deletions

View File

@@ -34,7 +34,7 @@ class BaseGuildEmojiManager extends CachedManager {
* @returns {?GuildEmoji} * @returns {?GuildEmoji}
*/ */
resolve(emoji) { resolve(emoji) {
if (emoji instanceof ReactionEmoji) return super.cache.get(emoji.id) ?? null; if (emoji instanceof ReactionEmoji) return this.cache.get(emoji.id) ?? null;
return super.resolve(emoji); return super.resolve(emoji);
} }

View File

@@ -89,7 +89,7 @@ class GuildChannelManager extends CachedManager {
* @returns {?(GuildChannel|ThreadChannel)} * @returns {?(GuildChannel|ThreadChannel)}
*/ */
resolve(channel) { 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); return super.resolve(channel);
} }

View File

@@ -55,8 +55,8 @@ class GuildMemberManager extends CachedManager {
resolve(member) { resolve(member) {
const memberResolvable = super.resolve(member); const memberResolvable = super.resolve(member);
if (memberResolvable) return memberResolvable; if (memberResolvable) return memberResolvable;
const userResolvable = this.client.users.resolveId(member); const userId = this.client.users.resolveId(member);
if (userResolvable) return super.cache.get(userResolvable) ?? null; if (userId) return this.cache.get(userId) ?? null;
return null; return null;
} }
@@ -68,8 +68,8 @@ class GuildMemberManager extends CachedManager {
resolveId(member) { resolveId(member) {
const memberResolvable = super.resolveId(member); const memberResolvable = super.resolveId(member);
if (memberResolvable) return memberResolvable; if (memberResolvable) return memberResolvable;
const userResolvable = this.client.users.resolveId(member); const userId = this.client.users.resolveId(member);
return this.cache.has(userResolvable) ? userResolvable : null; return this.cache.has(userId) ? userId : null;
} }
/** /**

View File

@@ -39,7 +39,7 @@ class PresenceManager extends CachedManager {
const presenceResolvable = super.resolve(presence); const presenceResolvable = super.resolve(presence);
if (presenceResolvable) return presenceResolvable; if (presenceResolvable) return presenceResolvable;
const userId = this.client.users.resolveId(presence); const userId = this.client.users.resolveId(presence);
return super.cache.get(userId) ?? null; return this.cache.get(userId) ?? null;
} }
/** /**

View File

@@ -73,7 +73,7 @@ class ThreadMemberManager extends CachedManager {
const memberResolvable = super.resolve(member); const memberResolvable = super.resolve(member);
if (memberResolvable) return memberResolvable; if (memberResolvable) return memberResolvable;
const userId = this.client.users.resolveId(member); const userId = this.client.users.resolveId(member);
if (userId) return super.cache.get(userId) ?? null; if (userId) return this.cache.get(userId) ?? null;
return null; return null;
} }

View File

@@ -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 TypeError('INVALID_TYPE', 'parameter', 'User nor a Role'); if (!userOrRole) throw new TypeError('INVALID_TYPE', 'parameter', 'User nor a Role');
const type = userOrRole instanceof Role ? OverwriteTypes.role : OverwriteTypes.member; const type = userOrRole instanceof Role ? OverwriteTypes.role : OverwriteTypes.member;