diff --git a/.swcrc b/.swcrc index 8622d22..a2c9065 100644 --- a/.swcrc +++ b/.swcrc @@ -1,5 +1,5 @@ { - "$schema": "https://json.schemastore.org/swcrc", + "$schema": "https://swc.rs/schema.json", "jsc": { "parser": { "syntax": "typescript", @@ -25,7 +25,8 @@ "strictMode": true, "noInterop": false, "lazy": false, - "ignoreDynamic": true + "ignoreDynamic": true, + "resolveFully": true }, "minify": false, "sourceMaps": false diff --git a/package.json b/package.json index 799e7ae..7f534f6 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "db:studio": "drizzle-kit studio", "db:start": "docker compose -f dev-db.yml up -d", "db:stop": "docker compose -f dev-db.yml down", - "bot:update": "tsx scripts/update-bot.ts", "push:prod": "tsx scripts/deploy-commands.ts", "push:dev": "tsx scripts/dev-deploy.ts", "delete:dev": "tsx scripts/delete-commands.ts" diff --git a/scripts/delete-commands.ts b/scripts/delete-commands.ts index 9fb9ac7..40dcdad 100644 --- a/scripts/delete-commands.ts +++ b/scripts/delete-commands.ts @@ -1,13 +1,13 @@ import { REST, Routes } from "discord.js" import env from "../src/utils/Env" -import { log } from "../src/utils/Logger.js" +import { log } from "../src/utils/Logger" const rest = new REST({ version: "10" }).setToken(env.dev.DEVTOKEN) try { log("Started deleting application (/) commands.", "info") await rest.put( - Routes.applicationGuildCommands(env.dev.devid, env.dev.guildid), + Routes.applicationGuildCommands(env.dev.DEVID, env.dev.GUILDID), { body: [] } ) log("Successfully deleted application (/) commands.", "info") diff --git a/scripts/deploy-commands.ts b/scripts/deploy-commands.ts index 6298926..797b6e9 100644 --- a/scripts/deploy-commands.ts +++ b/scripts/deploy-commands.ts @@ -1,8 +1,8 @@ import { REST, RESTPutAPIApplicationCommandsJSONBody, Routes } from "discord.js" import fs from "node:fs" -import { ICommand } from "../src/interfaces" +import { ICommand } from "../src/typings" import env from "../src/utils/Env" -import { log } from "../src/utils/Logger.js" +import { log } from "../src/utils/Logger" const rest = new REST({ version: "10" }).setToken(env.prod.TOKEN) const commands: RESTPutAPIApplicationCommandsJSONBody = [] @@ -25,7 +25,7 @@ try { log(commandsString.join("\n"), "info", { type: "preset", color: "lavender" }) await rest.put( - Routes.applicationCommands(env.dev.clientid), + Routes.applicationCommands(env.dev.CLIENTID), { body: commands } ).then(() => { log(`Successfully reloaded ${commands.length} application (/) commands.`, "info", { type: "preset", color: "green" }) diff --git a/scripts/dev-deploy.ts b/scripts/dev-deploy.ts index c9e61b0..eb8327b 100644 --- a/scripts/dev-deploy.ts +++ b/scripts/dev-deploy.ts @@ -1,8 +1,8 @@ import { REST, RESTPutAPIApplicationCommandsJSONBody, Routes } from "discord.js" import fs from "fs" -import { ICommand } from "../src/interfaces" +import { ICommand } from "../src/typings" import env from "../src/utils/Env" -import { log } from "../src/utils/Logger.js" +import { log } from "../src/utils/Logger" const rest = new REST({ version: "10" }).setToken(env.dev.DEVTOKEN) const commands: RESTPutAPIApplicationCommandsJSONBody = [] @@ -26,7 +26,7 @@ try { log(`Started refreshing ${commands.length} application (/) commands.`, "info") await rest.put( - Routes.applicationGuildCommands(env.dev.devid, env.dev.guildid), + Routes.applicationGuildCommands(env.dev.DEVID, env.dev.GUILDID), { body: commands } ).then(() => { log(`Successfully reloaded ${commands.length} application (/) commands.`, "info") diff --git a/scripts/update-bot.ts b/scripts/update-bot.ts deleted file mode 100644 index c1394e2..0000000 --- a/scripts/update-bot.ts +++ /dev/null @@ -1,19 +0,0 @@ -import axios from "axios" -import { log } from "../src/utils/Logger.js" - -const url = process.env.WATCHTOWERURL -const token = process.env.WATCHTOWERTOKEN - -if (!url || !token) { - throw new Error("Missing WATCHTOWERURL or WATCHTOWERTOKEN") -} - -await axios.get(url, { - headers: { - Authorization: `Bearer ${token}` - } -}).then(() => { - log("Illegitimate bot updated", "info") -}).catch(err => { - console.error("Error updating bot", err) -}) diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index f7a0dfc..87d3ed4 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -1,11 +1,11 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, InteractionContextType, MessageFlags, PermissionFlagsBits, userMention } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" -import { waitingListRole } from "~/config/roles.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" +import { waitingListRole } from "~/config/roles" import { IContextMenu } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel" export default { name: "Update User", diff --git a/src/commands/anime.ts b/src/commands/anime.ts index 44910ff..1b12721 100644 --- a/src/commands/anime.ts +++ b/src/commands/anime.ts @@ -1,6 +1,6 @@ import { anilist } from "anilist" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 8afb06d..815db09 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -1,8 +1,8 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { admin, helper } from "~/config/roles.js" +import { devMessage, embedColor } from "~/config/options" +import { admin, helper } from "~/config/roles" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "ban", diff --git a/src/commands/botinfo.ts b/src/commands/botinfo.ts index 9bbe0a9..6e9c191 100644 --- a/src/commands/botinfo.ts +++ b/src/commands/botinfo.ts @@ -3,7 +3,7 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" import { createRequire } from "node:module" import os from "os" import prettyMs from "pretty-ms" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" const require = createRequire(import.meta.url) diff --git a/src/commands/check.ts b/src/commands/check.ts index 407a931..58ab1f7 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -1,8 +1,8 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { devMessage, embedColor } from "~/config/options" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs" import { ICommand } from "~/typings" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel" export default { name: "check", diff --git a/src/commands/clear.ts b/src/commands/clear.ts index 224115c..1b64d72 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -1,7 +1,7 @@ import { channelMention, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "clear", diff --git a/src/commands/config.ts b/src/commands/config.ts index b0bb9b3..7d36a51 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -1,6 +1,6 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { addSetting, getSetting, updateSetting } from "src/drizzle/functions.js" -import { embedColor } from "~/config/options.js" +import { addSetting, getSetting, updateSetting } from "src/drizzle/functions" +import { embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/counting.ts b/src/commands/counting.ts index 72f2e84..da4a9a7 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -1,8 +1,8 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import ban from "./counting/ban.js" -import unban from "./counting/unban.js" +import ban from "./counting/ban" +import unban from "./counting/unban" export default { name: "counting", diff --git a/src/commands/counting/ban.ts b/src/commands/counting/ban.ts index 081cf63..52f19f2 100644 --- a/src/commands/counting/ban.ts +++ b/src/commands/counting/ban.ts @@ -1,6 +1,6 @@ import { GuildMember, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { countingBanned } from "~/config/roles.js" +import { devMessage, embedColor } from "~/config/options" +import { countingBanned } from "~/config/roles" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/counting/unban.ts b/src/commands/counting/unban.ts index 4fed630..5e9325d 100644 --- a/src/commands/counting/unban.ts +++ b/src/commands/counting/unban.ts @@ -1,6 +1,6 @@ import { GuildMember, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { countingBanned } from "~/config/roles.js" +import { devMessage, embedColor } from "~/config/options" +import { countingBanned } from "~/config/roles" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/find.ts b/src/commands/find.ts index 5e53137..0985760 100644 --- a/src/commands/find.ts +++ b/src/commands/find.ts @@ -1,8 +1,8 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import { getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" +import { getHeadURL, getIGN, getUUID } from "~/utils/Hypixel" export default { name: "find", diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index 3ea88b2..d0ef0db 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -1,10 +1,10 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { getVerify, removeVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" +import { getVerify, removeVerify } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getIGN } from "~/utils/Hypixel.js" +import logToChannel from "~/utils/Functions/logtochannel" +import roleManage from "~/utils/Functions/rolesmanage" +import { getIGN } from "~/utils/Hypixel" export default { name: "forceunverify", diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 1c4d55b..e4535d6 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -1,11 +1,11 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" -import { waitingListRole } from "~/config/roles.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" +import { waitingListRole } from "~/config/roles" import { ICommand } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel" export default { name: "forceupdate", diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index 98c291d..1866636 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -1,11 +1,11 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { addVerify, getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { addVerify, getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" import { ICommand } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import logToChannel from "~/utils/Functions/logtochannel.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import logToChannel from "~/utils/Functions/logtochannel" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel" export default { name: "forceverify", diff --git a/src/commands/guild.ts b/src/commands/guild.ts index 913b82e..dcb6e78 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -1,9 +1,9 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import guildInfo from "./guild/info.js" -import guildMember from "./guild/member.js" -import guildTop from "./guild/top.js" +import guildInfo from "./guild/info" +import guildMember from "./guild/member" +import guildTop from "./guild/top" export default { name: "guild", diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index 4308c48..9805771 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { IGuildData, SubCommand } from "~/typings" -import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters.js" -import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "~/utils/Hypixel.js" +import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters" +import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "~/utils/Hypixel" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index 1c382ef..77d2341 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { SubCommand } from "~/typings" -import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" +import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 29c1c70..67ada54 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { IGuildData, SubCommand } from "~/typings" -import { numberFormatter } from "~/utils/Functions/intlFormaters.js" -import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel.js" -import { redis } from "~/utils/Illegitimate.js" +import { numberFormatter } from "~/utils/Functions/intlFormaters" +import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel" +import { redis } from "~/utils/Illegitimate" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/help.ts b/src/commands/help.ts index 8410e8b..d4f3d46 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, InteractionContextType, MessageFlags, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index f714a89..c04d580 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -1,5 +1,5 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor, instructionsgif } from "~/config/options.js" +import { devMessage, embedColor, instructionsgif } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/kick.ts b/src/commands/kick.ts index d206577..f649652 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -1,8 +1,8 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { admin, helper } from "~/config/roles.js" +import { devMessage, embedColor } from "~/config/options" +import { admin, helper } from "~/config/roles" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "kick", diff --git a/src/commands/music.ts b/src/commands/music.ts index 3b557b5..4120c59 100644 --- a/src/commands/music.ts +++ b/src/commands/music.ts @@ -1,14 +1,14 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { ICommand } from "~/typings" -import leave from "./music/leave.js" -import nowplaying from "./music/nowplaying.js" -import pause from "./music/pause.js" -import play from "./music/play.js" -import queue from "./music/queue.js" -import repeat from "./music/repeat.js" -import skip from "./music/skip.js" -import unpause from "./music/unpause.js" -import volume from "./music/volume.js" +import leave from "./music/leave" +import nowplaying from "./music/nowplaying" +import pause from "./music/pause" +import play from "./music/play" +import queue from "./music/queue" +import repeat from "./music/repeat" +import skip from "./music/skip" +import unpause from "./music/unpause" +import volume from "./music/volume" export default { name: "music", diff --git a/src/commands/music/leave.ts b/src/commands/music/leave.ts index b67dde6..6d5735c 100644 --- a/src/commands/music/leave.ts +++ b/src/commands/music/leave.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/nowplaying.ts b/src/commands/music/nowplaying.ts index 5803a92..640f5ee 100644 --- a/src/commands/music/nowplaying.ts +++ b/src/commands/music/nowplaying.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/pause.ts b/src/commands/music/pause.ts index cdcef02..5eddfe9 100644 --- a/src/commands/music/pause.ts +++ b/src/commands/music/pause.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/play.ts b/src/commands/music/play.ts index f7f9d0e..3306296 100644 --- a/src/commands/music/play.ts +++ b/src/commands/music/play.ts @@ -1,6 +1,6 @@ import { useMainPlayer } from "discord-player" import { GuildMember } from "discord.js" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/queue.ts b/src/commands/music/queue.ts index 3d44705..b04bee4 100644 --- a/src/commands/music/queue.ts +++ b/src/commands/music/queue.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/repeat.ts b/src/commands/music/repeat.ts index 23747f0..6080c00 100644 --- a/src/commands/music/repeat.ts +++ b/src/commands/music/repeat.ts @@ -1,5 +1,5 @@ import { QueueRepeatMode, useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const QueueRepeatModes = { diff --git a/src/commands/music/skip.ts b/src/commands/music/skip.ts index f28785d..18c26db 100644 --- a/src/commands/music/skip.ts +++ b/src/commands/music/skip.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/unpause.ts b/src/commands/music/unpause.ts index 9f64271..99854e9 100644 --- a/src/commands/music/unpause.ts +++ b/src/commands/music/unpause.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/music/volume.ts b/src/commands/music/volume.ts index b3bde44..0ccb7c4 100644 --- a/src/commands/music/volume.ts +++ b/src/commands/music/volume.ts @@ -1,5 +1,5 @@ import { useMainPlayer } from "discord-player" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { SubCommand } from "~/typings" const cmd: SubCommand = async (interaction) => { diff --git a/src/commands/ping.ts b/src/commands/ping.ts index c93846d..97f3907 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -1,5 +1,5 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/pp.ts b/src/commands/pp.ts index b610546..c9da0a8 100644 --- a/src/commands/pp.ts +++ b/src/commands/pp.ts @@ -1,7 +1,7 @@ import { InteractionContextType, SlashCommandBuilder, User } from "discord.js" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { ICommand } from "~/typings" -import env from "~/utils/Env.js" +import env from "~/utils/Env" export default { name: "pp", diff --git a/src/commands/remove.ts b/src/commands/remove.ts index 6dfe8dd..df9fbc4 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -1,9 +1,9 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { getWaitingList, removeWaitingList } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" -import { waitingListRole } from "~/config/roles.js" +import { getWaitingList, removeWaitingList } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" +import { waitingListRole } from "~/config/roles" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "remove", diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index 9b04052..ac69817 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -1,6 +1,6 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { devMessage, embedColor } from "~/config/options" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs" import { ICommand } from "~/typings" export default { diff --git a/src/commands/send.ts b/src/commands/send.ts index 3bd8fd5..c5077ce 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -1,5 +1,5 @@ import { ChannelType, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder, TextChannel } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/setnick.ts b/src/commands/setnick.ts index ed00cec..5dba861 100644 --- a/src/commands/setnick.ts +++ b/src/commands/setnick.ts @@ -1,7 +1,7 @@ import { GuildMember, InteractionContextType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "setnick", diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 101cc3a..f49a078 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -9,7 +9,7 @@ import { SlashCommandBuilder, TextChannel } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" export default { diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index 16fb0d5..eaa891a 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -8,9 +8,9 @@ import { TextChannel, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "slowmode", diff --git a/src/commands/staff.ts b/src/commands/staff.ts index 06d322a..175b140 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -1,11 +1,11 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import beast from "./staff/beast.js" -import help from "./staff/help.js" -import prune from "./staff/prune.js" -import removeGuildRoles from "./staff/removeguildroles.js" -import updateAll from "./staff/updateall.js" +import beast from "./staff/beast" +import help from "./staff/help" +import prune from "./staff/prune" +import removeGuildRoles from "./staff/removeguildroles" +import updateAll from "./staff/updateall" export default { name: "staff", diff --git a/src/commands/staff/beast.ts b/src/commands/staff/beast.ts index c435605..28582b0 100644 --- a/src/commands/staff/beast.ts +++ b/src/commands/staff/beast.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "~/config/options.js" -import { beastbwfkdr, beastbwstars, beastduelswins, beastswkdr, beastswstars, bwwins, duelswlr } from "~/config/reqs.js" +import { devMessage, embedColor } from "~/config/options" +import { beastbwfkdr, beastbwstars, beastduelswins, beastswkdr, beastswstars, bwwins, duelswlr } from "~/config/reqs" import { SubCommand } from "~/typings" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/staff/help.ts b/src/commands/staff/help.ts index dbe5108..33d495a 100644 --- a/src/commands/staff/help.ts +++ b/src/commands/staff/help.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, MessageFlags } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { SubCommmndClient } from "~/typings" const cmd: SubCommmndClient = async (interaction, client) => { diff --git a/src/commands/staff/prune.ts b/src/commands/staff/prune.ts index e0e711a..5773092 100644 --- a/src/commands/staff/prune.ts +++ b/src/commands/staff/prune.ts @@ -1,7 +1,7 @@ import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, ComponentType } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { SubCommand } from "~/typings" -import env from "~/utils/Env.js" +import env from "~/utils/Env" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/staff/removeguildroles.ts b/src/commands/staff/removeguildroles.ts index 6be6799..9bb1561 100644 --- a/src/commands/staff/removeguildroles.ts +++ b/src/commands/staff/removeguildroles.ts @@ -1,10 +1,10 @@ import { GuildMember } from "discord.js" -import { getVerifies } from "src/drizzle/functions.js" -import { embedColor, hypixelGuildID } from "~/config/options.js" +import { getVerifies } from "src/drizzle/functions" +import { embedColor, hypixelGuildID } from "~/config/options" import { IGuildData, SubCommand } from "~/typings" -import env from "~/utils/Env.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild } from "~/utils/Hypixel.js" +import env from "~/utils/Env" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild } from "~/utils/Hypixel" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts index 92fbce1..d6e1b0d 100644 --- a/src/commands/staff/updateall.ts +++ b/src/commands/staff/updateall.ts @@ -1,12 +1,12 @@ import { ChannelType, GuildMember } from "discord.js" -import { getVerifies } from "src/drizzle/functions.js" -import { embedColor, hypixelGuildID } from "~/config/options.js" +import { getVerifies } from "src/drizzle/functions" +import { embedColor, hypixelGuildID } from "~/config/options" import { IGuildData, SubCommand } from "~/typings" -import env from "~/utils/Env.js" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getIGN } from "~/utils/Hypixel.js" -import { log } from "~/utils/Logger.js" +import env from "~/utils/Env" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getIGN } from "~/utils/Hypixel" +import { log } from "~/utils/Logger" const cmd: SubCommand = async (interaction) => { await interaction.deferReply() diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts index f233574..a6c0f78 100644 --- a/src/commands/timeout.ts +++ b/src/commands/timeout.ts @@ -1,9 +1,9 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import ms from "ms" import prettyMs from "pretty-ms" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "timeout", diff --git a/src/commands/unban.ts b/src/commands/unban.ts index 2b1d775..3d939c4 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -1,7 +1,7 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, User, userMention } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export default { name: "unban", diff --git a/src/commands/update.ts b/src/commands/update.ts index d5e3a73..325f63e 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -1,11 +1,11 @@ import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" -import { waitingListRole } from "~/config/roles.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" +import { waitingListRole } from "~/config/roles" import { ICommand } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel" export default { name: "update", diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index 9c0b447..b9ddde6 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -1,7 +1,7 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { devMessage, embedColor } from "~/config/options.js" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import { formatUuid, getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" +import { formatUuid, getHeadURL, getIGN, getUUID } from "~/utils/Hypixel" export default { name: "uuid", diff --git a/src/commands/verify.ts b/src/commands/verify.ts index ad83af1..33c9fb8 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -1,10 +1,10 @@ import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js" -import { addVerify, getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { addVerify, getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" import { ICommand, IGuildData, IPlayerData } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel" export default { name: "verify", diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index 1fc55f8..fe90508 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -1,8 +1,8 @@ import { InteractionContextType, SlashCommandBuilder, userMention } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import { getHeadURL, getIGN } from "~/utils/Hypixel.js" +import { getHeadURL, getIGN } from "~/utils/Hypixel" export default { name: "whoami", diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 6eacb3b..3dad50b 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -1,8 +1,8 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" +import { getVerify } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" import { ICommand } from "~/typings" -import { getHeadURL, getIGN } from "~/utils/Hypixel.js" +import { getHeadURL, getIGN } from "~/utils/Hypixel" export default { name: "whois", diff --git a/src/components/autocomplete/unban.ts b/src/components/autocomplete/unban.ts index 8f127df..9676fb4 100644 --- a/src/components/autocomplete/unban.ts +++ b/src/components/autocomplete/unban.ts @@ -1,5 +1,5 @@ import { IAutocomplete } from "~/typings" -import { log } from "~/utils/Logger.js" +import { log } from "~/utils/Logger" export default { name: "unban", diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 3b0b77a..41b2279 100644 --- a/src/components/buttons/checkstats.ts +++ b/src/components/buttons/checkstats.ts @@ -1,8 +1,8 @@ -import { getGuildApp } from "src/drizzle/functions.js" -import { devMessage, embedColor } from "~/config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { getGuildApp } from "src/drizzle/functions" +import { devMessage, embedColor } from "~/config/options" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs" import { IButton } from "~/typings" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "~/utils/Hypixel" export default { name: "checkstats", diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index 852a51c..b07bd5c 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/src/components/buttons/guildapplicationaccept.ts @@ -1,11 +1,11 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, TextChannel } from "discord.js" -import { getGuildApp, removeVerify } from "src/drizzle/functions.js" -import { addWaitingList, getWaitingLists, removeWaitingList } from "src/drizzle/functions.js" -import { embedColor, hypixelGuildID, waitingListChannel, waitingListMessage } from "~/config/options.js" -import { waitingListRole } from "~/config/roles.js" +import { getGuildApp, removeVerify } from "src/drizzle/functions" +import { addWaitingList, getWaitingLists, removeWaitingList } from "src/drizzle/functions" +import { embedColor, hypixelGuildID, waitingListChannel, waitingListMessage } from "~/config/options" +import { waitingListRole } from "~/config/roles" import { IButton } from "~/typings" -import { getGuild, getIGN } from "~/utils/Hypixel.js" -import { log } from "~/utils/Logger.js" +import { getGuild, getIGN } from "~/utils/Hypixel" +import { log } from "~/utils/Logger" export default { name: "guildapplicationaccept", diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index 5df7a55..b9549d5 100644 --- a/src/components/buttons/guildapply.ts +++ b/src/components/buttons/guildapply.ts @@ -1,11 +1,11 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, MessageFlags, TextChannel } from "discord.js" -import { addGuildApp, getGuildApp } from "src/drizzle/functions.js" -import { ignM, largeM, smallM } from "~/config/limitmessages.js" -import { applicationsChannel, embedColor } from "~/config/options.js" -import { guild as guildQuestions } from "~/config/questions.js" -import { guildRole } from "~/config/roles.js" +import { addGuildApp, getGuildApp } from "src/drizzle/functions" +import { ignM, largeM, smallM } from "~/config/limitmessages" +import { applicationsChannel, embedColor } from "~/config/options" +import { guild as guildQuestions } from "~/config/questions" +import { guildRole } from "~/config/roles" import { IButton } from "~/typings" -import applicationQuestions from "~/utils/Functions/applicationquestions.js" +import applicationQuestions from "~/utils/Functions/applicationquestions" export default { name: "guildapply", diff --git a/src/components/buttons/guildinactivitylog.ts b/src/components/buttons/guildinactivitylog.ts index 4fbdbf8..b7acece 100644 --- a/src/components/buttons/guildinactivitylog.ts +++ b/src/components/buttons/guildinactivitylog.ts @@ -1,10 +1,10 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, MessageFlags, TextChannel } from "discord.js" -import { ignM, largeM, smallM } from "~/config/limitmessages.js" -import { embedColor, inactivityLogChannel } from "~/config/options.js" -import { inactivity } from "~/config/questions.js" -import { beast, gm, guildRole, guildStaff, leader, member, staff } from "~/config/roles.js" +import { ignM, largeM, smallM } from "~/config/limitmessages" +import { embedColor, inactivityLogChannel } from "~/config/options" +import { inactivity } from "~/config/questions" +import { beast, gm, guildRole, guildStaff, leader, member, staff } from "~/config/roles" import { IButton } from "~/typings" -import applicationQuestions from "~/utils/Functions/applicationquestions.js" +import applicationQuestions from "~/utils/Functions/applicationquestions" const guildRoles = [gm, leader, staff, beast, member, guildStaff, guildRole] export default { diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index 7cb111b..9856672 100644 --- a/src/components/buttons/staffapplicationaccept.ts +++ b/src/components/buttons/staffapplicationaccept.ts @@ -1,6 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js" -import { removeStaffApp } from "src/drizzle/functions.js" -import { embedColor } from "~/config/options.js" +import { removeStaffApp } from "src/drizzle/functions" +import { embedColor } from "~/config/options" import { IButton } from "~/typings" export default { diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index 566c5c9..cde7cd8 100644 --- a/src/components/buttons/staffapply.ts +++ b/src/components/buttons/staffapply.ts @@ -1,12 +1,12 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, MessageFlags, TextChannel } from "discord.js" -import { addStaffApp, getSetting, getStaffApp } from "src/drizzle/functions.js" -import { ignM, largeM } from "~/config/limitmessages.js" -import { embedColor, staffApplicationsChannel } from "~/config/options.js" -import { staff as staffQuestions } from "~/config/questions.js" -import { guildRole, guildStaff } from "~/config/roles.js" +import { addStaffApp, getSetting, getStaffApp } from "src/drizzle/functions" +import { ignM, largeM } from "~/config/limitmessages" +import { embedColor, staffApplicationsChannel } from "~/config/options" +import { staff as staffQuestions } from "~/config/questions" +import { guildRole, guildStaff } from "~/config/roles" import { IButton } from "~/typings" -import env from "~/utils/Env.js" -import applicationQuestions from "~/utils/Functions/applicationquestions.js" +import env from "~/utils/Env" +import applicationQuestions from "~/utils/Functions/applicationquestions" export default { name: "staffapply", diff --git a/src/components/buttons/waitingListUpdate.ts b/src/components/buttons/waitingListUpdate.ts index 228b5af..7271bac 100644 --- a/src/components/buttons/waitingListUpdate.ts +++ b/src/components/buttons/waitingListUpdate.ts @@ -1,8 +1,8 @@ import { MessageFlags } from "discord.js" -import { getWaitingLists, removeWaitingList } from "src/drizzle/functions.js" -import { hypixelGuildID } from "~/config/options.js" +import { getWaitingLists, removeWaitingList } from "src/drizzle/functions" +import { hypixelGuildID } from "~/config/options" import { IButton } from "~/typings" -import { getGuild, getIGN } from "~/utils/Hypixel.js" +import { getGuild, getIGN } from "~/utils/Hypixel" export default { name: "waitinglistupdate", diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index 1b0d26b..2625cc6 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/src/components/modals/denyreasonbox.ts @@ -1,6 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, GuildMember, Message } from "discord.js" -import { removeGuildApp } from "src/drizzle/functions.js" -import { embedColor } from "~/config/options.js" +import { removeGuildApp } from "src/drizzle/functions" +import { embedColor } from "~/config/options" import { IModal } from "~/typings" export default { diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index 71694bc..121058c 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/src/components/modals/staffdenyreasonbox.ts @@ -1,6 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js" -import { removeStaffApp } from "src/drizzle/functions.js" -import { embedColor } from "~/config/options.js" +import { removeStaffApp } from "src/drizzle/functions" +import { embedColor } from "~/config/options" import { IModal } from "~/typings" export default { diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index 6925d5a..767f616 100644 --- a/src/components/modals/verifyModal.ts +++ b/src/components/modals/verifyModal.ts @@ -1,10 +1,10 @@ import { GuildMember, MessageFlags } from "discord.js" -import { addVerify, getVerify } from "src/drizzle/functions.js" -import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { addVerify, getVerify } from "src/drizzle/functions" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options" import { IModal } from "~/typings" -import getGuildRank from "~/utils/Functions/guildrank.js" -import roleManage from "~/utils/Functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" +import getGuildRank from "~/utils/Functions/guildrank" +import roleManage from "~/utils/Functions/rolesmanage" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel" export default { name: "verifybox", diff --git a/src/drizzle/db.ts b/src/drizzle/db.ts index 66d11d5..e895f4a 100644 --- a/src/drizzle/db.ts +++ b/src/drizzle/db.ts @@ -1,6 +1,6 @@ import { drizzle } from "drizzle-orm/postgres-js" -import env from "~/utils/Env.js" -import * as schema from "./schema.js" +import env from "~/utils/Env" +import * as schema from "./schema" const db = drizzle({ connection: { diff --git a/src/drizzle/functions/guildApps.ts b/src/drizzle/functions/guildApps.ts index 189ab31..8a1d2d1 100644 --- a/src/drizzle/functions/guildApps.ts +++ b/src/drizzle/functions/guildApps.ts @@ -1,6 +1,6 @@ import { eq, or } from "drizzle-orm" -import db from "../db.js" -import { guildApps, InsertGuildApp } from "../schema.js" +import db from "../db" +import { guildApps, InsertGuildApp } from "../schema" type GuildAppDBData = Partial> diff --git a/src/drizzle/functions/settings.ts b/src/drizzle/functions/settings.ts index 3a4eebd..56c79c5 100644 --- a/src/drizzle/functions/settings.ts +++ b/src/drizzle/functions/settings.ts @@ -1,6 +1,6 @@ import { eq, or } from "drizzle-orm" -import db from "../db.js" -import { InsertSetting, settings } from "../schema.js" +import db from "../db" +import { InsertSetting, settings } from "../schema" type SettingsDBData = Partial> diff --git a/src/drizzle/functions/staffApps.ts b/src/drizzle/functions/staffApps.ts index d73779e..145d8dd 100644 --- a/src/drizzle/functions/staffApps.ts +++ b/src/drizzle/functions/staffApps.ts @@ -1,6 +1,6 @@ import { eq, or } from "drizzle-orm" -import db from "../db.js" -import { InsertStaffApp, staffApps } from "../schema.js" +import db from "../db" +import { InsertStaffApp, staffApps } from "../schema" type StaffAppDBData = Partial> diff --git a/src/drizzle/functions/verifies.ts b/src/drizzle/functions/verifies.ts index d317cf3..93bc42b 100644 --- a/src/drizzle/functions/verifies.ts +++ b/src/drizzle/functions/verifies.ts @@ -1,6 +1,6 @@ import { eq, or } from "drizzle-orm" -import db from "../db.js" -import { InsertVerify, verifies } from "../schema.js" +import db from "../db" +import { InsertVerify, verifies } from "../schema" type VerifyDBData = Partial> diff --git a/src/drizzle/functions/waitingList.ts b/src/drizzle/functions/waitingList.ts index a023a44..edcfc56 100644 --- a/src/drizzle/functions/waitingList.ts +++ b/src/drizzle/functions/waitingList.ts @@ -1,6 +1,6 @@ import { eq, or } from "drizzle-orm" -import db from "../db.js" -import { InsertWaitingList, waitingLists } from "../schema.js" +import db from "../db" +import { InsertWaitingList, waitingLists } from "../schema" type WaitingListDBData = Partial> diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index 5484479..362012a 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -1,10 +1,10 @@ import { TextChannel } from "discord.js" -import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "~/config/options.js" +import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "~/config/options" import { ICron, IGuildData } from "~/typings" -import { numberFormatter } from "~/utils/Functions/intlFormaters.js" -import { getGuild, getIGN } from "~/utils/Hypixel.js" -import { client } from "~/utils/Illegitimate.js" -import { log } from "~/utils/Logger.js" +import { numberFormatter } from "~/utils/Functions/intlFormaters" +import { getGuild, getIGN } from "~/utils/Hypixel" +import { client } from "~/utils/Illegitimate" +import { log } from "~/utils/Logger" async function guildWeekly() { const channel = client.channels.cache.get(guildLogChannel) as TextChannel diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index 9d12b5f..3cac394 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -1,8 +1,8 @@ import { userMention } from "discord.js" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { Event } from "~/typings" -import { dateTimeFormatter } from "~/utils/Functions/intlFormaters.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { dateTimeFormatter } from "~/utils/Functions/intlFormaters" +import logToChannel from "~/utils/Functions/logtochannel" const event: Event<"guildMemberAdd"> = (member) => { if (process.env.NODE_ENV === "dev") return diff --git a/src/events/server/interactionCreate/logBtnsCmds.ts b/src/events/server/interactionCreate/logBtnsCmds.ts index d3e2a20..98d7a7d 100644 --- a/src/events/server/interactionCreate/logBtnsCmds.ts +++ b/src/events/server/interactionCreate/logBtnsCmds.ts @@ -1,5 +1,5 @@ import { Event } from "~/typings" -import { log } from "~/utils/Logger.js" +import { log } from "~/utils/Logger" const event: Event<"interactionCreate"> = (interaction) => { if (interaction.isChatInputCommand()) { diff --git a/src/events/server/ready/consolelog.ts b/src/events/server/ready/consolelog.ts index edec994..2b102f9 100644 --- a/src/events/server/ready/consolelog.ts +++ b/src/events/server/ready/consolelog.ts @@ -1,5 +1,5 @@ import { Event } from "~/typings" -import { log } from "~/utils/Logger.js" +import { log } from "~/utils/Logger" export const once = true const event: Event<"ready"> = (client) => { diff --git a/src/events/server/ready/sendOnlineMessage.ts b/src/events/server/ready/sendOnlineMessage.ts index 4c5b135..25313d7 100644 --- a/src/events/server/ready/sendOnlineMessage.ts +++ b/src/events/server/ready/sendOnlineMessage.ts @@ -1,6 +1,6 @@ -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { Event } from "~/typings" -import logToChannel from "~/utils/Functions/logtochannel.js" +import logToChannel from "~/utils/Functions/logtochannel" export const once = true const event: Event<"ready"> = () => { diff --git a/src/events/server/ready/status.ts b/src/events/server/ready/status.ts index a177f51..aa9b805 100644 --- a/src/events/server/ready/status.ts +++ b/src/events/server/ready/status.ts @@ -1,6 +1,6 @@ import { Guild } from "discord.js" -import { guildid } from "~/config/options.js" -import statuses from "~/config/statuses.js" +import { guildid } from "~/config/options" +import statuses from "~/config/statuses" import { Event } from "~/typings" export const once = true diff --git a/src/index.ts b/src/index.ts index d65f034..23e00ed 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,3 @@ -import { Illegitimate } from "~/utils/Illegitimate.js" +import { Illegitimate } from "~/utils/Illegitimate" new Illegitimate().start() diff --git a/src/typings/Autocomplete.ts b/src/typings/Autocomplete.ts index f6ee42e..5023a5a 100644 --- a/src/typings/Autocomplete.ts +++ b/src/typings/Autocomplete.ts @@ -1,5 +1,5 @@ import { AutocompleteInteraction } from "discord.js" -import { ExtendedClient } from "~/utils/Client.js" +import { ExtendedClient } from "~/utils/Client" export interface IAutocomplete { name: string diff --git a/src/typings/Button.ts b/src/typings/Button.ts index 0ebd986..d013d16 100644 --- a/src/typings/Button.ts +++ b/src/typings/Button.ts @@ -1,5 +1,5 @@ import { ButtonInteraction } from "discord.js" -import { ExtendedClient } from "~/utils/Client.js" +import { ExtendedClient } from "~/utils/Client" export interface IButton { name: string diff --git a/src/typings/Command.ts b/src/typings/Command.ts index cce1779..a94909e 100644 --- a/src/typings/Command.ts +++ b/src/typings/Command.ts @@ -1,5 +1,5 @@ import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js" -import { ExtendedClient as Client } from "~/utils/Client.js" +import { ExtendedClient as Client } from "~/utils/Client" export interface ICommand { name: string diff --git a/src/typings/ContextMenu.ts b/src/typings/ContextMenu.ts index 5e56d58..f9e1c10 100644 --- a/src/typings/ContextMenu.ts +++ b/src/typings/ContextMenu.ts @@ -1,5 +1,5 @@ import { ContextMenuCommandBuilder, ContextMenuCommandInteraction } from "discord.js" -import { ExtendedClient } from "~/utils/Client.js" +import { ExtendedClient } from "~/utils/Client" export interface IContextMenu { name: string diff --git a/src/typings/Modal.ts b/src/typings/Modal.ts index d4774fb..aefd302 100644 --- a/src/typings/Modal.ts +++ b/src/typings/Modal.ts @@ -1,5 +1,5 @@ import { ModalSubmitInteraction } from "discord.js" -import { ExtendedClient } from "~/utils/Client.js" +import { ExtendedClient } from "~/utils/Client" export interface IModal { name: string diff --git a/src/utils/Autodeploy.ts b/src/utils/Autodeploy.ts index 93c0ebd..eb031ad 100644 --- a/src/utils/Autodeploy.ts +++ b/src/utils/Autodeploy.ts @@ -1,9 +1,9 @@ import { RESTPostAPIChatInputApplicationCommandsJSONBody, RESTPostAPIContextMenuApplicationCommandsJSONBody } from "discord.js" import fs from "fs" import { ICommand, IContextMenu } from "~/typings" -import { ExtendedClient } from "./Client.js" -import env from "./Env.js" -import { log } from "./Logger.js" +import { ExtendedClient } from "./Client" +import env from "./Env" +import { log } from "./Logger" type FileType = "js" | "ts" export default async function autoDeployCommands(fileType: FileType, client: ExtendedClient) { diff --git a/src/utils/Client.ts b/src/utils/Client.ts index d2b70ad..4cc0a4c 100644 --- a/src/utils/Client.ts +++ b/src/utils/Client.ts @@ -1,8 +1,8 @@ import { Client, Collection, GatewayIntentBits, Partials } from "discord.js" import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "~/typings" -import autoDeployCommands from "./Autodeploy.js" -import env from "./Env.js" -import { log } from "./Logger.js" +import autoDeployCommands from "./Autodeploy" +import env from "./Env" +import { log } from "./Logger" export class ExtendedClient extends Client { commands: Collection = new Collection() diff --git a/src/utils/Env.ts b/src/utils/Env.ts index a404d99..70c9bdf 100644 --- a/src/utils/Env.ts +++ b/src/utils/Env.ts @@ -1,6 +1,6 @@ import { createEnv } from "@t3-oss/env-core" import { z } from "zod" -import { MissingEnvVarsError } from "./Classes/EnvVarError.js" +import { MissingEnvVarsError } from "./Classes/EnvVarError" const prodEnv = createEnv({ server: { diff --git a/src/utils/Events/autocomplete.ts b/src/utils/Events/autocomplete.ts index 9e8b8c6..066b201 100644 --- a/src/utils/Events/autocomplete.ts +++ b/src/utils/Events/autocomplete.ts @@ -1,10 +1,10 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { IAutocomplete } from "~/typings" -import { ExtendedClient as Client } from "~/utils/Client.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { ExtendedClient as Client } from "~/utils/Client" +import logToChannel from "~/utils/Functions/logtochannel" type FileType = "js" | "ts" export default async function loadAutocompleteEvents(client: Client, ft: FileType) { diff --git a/src/utils/Events/button.ts b/src/utils/Events/button.ts index 0cb5020..dc72d28 100644 --- a/src/utils/Events/button.ts +++ b/src/utils/Events/button.ts @@ -1,10 +1,10 @@ import { Events, MessageFlags } from "discord.js" import fs from "fs" import path from "path" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { IButton } from "~/typings" -import { ExtendedClient as Client } from "~/utils/Client.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { ExtendedClient as Client } from "~/utils/Client" +import logToChannel from "~/utils/Functions/logtochannel" type FileType = "js" | "ts" export default async function loadButtonEvents(client: Client, ft: FileType) { diff --git a/src/utils/Events/command.ts b/src/utils/Events/command.ts index 20d82ec..4713943 100644 --- a/src/utils/Events/command.ts +++ b/src/utils/Events/command.ts @@ -1,10 +1,10 @@ import { Events, MessageFlags } from "discord.js" import fs from "fs" import path from "path" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { ICommand } from "~/typings" -import { ExtendedClient as Client } from "~/utils/Client.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { ExtendedClient as Client } from "~/utils/Client" +import logToChannel from "~/utils/Functions/logtochannel" type FileType = "js" | "ts" export default async function loadSlashCommandsEvents(client: Client, ft: FileType) { diff --git a/src/utils/Events/contextmenu.ts b/src/utils/Events/contextmenu.ts index 4d1683e..fa050eb 100644 --- a/src/utils/Events/contextmenu.ts +++ b/src/utils/Events/contextmenu.ts @@ -1,10 +1,10 @@ import { Events, MessageFlags } from "discord.js" import fs from "fs" import path from "path" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { IContextMenu } from "~/typings" -import { ExtendedClient as Client } from "~/utils/Client.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { ExtendedClient as Client } from "~/utils/Client" +import logToChannel from "~/utils/Functions/logtochannel" type FileType = "js" | "ts" export default async function loadContextMenuEvents(client: Client, ft: FileType) { diff --git a/src/utils/Events/events.ts b/src/utils/Events/events.ts index 2b316b7..8e64d17 100644 --- a/src/utils/Events/events.ts +++ b/src/utils/Events/events.ts @@ -1,6 +1,6 @@ import fs from "fs" import path from "path" -import { ExtendedClient as Client } from "~/utils/Client.js" +import { ExtendedClient as Client } from "~/utils/Client" type FileType = "js" | "ts" export default async function loadEvents(client: Client, ft: FileType) { diff --git a/src/utils/Events/loadevents.ts b/src/utils/Events/loadevents.ts index a63ab61..c9ac73f 100644 --- a/src/utils/Events/loadevents.ts +++ b/src/utils/Events/loadevents.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client.js" -import loadAutocompleteEvents from "./autocomplete.js" -import loadButtonEvents from "./button.js" -import loadSlashCommandsEvents from "./command.js" -import loadContextMenuEvents from "./contextmenu.js" -import loadCronEvents from "./cron.js" -import loadEvents from "./events.js" -import loadModalEvents from "./modal.js" +import { ExtendedClient as Client } from "../Client" +import loadAutocompleteEvents from "./autocomplete" +import loadButtonEvents from "./button" +import loadSlashCommandsEvents from "./command" +import loadContextMenuEvents from "./contextmenu" +import loadCronEvents from "./cron" +import loadEvents from "./events" +import loadModalEvents from "./modal" export default async function loadAllEvents(client: Client, ft: "js" | "ts") { await loadEvents(client, ft) diff --git a/src/utils/Events/modal.ts b/src/utils/Events/modal.ts index 205decc..d693709 100644 --- a/src/utils/Events/modal.ts +++ b/src/utils/Events/modal.ts @@ -1,10 +1,10 @@ import { Events, MessageFlags } from "discord.js" import fs from "fs" import path from "path" -import { embedColor } from "~/config/options.js" +import { embedColor } from "~/config/options" import { IModal } from "~/typings" -import { ExtendedClient as Client } from "~/utils/Client.js" -import logToChannel from "~/utils/Functions/logtochannel.js" +import { ExtendedClient as Client } from "~/utils/Client" +import logToChannel from "~/utils/Functions/logtochannel" type FileType = "js" | "ts" export default async function loadModalEvents(client: Client, ft: FileType) { diff --git a/src/utils/Functions/applicationquestions.ts b/src/utils/Functions/applicationquestions.ts index b98a8df..9fd8bea 100644 --- a/src/utils/Functions/applicationquestions.ts +++ b/src/utils/Functions/applicationquestions.ts @@ -1,6 +1,6 @@ import { Collection, EmbedBuilder, GuildMember, Message } from "discord.js" -import { embedColor } from "~/config/options.js" -import { getUUID } from "~/utils/Hypixel.js" +import { embedColor } from "~/config/options" +import { getUUID } from "~/utils/Hypixel" const tooLong = new EmbedBuilder() .setDescription("You took too long to respond.") diff --git a/src/utils/Functions/guildrank.ts b/src/utils/Functions/guildrank.ts index b88b6ca..8331cb3 100644 --- a/src/utils/Functions/guildrank.ts +++ b/src/utils/Functions/guildrank.ts @@ -1,4 +1,4 @@ -import roleManage from "./rolesmanage.js" +import roleManage from "./rolesmanage" export default function getGuildRank(rank: string) { if (rank === "Guild Master") { diff --git a/src/utils/Functions/logtochannel.ts b/src/utils/Functions/logtochannel.ts index a46fe76..de0cd74 100644 --- a/src/utils/Functions/logtochannel.ts +++ b/src/utils/Functions/logtochannel.ts @@ -1,7 +1,7 @@ import { Guild, MessageCreateOptions, TextChannel } from "discord.js" -import { botLogChannel, devLogChannel, errorLogChannel, guildid, guildLogChannel, moderationLogChannel, onlineLogChannel } from "~/config/options.js" -import { client } from "~/utils/Illegitimate.js" -import { log } from "../Logger.js" +import { botLogChannel, devLogChannel, errorLogChannel, guildid, guildLogChannel, moderationLogChannel, onlineLogChannel } from "~/config/options" +import { client } from "~/utils/Illegitimate" +import { log } from "../Logger" const channels = { online: onlineLogChannel, diff --git a/src/utils/Functions/rolesmanage.ts b/src/utils/Functions/rolesmanage.ts index 25aea80..831c49f 100644 --- a/src/utils/Functions/rolesmanage.ts +++ b/src/utils/Functions/rolesmanage.ts @@ -1,4 +1,4 @@ -import { beast, defaultMember, elite, gm, guildRole, guildStaff, leader, member, staff, verifyTick } from "~/config/roles.js" +import { beast, defaultMember, elite, gm, guildRole, guildStaff, leader, member, staff, verifyTick } from "~/config/roles" const roles = [ gm, leader, diff --git a/src/utils/HypixelFunctions/account.ts b/src/utils/HypixelFunctions/account.ts index 92093af..6306ece 100644 --- a/src/utils/HypixelFunctions/account.ts +++ b/src/utils/HypixelFunctions/account.ts @@ -1,6 +1,6 @@ import axios from "axios" import { IGuild, IGuildData, IPlayer, IPlayerData } from "~/typings" -import env from "~/utils/Env.js" +import env from "~/utils/Env" const apikey = env.prod.HYPIXELAPIKEY const mojang = "https://api.mojang.com/users/profiles/minecraft/" const mojanguuid = "https://sessionserver.mojang.com/session/minecraft/profile/" diff --git a/src/utils/Illegitimate.ts b/src/utils/Illegitimate.ts index 328de49..a1443c4 100644 --- a/src/utils/Illegitimate.ts +++ b/src/utils/Illegitimate.ts @@ -2,10 +2,10 @@ import { DefaultExtractors } from "@discord-player/extractor" import { Player } from "discord-player" import { YoutubeiExtractor } from "discord-player-youtubei" import { Redis } from "ioredis" -import { ExtendedClient as Client } from "~/utils/Client.js" -import env from "~/utils/Env.js" -import loadAllEvents from "./Events/loadevents.js" -import { log } from "./Logger.js" +import { ExtendedClient as Client } from "~/utils/Client" +import env from "~/utils/Env" +import loadAllEvents from "./Events/loadevents" +import { log } from "./Logger" const client = new Client() const redis = new Redis(env.prod.REDISURI) diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts index ea1ae20..a3e768a 100644 --- a/src/utils/Logger.ts +++ b/src/utils/Logger.ts @@ -1,5 +1,5 @@ import chalk from "chalk" -import { logTimeFormatter } from "./Functions/intlFormaters.js" +import { logTimeFormatter } from "./Functions/intlFormaters" const colors = { red: "#f38ba8",