Fix several locations that expected resolveUser() to return null

backend/src/plugins/ModActions/commands/BanCmd.ts

@@ -33,7 +33,9 @@ export const BanCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const memberToBan = await resolveMember(pluginData.client, pluginData.guild, user.id);
 

backend/src/plugins/ModActions/commands/CasesUserCmd.ts

@@ -36,7 +36,9 @@ export const CasesUserCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const cases = await pluginData.state.cases.with("notes").getByUserId(user.id);
     const normalCases = cases.filter(c => !c.is_hidden);

backend/src/plugins/ModActions/commands/ForcebanCmd.ts

@@ -31,7 +31,9 @@ export const ForcebanCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     // If the user exists as a guild member, make sure we can act on them first
     const member = await resolveMember(pluginData.client, pluginData.guild, user.id);

backend/src/plugins/ModActions/commands/ForcemuteCmd.ts

@@ -33,7 +33,9 @@ export const ForcemuteCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const memberToMute = await resolveMember(pluginData.client, pluginData.guild, user.id);
 

backend/src/plugins/ModActions/commands/ForceunmuteCmd.ts

@@ -31,7 +31,9 @@ export const ForceUnmuteCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     // Check if they're muted in the first place
     if (!(await pluginData.state.mutes.isMuted(user.id))) {

backend/src/plugins/ModActions/commands/MuteCmd.ts

@@ -43,7 +43,9 @@ export const MuteCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const memberToMute = await resolveMember(pluginData.client, pluginData.guild, user.id);
 

backend/src/plugins/ModActions/commands/NoteCmd.ts

@@ -20,7 +20,9 @@ export const NoteCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const userName = `${user.username}#${user.discriminator}`;
     const reason = formatReasonWithAttachments(args.note, msg.attachments);

backend/src/plugins/ModActions/commands/UnbanCmd.ts

@@ -28,7 +28,9 @@ export const UnbanCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     // The moderator who did the action is the message author or, if used, the specified -mod
     let mod = msg.member;

backend/src/plugins/ModActions/commands/UnmuteCmd.ts

@@ -33,7 +33,9 @@ export const UnmuteCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const memberToUnmute = await resolveMember(pluginData.client, pluginData.guild, user.id);
     const mutesPlugin = pluginData.getPlugin(MutesPlugin);

backend/src/plugins/ModActions/commands/WarnCmd.ts

@@ -29,7 +29,9 @@ export const WarnCmd = modActionsCmd({
 
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
-    if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    if (!user.id) {
+      return sendErrorMessage(pluginData, msg.channel, `User not found`);
+    }
 
     const memberToWarn = await resolveMember(pluginData.client, pluginData.guild, user.id);
 

backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts

@@ -24,7 +24,9 @@ export async function actualKickMemberCmd(
   },
 ) {
   const user = await resolveUser(pluginData.client, args.user);
-  if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
+  if (!user.id) {
+    return sendErrorMessage(pluginData, msg.channel, `User not found`);
+  }
 
   const memberToKick = await resolveMember(pluginData.client, pluginData.guild, user.id);
 

backend/src/plugins/ModActions/functions/banUserId.ts

@@ -27,7 +27,7 @@ export async function banUserId(
 ): Promise<BanResult> {
   const config = pluginData.config.get();
   const user = await resolveUser(pluginData.client, userId);
-  if (!user) {
+  if (!user.id) {
     return {
       status: "failed",
       error: "Invalid user",

backend/src/plugins/Mutes/functions/muteUser.ts

@@ -42,7 +42,7 @@ export async function muteUser(
   }
 
   const user = await resolveUser(pluginData.client, userId);
-  if (!user) {
+  if (!user.id) {
     lock.unlock();
     throw new RecoverablePluginError(ERRORS.INVALID_USER);
   }