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

refactor: use cache.get() for snowflakes, resolve() otherwise (#10626)

Browse Source 
* refactor: use `cache.get()` for snowflakes, `resolve()` otherwise

* fix: requested changes

Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com>

* chore: remove unnecessary `?? null`

---------

Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Danial Raza
2024-11-28 18:48:04 +01:00
committed by Jiralite
parent ed00a10e1f
commit dedaa5d657
16 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/discord.js/src/client/actions/ThreadListSync.js
View File

@@ -13,7 +13,7 @@ class ThreadListSyncAction extends Action {
if (data.channel_ids) { if (data.channel_ids) {
for (const id of data.channel_ids) { for (const id of data.channel_ids) {
const channel = client.channels.resolve(id); const channel = client.channels.cache.get(id);
if (channel) this.removeStale(channel); if (channel) this.removeStale(channel);
} }
} else { } else {

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.resolve(emoji.id); if (emoji instanceof ReactionEmoji) return super.cache.get(emoji.id) ?? null;
if (emoji instanceof ApplicationEmoji) return super.resolve(emoji.id); if (emoji instanceof ApplicationEmoji) return super.cache.get(emoji.id) ?? null;
return super.resolve(emoji); return super.resolve(emoji);
} }

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

@@ -175,7 +175,7 @@ class GuildBanManager extends CachedManager {
reason: options.reason, reason: options.reason,
}); });
if (user instanceof GuildMember) return user; if (user instanceof GuildMember) return user;
const _user = this.client.users.resolve(id); const _user = this.client.users.cache.get(id);
if (_user) { if (_user) {
return this.guild.members.resolve(_user) ?? _user; return this.guild.members.resolve(_user) ?? _user;
} }

10
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.resolve(channel.id); if (channel instanceof ThreadChannel) return super.cache.get(channel.id) ?? null;
return super.resolve(channel); return super.resolve(channel);
} }
@@ -287,7 +287,7 @@ class GuildChannelManager extends CachedManager {
const resolvedChannel = this.resolve(channel); const resolvedChannel = this.resolve(channel);
if (!resolvedChannel) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'channel', 'GuildChannelResolvable'); if (!resolvedChannel) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'channel', 'GuildChannelResolvable');
const parent = options.parent && this.client.channels.resolveId(options.parent); const parentId = options.parent && this.client.channels.resolveId(options.parent);
if (options.position !== undefined) { if (options.position !== undefined) {
await this.setPosition(resolvedChannel, options.position, { position: options.position, reason: options.reason }); await this.setPosition(resolvedChannel, options.position, { position: options.position, reason: options.reason });
@@ -298,8 +298,8 @@ class GuildChannelManager extends CachedManager {
); );
if (options.lockPermissions) { if (options.lockPermissions) {
if (parent) { if (parentId) {
const newParent = this.resolve(parent); const newParent = this.cache.get(parentId);
if (newParent?.type === ChannelType.GuildCategory) { if (newParent?.type === ChannelType.GuildCategory) {
permission_overwrites = newParent.permissionOverwrites.cache.map(overwrite => permission_overwrites = newParent.permissionOverwrites.cache.map(overwrite =>
PermissionOverwrites.resolve(overwrite, this.guild), PermissionOverwrites.resolve(overwrite, this.guild),
@@ -322,7 +322,7 @@ class GuildChannelManager extends CachedManager {
user_limit: options.userLimit, user_limit: options.userLimit,
rtc_region: options.rtcRegion, rtc_region: options.rtcRegion,
video_quality_mode: options.videoQualityMode, video_quality_mode: options.videoQualityMode,
parent_id: parent, parent_id: parentId,
lock_permissions: options.lockPermissions, lock_permissions: options.lockPermissions,
rate_limit_per_user: options.rateLimitPerUser, rate_limit_per_user: options.rateLimitPerUser,
default_auto_archive_duration: options.defaultAutoArchiveDuration, default_auto_archive_duration: options.defaultAutoArchiveDuration,

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

@@ -55,7 +55,7 @@ class GuildMemberManager extends CachedManager {
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 userResolvable = this.client.users.resolveId(member);
if (userResolvable) return super.resolve(userResolvable); if (userResolvable) return super.cache.get(userResolvable) ?? null;
return null; return null;
} }
@@ -144,7 +144,7 @@ class GuildMemberManager extends CachedManager {
*/ */
get me() { get me() {
return ( return (
this.resolve(this.client.user.id) ?? this.cache.get(this.client.user.id) ??
(this.client.options.partials.includes(Partials.GuildMember) (this.client.options.partials.includes(Partials.GuildMember)
? this._add({ user: { id: this.client.user.id } }, true) ? this._add({ user: { id: this.client.user.id } }, true)
: null) : null)

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

@@ -38,8 +38,8 @@ class PresenceManager extends CachedManager {
resolve(presence) { resolve(presence) {
const presenceResolvable = super.resolve(presence); const presenceResolvable = super.resolve(presence);
if (presenceResolvable) return presenceResolvable; if (presenceResolvable) return presenceResolvable;
const UserResolvable = this.client.users.resolveId(presence); const userId = this.client.users.resolveId(presence);
return super.resolve(UserResolvable); return super.cache.get(userId) ?? null;
} }
/** /**
@@ -50,8 +50,8 @@ class PresenceManager extends CachedManager {
resolveId(presence) { resolveId(presence) {
const presenceResolvable = super.resolveId(presence); const presenceResolvable = super.resolveId(presence);
if (presenceResolvable) return presenceResolvable; if (presenceResolvable) return presenceResolvable;
const userResolvable = this.client.users.resolveId(presence); const userId = this.client.users.resolveId(presence);
return this.cache.has(userResolvable) ? userResolvable : null; return this.cache.has(userId) ? userId : null;
} }
} }

6
packages/discord.js/src/managers/ThreadMemberManager.js
View File

@@ -57,7 +57,7 @@ class ThreadMemberManager extends CachedManager {
* @readonly * @readonly
*/ */
get me() { get me() {
return this.resolve(this.client.user.id); return this.cache.get(this.client.user.id) ?? null;
} }
/** /**
@@ -75,8 +75,8 @@ class ThreadMemberManager 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.resolve(userResolvable); if (userId) return super.cache.get(userId) ?? null;
return null; return null;
} }

2
packages/discord.js/src/structures/GuildMember.js
View File

@@ -228,7 +228,7 @@ class GuildMember extends Base {
* @readonly * @readonly
*/ */
get presence() { get presence() {
return this.guild.presences.resolve(this.id); return this.guild.presences.cache.get(this.id) ?? null;
} }
/** /**

2
packages/discord.js/src/structures/GuildOnboardingPromptOption.js
View File

@@ -79,7 +79,7 @@ class GuildOnboardingPromptOption extends Base {
*/ */
get emoji() { get emoji() {
if (!this._emoji.id && !this._emoji.name) return null; if (!this._emoji.id && !this._emoji.name) return null;
return this.client.emojis.resolve(this._emoji.id) ?? new Emoji(this.client, this._emoji); return this.client.emojis.cache.get(this._emoji.id) ?? new Emoji(this.client, this._emoji);
} }
} }

2
packages/discord.js/src/structures/Invite.js
View File

@@ -40,7 +40,7 @@ class Invite extends Base {
*/ */
this.guild ??= null; this.guild ??= null;
if (data.guild) { if (data.guild) {
this.guild = this.client.guilds.resolve(data.guild.id) ?? new InviteGuild(this.client, data.guild); this.guild = this.client.guilds.cache.get(data.guild.id) ?? new InviteGuild(this.client, data.guild);
} }
if ('code' in data) { if ('code' in data) {

2
packages/discord.js/src/structures/Message.js
View File

@@ -570,7 +570,7 @@ class Message extends Base {
* @readonly * @readonly
*/ */
get thread() { get thread() {
return this.channel?.threads?.resolve(this.id) ?? null; return this.channel?.threads?.cache.get(this.id) ?? null;
} }
/** /**

2
packages/discord.js/src/structures/PermissionOverwrites.js
View File

@@ -180,7 +180,7 @@ class PermissionOverwrites extends Base {
}; };
} }
const userOrRole = guild.roles.resolve(overwrite.id) ?? guild.client.users.resolve(overwrite.id); const userOrRole = guild.roles.cache.get(overwrite.id) ?? guild.client.users.cache.get(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;

2
packages/discord.js/src/structures/PollAnswer.js
View File

@@ -61,7 +61,7 @@ class PollAnswer extends Base {
*/ */
get emoji() { get emoji() {
if (!this._emoji || (!this._emoji.id && !this._emoji.name)) return null; if (!this._emoji || (!this._emoji.id && !this._emoji.name)) return null;
return this.client.emojis.resolve(this._emoji.id) ?? new Emoji(this.client, this._emoji); return this.client.emojis.cache.get(this._emoji.id) ?? new Emoji(this.client, this._emoji);
} }
/** /**

4
packages/discord.js/src/structures/ThreadMember.js
View File

@@ -70,7 +70,7 @@ class ThreadMember extends Base {
* @readonly * @readonly
*/ */
get guildMember() { get guildMember() {
return this.member ?? this.thread.guild.members.resolve(this.id); return this.member ?? this.thread.guild.members.cache.get(this.id) ?? null;
} }
/** /**
@@ -88,7 +88,7 @@ class ThreadMember extends Base {
* @readonly * @readonly
*/ */
get user() { get user() {
return this.client.users.resolve(this.id); return this.client.users.cache.get(this.id) ?? null;
} }
/** /**

4
packages/discord.js/src/structures/Webhook.js
View File

@@ -108,7 +108,7 @@ class Webhook {
* The source guild of the webhook * The source guild of the webhook
* @type {?(Guild|APIGuild)} * @type {?(Guild|APIGuild)}
*/ */
this.sourceGuild = this.client.guilds?.resolve(data.source_guild.id) ?? data.source_guild; this.sourceGuild = this.client.guilds?.cache.get(data.source_guild.id) ?? data.source_guild;
} else { } else {
this.sourceGuild ??= null; this.sourceGuild ??= null;
} }
@@ -118,7 +118,7 @@ class Webhook {
* The source channel of the webhook * The source channel of the webhook
* @type {?(NewsChannel|APIChannel)} * @type {?(NewsChannel|APIChannel)}
*/ */
this.sourceChannel = this.client.channels?.resolve(data.source_channel?.id) ?? data.source_channel; this.sourceChannel = this.client.channels?.cache.get(data.source_channel?.id) ?? data.source_channel;
} else { } else {
this.sourceChannel ??= null; this.sourceChannel ??= null;
} }

2
packages/discord.js/src/structures/WelcomeChannel.js
View File

@@ -53,7 +53,7 @@ class WelcomeChannel extends Base {
* @type {GuildEmoji|Emoji} * @type {GuildEmoji|Emoji}
*/ */
get emoji() { get emoji() {
return this.client.emojis.resolve(this._emoji.id) ?? new Emoji(this.client, this._emoji); return this.client.emojis.cache.get(this._emoji.id) ?? new Emoji(this.client, this._emoji);
} }
} }