From 44329ce277182421d2209fc116e39fff4faecb62 Mon Sep 17 00:00:00 2001
From: Histmy <Histmytv@seznam.cz>
Date: Mon, 27 Sep 2021 21:07:31 +0200
Subject: [PATCH] added better pgn

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

diff --git a/package-lock.json b/package-lock.json
index 4509faf..a555d5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "denim_3001",
-  "version": "3001.27.1",
+  "version": "3001.28.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "denim_3001",
-      "version": "3001.27.1",
+      "version": "3001.28.0",
       "license": "ISC",
       "dependencies": {
         "@discordjs/opus": "github:discordjs/opus",
diff --git a/package.json b/package.json
index d1f795f..4b33819 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "denim_3001",
-  "version": "3001.27.1",
+  "version": "3001.28.0",
   "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 16698b8..a3b6e85 100644
--- a/src/modules/spink.ts
+++ b/src/modules/spink.ts
@@ -83,14 +83,16 @@ module.exports = {
       if (/^\d+$/.test(kdy) || !kdy)
         spink.setTime(tedT + Number(kdy || 7200) * 1000);
       else {
-        const cojavim = /^((?<d>\d+)\. ?((?<mo>\d+)\.)? ?)?(?<h>\d+):(?<m>\d+)(:(?<s>\d+))?$/.exec(kdy);
+        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);
-        spink.setHours(Number(g.h));
-        spink.setMinutes(Number(g.m));
+        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";
       }