diff --git a/src/app.ts b/src/app.ts index eed1e0b..f171a2f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,19 +1,20 @@ import { Client, Intents } from "discord.js"; import { readdirSync } from "fs"; -import { EventSOn, Komand, ListenerFunkce, Modul, SuperListenerFunkce } from "./utils/types"; +import { EventSOn, Komand, ListenerFunkce, Modul, SRecord, SuperListenerFunkce } from "./utils/types"; import { formatCas, loadEnv, oddiakritikovat } from "./utils/utils.js"; +loadEnv(); + const ints = Intents.FLAGS; const client = new Client({ intents: [ints.GUILDS, ints.GUILD_VOICE_STATES, ints.GUILD_PRESENCES, ints.GUILD_MESSAGES] }); -loadEnv(); - const prefix = process.env.prefix || "more"; const modulFolder = `${__dirname}/modules/`; -const eventy: Record = {}; -const superEventy: Record = {}; -const komandy: Record = {}; -const aliasy: Record = {}; -const kuldan_log: Record> = {}; +const eventy: SRecord = {}; +const superEventy: SRecord = {}; +const komandy: SRecord = {}; +const aliasy: SRecord = {}; +const kuldan_log: SRecord> = {}; +const komandyNaPoslani: KoamndNaExport[] = []; const runEvent = (name: string, args: any[]) => { for (const listener of superEventy[name] || []) { diff --git a/src/modules/komComplex.ts b/src/modules/komComplex.ts index 6233b3d..8fc0cea 100644 --- a/src/modules/komComplex.ts +++ b/src/modules/komComplex.ts @@ -3,7 +3,7 @@ import { ActivityType, Message, PresenceStatusData } from "discord.js"; import { emouty } from "../utils/emotes"; -import { Modul } from "../utils/types"; +import { Modul, SRecord } from "../utils/types"; import { formatter, ping } from "../utils/utils"; const changeStatus = (mes: Message, status: PresenceStatusData) => { @@ -68,7 +68,7 @@ const exp: Modul = { if (!(presence && Object.keys(presence).length)) { embed.description = "*Všude je offline*"; } else { - const zarizeni: Record = { desktop: "Počítač", mobile: "Mobil", web: "Web" }; + const zarizeni: SRecord = { desktop: "Počítač", mobile: "Mobil", web: "Web" }; const statusy = { online: "🟢", idle: "🟡", dnd: "🔴" }; const uStatusy: string[] = []; const klice = Object.keys(presence) as ("web" | "mobile" | "desktop")[]; diff --git a/src/modules/spink.ts b/src/modules/spink.ts index 3d92cd9..1fb4701 100644 --- a/src/modules/spink.ts +++ b/src/modules/spink.ts @@ -3,11 +3,11 @@ import { GuildMember, Message, Role, VoiceState } from "discord.js"; import fetch from "node-fetch"; import { emouty } from "../utils/emotes"; -import { Modul, Spinkackar } from "../utils/types"; +import { Modul, Spinkackar, SRecord } from "../utils/types"; import { formatCas, formatter, oddiakritikovat, ping } from "../utils/utils"; -let spinkacky: Record; -const budouciSpinky: Record = {}; +let spinkacky: SRecord; +const budouciSpinky: SRecord = {}; const contactSpinkServer = async (akce: string, id: string, nick: string = "", avatar: string | null = "") => { const options = `heslo=${process.env.spinkPass}&akce=${akce}&id=${id}&nick=${encodeURIComponent(nick)}&avatar=${encodeURIComponent(avatar ?? "")}`; @@ -17,7 +17,7 @@ const contactSpinkServer = async (akce: string, id: string, nick: string = "", a const syncSpink = () => { fetch("https://spinkacek.ga/api/spinkacky") - .then(r => r.json() as Promise<{ spinkacky: Record; }>) + .then(r => r.json() as Promise<{ spinkacky: SRecord; }>) .then(d => { const data = d.spinkacky; const keys = Object.keys(data); diff --git a/src/modules/status.ts b/src/modules/status.ts index 551a519..01e5261 100644 --- a/src/modules/status.ts +++ b/src/modules/status.ts @@ -1,7 +1,7 @@ // Trekování statusů všech lidí o kterých bot ví import { Client, Guild, Presence, User } from "discord.js"; import fetch from "node-fetch"; -import { FakePresence, Modul, StatusyINaFounu, UserChange, ZmenovejObjekt } from "../utils/types"; +import { FakePresence, Modul, SRecord, StatusyINaFounu, UserChange, ZmenovejObjekt } from "../utils/types"; const role = { online: "Online", idle: "Idle", dnd: "DND", offline: "Offline" }; const statusy = { Offline: "0", Online: "1", Idle: "2", DND: "3", OnlinePhone: "11", IdlePhone: "12", DNDPhone: "13" }; @@ -24,7 +24,7 @@ const prepSend = (zmeny: UserChange[]) => { poslatData({ changes }); }; -const poslatData = (data: Record) => { +const poslatData = (data: SRecord) => { data.pwd = process.env.statPass; fetch("http://deadfish.cz:4629/endpoint-pro-denimka/", { method: "POST", headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(data) }); }; diff --git a/src/modules/vojs.ts b/src/modules/vojs.ts index 5819327..0b003b9 100644 --- a/src/modules/vojs.ts +++ b/src/modules/vojs.ts @@ -3,10 +3,10 @@ import { getVoiceConnection, VoiceConnection, VoiceConnectionStatus } from "@discordjs/voice"; import { GuildMember, VoiceChannel } from "discord.js"; import { emouty } from "../utils/emotes"; -import { Modul, MuzikaFace } from "../utils/types"; +import { Modul, MuzikaFace, SRecord } from "../utils/types"; import { handlePrevVoice, joinVoice, play } from "../utils/utils"; -const timeouty: Record = {}; +const timeouty: SRecord = {}; const vypocitatCas = (conn: VoiceConnection) => { const c = new Date(); diff --git a/src/utils/types.ts b/src/utils/types.ts index b5a47b4..732c79a 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -21,8 +21,10 @@ interface SuperObject { export type EventSOn = `on_${keyof ClientEvents}` | `super_on_${keyof ClientEvents}`; +export type SRecord = Record; + export type Modul = { - more_komandy?: Record; + more_komandy?: SRecord; client?: Client; } & { [key in EventSOn]?: ListenerFunkce | SuperObject | SuperListenerFunkce; }; diff --git a/src/utils/utils.ts b/src/utils/utils.ts index b303987..d21614e 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -1,11 +1,11 @@ import { AudioPlayerStatus, AudioResource, createAudioPlayer, createAudioResource, entersState, getVoiceConnection, joinVoiceChannel, PlayerSubscription, VoiceConnection, VoiceConnectionStatus } from "@discordjs/voice"; import { Guild, StageChannel, VoiceChannel } from "discord.js"; import { once } from "events"; -import { MuzikaFace } from "./types"; +import { MuzikaFace, SRecord } from "./types"; import { existsSync } from "fs"; import { Readable } from "node:stream"; -const pripojeni: Record = {}; +const pripojeni: SRecord = {}; export const oddiakritikovat = (a: string) => { return a