From 6f1f79d0586a7d8c85d761977579c1e7ee800d17 Mon Sep 17 00:00:00 2001 From: Histmy Date: Mon, 5 Jun 2023 12:41:31 +0200 Subject: [PATCH] =?UTF-8?q?dal=C5=A1=C3=AD=20teoreticky=20zlep=C5=A1en?= =?UTF-8?q?=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- src/modules/custom.ts | 27 ++++++++++++--------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index f201aef..df86444 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "denim_3001", - "version": "3001.50.0", + "version": "3001.50.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "denim_3001", - "version": "3001.50.0", + "version": "3001.50.1", "license": "ISC", "dependencies": { "@discordjs/voice": "^0.15.0", diff --git a/package.json b/package.json index ebe2297..5e2622d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "denim_3001", - "version": "3001.50.0", + "version": "3001.50.1", "description": "Toto je velmi kvalitní bot.", "repository": { "url": "https://github.com/Histmy/Denim-Bot/" diff --git a/src/modules/custom.ts b/src/modules/custom.ts index 01d5906..4791e61 100644 --- a/src/modules/custom.ts +++ b/src/modules/custom.ts @@ -41,6 +41,12 @@ function save() { spojit(); } +function komandNeboAlias(nazev: string) { + if (customKomandy[nazev]) return { jeKomand: true, cmd: customKomandy[nazev] }; + if (customAliasy[nazev]) return { jeKomand: false, cmd: customAliasy[nazev] }; + return { jeKomand: false }; +} + const exp: Modul = { more_komandy: { naucse: { @@ -94,11 +100,8 @@ const exp: Modul = { if (zakladniKomandy[name]) return "tuten komand se neda smazat ti smazko"; if (zakladniAliasy[name]) return "tuten alijaas se neda smazat ti smazko"; - let jeKomand: boolean; - let cmd; - if (cmd = customKomandy[name]) jeKomand = true; - else if (cmd = customAliasy[name]) jeKomand = false; - else return `"${name}" nen komnad an alias`; + const { jeKomand, cmd } = komandNeboAlias(name); + if (!cmd) return `"${name}" nen komnad an alias`; if (cmd.owner != mes.author.id) return "tuto ael neni tvoje toxikale zkurvenej"; @@ -204,11 +207,8 @@ const exp: Modul = { if (zakladniKomandy[name]) return "tuten komand se neda vopravit"; if (zakladniAliasy[name]) return "tuten alijaas se neda vopravit"; - let jeKomand: boolean; - let cmd; - if (cmd = customKomandy[name]) jeKomand = true; - else if (cmd = customAliasy[name]) jeKomand = false; - else return `"${name}" nen komnad an alias`; + const { jeKomand, cmd } = komandNeboAlias(name); + if (!cmd) return `"${name}" nen komnad an alias`; if (cmd.owner != mes.author.id) return "tuto ael neni tvoe toxikale zkurvenej"; @@ -232,11 +232,8 @@ const exp: Modul = { if (zakladniKomandy[name]) return "tuten komand se neda vopravit"; if (zakladniAliasy[name]) return "tuten alijaas se neda vopravit"; - let jeKomand: boolean; - let cmd; - if (cmd = customKomandy[name]) jeKomand = true; - else if (cmd = customAliasy[name]) jeKomand = false; - else return `"${name}" nen komnad an alias`; + const { jeKomand, cmd } = komandNeboAlias(name); + if (!cmd) return `"${name}" nen komnad an alias`; if (cmd.owner != mes.author.id) return "tuto ael neni tvoe toxikale zkurvenej";