Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 03:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use resolve() for PermissionOverwrites (#10686)

Browse Source 
* fix: use `resolve()` for `PermissionOverwrites`

* fix: typo

Co-authored-by: René <contact.9a5d6388@renegade334.me.uk>

---------

Co-authored-by: René <contact.9a5d6388@renegade334.me.uk>
This commit is contained in:
Danial Raza
2025-01-04 18:09:05 +01:00
committed by GitHub
parent bd2914cc98
commit 7280d4e82e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/discord.js/src/managers/BaseGuildEmojiManager.js
View File

@@ -36,8 +36,8 @@ 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;
if (emoji instanceof ApplicationEmoji) return super.cache.get(emoji.id) ?? null; if (emoji instanceof ApplicationEmoji) return this.cache.get(emoji.id) ?? null;
return super.resolve(emoji); return super.resolve(emoji);
} }

2
packages/discord.js/src/managers/GuildChannelManager.js
View File

@@ -84,7 +84,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);
} }

8
packages/discord.js/src/managers/GuildMemberManager.js
View File

@@ -54,8 +54,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;
} }
@@ -67,8 +67,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;
} }
/** /**

2
packages/discord.js/src/structures/PermissionOverwrites.js
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 DiscordjsTypeError(ErrorCodes.InvalidType, 'parameter', 'User nor a Role'); if (!userOrRole) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'parameter', 'User nor a Role');
const type = userOrRole instanceof Role ? OverwriteType.Role : OverwriteType.Member; const type = userOrRole instanceof Role ? OverwriteType.Role : OverwriteType.Member;