added better pgn

This commit is contained in:
Histmy 2021-09-27 21:07:31 +02:00
parent 802a1bdbb8
commit 44329ce277
3 changed files with 8 additions and 6 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.27.1", "version": "3001.28.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.27.1", "version": "3001.28.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@discordjs/opus": "github:discordjs/opus", "@discordjs/opus": "github:discordjs/opus",

View File

@ -1,6 +1,6 @@
{ {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.27.1", "version": "3001.28.0",
"description": "Toto je velmi kvalitní bot.", "description": "Toto je velmi kvalitní bot.",
"repository": { "repository": {
"url": "https://github.com/Histmy/Denim-Bot/" "url": "https://github.com/Histmy/Denim-Bot/"

View File

@ -83,14 +83,16 @@ module.exports = {
if (/^\d+$/.test(kdy) || !kdy) if (/^\d+$/.test(kdy) || !kdy)
spink.setTime(tedT + Number(kdy || 7200) * 1000); spink.setTime(tedT + Number(kdy || 7200) * 1000);
else { 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?`; if (!cojavim) return `cos to tam napsal ty kokote?`;
const g = cojavim.groups!; const g = cojavim.groups!;
if (g.d) spink.setDate(Number(g.d)); 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); if (g.mo) spink.setMonth(Number(g.mo) - 1);
spink.setHours(Number(g.h)); const h = Number(g.h);
spink.setMinutes(Number(g.m)); spink.setHours(g.p == "pm" && h < 12 ? h + 12 : h);
spink.setMinutes(Number(g.m) || 0);
spink.setSeconds(Number(g.s) || 0); spink.setSeconds(Number(g.s) || 0);
if (Number(spink) < tedT) return "to uz bylo ty magore"; if (Number(spink) < tedT) return "to uz bylo ty magore";
} }