refactor: consistent use of resolve instead of cache.get() ?? null

Author: sdanialraza

packages/discord.js/src/structures/AutoModerationActionExecution.js

@@ -82,7 +82,7 @@ class AutoModerationActionExecution {
    * @readonly
    */
   get autoModerationRule() {
-    return this.guild.autoModerationRules.cache.get(this.ruleId) ?? null;
+    return this.guild.autoModerationRules.resolve(this.ruleId);
   }
 
   /**
@@ -91,7 +91,7 @@ class AutoModerationActionExecution {
    * @readonly
    */
   get channel() {
-    return this.guild.channels.cache.get(this.channelId) ?? null;
+    return this.guild.channels.resolve(this.channelId);
   }
 
   /**
@@ -100,7 +100,7 @@ class AutoModerationActionExecution {
    * @readonly
    */
   get user() {
-    return this.guild.client.users.cache.get(this.userId) ?? null;
+    return this.guild.client.users.resolve(this.userId);
   }
 
   /**
@@ -109,7 +109,7 @@ class AutoModerationActionExecution {
    * @readonly
    */
   get member() {
-    return this.guild.members.cache.get(this.userId) ?? null;
+    return this.guild.members.resolve(this.userId);
   }
 }
 

packages/discord.js/src/structures/AutocompleteInteraction.js

@@ -62,7 +62,7 @@ class AutocompleteInteraction extends BaseInteraction {
    */
   get command() {
     const id = this.commandId;
-    return this.guild?.commands.cache.get(id) ?? this.client.application.commands.cache.get(id) ?? null;
+    return this.guild?.commands.cache.get(id) ?? this.client.application.commands.resolve(id);
   }
 
   /**

packages/discord.js/src/structures/BaseInteraction.js

@@ -147,7 +147,7 @@ class BaseInteraction extends Base {
    * @readonly
    */
   get channel() {
-    return this.client.channels.cache.get(this.channelId) ?? null;
+    return this.client.channels.resolve(this.channelId);
   }
 
   /**
@@ -156,7 +156,7 @@ class BaseInteraction extends Base {
    * @readonly
    */
   get guild() {
-    return this.client.guilds.cache.get(this.guildId) ?? null;
+    return this.client.guilds.resolve(this.guildId);
   }
 
   /**

packages/discord.js/src/structures/ClientApplication.js

@@ -260,7 +260,7 @@ class ClientApplication extends Application {
    * @readonly
    */
   get guild() {
-    return this.client.guilds.cache.get(this.guildId) ?? null;
+    return this.client.guilds.resolve(this.guildId);
   }
 
   /**

packages/discord.js/src/structures/CommandInteraction.js

@@ -76,7 +76,7 @@ class CommandInteraction extends BaseInteraction {
    */
   get command() {
     const id = this.commandId;
-    return this.guild?.commands.cache.get(id) ?? this.client.application.commands.cache.get(id) ?? null;
+    return this.guild?.commands.cache.get(id) ?? this.client.application.commands.resolve(id);
   }
 
   /**

packages/discord.js/src/structures/Entitlement.js

@@ -107,7 +107,7 @@ class Entitlement extends Base {
    */
   get guild() {
     if (!this.guildId) return null;
-    return this.client.guilds.cache.get(this.guildId) ?? null;
+    return this.client.guilds.resolve(this.guildId);
   }
 
   /**

packages/discord.js/src/structures/GuildAuditLogsEntry.js

@@ -153,7 +153,7 @@ class GuildAuditLogsEntry {
     this.executor = data.user_id
       ? guild.client.options.partials.includes(Partials.User)
         ? guild.client.users._add({ id: data.user_id })
-        : (guild.client.users.cache.get(data.user_id) ?? null)
+        : guild.client.users.resolve(data.user_id)
       : null;
 
     /**
@@ -299,7 +299,7 @@ class GuildAuditLogsEntry {
     } else if (targetType === Targets.User && data.target_id) {
       this.target = guild.client.options.partials.includes(Partials.User)
         ? guild.client.users._add({ id: data.target_id })
-        : (guild.client.users.cache.get(data.target_id) ?? null);
+        : guild.client.users.resolve(data.target_id);
     } else if (targetType === Targets.Guild) {
       this.target = guild.client.guilds.cache.get(data.target_id);
     } else if (targetType === Targets.Webhook) {
@@ -323,7 +323,7 @@ class GuildAuditLogsEntry {
       this.target =
         data.action_type === AuditLogEvent.MessageBulkDelete
           ? (guild.channels.cache.get(data.target_id) ?? { id: data.target_id })
-          : (guild.client.users.cache.get(data.target_id) ?? null);
+          : guild.client.users.resolve(data.target_id);
     } else if (targetType === Targets.Integration) {
       this.target =
         logs?.integrations.get(data.target_id) ??

packages/discord.js/src/structures/VoiceChannelEffect.js

@@ -62,7 +62,7 @@ class VoiceChannelEffect {
    * @readonly
    */
   get channel() {
-    return this.guild.channels.cache.get(this.channelId) ?? null;
+    return this.guild.channels.resolve(this.channelId);
   }
 }
 

packages/discord.js/src/structures/VoiceState.js

@@ -136,7 +136,7 @@ class VoiceState extends Base {
    * @readonly
    */
   get member() {
-    return this.guild.members.cache.get(this.id) ?? null;
+    return this.guild.members.resolve(this.id);
   }
 
   /**
@@ -145,7 +145,7 @@ class VoiceState extends Base {
    * @readonly
    */
   get channel() {
-    return this.guild.channels.cache.get(this.channelId) ?? null;
+    return this.guild.channels.resolve(this.channelId);
   }
 
   /**