From fab5e316452828d00436fb9c407790646e88b430 Mon Sep 17 00:00:00 2001
From: Histmy <Histmytv@seznam.cz>
Date: Sun, 7 Nov 2021 22:47:19 +0100
Subject: [PATCH] 3001.30.1 added alias p:gn: added command zruspgn

---
 package-lock.json    |  4 +--
 package.json         |  2 +-
 src/modules/spink.ts | 72 ++++++++++++++++++++++++++------------------
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4614048..a0291fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "denim_3001",
-  "version": "3001.30.0",
+  "version": "3001.30.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "denim_3001",
-      "version": "3001.30.0",
+      "version": "3001.30.1",
       "license": "ISC",
       "dependencies": {
         "@discordjs/opus": "github:discordjs/opus",
diff --git a/package.json b/package.json
index daced30..b7e04fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "denim_3001",
-  "version": "3001.30.0",
+  "version": "3001.30.1",
   "description": "Toto je velmi kvalitní bot.",
   "repository": {
     "url": "https://github.com/Histmy/Denim-Bot/"
diff --git a/src/modules/spink.ts b/src/modules/spink.ts
index 410f94c..d0fb4c1 100644
--- a/src/modules/spink.ts
+++ b/src/modules/spink.ts
@@ -46,7 +46,7 @@ const exp: Modul = {
   more_komandy: {
 
     spinkacek: {
-      als: ["spink", "spoink", "spinkake", "spoinkacek", "gn", "<:spinkacek:761652251966046208>", "<:gn:887124590583746590>"],
+      als: ["spink", "spoink", "spinkake", "spoinkacek", "gn", emouty.spinkacek, emouty.gn],
       run: async (mes) => {
         if (mes.author.bot) return `až někdy${emouty.kapp}`;
         if (await handleSpink("spinkacek", mes.member!)) {
@@ -81,38 +81,41 @@ const exp: Modul = {
       }
     },
 
-    pgn: (mes, kdy) => {
-      if (mes.author.bot) return emouty.sjeta;
+    pgn: {
+      als: [`p${emouty.gn}`],
+      run: (mes, kdy) => {
+        if (mes.author.bot) return emouty.sjeta;
 
-      const ted = new Date();
-      const tedT = Number(ted);
-      const spink = new Date();
+        const ted = new Date();
+        const tedT = Number(ted);
+        const spink = new Date();
 
-      if (/^\d+$/.test(kdy) || !kdy)
-        spink.setTime(tedT + Number(kdy || 7200) * 1000);
-      else {
-        const cojavim = /^((?<d>\d+)\. ?((?<mo>\d+)\.)? ?|(?<z>z([ií]|ej)tra) )?(?<h>\d+)(:(?<m>\d+)(:(?<s>\d+))?)? ?(?<p>am|pm)?$/.exec(kdy.toLowerCase());
-        if (!cojavim) return `cos to tam napsal  ty kokote?`;
+        if (/^\d+$/.test(kdy) || !kdy)
+          spink.setTime(tedT + Number(kdy || 7200) * 1000);
+        else {
+          const cojavim = /^((?<d>\d+)\. ?((?<mo>\d+)\.)? ?|(?<z>z([ií]|ej)tra) )?(?<h>\d+)(:(?<m>\d+)(:(?<s>\d+))?)? ?(?<p>am|pm)?$/.exec(kdy.toLowerCase());
+          if (!cojavim) return `cos to tam napsal  ty kokote?`;
 
-        const g = cojavim.groups!;
-        if (g.d) spink.setDate(Number(g.d));
-        if (g.z) spink.setDate(ted.getDate() + 1);
-        if (g.mo) spink.setMonth(Number(g.mo) - 1);
-        const h = Number(g.h);
-        spink.setHours(g.p == "pm" && h < 12 ? h + 12 : h);
-        spink.setMinutes(Number(g.m) || 0);
-        spink.setSeconds(Number(g.s) || 0);
-        if (Number(spink) < tedT) return "to uz bylo ty magore";
+          const g = cojavim.groups!;
+          if (g.d) spink.setDate(Number(g.d));
+          if (g.z) spink.setDate(ted.getDate() + 1);
+          if (g.mo) spink.setMonth(Number(g.mo) - 1);
+          const h = Number(g.h);
+          spink.setHours(g.p == "pm" && h < 12 ? h + 12 : h);
+          spink.setMinutes(Number(g.m) || 0);
+          spink.setSeconds(Number(g.s) || 0);
+          if (Number(spink) < tedT) return "to uz bylo ty magore";
+        }
+
+        const uzPgn = budouciSpinky[mes.author.id];
+        if (uzPgn) {
+          clearTimeout(uzPgn);
+          delete budouciSpinky[mes.author.id];
+        }
+
+        budouciSpinky[mes.author.id] = setTimeout(() => handleSpink("spinkacek", mes.member!), Number(spink) - tedT);
+        return `tvuj spinkacek byl naplanovan na ${formatter(spink)}`;
       }
-
-      const uzPgn = budouciSpinky[mes.author.id];
-      if (uzPgn) {
-        clearTimeout(uzPgn);
-        delete budouciSpinky[mes.author.id];
-      }
-
-      budouciSpinky[mes.author.id] = setTimeout(() => handleSpink("spinkacek", mes.member!), Number(spink) - tedT);
-      return `tvuj spinkacek byl naplanovan na ${formatter(spink)}`;
     },
 
     ps: {
@@ -126,6 +129,17 @@ const exp: Modul = {
         const cas = Number(new Date()) - Number(new Date(tajmUp));
         return `uz ${f ? "je" : "jsi"} vzhuru ${formatCas(cas / 1000)}`;
       }
+    },
+
+    zruspgn: {
+      als: ["zpgn", "cancelpgn", "cpgn", "unpgn", `unp${emouty.gn}`],
+      run: (mes) => {
+        const jehoSpink = budouciSpinky[mes.author.id];
+        if (!jehoSpink) return `spinkacek ale nemas naplanovanej ty kkte ${mes.author}`;
+        clearTimeout(jehoSpink);
+        delete budouciSpinky[mes.author.id];
+        return "to bylo teda trapny debile";
+      }
     }
   },