diff --git a/nodemon-js.json b/nodemon-js.json index c1993e0..0ae271f 100644 --- a/nodemon-js.json +++ b/nodemon-js.json @@ -8,6 +8,7 @@ ], "verbose": true, "env": { + "NODE_PATH": "dist/", "NODE_ENV": "dev" }, "ext": "js, json" diff --git a/nodemon.json b/nodemon.json index 24cdcf8..fd07057 100644 --- a/nodemon.json +++ b/nodemon.json @@ -7,6 +7,7 @@ ], "verbose": true, "env": { + "NODE_PATH": "src/", "NODE_ENV": "dev", "TYPESCRIPT": "true" }, diff --git a/package.json b/package.json index 980d4d8..9a2661a 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "build": "tsc", "watch": "tsc -w", "dev": "nodemon", + "dev2": "nodemon --config nodemon.json src/index.ts", "dev:js": "nodemon --config nodemon-js.json dist/src/index.js", "dev:build": "ts-node scripts/dev-deploy.ts", "dev:delete": "ts-node scripts/delete-commands.ts", diff --git a/src/commands-contextmenu/congratsmessage.ts b/src/commands-contextmenu/congratsmessage.ts index b8f7536..f62ea58 100644 --- a/src/commands-contextmenu/congratsmessage.ts +++ b/src/commands-contextmenu/congratsmessage.ts @@ -4,7 +4,7 @@ import { PermissionFlagsBits, userMention, } from "discord.js" -import { ContextMenu } from "../interfaces" +import { ContextMenu } from "interfaces" export = { name: "congratsmessage", diff --git a/src/commands-contextmenu/resetnick.ts b/src/commands-contextmenu/resetnick.ts index 6625d37..efced60 100644 --- a/src/commands-contextmenu/resetnick.ts +++ b/src/commands-contextmenu/resetnick.ts @@ -3,7 +3,7 @@ import { ApplicationCommandType, PermissionFlagsBits, } from "discord.js" -import { ContextMenu } from "../interfaces" +import { ContextMenu } from "interfaces" export = { name: "resetnick", diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 8d4ca34..2bd5814 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -1,9 +1,9 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" -import { color, devMessage, hypixelGuildID } from "../../config/options.json" -import { ContextMenu } from "../interfaces" -import verifySchema from "../schemas/verifySchema" -import { getGuild, getHeadURL, getIGN } from "../utils/Hypixel" -import roleManage from "../utils/functions/rolesmanage" +import { color, devMessage, hypixelGuildID } from "config/options.json" +import { ContextMenu } from "interfaces" +import verifySchema from "schemas/verifySchema" +import { getGuild, getHeadURL, getIGN } from "utils/Hypixel" +import roleManage from "utils/functions/rolesmanage" export = { name: "Update User", diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 1020b8d..552bc7b 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -4,10 +4,10 @@ import { userMention, GuildMember, } from "discord.js" -import { admin, helper } from "../../config/roles.json" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { admin, helper } from "config/roles.json" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "ban", diff --git a/src/commands/check.ts b/src/commands/check.ts index 709d043..00f472a 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -7,8 +7,8 @@ import { swkdr, duelswins, duelswlr, -} from "../../config/reqs.json" -import { color, devMessage } from "../../config/options.json" +} from "config/reqs.json" +import { color, devMessage } from "config/options.json" import { hypixelLevel, bedwarsLevel, @@ -17,8 +17,8 @@ import { getPlayer, getGuild, getHeadURL, -} from "../utils/Hypixel" -import { Command } from "../interfaces" +} from "utils/Hypixel" +import { Command } from "interfaces" export = { name: "check", diff --git a/src/commands/clear.ts b/src/commands/clear.ts index 726fd4e..7332f11 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -5,9 +5,9 @@ import { channelMention, userMention, } from "discord.js" -import { color } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { color } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "clear", diff --git a/src/commands/config.ts b/src/commands/config.ts index ed5f05a..de9fe18 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -1,8 +1,8 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color } from "../../config/options.json" -import settings = require("../schemas/settingsSchema") -import mongoose = require("mongoose") -import { Command } from "../interfaces" +import { color } from "config/options.json" +import settings from "schemas/settingsSchema" +import mongoose from "mongoose" +import { Command } from "interfaces" export = { name: "config", diff --git a/src/commands/counting.ts b/src/commands/counting.ts index 909fe32..6f7dbfb 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -1,6 +1,6 @@ import { ChannelType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" import setup from "./counting/setup" import ban from "./counting/ban" import unban from "./counting/unban" diff --git a/src/commands/counting/ban.ts b/src/commands/counting/ban.ts index 7581377..ac9c2de 100644 --- a/src/commands/counting/ban.ts +++ b/src/commands/counting/ban.ts @@ -3,8 +3,8 @@ import { GuildMember, userMention, } from "discord.js" -import { countingBanned } from "../../../config/roles.json" -import { color, devMessage } from "../../../config/options.json" +import { countingBanned } from "config/roles.json" +import { color, devMessage } from "config/options.json" export default async function ban( interaction: ChatInputCommandInteraction, diff --git a/src/commands/counting/setup.ts b/src/commands/counting/setup.ts index 187b7f5..7b65e53 100644 --- a/src/commands/counting/setup.ts +++ b/src/commands/counting/setup.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction, TextChannel, channelMention } from "discord.js" -import settingsSchema from "../../schemas/settingsSchema" -import { color, devMessage } from "../../../config/options.json" +import settingsSchema from "schemas/settingsSchema" +import { color, devMessage } from "config/options.json" import mongoose from "mongoose" export default async function setup(interaction: ChatInputCommandInteraction): Promise { diff --git a/src/commands/counting/unban.ts b/src/commands/counting/unban.ts index 613d6e8..b59f01e 100644 --- a/src/commands/counting/unban.ts +++ b/src/commands/counting/unban.ts @@ -3,8 +3,8 @@ import { GuildMember, userMention, } from "discord.js" -import { countingBanned } from "../../../config/roles.json" -import { color, devMessage } from "../../../config/options.json" +import { countingBanned } from "config/roles.json" +import { color, devMessage } from "config/options.json" export default async function ban( interaction: ChatInputCommandInteraction, diff --git a/src/commands/dev-info.ts b/src/commands/dev-info.ts index a40aa7e..6b16cd0 100644 --- a/src/commands/dev-info.ts +++ b/src/commands/dev-info.ts @@ -3,7 +3,7 @@ import { PermissionFlagsBits, ChatInputCommandInteraction, } from "discord.js" -import { Command } from "../interfaces" +import { Command } from "interfaces" const command: Command = { name: "dev-info", diff --git a/src/commands/devel.ts b/src/commands/devel.ts index 518fe0d..9c6befe 100644 --- a/src/commands/devel.ts +++ b/src/commands/devel.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { Command } from "../interfaces" +import { Command } from "interfaces" export = { name: "devel", diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index 63ea845..ecc508c 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -4,12 +4,12 @@ import { userMention, GuildMember, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import verify = require("../schemas/verifySchema") -import { Command } from "../interfaces" -import roleManage from "../utils/functions/rolesmanage" -import logToChannel from "../utils/functions/logtochannel" -import { getIGN } from "../utils/Hypixel" +import { color, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" +import { Command } from "interfaces" +import roleManage from "utils/functions/rolesmanage" +import logToChannel from "utils/functions/logtochannel" +import { getIGN } from "utils/Hypixel" export = { name: "forceunverify", diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 6a473df..b4c1845 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -4,11 +4,11 @@ import { userMention, GuildMember, } from "discord.js" -import { getGuild, getHeadURL, getIGN } from "../utils/Hypixel" -import { hypixelGuildID, color, devMessage } from "../../config/options.json" -import verify = require("../schemas/verifySchema") -import { Command } from "../interfaces" -import roleManage from "../utils/functions/rolesmanage" +import { getGuild, getHeadURL, getIGN } from "utils/Hypixel" +import { hypixelGuildID, color, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" +import { Command } from "interfaces" +import roleManage from "utils/functions/rolesmanage" export = { name: "forceupdate", diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index b719dcf..1730ae6 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -4,13 +4,13 @@ import { GuildMember, userMention, } from "discord.js" -import { getUUID, getPlayer, getGuild, getHeadURL } from "../utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "../../config/options.json" -import verify = require("../schemas/verifySchema") +import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" +import { color, hypixelGuildID, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" import mongoose from "mongoose" -import roleManage from "../utils/functions/rolesmanage" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import roleManage from "utils/functions/rolesmanage" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "forceverify", diff --git a/src/commands/guild.ts b/src/commands/guild.ts index 93cffc7..254fbb9 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" import guildMember from "./guild/member" import guildInfo from "./guild/info" import guildTop from "./guild/top" diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index b79a4d4..ed73075 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -4,10 +4,10 @@ import { getPlayer, getGuild, guildLevel, -} from "../../utils/Hypixel" -import { color, devMessage } from "../../../config/options.json" +} from "utils/Hypixel" +import { color, devMessage } from "config/options.json" import { ChatInputCommandInteraction } from "discord.js" -import { GuildData } from "../../interfaces/Guild" +import { GuildData } from "interfaces" export default async function guildInfo( interaction: ChatInputCommandInteraction, diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index bbc4552..ff47c85 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -1,5 +1,5 @@ -import { getUUID, getPlayer, getGuild, getHeadURL } from "../../utils/Hypixel" -import { color, devMessage } from "../../../config/options.json" +import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" +import { color, devMessage } from "config/options.json" import { ChatInputCommandInteraction } from "discord.js" export default async function guildMember( diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 266b3bc..f8194f2 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -1,8 +1,8 @@ -import { getUUID, getPlayer, getGuild, getIGN } from "../../utils/Hypixel" -import { color, devMessage } from "../../../config/options.json" +import { getUUID, getPlayer, getGuild, getIGN } from "utils/Hypixel" +import { color, devMessage } from "config/options.json" import { ChannelType, ChatInputCommandInteraction } from "discord.js" -import { GuildData } from "../../interfaces/Guild" -import Illegitimate from "../../utils/Illegitimate" +import { GuildData } from "interfaces" +import Illegitimate from "utils/Illegitimate" const redis = Illegitimate.redis export default async function guildTop( diff --git a/src/commands/help.ts b/src/commands/help.ts index eacabdb..d9c256e 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" export = { name: "help", diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index 2ca075b..99d857f 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color, devMessage, instructionsgif } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage, instructionsgif } from "config/options.json" +import { Command } from "interfaces" export = { name: "instructions", diff --git a/src/commands/kick.ts b/src/commands/kick.ts index 680f524..9050365 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -4,10 +4,10 @@ import { userMention, GuildMember, } from "discord.js" -import { admin, helper } from "../../config/roles.json" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { admin, helper } from "config/roles.json" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "kick", diff --git a/src/commands/ping.ts b/src/commands/ping.ts index dd4a1be..2367478 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" export = { name: "ping", diff --git a/src/commands/remove.ts b/src/commands/remove.ts index eec8560..5996576 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -3,10 +3,10 @@ import { PermissionFlagsBits, userMention, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import waitinglistSchema = require("../schemas/waitinglistSchema") -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { color, devMessage } from "config/options.json" +import waitinglistSchema from "schemas/waitinglistSchema" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "remove", diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index 30ee333..42840e1 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" +import { color, devMessage } from "config/options.json" import { bwfkdr, bwstars, @@ -8,8 +8,8 @@ import { swkdr, duelswins, duelswlr, -} from "../../config/reqs.json" -import { Command } from "../interfaces" +} from "config/reqs.json" +import { Command } from "interfaces" export = { name: "reqs", diff --git a/src/commands/send.ts b/src/commands/send.ts index dbc5a83..221e1f1 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -4,8 +4,8 @@ import { ChannelType, TextChannel, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" export = { name: "send", diff --git a/src/commands/setnick.ts b/src/commands/setnick.ts index cd5e49e..8b1823f 100644 --- a/src/commands/setnick.ts +++ b/src/commands/setnick.ts @@ -4,9 +4,9 @@ import { userMention, GuildMember, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "setnick", diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 19db759..20228ef 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -7,8 +7,8 @@ import { ChannelType, TextChannel, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" export = { name: "setup", diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index 21060c5..eee9a91 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -6,9 +6,9 @@ import { channelMention, userMention, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "slowmode", diff --git a/src/commands/snipe.ts b/src/commands/snipe.ts index eabdf1f..1cc6455 100644 --- a/src/commands/snipe.ts +++ b/src/commands/snipe.ts @@ -1,8 +1,8 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" -import snipeCacheSchema from "../schemas/snipeCacheSchema" -import Command from "../interfaces/Command" -import { color } from "../../config/options.json" -import { SnipeCache } from "../utils/Types" +import snipeCacheSchema from "schemas/snipeCacheSchema" +import { Command } from "interfaces" +import { color } from "config/options.json" +import { SnipeCache } from "utils/Types" export = { name: "snipe", diff --git a/src/commands/staff.ts b/src/commands/staff.ts index c6c712a..19a05e4 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" import help from "./staff/help" import beast from "./staff/beast" import updateDiscordRoles from "./staff/updatediscordroles" diff --git a/src/commands/staff/beast.ts b/src/commands/staff/beast.ts index 98c40e0..543a8d0 100644 --- a/src/commands/staff/beast.ts +++ b/src/commands/staff/beast.ts @@ -6,8 +6,8 @@ import { beastswstars, beastduelswins, duelswlr, -} from "../../../config/reqs.json" -import { color, devMessage } from "../../../config/options.json" +} from "config/reqs.json" +import { color, devMessage } from "config/options.json" import { hypixelLevel, bedwarsLevel, @@ -16,7 +16,7 @@ import { getPlayer, getGuild, getHeadURL, -} from "../../utils/Hypixel" +} from "utils/Hypixel" import { ChatInputCommandInteraction } from "discord.js" export default async function beast( diff --git a/src/commands/staff/help.ts b/src/commands/staff/help.ts index f54ed99..52aa557 100644 --- a/src/commands/staff/help.ts +++ b/src/commands/staff/help.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction } from "discord.js" -import { color, devMessage } from "../../../config/options.json" -import { ExtendedClient as Client } from "../../utils/Client" +import { color, devMessage } from "config/options.json" +import { ExtendedClient as Client } from "utils/Client" export default async function help( interaction: ChatInputCommandInteraction, diff --git a/src/commands/staff/updatediscordroles.ts b/src/commands/staff/updatediscordroles.ts index 2d3da76..362cff8 100644 --- a/src/commands/staff/updatediscordroles.ts +++ b/src/commands/staff/updatediscordroles.ts @@ -1,10 +1,10 @@ -import verify = require("../../schemas/verifySchema") -import { color, hypixelGuildID } from "../../../config/options.json" -import roleManage from "../../utils/functions/rolesmanage" +import verify from "schemas/verifySchema" +import { color, hypixelGuildID } from "config/options.json" +import roleManage from "utils/functions/rolesmanage" import { ChatInputCommandInteraction, GuildMember } from "discord.js" -import env from "../../utils/Env" -import { getGuild } from "../../utils/Hypixel" -import { GuildData } from "../../interfaces" +import env from "utils/Env" +import { getGuild } from "utils/Hypixel" +import { GuildData } from "interfaces" export default async function updateDiscordRoles( interaction: ChatInputCommandInteraction, diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts index 45d17d8..acd61a0 100644 --- a/src/commands/timeout.ts +++ b/src/commands/timeout.ts @@ -5,10 +5,10 @@ import { ChatInputCommandInteraction, GuildMember, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" import ms from "ms" -import logToChannel from "../utils/functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" const command: Command = { name: "timeout", diff --git a/src/commands/unban.ts b/src/commands/unban.ts index a11ab5d..a724f9b 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -4,9 +4,9 @@ import { userMention, User, } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { Command } from "../interfaces" -import logToChannel from "../utils/functions/logtochannel" +import { color, devMessage } from "config/options.json" +import { Command } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "unban", diff --git a/src/commands/update.ts b/src/commands/update.ts index d1f5106..11ad333 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -1,9 +1,9 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" -import { getGuild, getIGN, getHeadURL } from "../utils/Hypixel" -import verify = require("../schemas/verifySchema") -import { color, hypixelGuildID, devMessage } from "../../config/options.json" -import roleManage from "../utils/functions/rolesmanage" -import { Command } from "../interfaces" +import { getGuild, getIGN, getHeadURL } from "utils/Hypixel" +import verify from "schemas/verifySchema" +import { color, hypixelGuildID, devMessage } from "config/options.json" +import roleManage from "utils/functions/rolesmanage" +import { Command } from "interfaces" export = { name: "update", diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index 3831a1f..a05ec4c 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -1,7 +1,7 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "../../config/options.json" -import { getUUID, getIGN, getHeadURL, formatUuid } from "../utils/Hypixel" -import { Command } from "../interfaces" +import { color, devMessage } from "config/options.json" +import { getUUID, getIGN, getHeadURL, formatUuid } from "utils/Hypixel" +import { Command } from "interfaces" export = { name: "uuid", diff --git a/src/commands/verify.ts b/src/commands/verify.ts index 2131761..fa36b6b 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -1,12 +1,12 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" -import { getUUID, getPlayer, getGuild, getHeadURL } from "../utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "../../config/options.json" +import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" +import { color, hypixelGuildID, devMessage } from "config/options.json" import mongoose from "mongoose" -import roleManage from "../utils/functions/rolesmanage" -import { Command } from "../interfaces" -import verify = require("../schemas/verifySchema") -import { PlayerData } from "../interfaces/Player" -import { GuildData } from "../interfaces/Guild" +import roleManage from "utils/functions/rolesmanage" +import { Command } from "interfaces" +import verify from "schemas/verifySchema" +import { PlayerData } from "interfaces" +import { GuildData } from "interfaces" export = { name: "verify", diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index c8c725b..6803384 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -1,8 +1,8 @@ import { SlashCommandBuilder, userMention } from "discord.js" -import { Command } from "../interfaces" -import { color, devMessage } from "../../config/options.json" -import verify from "../schemas/verifySchema" -import { getIGN, getHeadURL } from "../utils/Hypixel" +import { Command } from "interfaces" +import { color, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" +import { getIGN, getHeadURL } from "utils/Hypixel" export = { name: "whoami", diff --git a/src/commands/whois.ts b/src/commands/whois.ts index efe81b4..4d6a348 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -3,10 +3,10 @@ import { PermissionFlagsBits, userMention, } from "discord.js" -import { getIGN, getHeadURL } from "../utils/Hypixel" -import { color, devMessage } from "../../config/options.json" -import verify = require("../schemas/verifySchema") -import { Command } from "../interfaces" +import { getIGN, getHeadURL } from "utils/Hypixel" +import { color, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" +import { Command } from "interfaces" export = { name: "whois", diff --git a/src/components/autocomplete/unban.ts b/src/components/autocomplete/unban.ts index 53b74b3..51ded62 100644 --- a/src/components/autocomplete/unban.ts +++ b/src/components/autocomplete/unban.ts @@ -1,4 +1,4 @@ -import { Autocomplete } from "../../interfaces" +import { Autocomplete } from "interfaces" export = { name: "unban", diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 3d24065..010252c 100644 --- a/src/components/buttons/checkstats.ts +++ b/src/components/buttons/checkstats.ts @@ -1,5 +1,5 @@ -import { color, devMessage } from "../../../config/options.json" -import guildapp from "../../schemas/guildAppSchema" +import { color, devMessage } from "config/options.json" +import guildapp from "schemas/guildAppSchema" import { bwfkdr, bwstars, @@ -8,7 +8,7 @@ import { swkdr, duelswins, duelswlr, -} from "../../../config/reqs.json" +} from "config/reqs.json" import { hypixelLevel, bedwarsLevel, @@ -16,8 +16,8 @@ import { getPlayer, getGuild, getHeadURL, -} from "../../utils/Hypixel" -import { Button } from "../../interfaces" +} from "utils/Hypixel" +import { Button } from "interfaces" export = { name: "checkstats", diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index 2b06c69..b9709dc 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/src/components/buttons/guildapplicationaccept.ts @@ -9,14 +9,14 @@ import { waitingListChannel, waitingListMessage, hypixelGuildID, -} from "../../../config/options.json" -import colorLog from "../../utils/functions/colors" +} from "config/options.json" +import colorLog from "utils/functions/colors" import mongoose from "mongoose" -import guildapp from "../../schemas/guildAppSchema" -import waitingList from "../../schemas/waitinglistSchema" -import { waitingListRole } from "../../../config/roles.json" -import { Button } from "../../interfaces" -import { getGuild } from "../../utils/Hypixel" +import guildapp from "schemas/guildAppSchema" +import waitingList from "schemas/waitinglistSchema" +import { waitingListRole } from "config/roles.json" +import { Button } from "interfaces" +import { getGuild } from "utils/Hypixel" export = { name: "guildapplicationaccept", diff --git a/src/components/buttons/guildapplicationdeny.ts b/src/components/buttons/guildapplicationdeny.ts index e9c86f4..922291d 100644 --- a/src/components/buttons/guildapplicationdeny.ts +++ b/src/components/buttons/guildapplicationdeny.ts @@ -4,7 +4,7 @@ import { TextInputBuilder, TextInputStyle, } from "discord.js" -import { Button } from "../../interfaces" +import { Button } from "interfaces" export = { name: "guildapplicationdeny", diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index 3a74a9d..ff0b662 100644 --- a/src/components/buttons/guildapply.ts +++ b/src/components/buttons/guildapply.ts @@ -6,15 +6,15 @@ import { GuildMember, TextChannel, } from "discord.js" -import { color } from "../../../config/options.json" -import { largeM, smallM, ignM } from "../../../config/limitmessages.json" -import { applicationsChannel } from "../../../config/options.json" -import questions from "../../../config/questions.json" -import { guildRole } from "../../../config/roles.json" -import { getUUID } from "../../utils/Hypixel" +import { color } from "config/options.json" +import { largeM, smallM, ignM } from "config/limitmessages.json" +import { applicationsChannel } from "config/options.json" +import questions from "config/questions.json" +import { guildRole } from "config/roles.json" +import { getUUID } from "utils/Hypixel" import mongoose from "mongoose" -import guildapp from "../../schemas/guildAppSchema" -import { Button } from "../../interfaces" +import guildapp from "schemas/guildAppSchema" +import { Button } from "interfaces" export = { name: "guildapply", diff --git a/src/components/buttons/guildinactivitylog.ts b/src/components/buttons/guildinactivitylog.ts index ab48503..9d45a92 100644 --- a/src/components/buttons/guildinactivitylog.ts +++ b/src/components/buttons/guildinactivitylog.ts @@ -14,11 +14,11 @@ import { member, guildStaff, guildRole, -} from "../../../config/roles.json" -import { ignM, smallM, largeM } from "../../../config/limitmessages.json" -import { inactivity } from "../../../config/questions.json" -import { color, inactivityLogChannel } from "../../../config/options.json" -import { Button } from "../../interfaces" +} from "config/roles.json" +import { ignM, smallM, largeM } from "config/limitmessages.json" +import { inactivity } from "config/questions.json" +import { color, inactivityLogChannel } from "config/options.json" +import { Button } from "interfaces" const guildRoles = [ gm, manager, diff --git a/src/components/buttons/inactiveapplicationaccept.ts b/src/components/buttons/inactiveapplicationaccept.ts index 9cc1923..eaee5b2 100644 --- a/src/components/buttons/inactiveapplicationaccept.ts +++ b/src/components/buttons/inactiveapplicationaccept.ts @@ -1,4 +1,4 @@ -import { Button } from "../../interfaces" +import { Button } from "interfaces" export = { name: "inactiveapplicationaccept", diff --git a/src/components/buttons/inactiveapplicationdeny.ts b/src/components/buttons/inactiveapplicationdeny.ts index 874f2ec..1c12a60 100644 --- a/src/components/buttons/inactiveapplicationdeny.ts +++ b/src/components/buttons/inactiveapplicationdeny.ts @@ -1,4 +1,4 @@ -import { Button } from "../../interfaces" +import { Button } from "interfaces" export = { name: "inactiveapplicationdeny", diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index 9b5e68c..13b11ba 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 { color } from "../../../config/options.json" -import staffapp from "../../schemas/staffAppSchema" -import { Button } from "../../interfaces" +import { color } from "config/options.json" +import staffapp from "schemas/staffAppSchema" +import { Button } from "interfaces" export = { name: "staffapplicationaccept", diff --git a/src/components/buttons/staffapplicationdeny.ts b/src/components/buttons/staffapplicationdeny.ts index 1ae0de6..1034b16 100644 --- a/src/components/buttons/staffapplicationdeny.ts +++ b/src/components/buttons/staffapplicationdeny.ts @@ -4,7 +4,7 @@ import { TextInputBuilder, TextInputStyle, } from "discord.js" -import { Button } from "../../interfaces" +import { Button } from "interfaces" export = { name: "staffapplicationdeny", diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index f77ad3f..b92a33f 100644 --- a/src/components/buttons/staffapply.ts +++ b/src/components/buttons/staffapply.ts @@ -6,16 +6,16 @@ import { GuildMember, TextChannel, } from "discord.js" -import { color, staffApplicationsChannel } from "../../../config/options.json" -import { largeM, ignM } from "../../../config/limitmessages.json" -import questions from "../../../config/questions.json" -import { guildRole, guildStaff } from "../../../config/roles.json" +import { color, staffApplicationsChannel } from "config/options.json" +import { largeM, ignM } from "config/limitmessages.json" +import questions from "config/questions.json" +import { guildRole, guildStaff } from "config/roles.json" import mongoose from "mongoose" -import staffapp from "../../schemas/staffAppSchema" -import settings from "../../schemas/settingsSchema" -import { getUUID } from "../../utils/Hypixel" -import { Button } from "../../interfaces" -import env from "../../utils/Env" +import staffapp from "schemas/staffAppSchema" +import settings from "schemas/settingsSchema" +import { getUUID } from "utils/Hypixel" +import { Button } from "interfaces" +import env from "utils/Env" export = { name: "staffapply", diff --git a/src/components/buttons/verify.ts b/src/components/buttons/verify.ts index c5d45cb..1625b8a 100644 --- a/src/components/buttons/verify.ts +++ b/src/components/buttons/verify.ts @@ -4,7 +4,7 @@ import { TextInputBuilder, TextInputStyle, } from "discord.js" -import { Button } from "../../interfaces" +import { Button } from "interfaces" export = { name: "verify", diff --git a/src/components/buttons/waitingListUpdate.ts b/src/components/buttons/waitingListUpdate.ts index c74e905..79d2b11 100644 --- a/src/components/buttons/waitingListUpdate.ts +++ b/src/components/buttons/waitingListUpdate.ts @@ -1,7 +1,7 @@ -import waitinglist from "../../schemas/waitinglistSchema" -import { getGuild } from "../../utils/Hypixel" -import { hypixelGuildID } from "../../../config/options.json" -import { Button } from "../../interfaces" +import waitinglist from "schemas/waitinglistSchema" +import { getGuild } from "utils/Hypixel" +import { hypixelGuildID } from "config/options.json" +import { Button } from "interfaces" export = { name: "waitinglistupdate", diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index 6bcfac1..5524f46 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/src/components/modals/denyreasonbox.ts @@ -6,9 +6,9 @@ import { Message, GuildMember, } from "discord.js" -import { color } from "../../../config/options.json" -import guildapp from "../../schemas/guildAppSchema" -import { Modal } from "../../interfaces" +import { color } from "config/options.json" +import guildapp from "schemas/guildAppSchema" +import { Modal } from "interfaces" export = { name: "denyreasonbox", diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index 05b701d..b3f7379 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/src/components/modals/staffdenyreasonbox.ts @@ -4,9 +4,9 @@ import { ButtonBuilder, ButtonStyle, } from "discord.js" -import { color } from "../../../config/options.json" -import staffapp from "../../schemas/staffAppSchema" -import { Modal } from "../../interfaces" +import { color } from "config/options.json" +import staffapp from "schemas/staffAppSchema" +import { Modal } from "interfaces" export = { name: "staffdenyreasonbox", diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index 8796c37..6622d42 100644 --- a/src/components/modals/verifyModal.ts +++ b/src/components/modals/verifyModal.ts @@ -1,6 +1,6 @@ -import { getUUID, getPlayer, getGuild, getHeadURL } from "../../utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "../../../config/options.json" -import verify from "../../schemas/verifySchema" +import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" +import { color, hypixelGuildID, devMessage } from "config/options.json" +import verify from "schemas/verifySchema" import mongoose from "mongoose" import { gm, @@ -12,8 +12,8 @@ import { guildRole, guildStaff, defaultMember, -} from "../../../config/roles.json" -import { Modal } from "../../interfaces" +} from "config/roles.json" +import { Modal } from "interfaces" import { GuildMember } from "discord.js" export = { diff --git a/config/limitmessages.json b/src/config/limitmessages.json similarity index 100% rename from config/limitmessages.json rename to src/config/limitmessages.json diff --git a/config/options.json b/src/config/options.json similarity index 100% rename from config/options.json rename to src/config/options.json diff --git a/config/questions.json b/src/config/questions.json similarity index 100% rename from config/questions.json rename to src/config/questions.json diff --git a/config/reqs.json b/src/config/reqs.json similarity index 100% rename from config/reqs.json rename to src/config/reqs.json diff --git a/config/roles.json b/src/config/roles.json similarity index 100% rename from config/roles.json rename to src/config/roles.json diff --git a/config/statuses.json b/src/config/statuses.json similarity index 100% rename from config/statuses.json rename to src/config/statuses.json diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index ad25f16..04a0273 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -3,11 +3,11 @@ import { guildLogChannel, color, devMessage, -} from "../../../config/options.json" -import colorLog from "../../utils/functions/colors" -import { getGuild, getIGN } from "../../utils/Hypixel" -import { Cron, GuildData } from "../../interfaces" -import Illegitimate from "../../utils/Illegitimate" +} from "config/options.json" +import colorLog from "utils/functions/colors" +import { getGuild, getIGN } from "utils/Hypixel" +import { Cron, GuildData } from "interfaces" +import Illegitimate from "utils/Illegitimate" import { TextChannel } from "discord.js" const client = Illegitimate.client diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index 56b4ddb..a73d41f 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -1,7 +1,7 @@ import { GuildMember, userMention } from "discord.js" -import { color } from "../../../../config/options.json" -import { Event } from "../../../interfaces" -import logToChannel from "../../../utils/functions/logtochannel" +import { color } from "config/options.json" +import { Event } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "logNewJoins", diff --git a/src/events/server/interactions/logBtnsCmds.ts b/src/events/server/interactions/logBtnsCmds.ts index 7b385e2..d8ffc90 100644 --- a/src/events/server/interactions/logBtnsCmds.ts +++ b/src/events/server/interactions/logBtnsCmds.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction, ButtonInteraction } from "discord.js" -import color from "../../../utils/functions/colors" -import { Event } from "../../../interfaces" +import color from "utils/functions/colors" +import { Event } from "interfaces" export = { name: "logBtnsCmds", diff --git a/src/events/server/messages/react.ts b/src/events/server/messages/react.ts index 4f970af..f6fb27e 100644 --- a/src/events/server/messages/react.ts +++ b/src/events/server/messages/react.ts @@ -1,4 +1,4 @@ -import { Event } from "../../../interfaces" +import { Event } from "interfaces" import { Message } from "discord.js" export = { diff --git a/src/events/server/messages/snipecache.ts b/src/events/server/messages/snipecache.ts index e017d8d..9b0f147 100644 --- a/src/events/server/messages/snipecache.ts +++ b/src/events/server/messages/snipecache.ts @@ -1,8 +1,8 @@ import { ChannelType, Message } from "discord.js" -import { Event } from "../../../interfaces" -import snipeCacheSchema from "../../../schemas/snipeCacheSchema" +import { Event } from "interfaces" +import snipeCacheSchema from "schemas/snipeCacheSchema" import mongoose from "mongoose" -import { SnipeCache } from "../../../utils/Types" +import { SnipeCache } from "utils/Types" export = { name: "snipecache", diff --git a/src/events/server/ready/consolelog.ts b/src/events/server/ready/consolelog.ts index 9759050..b4cf936 100644 --- a/src/events/server/ready/consolelog.ts +++ b/src/events/server/ready/consolelog.ts @@ -1,6 +1,6 @@ -import { Event } from "../../../interfaces" -import { ExtendedClient as Client } from "../../../utils/Client" -import color from "../../../utils/functions/colors" +import { Event } from "interfaces" +import { ExtendedClient as Client } from "utils/Client" +import color from "utils/functions/colors" export = { name: "conolelog", diff --git a/src/events/server/ready/sendOnlineMessage.ts b/src/events/server/ready/sendOnlineMessage.ts index 40dd0c8..4d7d7c4 100644 --- a/src/events/server/ready/sendOnlineMessage.ts +++ b/src/events/server/ready/sendOnlineMessage.ts @@ -1,6 +1,6 @@ -import logToChannel from "../../../utils/functions/logtochannel" -import { Event } from "../../../interfaces" -import { color } from "../../../../config/options.json" +import logToChannel from "utils/functions/logtochannel" +import { Event } from "interfaces" +import { color } from "config/options.json" export = { name: "sendonlinemessage", diff --git a/src/events/server/ready/status.ts b/src/events/server/ready/status.ts index 667b8d8..9232cfa 100644 --- a/src/events/server/ready/status.ts +++ b/src/events/server/ready/status.ts @@ -1,6 +1,6 @@ -import statuses = require("../../../../config/statuses.json") -import { Event } from "../../../interfaces" -import { ExtendedClient as Client } from "../../../utils/Client" +import statuses = require("config/statuses.json") +import { Event } from "interfaces" +import { ExtendedClient as Client } from "utils/Client" export = { name: "status", diff --git a/src/events/server/voiceStateUpdate/vcJoinLeave.ts b/src/events/server/voiceStateUpdate/vcJoinLeave.ts index 1acd9a7..236ffba 100644 --- a/src/events/server/voiceStateUpdate/vcJoinLeave.ts +++ b/src/events/server/voiceStateUpdate/vcJoinLeave.ts @@ -3,9 +3,9 @@ import { channelMention, VoiceState, } from "discord.js" -import { color } from "../../../../config/options.json" -import { Event } from "../../../interfaces" -import logToChannel from "../../../utils/functions/logtochannel" +import { color } from "config/options.json" +import { Event } from "interfaces" +import logToChannel from "utils/functions/logtochannel" export = { name: "vcJoinLeave", diff --git a/src/index.ts b/src/index.ts index 0f9f149..59588f7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import Illegitimate from "./utils/Illegitimate" +import Illegitimate from "utils/Illegitimate" const illegitimate = new Illegitimate.Bot() illegitimate.start() diff --git a/src/interfaces/Command.ts b/src/interfaces/Command.ts index e0757c4..77be96e 100644 --- a/src/interfaces/Command.ts +++ b/src/interfaces/Command.ts @@ -1,6 +1,6 @@ /* eslint-disable no-unused-vars */ import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js" -import { ExtendedClient as Client } from "../utils/Client" +import { ExtendedClient as Client } from "utils/Client" export default interface Command { name: string diff --git a/src/utils/Autodeploy.ts b/src/utils/Autodeploy.ts index b7eec34..ff642ef 100644 --- a/src/utils/Autodeploy.ts +++ b/src/utils/Autodeploy.ts @@ -1,4 +1,4 @@ -import { Command } from "../interfaces" +import { Command } from "interfaces" import color from "./functions/colors" import env from "./Env" import { diff --git a/src/utils/Client.ts b/src/utils/Client.ts index 9a0b1cb..461697c 100644 --- a/src/utils/Client.ts +++ b/src/utils/Client.ts @@ -1,10 +1,10 @@ import { Client, Collection, GatewayIntentBits, Partials } from "discord.js" import color from "./functions/colors" -import { Command } from "../interfaces" -import { ContextMenu } from "../interfaces" -import { Button } from "../interfaces" -import { Modal } from "../interfaces" -import { Autocomplete } from "../interfaces" +import { Command } from "interfaces" +import { ContextMenu } from "interfaces" +import { Button } from "interfaces" +import { Modal } from "interfaces" +import { Autocomplete } from "interfaces" import env from "./Env" import autoDeployCommands from "./Autodeploy" import { loadAllEvents } from "./Events" diff --git a/src/utils/Env.ts b/src/utils/Env.ts index 10e6c4a..05d4a1e 100644 --- a/src/utils/Env.ts +++ b/src/utils/Env.ts @@ -1,4 +1,4 @@ -import { Env } from "../interfaces" +import { Env } from "interfaces" import "dotenv/config" const env: Env = { diff --git a/src/utils/Events.ts b/src/utils/Events.ts index d32e6bd..a5d2888 100644 --- a/src/utils/Events.ts +++ b/src/utils/Events.ts @@ -1,10 +1,10 @@ -import { ExtendedClient as Client } from "./Client" -import { loadButtonEvents } from "./eventHandlers" -import { loadSlashCommandsEvents } from "./eventHandlers" -import { loadContextMenuEvents } from "./eventHandlers" -import { loadModalEvents } from "./eventHandlers" -import { loadEvents } from "./eventHandlers" -import { loadAutocompleteEvents } from "./eventHandlers" +import { ExtendedClient as Client } from "utils/Client" +import { loadButtonEvents } from "utils/eventHandlers" +import { loadSlashCommandsEvents } from "utils/eventHandlers" +import { loadContextMenuEvents } from "utils/eventHandlers" +import { loadModalEvents } from "utils/eventHandlers" +import { loadEvents } from "utils/eventHandlers" +import { loadAutocompleteEvents } from "utils/eventHandlers" type FileType = "js" | "ts" export function loadAllEvents(client: Client, ft: FileType) { diff --git a/src/utils/Hypixel.ts b/src/utils/Hypixel.ts index 275907d..fc4ce49 100644 --- a/src/utils/Hypixel.ts +++ b/src/utils/Hypixel.ts @@ -1,12 +1,12 @@ -export { skywarsLevel } from "./functions/skywars" -export { bedwarsLevel } from "./functions/bedwars" -export { hypixelLevel } from "./functions/hypixel" -export { formatUuid } from "./functions/uuid" -export { guildLevel, scaledGEXP } from "./functions/guild" +export { skywarsLevel } from "utils/functions/skywars" +export { bedwarsLevel } from "utils/functions/bedwars" +export { hypixelLevel } from "utils/functions/hypixel" +export { formatUuid } from "utils/functions/uuid" +export { guildLevel, scaledGEXP } from "utils/functions/guild" export { getUUID, getIGN, getPlayer, getGuild, getHeadURL, -} from "./functions/account" +} from "utils/functions/account" diff --git a/src/utils/Illegitimate.ts b/src/utils/Illegitimate.ts index 5a7bd9b..f346416 100644 --- a/src/utils/Illegitimate.ts +++ b/src/utils/Illegitimate.ts @@ -1,10 +1,10 @@ -import { ExtendedClient as Client } from "./Client" -import color from "./functions/colors" +import { ExtendedClient as Client } from "utils/Client" +import color from "utils/functions/colors" import { Redis } from "ioredis" -import env from "./Env" +import env from "utils/Env" import { connect } from "mongoose" -import init from "./Init" -import { loadCronEvents } from "./eventHandlers" +import init from "utils/Init" +import { loadCronEvents } from "utils/eventHandlers" const client = new Client() const redis = new Redis(env.prod.redisURI!) diff --git a/src/utils/Init.ts b/src/utils/Init.ts index 658e115..04b741f 100644 --- a/src/utils/Init.ts +++ b/src/utils/Init.ts @@ -1,4 +1,4 @@ -import env from "./Env" +import env from "utils/Env" const prodValues = env.prod const devValues = env.dev diff --git a/src/utils/eventHandlers/autocomplete.ts b/src/utils/eventHandlers/autocomplete.ts index cc8e7f4..5e9efe9 100644 --- a/src/utils/eventHandlers/autocomplete.ts +++ b/src/utils/eventHandlers/autocomplete.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client" -import { color } from "../../../config/options.json" -import { Autocomplete } from "../../interfaces" +import { ExtendedClient as Client } from "utils/Client" +import { color } from "config/options.json" +import { Autocomplete } from "interfaces" import { Events } from "discord.js" -import colorLog from "../functions/colors" +import colorLog from "utils/functions/colors" import path = require("path") import fs = require("fs") -import logToChannel from "../functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" const embedColor = Number(color.replace("#", "0x")) diff --git a/src/utils/eventHandlers/button.ts b/src/utils/eventHandlers/button.ts index 091a862..976c7ce 100644 --- a/src/utils/eventHandlers/button.ts +++ b/src/utils/eventHandlers/button.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client" -import colorLog from "../functions/colors" -import { color } from "../../../config/options.json" -import { Button } from "../../interfaces" +import { ExtendedClient as Client } from "utils/Client" +import colorLog from "utils/functions/colors" +import { color } from "config/options.json" +import { Button } from "interfaces" import { Events } from "discord.js" import path = require("path") import fs = require("fs") -import logToChannel from "../functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" const embedColor = Number(color.replace("#", "0x")) diff --git a/src/utils/eventHandlers/command.ts b/src/utils/eventHandlers/command.ts index b37c975..5b2297d 100644 --- a/src/utils/eventHandlers/command.ts +++ b/src/utils/eventHandlers/command.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client" -import colorLog from "../functions/colors" -import { color } from "../../../config/options.json" -import { Command } from "../../interfaces" +import { ExtendedClient as Client } from "utils/Client" +import colorLog from "utils/functions/colors" +import { color } from "config/options.json" +import { Command } from "interfaces" import { Events } from "discord.js" import path = require("path") import fs = require("fs") -import logToChannel from "../functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" const embedColor = Number(color.replace("#", "0x")) diff --git a/src/utils/eventHandlers/contextmenu.ts b/src/utils/eventHandlers/contextmenu.ts index 22635d3..9c06797 100644 --- a/src/utils/eventHandlers/contextmenu.ts +++ b/src/utils/eventHandlers/contextmenu.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client" -import colorLog from "../functions/colors" -import { ContextMenu } from "../../interfaces" -import { color } from "../../../config/options.json" +import { ExtendedClient as Client } from "utils/Client" +import colorLog from "utils/functions/colors" +import { ContextMenu } from "interfaces" +import { color } from "config/options.json" import { Events } from "discord.js" import path = require("path") import fs = require("fs") -import logToChannel from "../functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" const embedColor = Number(color.replace("#", "0x")) diff --git a/src/utils/eventHandlers/cron.ts b/src/utils/eventHandlers/cron.ts index 1784171..87d48f1 100644 --- a/src/utils/eventHandlers/cron.ts +++ b/src/utils/eventHandlers/cron.ts @@ -1,7 +1,7 @@ import { CronJob } from "cron" import path from "path" import fs from "fs" -import { Cron } from "../../interfaces" +import { Cron } from "interfaces" export default function loadCronEvents() { const cronPath = path.join(__dirname, "..", "..", "events", "cron") diff --git a/src/utils/eventHandlers/events.ts b/src/utils/eventHandlers/events.ts index f41042d..6c5825f 100644 --- a/src/utils/eventHandlers/events.ts +++ b/src/utils/eventHandlers/events.ts @@ -1,5 +1,5 @@ -import { ExtendedClient as Client } from "../Client" -import { Event } from "../../interfaces" +import { ExtendedClient as Client } from "utils/Client" +import { Event } from "interfaces" import path = require("path") import fs = require("fs") diff --git a/src/utils/eventHandlers/index.ts b/src/utils/eventHandlers/index.ts index 4d26817..0496fc5 100644 --- a/src/utils/eventHandlers/index.ts +++ b/src/utils/eventHandlers/index.ts @@ -1,10 +1,10 @@ -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" +import loadAutocompleteEvents from "utils/eventHandlers/autocomplete" +import loadButtonEvents from "utils/eventHandlers/button" +import loadSlashCommandsEvents from "utils/eventHandlers/command" +import loadContextMenuEvents from "utils/eventHandlers/contextmenu" +import loadCronEvents from "utils/eventHandlers/cron" +import loadEvents from "utils/eventHandlers/events" +import loadModalEvents from "utils/eventHandlers/modal" export { loadAutocompleteEvents, diff --git a/src/utils/eventHandlers/modal.ts b/src/utils/eventHandlers/modal.ts index b23c89b..046effa 100644 --- a/src/utils/eventHandlers/modal.ts +++ b/src/utils/eventHandlers/modal.ts @@ -1,11 +1,11 @@ -import { ExtendedClient as Client } from "../Client" -import colorLog from "../functions/colors" -import { color } from "../../../config/options.json" -import { Modal } from "../../interfaces" +import { ExtendedClient as Client } from "utils/Client" +import colorLog from "utils/functions/colors" +import { color } from "config/options.json" +import { Modal } from "interfaces" import { Events } from "discord.js" import path = require("path") import fs = require("fs") -import logToChannel from "../functions/logtochannel" +import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" const embedColor = Number(color.replace("#", "0x")) diff --git a/src/utils/functions/account.ts b/src/utils/functions/account.ts index ab2f28f..5c5d630 100644 --- a/src/utils/functions/account.ts +++ b/src/utils/functions/account.ts @@ -1,7 +1,7 @@ import fetch from "axios" -import env from "../Env" -import { Player, PlayerData } from "../../interfaces" -import { Guild, GuildData } from "../../interfaces" +import env from "utils/Env" +import { Player, PlayerData } from "interfaces" +import { Guild, GuildData } from "interfaces" 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/functions/logtochannel.ts b/src/utils/functions/logtochannel.ts index d0e1068..a10cf6e 100644 --- a/src/utils/functions/logtochannel.ts +++ b/src/utils/functions/logtochannel.ts @@ -1,6 +1,6 @@ -import { guildid, onlineLogChannel, botLogChannel, guildLogChannel, errorLogChannel, moderationLogChannel, devLogChannel } from "../../../config/options.json" +import { guildid, onlineLogChannel, botLogChannel, guildLogChannel, errorLogChannel, moderationLogChannel, devLogChannel } from "config/options.json" import { Guild, MessageCreateOptions, TextChannel } from "discord.js" -import Illegitimate from "../Illegitimate" +import Illegitimate from "utils/Illegitimate" const channels = { online: onlineLogChannel, diff --git a/src/utils/functions/rolesmanage.ts b/src/utils/functions/rolesmanage.ts index da14dd5..a168c97 100644 --- a/src/utils/functions/rolesmanage.ts +++ b/src/utils/functions/rolesmanage.ts @@ -8,7 +8,7 @@ import { guildStaff, guildRole, defaultMember -} from "../../../config/roles.json" +} from "config/roles.json" const roles = [ gm, manager, diff --git a/tsconfig.json b/tsconfig.json index 2feb46e..855b0ae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,14 @@ "resolveJsonModule": true, "removeComments": true, "noUnusedLocals": true, - "outDir": "dist" + "outDir": "dist", + "baseUrl": ".", + "paths": { + "utils/*": ["src/utils/*"], + "interfaces": ["src/interfaces/index"], + "schemas/*": ["src/schemas/*"], + "config/*": ["src/config/*"], + } }, "include": ["src"], "exclude": ["node_modules"] diff --git a/yarn.lock b/yarn.lock index 9cd7ceb..72dc8cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1195,10 +1195,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.0.tgz#aedf3dfb42c00ee4eda533c1380f7d9624f768b8" - integrity sha512-/vBUecTGaPlRVwyZVROVC58bYIScqaoEJzZmzQXXrZOzqn0TwWz0EnOozOlFO/YAImRnb7XsKpTCd3m1SjS2Ww== +prettier@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.1.tgz#babf33580e16c796a9740b9fae551624f7bfeaab" + integrity sha512-qSUWshj1IobVbKc226Gw2pync27t0Kf0EdufZa9j7uBSJay1CC+B3K5lAAZoqgX3ASiKuWsk6OmzKRetXNObWg== pretty-ms@^8.0.0: version "8.0.0"