diff --git a/package-lock.json b/package-lock.json index ffbfdfb..61d9ac7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "denim_3001", - "version": "3001.56.0", + "version": "3001.57.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "denim_3001", - "version": "3001.56.0", + "version": "3001.57.0", "license": "ISC", "dependencies": { "@discordjs/voice": "^0.16.1", diff --git a/package.json b/package.json index 046e602..a1c1489 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "denim_3001", - "version": "3001.56.0", + "version": "3001.57.0", "description": "Toto je velmi kvalitní bot.", "repository": { "url": "https://github.com/Histmy/Denim-Bot/" diff --git a/src/modules/anketa.ts b/src/modules/anketa.ts index 90b5ad2..2a6f5dc 100644 --- a/src/modules/anketa.ts +++ b/src/modules/anketa.ts @@ -12,7 +12,6 @@ const exp: Modul = { more_komandy: { anketa: { - arg: "([nastaveni]) moznosti...", DMUnsafe: true, slashRun: async int => { diff --git a/src/modules/custom.ts b/src/modules/custom.ts index 26cf5f1..75c3098 100644 --- a/src/modules/custom.ts +++ b/src/modules/custom.ts @@ -220,41 +220,78 @@ const exp: Modul = { } }, - aliasy: (mes, arg) => { - const name = arg.toLowerCase(); - const cmdName = client.aliasy[name] ?? name; + aliasy: { + arg: "název komandu nebo jedno z aliasů", + run: (mes, arg) => { + const name = arg.toLowerCase(); + const cmdName = client.aliasy[name] ?? name; - let celkovadylka = 0; - const stranky: string[][] = [[]]; - let aktualniStranka = 0; - for (const key in client.aliasy) { - const val = client.aliasy[key]; - if (val != cmdName) continue; + let celkovadylka = 0; + const stranky: string[][] = [[]]; + let aktualniStranka = 0; + for (const key in client.aliasy) { + const val = client.aliasy[key]; + if (val != cmdName) continue; - const dylka = key.length + 3; - celkovadylka += dylka; - if (celkovadylka > 1024 || stranky[aktualniStranka].length == 20) { - aktualniStranka++; - celkovadylka = dylka; + const dylka = key.length + 3; + celkovadylka += dylka; + if (celkovadylka > 1024 || stranky[aktualniStranka].length == 20) { + aktualniStranka++; + celkovadylka = dylka; + } + + const stranka = stranky[aktualniStranka] ??= []; + stranka.push(key); } - const stranka = stranky[aktualniStranka] ??= []; - stranka.push(key); + if (!celkovadylka) return `"${name}" bud nen9 komand ani ajilas nebo nema ajilasi vubec`; + + const zacatekNazvu = `alijasy pro **${cmdName}**:`; + const embed: APIEmbed = { + color: 13697024, + fields: [{ name: zacatekNazvu, value: `• ${stranky[0].join("\n• ")}` }] + }; + + if (stranky.length == 1) return { embeds: [embed] }; + + embed.fields![0].name += ` (1/${stranky.length})`; + + strankovani(mes.channel, embed, zacatekNazvu, stranky); } + }, - if (!celkovadylka) return `"${name}" bud nen9 komand ani ajilas nebo nema ajilasi vubec`; + coje: { + arg: "název komandu nebo aliasu", + run: (_, arg) => { + const nazev = oddiakritikovat(arg.toLowerCase()); - const zacatekNazvu = `alijasy pro **${cmdName}**:`; - const embed: APIEmbed = { - color: 13697024, - fields: [{ name: zacatekNazvu, value: `• ${stranky[0].join("\n• ")}` }] - }; + // Vestavěnej komand + const vZakladni = zakladniKomandy[nazev]?.run; + if (typeof vZakladni == "function") + return "tuto je slozitej kmenovej koamnd"; - if (stranky.length == 1) return { embeds: [embed] }; + if (typeof vZakladni == "string") + return `tuto je kmenovej koamnd a povida "${vZakladni}"`; - embed.fields![0].name += ` (1/${stranky.length})`; + // Vestavěnej alias + const vZakladniAlias = zakladniAliasy[nazev]; + if (vZakladniAlias) + return `tuto je kmenovej alijaas na "${vZakladniAlias}"`; - strankovani(mes.channel, embed, zacatekNazvu, stranky); + // Vlastní komand + const vlastniKomand = customKomandy[nazev]; + if (vlastniKomand) { + const jekod = vlastniKomand.text.startsWith("dj:"); + const textZatim = `tuto je valstni koamnd <@${vlastniKomand.owner}> a ${jekod ? "tahle fukue" : "povida"}:\`\`\``; + return `${textZatim}${vlastniKomand.text.slice(0, 1997 - textZatim.length)}\`\`\``; + } + + // Vlastní alias + const vlastniAlias = customAliasy[nazev]; + if (vlastniAlias) + return `tuto je vlastni alijaas <@${vlastniAlias.owner}> na "${vlastniAlias.cmd}"`; + + } } }, diff --git a/src/modules/komComplex.ts b/src/modules/komComplex.ts index 206ac6a..b4b4418 100644 --- a/src/modules/komComplex.ts +++ b/src/modules/komComplex.ts @@ -3,7 +3,7 @@ import { ChannelType, Message, MessageReaction } from "discord.js"; import { emouty } from "../utils/emotes"; import { Modul, SRecord } from "../utils/types"; -import { formatter, ping } from "../utils/utils"; +import { formatter, ping, sendDM } from "../utils/utils"; const exp: Modul = { more_komandy: { @@ -98,8 +98,8 @@ const exp: Modul = { } setTimeout(async () => { - for (let i = 0; i < 15; i++) { - await mes.author.send("uz?"); + for (let i = 0; i < 7; i++) { + await sendDM(mes.author, "uz?"); } }, cas * 1000); diff --git a/src/modules/muzika.ts b/src/modules/muzika.ts index 938970c..bf90786 100644 --- a/src/modules/muzika.ts +++ b/src/modules/muzika.ts @@ -126,6 +126,7 @@ const exp: Modul = { remove: { DMUnsafe: true, als: ["odebrat"], + arg: "pořadový číslo věci, kterou odebrat", run: (mes, arg) => { const numero = Number(arg); if (isNaN(numero)) return "cokundo?"; @@ -142,6 +143,7 @@ const exp: Modul = { seek: { DMUnsafe: true, + arg: "na kolikátou sekundu přetočit", run: (mes, arg) => { const numero = Number(arg); if (isNaN(numero)) return "huh?"; diff --git a/src/modules/spink.ts b/src/modules/spink.ts index 1f65553..f1d86ff 100644 --- a/src/modules/spink.ts +++ b/src/modules/spink.ts @@ -157,6 +157,7 @@ const exp: Modul = { vstavacek: { als: ["vstavcacek", "gm", "unspinkacek"], + arg: "fejk (nepovinné)", run: async (mes, arg) => { if (mes.author.bot) return emouty.sjeta; diff --git a/src/modules/zbytek.ts b/src/modules/zbytek.ts index 4dd0d5f..8470464 100644 --- a/src/modules/zbytek.ts +++ b/src/modules/zbytek.ts @@ -109,13 +109,14 @@ const exp: Modul = { if (pocet < 7) return false; (async () => { - if (mes.author.id == client.user?.id) return mes.channel.send("uz nechci"); + if (mes.author.id == client.user?.id) + return mes.content != "uz nechci" ? mes.channel.send("uz nechci") : ""; const adminRole = mes.member?.roles.cache.find(r => r.name == "admin"); if (adminRole) { - await mes.member?.roles.remove(adminRole).catch(e => log("nejde odebrat admin", e)); + await mes.member?.roles.remove(adminRole).catch(e => log(mes.author.displayName, "nejde odebrat admin", e)); } - await mes.member?.timeout(60_000, "spamer zasranej").catch(e => log("nejde timeoutnout zmrd", e)); + await mes.member?.timeout(60_000, "spamer zasranej").catch(e => log(mes.author.displayName, "nejde timeoutnout zmrd", e)); if (adminRole) setTimeout(() => { mes.member?.roles.add(adminRole); }, 60_000);