Merge branch 'ZeppelinBot:master' into stock

Author: rubyowo

backend/src/plugins/ModActions/commands/addcase/AddCaseSlashCmd.ts

@@ -28,7 +28,9 @@ export const AddCaseSlashCmd = modActionsSlashCmd({
       name: "type",
       description: "The type of case to add",
       required: true,
-      choices: Object.keys(CaseTypes).map((type) => ({ name: type, value: type })),
+      choices: Object.keys(CaseTypes)
+        .filter((key) => isNaN(Number(key)))
+        .map((key) => ({ name: key, value: key })),
     }),
     slashOptions.user({ name: "user", description: "The user to add a case to", required: true }),
 

backend/src/plugins/ModActions/commands/unhidecase/UnhideCaseMsgCmd.ts

@@ -1,6 +1,6 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes.js";
 import { modActionsMsgCmd } from "../../types.js";
-import { actualHideCaseCmd } from "../hidecase/actualHideCaseCmd.js";
+import { actualUnhideCaseCmd } from "./actualUnhideCaseCmd.js";
 
 export const UnhideCaseMsgCmd = modActionsMsgCmd({
   trigger: ["unhide", "unhidecase", "unhide_case"],
@@ -14,6 +14,6 @@ export const UnhideCaseMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualHideCaseCmd(pluginData, msg, args.caseNum);
+    actualUnhideCaseCmd(pluginData, msg, args.caseNum);
   },
 });

backend/src/utils/templateSafeObjects.ts

@@ -261,11 +261,11 @@ export function userToTemplateSafeUser(user: User | UnknownUser | PartialUser):
 
   return new TemplateSafeUser({
     id: user.id,
-    username: "Unknown",
-    discriminator: "0000",
+    username: user.username || "Unknown",
+    discriminator: user.discriminator || "0000",
     mention: `<@${user.id}>`,
-    tag: "Unknown#0000",
-    renderedUsername: "Unknown",
+    tag: user.tag || "Unknown#0000",
+    renderedUsername: user.tag || "Unknown",
   });
 }