Remove distinction

Author: holzmaster

src/commands/hilfe.ts

@@ -16,8 +16,12 @@ export default class HilfeCommand implements MessageCommand {
         const prefix = context.prefix.command;
 
         const lines = [];
-        const newCommands = await commandService.readAvailableCommands(context, ["normal"]);
+        const newCommands = await commandService.readAvailableCommands(context);
         for (const command of newCommands) {
+            if (command.modCommand) {
+                continue;
+            }
+
             // TODO: Hack to exclude faulenzerping and video download
             if (
                 "applicationCommand" in command &&

src/commands/modcommands/modhilfe.ts

@@ -15,8 +15,12 @@ export default class ModHilfeCommand implements MessageCommand {
         const prefix = context.prefix.modCommand;
 
         const lines = [];
-        const newCommands = await commandService.readAvailableCommands(context, ["mod"]);
+        const newCommands = await commandService.readAvailableCommands(context);
         for (const command of newCommands) {
+            if (!command.modCommand) {
+                continue;
+            }
+
             const commandStr = prefix + command.name;
             lines.push(
                 `${commandStr}: ${replacePrefixPlaceholders(command.description, context)}\n`,

src/handler/commandHandler.ts

@@ -50,21 +50,14 @@ const getMessageCommands = (modCommand: boolean) =>
 const latestSpecialCommandInvocations: Record<string, number> = {};
 
 export const loadCommands = async (context: BotContext): Promise<void> => {
-    const availableCommands = await commandService.readAvailableCommands(context, [
-        "mod",
-        "normal",
-    ]);
+    const availableCommands = await commandService.readAvailableCommands(context);
 
-    // We also respect the modCommand flag, so we can load .hilfe and ~hilfe
-    const loadedCommandNames = new Set(
-        staticCommands.map(c => `${c.name}-${c.modCommand ?? false}`),
-    );
+    const loadedCommandNames = new Set(staticCommands.map(c => c.name));
 
     const dynamicCommands = [];
     for (const instance of availableCommands) {
-        const loadedName = `${instance.name}-${instance.modCommand ?? false}`;
-        if (loadedCommandNames.has(loadedName)) {
-            log.debug(`Command "${loadedName}" is already loaded, skipping`);
+        if (loadedCommandNames.has(instance.name)) {
+            log.debug(`Command "${instance.name}" is already loaded, skipping`);
             continue;
         }
 

src/service/command.ts

@@ -12,22 +12,11 @@ import log from "#log";
 const commandExtensions = [".ts", ".js"];
 const ignoredExtensions = [".spec.ts", ".test.ts", ".d.ts", ".test.js", ".spec.js"];
 
-export type CommandKind = "mod" | "normal";
-
-export async function readAvailableCommands(
-    context: BotContext,
-    kinds: readonly CommandKind[],
-): Promise<Command[]> {
-    const modules = [];
-
-    if (kinds.includes("mod")) {
-        const modCommands = await loadRawCommandModulesFromDirectory(context.path.modCommands);
-        modules.push(...modCommands);
-    }
-    if (kinds.includes("normal")) {
-        const commands = await loadRawCommandModulesFromDirectory(context.path.commands);
-        modules.push(...commands);
-    }
+export async function readAvailableCommands(context: BotContext): Promise<Command[]> {
+    const modules = [
+        ...(await loadRawCommandModulesFromDirectory(context.path.modCommands)),
+        ...(await loadRawCommandModulesFromDirectory(context.path.commands)),
+    ];
 
     const res = [];
     for (const { module } of modules) {