From 9bba0012c9849794ac8f202fa8a9d0df6e557e29 Mon Sep 17 00:00:00 2001
From: det-fys <tovjemam@deadfish.cz>
Date: Fri, 12 Jul 2024 19:47:27 +0200
Subject: [PATCH] homemade DN0196

---
 src/app.ts              | 13 +++++++++++--
 src/modules/custom.ts   |  2 ++
 src/utils/helpServer.ts |  7 +++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/app.ts b/src/app.ts
index c6a91bc..43f178e 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -291,9 +291,18 @@ client.on("messageCreate", async mes => {
     return;
   }
 
-  const celArgs = args.join(" ");
   const komandBez = oddiakritikovat(komandSDiakritikou).toLowerCase();
-  const cmdName = client.aliasy[komandBez] ?? komandBez;
+  // const cmdName = client.aliasy[komandBez] ?? komandBez;
+  let cmdName = komandBez;
+  
+  const aliasCelej = client.aliasy[komandBez];
+  if (aliasCelej) {
+    const [aliasCmdName, ...aliasArgs] = aliasCelej.split(" ");
+    cmdName = aliasCmdName;
+    args.unshift(...aliasArgs);
+  }
+  
+  const celArgs = args.join(" ");
 
   if (await runEvent("messageCreate", [mes, cmdName])) return;
 
diff --git a/src/modules/custom.ts b/src/modules/custom.ts
index edada3f..c4914a6 100644
--- a/src/modules/custom.ts
+++ b/src/modules/custom.ts
@@ -109,6 +109,8 @@ const exp: Modul = {
           jmeno = customKomandy[args[1]] ? args[1] : customAliasy[args[1]].cmd;
         } else jmeno = zakladniKomandy[args[1]] ? args[1] : zakladniAliasy[args[1]];
 
+        if (args.length > 2) jmeno += " " + args.slice(2).join(" ");
+
         customAliasy[args[0]] = { cmd: jmeno, owner: mes.author.id };
         save();
         return "jo";
diff --git a/src/utils/helpServer.ts b/src/utils/helpServer.ts
index a6b99e5..b9bcacd 100644
--- a/src/utils/helpServer.ts
+++ b/src/utils/helpServer.ts
@@ -9,9 +9,12 @@ createServer((_, res) => {
   const vsechnyKomandy: KomandNaExport[] = JSON.parse(JSON.stringify([...komandy, ...customKomandy]));
 
   for (const key in customAliasy) {
-    const i = vsechnyKomandy.findIndex(komand => komand.name == customAliasy[key]);
+    const aliasParts = customAliasy[key].split(" ");
+    const aliasCmd = aliasParts[0];
+
+    const i = vsechnyKomandy.findIndex(komand => komand.name == aliasCmd);
     if (i == -1) continue;
-    (vsechnyKomandy[i].als ??= []).push(key);
+    (vsechnyKomandy[i].als ??= []).push(aliasParts.length == 1 ? key : `${key} [${aliasParts.slice(1).join(" ")}]`);
   }
 
   vsechnyKomandy.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);