diff --git a/.swcrc b/.swcrc index 94c9b99..8622d22 100644 --- a/.swcrc +++ b/.swcrc @@ -16,7 +16,6 @@ "paths": { "~/utils/*": ["src/utils/*"], "~/config/*": ["src/config/*"], - "~/interfaces": ["src/interfaces/index"], "~/typings": ["src/typings/index"] } }, diff --git a/src/commands-contextmenu/congratsmessage.ts b/src/commands-contextmenu/congratsmessage.ts index a53dcfa..9126647 100644 --- a/src/commands-contextmenu/congratsmessage.ts +++ b/src/commands-contextmenu/congratsmessage.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, InteractionContextType, PermissionFlagsBits, userMention } from "discord.js" -import { IContextMenu } from "~/interfaces" +import { IContextMenu } from "~/typings" export default { name: "congratsmessage", diff --git a/src/commands-contextmenu/resetnick.ts b/src/commands-contextmenu/resetnick.ts index 2fa9484..5328cef 100644 --- a/src/commands-contextmenu/resetnick.ts +++ b/src/commands-contextmenu/resetnick.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, InteractionContextType, PermissionFlagsBits } from "discord.js" -import { IContextMenu } from "~/interfaces" +import { IContextMenu } from "~/typings" export default { name: "resetnick", diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 6533170..88b424b 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -2,7 +2,7 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, InteractionContextTy import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" import { waitingListRole } from "~/config/roles.js" -import { IContextMenu } from "~/interfaces" +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" diff --git a/src/commands/anime.ts b/src/commands/anime.ts index dc4371d..44910ff 100644 --- a/src/commands/anime.ts +++ b/src/commands/anime.ts @@ -1,7 +1,7 @@ import { anilist } from "anilist" import { InteractionContextType, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "anime", diff --git a/src/commands/ban.ts b/src/commands/ban.ts index fe2517c..8afb06d 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -1,7 +1,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" import { admin, helper } from "~/config/roles.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/botinfo.ts b/src/commands/botinfo.ts index fd94f65..9bbe0a9 100644 --- a/src/commands/botinfo.ts +++ b/src/commands/botinfo.ts @@ -4,7 +4,7 @@ import { createRequire } from "node:module" import os from "os" import prettyMs from "pretty-ms" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" const require = createRequire(import.meta.url) const { dependencies, devDependencies } = require("../../package.json") diff --git a/src/commands/check.ts b/src/commands/check.ts index ff105e0..407a931 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -1,7 +1,7 @@ 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 { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" export default { diff --git a/src/commands/clear.ts b/src/commands/clear.ts index de6a04d..231e4e9 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -1,6 +1,6 @@ import { channelMention, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js" import { embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/config.ts b/src/commands/config.ts index 8bfd18e..b0bb9b3 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -1,7 +1,7 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { addSetting, getSetting, updateSetting } from "src/drizzle/functions.js" import { embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "config", diff --git a/src/commands/counting.ts b/src/commands/counting.ts index 7c7168b..72f2e84 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -1,6 +1,6 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import ban from "./counting/ban.js" import unban from "./counting/unban.js" diff --git a/src/commands/find.ts b/src/commands/find.ts index bf45403..5e53137 100644 --- a/src/commands/find.ts +++ b/src/commands/find.ts @@ -1,7 +1,7 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" export default { diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index 2ecf4a8..3ea88b2 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -1,7 +1,7 @@ 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 { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" import roleManage from "~/utils/Functions/rolesmanage.js" import { getIGN } from "~/utils/Hypixel.js" diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 771de7b..1c4d55b 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandB import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" import { waitingListRole } from "~/config/roles.js" -import { ICommand } from "~/interfaces" +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" diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index 2bebfd0..98c291d 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -1,7 +1,7 @@ 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 { ICommand } from "~/interfaces" +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" diff --git a/src/commands/guild.ts b/src/commands/guild.ts index 99f7075..913b82e 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -1,6 +1,6 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import guildInfo from "./guild/info.js" import guildMember from "./guild/member.js" import guildTop from "./guild/top.js" diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index f2f7c90..2e949f9 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { IGuildData } from "~/interfaces" +import { IGuildData } from "~/typings" import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters.js" import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "~/utils/Hypixel.js" diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 7ae59d6..c35e62f 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { IGuildData } from "~/interfaces" +import { IGuildData } from "~/typings" import { numberFormatter } from "~/utils/Functions/intlFormaters.js" import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel.js" import { redis } from "~/utils/Illegitimate.js" diff --git a/src/commands/help.ts b/src/commands/help.ts index b11930e..517f8a5 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,6 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, InteractionContextType, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "help", diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index 79dd633..f714a89 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -1,6 +1,6 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor, instructionsgif } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "instructions", diff --git a/src/commands/kick.ts b/src/commands/kick.ts index ec7f6ae..d206577 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -1,7 +1,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" import { admin, helper } from "~/config/roles.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/music.ts b/src/commands/music.ts index 835a491..0537638 100644 --- a/src/commands/music.ts +++ b/src/commands/music.ts @@ -1,5 +1,5 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import leave from "./music/leave.js" import nowplaying from "./music/nowplaying.js" import pause from "./music/pause.js" diff --git a/src/commands/ping.ts b/src/commands/ping.ts index 14485ee..c93846d 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -1,6 +1,6 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "ping", diff --git a/src/commands/pp.ts b/src/commands/pp.ts index 1b3a213..1840e4c 100644 --- a/src/commands/pp.ts +++ b/src/commands/pp.ts @@ -1,6 +1,6 @@ import { InteractionContextType, SlashCommandBuilder, User } from "discord.js" import { embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import env from "~/utils/Env.js" export default { diff --git a/src/commands/remove.ts b/src/commands/remove.ts index 3db1bdc..6dfe8dd 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandB import { getWaitingList, removeWaitingList } from "src/drizzle/functions.js" import { devMessage, embedColor } from "~/config/options.js" import { waitingListRole } from "~/config/roles.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index b6a3a9e..9b04052 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -1,7 +1,7 @@ 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 { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "reqs", diff --git a/src/commands/send.ts b/src/commands/send.ts index 4941882..a77976c 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -1,6 +1,6 @@ import { ChannelType, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "send", diff --git a/src/commands/setnick.ts b/src/commands/setnick.ts index 7b55111..f5e8dce 100644 --- a/src/commands/setnick.ts +++ b/src/commands/setnick.ts @@ -1,6 +1,6 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 1d12dee..3dbb333 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -9,7 +9,7 @@ import { TextChannel } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" export default { name: "setup", diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index a4f5a0b..ef3dce7 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -1,6 +1,6 @@ import { channelMention, ChannelType, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/staff.ts b/src/commands/staff.ts index f0dc37c..06d322a 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -1,6 +1,6 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import beast from "./staff/beast.js" import help from "./staff/help.js" import prune from "./staff/prune.js" diff --git a/src/commands/staff/removeguildroles.ts b/src/commands/staff/removeguildroles.ts index b9ce6cd..df9f63c 100644 --- a/src/commands/staff/removeguildroles.ts +++ b/src/commands/staff/removeguildroles.ts @@ -1,7 +1,7 @@ import { ChatInputCommandInteraction, GuildMember } from "discord.js" import { getVerifies } from "src/drizzle/functions.js" import { embedColor, hypixelGuildID } from "~/config/options.js" -import { IGuildData } from "~/interfaces" +import { IGuildData } from "~/typings" import env from "~/utils/Env.js" import roleManage from "~/utils/Functions/rolesmanage.js" import { getGuild } from "~/utils/Hypixel.js" diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts index ef0a9e9..9ba9a0a 100644 --- a/src/commands/staff/updateall.ts +++ b/src/commands/staff/updateall.ts @@ -1,7 +1,7 @@ import { ChannelType, ChatInputCommandInteraction, GuildMember } from "discord.js" import { getVerifies } from "src/drizzle/functions.js" import { embedColor, hypixelGuildID } from "~/config/options.js" -import { IGuildData } from "~/interfaces" +import { IGuildData } from "~/typings" import env from "~/utils/Env.js" import getGuildRank from "~/utils/Functions/guildrank.js" import roleManage from "~/utils/Functions/rolesmanage.js" diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts index ffe5f08..6545708 100644 --- a/src/commands/timeout.ts +++ b/src/commands/timeout.ts @@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandB import ms from "ms" import prettyMs from "pretty-ms" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/unban.ts b/src/commands/unban.ts index 3e7aaf3..2b1d775 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -1,6 +1,6 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, User, userMention } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" export default { diff --git a/src/commands/update.ts b/src/commands/update.ts index 887ad54..d5e3a73 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discor import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" import { waitingListRole } from "~/config/roles.js" -import { ICommand } from "~/interfaces" +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" diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index f79b704..9c0b447 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -1,6 +1,6 @@ import { InteractionContextType, SlashCommandBuilder } from "discord.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { formatUuid, getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" export default { diff --git a/src/commands/verify.ts b/src/commands/verify.ts index 6c8aea2..ad83af1 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -1,9 +1,7 @@ import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js" import { addVerify, getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" -import { ICommand } from "~/interfaces" -import { IPlayerData } from "~/interfaces" -import { IGuildData } from "~/interfaces" +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" diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index beb9443..1fc55f8 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -1,7 +1,7 @@ import { InteractionContextType, SlashCommandBuilder, userMention } from "discord.js" import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { diff --git a/src/commands/whois.ts b/src/commands/whois.ts index ad40fcf..6eacb3b 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -1,7 +1,7 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { diff --git a/src/components/autocomplete/music.ts b/src/components/autocomplete/music.ts index 161a115..f74f9d1 100644 --- a/src/components/autocomplete/music.ts +++ b/src/components/autocomplete/music.ts @@ -1,5 +1,5 @@ import { QueryType, useMainPlayer } from "discord-player" -import { IAutocomplete } from "~/interfaces" +import { IAutocomplete } from "~/typings" export default { name: "music", diff --git a/src/components/autocomplete/unban.ts b/src/components/autocomplete/unban.ts index 0af4127..8f127df 100644 --- a/src/components/autocomplete/unban.ts +++ b/src/components/autocomplete/unban.ts @@ -1,4 +1,4 @@ -import { IAutocomplete } from "~/interfaces" +import { IAutocomplete } from "~/typings" import { log } from "~/utils/Logger.js" export default { diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 5c43972..3b0b77a 100644 --- a/src/components/buttons/checkstats.ts +++ b/src/components/buttons/checkstats.ts @@ -1,7 +1,7 @@ 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 { IButton } from "~/interfaces" +import { IButton } from "~/typings" import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" export default { diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index 0926006..852a51c 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/src/components/buttons/guildapplicationaccept.ts @@ -3,7 +3,7 @@ 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 { IButton } from "~/interfaces" +import { IButton } from "~/typings" import { getGuild, getIGN } from "~/utils/Hypixel.js" import { log } from "~/utils/Logger.js" diff --git a/src/components/buttons/guildapplicationdeny.ts b/src/components/buttons/guildapplicationdeny.ts index 3ebccd1..6007456 100644 --- a/src/components/buttons/guildapplicationdeny.ts +++ b/src/components/buttons/guildapplicationdeny.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "guildapplicationdeny", diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index cc4f0e9..7e72003 100644 --- a/src/components/buttons/guildapply.ts +++ b/src/components/buttons/guildapply.ts @@ -4,7 +4,7 @@ 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 { IButton } from "~/interfaces" +import { IButton } from "~/typings" import applicationQuestions from "~/utils/Functions/applicationquestions.js" export default { diff --git a/src/components/buttons/guildinactivitylog.ts b/src/components/buttons/guildinactivitylog.ts index a9096ee..51fcc8b 100644 --- a/src/components/buttons/guildinactivitylog.ts +++ b/src/components/buttons/guildinactivitylog.ts @@ -3,7 +3,7 @@ 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 { IButton } from "~/interfaces" +import { IButton } from "~/typings" import applicationQuestions from "~/utils/Functions/applicationquestions.js" const guildRoles = [gm, leader, staff, beast, member, guildStaff, guildRole] diff --git a/src/components/buttons/inactiveapplicationaccept.ts b/src/components/buttons/inactiveapplicationaccept.ts index 171f620..801b35b 100644 --- a/src/components/buttons/inactiveapplicationaccept.ts +++ b/src/components/buttons/inactiveapplicationaccept.ts @@ -1,4 +1,4 @@ -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "inactiveapplicationaccept", diff --git a/src/components/buttons/inactiveapplicationdeny.ts b/src/components/buttons/inactiveapplicationdeny.ts index 1895848..888c1f8 100644 --- a/src/components/buttons/inactiveapplicationdeny.ts +++ b/src/components/buttons/inactiveapplicationdeny.ts @@ -1,4 +1,4 @@ -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "inactiveapplicationdeny", diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index 483fe3a..7cb111b 100644 --- a/src/components/buttons/staffapplicationaccept.ts +++ b/src/components/buttons/staffapplicationaccept.ts @@ -1,7 +1,7 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js" import { removeStaffApp } from "src/drizzle/functions.js" import { embedColor } from "~/config/options.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "staffapplicationaccept", diff --git a/src/components/buttons/staffapplicationdeny.ts b/src/components/buttons/staffapplicationdeny.ts index e6c1d0f..fc6e0c5 100644 --- a/src/components/buttons/staffapplicationdeny.ts +++ b/src/components/buttons/staffapplicationdeny.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "staffapplicationdeny", diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index 1adeb4c..d2142fc 100644 --- a/src/components/buttons/staffapply.ts +++ b/src/components/buttons/staffapply.ts @@ -4,7 +4,7 @@ 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 { IButton } from "~/interfaces" +import { IButton } from "~/typings" import env from "~/utils/Env.js" import applicationQuestions from "~/utils/Functions/applicationquestions.js" diff --git a/src/components/buttons/verify.ts b/src/components/buttons/verify.ts index a802578..e7c8adb 100644 --- a/src/components/buttons/verify.ts +++ b/src/components/buttons/verify.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" export default { name: "verify", diff --git a/src/components/buttons/waitingListUpdate.ts b/src/components/buttons/waitingListUpdate.ts index 5b7f55b..209a807 100644 --- a/src/components/buttons/waitingListUpdate.ts +++ b/src/components/buttons/waitingListUpdate.ts @@ -1,6 +1,6 @@ import { getWaitingLists, removeWaitingList } from "src/drizzle/functions.js" import { hypixelGuildID } from "~/config/options.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" import { getGuild, getIGN } from "~/utils/Hypixel.js" export default { diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index 1317da6..1b0d26b 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/src/components/modals/denyreasonbox.ts @@ -1,7 +1,7 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, GuildMember, Message } from "discord.js" import { removeGuildApp } from "src/drizzle/functions.js" import { embedColor } from "~/config/options.js" -import { IModal } from "~/interfaces" +import { IModal } from "~/typings" export default { name: "denyreasonbox", diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index 4d236d2..71694bc 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/src/components/modals/staffdenyreasonbox.ts @@ -1,7 +1,7 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js" import { removeStaffApp } from "src/drizzle/functions.js" import { embedColor } from "~/config/options.js" -import { IModal } from "~/interfaces" +import { IModal } from "~/typings" export default { name: "staffdenyreasonbox", diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index 112eda7..8c6a051 100644 --- a/src/components/modals/verifyModal.ts +++ b/src/components/modals/verifyModal.ts @@ -1,7 +1,7 @@ import { GuildMember } from "discord.js" import { addVerify, getVerify } from "src/drizzle/functions.js" import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" -import { IModal } from "~/interfaces" +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" diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index c6bbbb1..5484479 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -1,6 +1,6 @@ import { TextChannel } from "discord.js" import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "~/config/options.js" -import { ICron, IGuildData } from "~/interfaces" +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" diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index 4c75fa8..9d12b5f 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -1,10 +1,10 @@ import { userMention } from "discord.js" import { embedColor } from "~/config/options.js" -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" import { dateTimeFormatter } from "~/utils/Functions/intlFormaters.js" import logToChannel from "~/utils/Functions/logtochannel.js" -const event: IEvent<"guildMemberAdd"> = (member) => { +const event: Event<"guildMemberAdd"> = (member) => { if (process.env.NODE_ENV === "dev") return logToChannel("bot", { embeds: [{ diff --git a/src/events/server/interactionCreate/logBtnsCmds.ts b/src/events/server/interactionCreate/logBtnsCmds.ts index 8d81788..d3e2a20 100644 --- a/src/events/server/interactionCreate/logBtnsCmds.ts +++ b/src/events/server/interactionCreate/logBtnsCmds.ts @@ -1,7 +1,7 @@ -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" import { log } from "~/utils/Logger.js" -const event: IEvent<"interactionCreate"> = (interaction) => { +const event: Event<"interactionCreate"> = (interaction) => { if (interaction.isChatInputCommand()) { let subcommand: string | null diff --git a/src/events/server/ready/consolelog.ts b/src/events/server/ready/consolelog.ts index 625e5cf..bbbd851 100644 --- a/src/events/server/ready/consolelog.ts +++ b/src/events/server/ready/consolelog.ts @@ -1,7 +1,7 @@ -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" import { log } from "~/utils/Logger.js" -const event: IEvent<"ready"> = (client) => { +const event: Event<"ready"> = (client) => { log("Logged in as " + client.user!.tag + "!", "info", { type: "preset", color: "green" }) } diff --git a/src/events/server/ready/sendOnlineMessage.ts b/src/events/server/ready/sendOnlineMessage.ts index effd0cf..b3aba86 100644 --- a/src/events/server/ready/sendOnlineMessage.ts +++ b/src/events/server/ready/sendOnlineMessage.ts @@ -1,8 +1,8 @@ import { embedColor } from "~/config/options.js" -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" import logToChannel from "~/utils/Functions/logtochannel.js" -const event: IEvent<"ready"> = () => { +const event: Event<"ready"> = () => { if (process.env.NODE_ENV === "dev") return logToChannel("online", { diff --git a/src/events/server/ready/status.ts b/src/events/server/ready/status.ts index 0f40dd8..b5fe2c4 100644 --- a/src/events/server/ready/status.ts +++ b/src/events/server/ready/status.ts @@ -1,9 +1,9 @@ import { Guild } from "discord.js" import { guildid } from "~/config/options.js" import statuses from "~/config/statuses.js" -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" -const event: IEvent<"ready"> = (client) => { +const event: Event<"ready"> = (client) => { const user = client.user! const guild = client.guilds.cache.get(guildid) as Guild diff --git a/src/events/server/voiceStateUpdate/updatecache.ts b/src/events/server/voiceStateUpdate/updatecache.ts index f14fb34..8f2eff4 100644 --- a/src/events/server/voiceStateUpdate/updatecache.ts +++ b/src/events/server/voiceStateUpdate/updatecache.ts @@ -1,6 +1,6 @@ -import { IEvent } from "~/interfaces" +import { Event } from "~/typings" -const event: IEvent<"voiceStateUpdate"> = (_o, n) => { +const event: Event<"voiceStateUpdate"> = (_o, n) => { const guild = n.guild if (!guild) return diff --git a/src/interfaces/IEvent.ts b/src/interfaces/IEvent.ts deleted file mode 100644 index d9003d7..0000000 --- a/src/interfaces/IEvent.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { ClientEvents } from "discord.js" - -type IEvent = (...args: ClientEvents[E]) => void - -export default IEvent diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts deleted file mode 100644 index 98995da..0000000 --- a/src/interfaces/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import IAutocomplete from "./IAutocomplete" -import IButton from "./IButton" -import ICommand from "./ICommand" -import IContextMenu from "./IContextMenu" -import IEvent from "./IEvent" -import IModal from "./IModal" - -import ICron from "./ICron" - -import { IGuild, IGuildData } from "./IGuild" -import { IPlayer, IPlayerData } from "./IPlayer" - -export { IAutocomplete, IButton, ICommand, IContextMenu, ICron, IEvent, IGuild, IGuildData, IModal, IPlayer, IPlayerData } diff --git a/src/interfaces/IAutocomplete.ts b/src/typings/Autocomplete.ts similarity index 85% rename from src/interfaces/IAutocomplete.ts rename to src/typings/Autocomplete.ts index 200cb19..f6ee42e 100644 --- a/src/interfaces/IAutocomplete.ts +++ b/src/typings/Autocomplete.ts @@ -1,7 +1,7 @@ import { AutocompleteInteraction } from "discord.js" import { ExtendedClient } from "~/utils/Client.js" -export default interface IAutocomplete { +export interface IAutocomplete { name: string description: string execute: (arg: { interaction: AutocompleteInteraction, client: ExtendedClient }) => Promise diff --git a/src/interfaces/IButton.ts b/src/typings/Button.ts similarity index 87% rename from src/interfaces/IButton.ts rename to src/typings/Button.ts index 776d666..0ebd986 100644 --- a/src/interfaces/IButton.ts +++ b/src/typings/Button.ts @@ -1,7 +1,7 @@ import { ButtonInteraction } from "discord.js" import { ExtendedClient } from "~/utils/Client.js" -export default interface IButton { +export interface IButton { name: string description: string execute: (arg: { interaction: ButtonInteraction, client: ExtendedClient }) => Promise diff --git a/src/interfaces/ICommand.ts b/src/typings/Command.ts similarity index 91% rename from src/interfaces/ICommand.ts rename to src/typings/Command.ts index 5602db2..cce1779 100644 --- a/src/interfaces/ICommand.ts +++ b/src/typings/Command.ts @@ -1,7 +1,7 @@ import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js" import { ExtendedClient as Client } from "~/utils/Client.js" -export default interface ICommand { +export interface ICommand { name: string description: string dev?: boolean diff --git a/src/interfaces/IContextMenu.ts b/src/typings/ContextMenu.ts similarity index 89% rename from src/interfaces/IContextMenu.ts rename to src/typings/ContextMenu.ts index 2026e6b..5e56d58 100644 --- a/src/interfaces/IContextMenu.ts +++ b/src/typings/ContextMenu.ts @@ -1,7 +1,7 @@ import { ContextMenuCommandBuilder, ContextMenuCommandInteraction } from "discord.js" import { ExtendedClient } from "~/utils/Client.js" -export default interface IContextMenu { +export interface IContextMenu { name: string description: string dev?: boolean diff --git a/src/interfaces/ICron.ts b/src/typings/Cron.ts similarity index 71% rename from src/interfaces/ICron.ts rename to src/typings/Cron.ts index 2cdd358..7c6ba4a 100644 --- a/src/interfaces/ICron.ts +++ b/src/typings/Cron.ts @@ -1,6 +1,6 @@ -import { TimeZones } from "~/typings" +import { TimeZones } from "./TimeZones" -interface TimeFormat { +interface ITimeFormat { seconds: "*" | number minutes: "*" | number hours: "*" | number @@ -9,8 +9,8 @@ interface TimeFormat { dayOfWeek: "*" | number } -export default interface ICron { - time: TimeFormat +export interface ICron { + time: ITimeFormat execute: () => void onComplete?: null | undefined start?: boolean | null | undefined diff --git a/src/typings/Event.ts b/src/typings/Event.ts new file mode 100644 index 0000000..6745b54 --- /dev/null +++ b/src/typings/Event.ts @@ -0,0 +1,3 @@ +import { ClientEvents } from "discord.js" + +export type Event = (...args: ClientEvents[E]) => void diff --git a/src/interfaces/IGuild.ts b/src/typings/Guild.ts similarity index 100% rename from src/interfaces/IGuild.ts rename to src/typings/Guild.ts diff --git a/src/interfaces/IModal.ts b/src/typings/Modal.ts similarity index 87% rename from src/interfaces/IModal.ts rename to src/typings/Modal.ts index 28ab649..d4774fb 100644 --- a/src/interfaces/IModal.ts +++ b/src/typings/Modal.ts @@ -1,7 +1,7 @@ import { ModalSubmitInteraction } from "discord.js" import { ExtendedClient } from "~/utils/Client.js" -export default interface IModal { +export interface IModal { name: string description: string execute: (arg: { interaction: ModalSubmitInteraction, client: ExtendedClient }) => Promise diff --git a/src/interfaces/IPlayer.ts b/src/typings/Player.ts similarity index 100% rename from src/interfaces/IPlayer.ts rename to src/typings/Player.ts diff --git a/src/typings/SubCommand.ts b/src/typings/SubCommand.ts new file mode 100644 index 0000000..52ecc4d --- /dev/null +++ b/src/typings/SubCommand.ts @@ -0,0 +1,4 @@ +import { ChatInputCommandInteraction } from "discord.js" + +export type SubCommand = (interaction: ChatInputCommandInteraction) => Promise + diff --git a/src/typings/TimeZones.ts b/src/typings/TimeZones.ts index baed6df..04598c9 100644 --- a/src/typings/TimeZones.ts +++ b/src/typings/TimeZones.ts @@ -1,4 +1,4 @@ -const TimeZones = [ +type TimeZonesArray = [ "Africa/Abidjan", "Africa/Accra", "Africa/Addis_Ababa", @@ -427,6 +427,6 @@ const TimeZones = [ "Pacific/Truk", "Pacific/Wake", "Pacific/Wallis" -] as const +] -export default TimeZones +export type TimeZones = TimeZonesArray[number] diff --git a/src/typings/index.ts b/src/typings/index.ts index a710bb7..1e3e7b3 100644 --- a/src/typings/index.ts +++ b/src/typings/index.ts @@ -1,3 +1,10 @@ -import TZs from "./TimeZones" - -export type TimeZones = typeof TZs[number] +export * from "./Autocomplete" +export * from "./Button" +export * from "./Command" +export * from "./ContextMenu" +export * from "./Cron" +export * from "./Event" +export * from "./Guild" +export * from "./Modal" +export * from "./Player" +export * from "./SubCommand" diff --git a/src/utils/Autodeploy.ts b/src/utils/Autodeploy.ts index f38498e..40a1153 100644 --- a/src/utils/Autodeploy.ts +++ b/src/utils/Autodeploy.ts @@ -1,6 +1,6 @@ import { RESTPostAPIChatInputApplicationCommandsJSONBody, RESTPostAPIContextMenuApplicationCommandsJSONBody } from "discord.js" import fs from "fs" -import { ICommand, IContextMenu } from "~/interfaces" +import { ICommand, IContextMenu } from "~/typings" import { ExtendedClient } from "./Client.js" import env from "./Env.js" import { log } from "./Logger.js" diff --git a/src/utils/Client.ts b/src/utils/Client.ts index 6766531..a335510 100644 --- a/src/utils/Client.ts +++ b/src/utils/Client.ts @@ -1,5 +1,5 @@ import { Client, Collection, GatewayIntentBits, Partials } from "discord.js" -import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "~/interfaces" +import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "~/typings" import autoDeployCommands from "./Autodeploy.js" import env from "./Env.js" import { log } from "./Logger.js" diff --git a/src/utils/Events/autocomplete.ts b/src/utils/Events/autocomplete.ts index 1684481..9e8b8c6 100644 --- a/src/utils/Events/autocomplete.ts +++ b/src/utils/Events/autocomplete.ts @@ -2,7 +2,7 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" import { embedColor } from "~/config/options.js" -import { IAutocomplete } from "~/interfaces" +import { IAutocomplete } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client.js" import logToChannel from "~/utils/Functions/logtochannel.js" type FileType = "js" | "ts" diff --git a/src/utils/Events/button.ts b/src/utils/Events/button.ts index b9d2594..37efd88 100644 --- a/src/utils/Events/button.ts +++ b/src/utils/Events/button.ts @@ -2,7 +2,7 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" import { embedColor } from "~/config/options.js" -import { IButton } from "~/interfaces" +import { IButton } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client.js" import logToChannel from "~/utils/Functions/logtochannel.js" type FileType = "js" | "ts" diff --git a/src/utils/Events/command.ts b/src/utils/Events/command.ts index 32a89b5..cd49883 100644 --- a/src/utils/Events/command.ts +++ b/src/utils/Events/command.ts @@ -2,7 +2,7 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" import { embedColor } from "~/config/options.js" -import { ICommand } from "~/interfaces" +import { ICommand } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client.js" import logToChannel from "~/utils/Functions/logtochannel.js" type FileType = "js" | "ts" diff --git a/src/utils/Events/contextmenu.ts b/src/utils/Events/contextmenu.ts index dd17429..ff58166 100644 --- a/src/utils/Events/contextmenu.ts +++ b/src/utils/Events/contextmenu.ts @@ -2,7 +2,7 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" import { embedColor } from "~/config/options.js" -import { IContextMenu } from "~/interfaces" +import { IContextMenu } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client.js" import logToChannel from "~/utils/Functions/logtochannel.js" type FileType = "js" | "ts" diff --git a/src/utils/Events/cron.ts b/src/utils/Events/cron.ts index cc9d43b..027fecc 100644 --- a/src/utils/Events/cron.ts +++ b/src/utils/Events/cron.ts @@ -1,7 +1,7 @@ import { CronJob } from "cron" import fs from "fs" import path from "path" -import { ICron } from "~/interfaces" +import { ICron } from "~/typings" type FileType = "js" | "ts" export default async function loadCronEvents(ft: FileType) { diff --git a/src/utils/Events/modal.ts b/src/utils/Events/modal.ts index ff786e0..78e6aef 100644 --- a/src/utils/Events/modal.ts +++ b/src/utils/Events/modal.ts @@ -2,7 +2,7 @@ import { Events } from "discord.js" import fs from "fs" import path from "path" import { embedColor } from "~/config/options.js" -import { IModal } from "~/interfaces" +import { IModal } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client.js" import logToChannel from "~/utils/Functions/logtochannel.js" type FileType = "js" | "ts" diff --git a/src/utils/HypixelFunctions/account.ts b/src/utils/HypixelFunctions/account.ts index 1c72735..6a0a478 100644 --- a/src/utils/HypixelFunctions/account.ts +++ b/src/utils/HypixelFunctions/account.ts @@ -1,6 +1,5 @@ import axios from "axios" -import { IPlayer, IPlayerData } from "~/interfaces" -import { IGuild, IGuildData } from "~/interfaces" +import { IGuild, IGuildData, IPlayer, IPlayerData } from "~/typings" import env from "~/utils/Env.js" const apikey = env.prod.hypixelapikey const mojang = "https://api.mojang.com/users/profiles/minecraft/" diff --git a/tsconfig.json b/tsconfig.json index f1475ac..5996b5f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,9 +21,6 @@ "~/config/*": [ "src/config/*" ], - "~/interfaces": [ - "src/interfaces/index" - ], "~/typings": [ "src/typings/index" ]