chore: update and clean up imports

README.md

@@ -1,7 +1,7 @@
 # Poixpixel's Discord Bot
 
 > [!WARNING]
-> This Discord bot is not production ready.
+> This Discord bot is not production ready and is still in a testing state.
 
 > [!TIP]
 > Want to see the bot in action? [Join our Discord server](https://discord.gg/KRTGjxx7gY).

src/commands/fun/counting.ts

@@ -4,9 +4,9 @@ import {
   PermissionsBitField,
 } from 'discord.js';
 
-import { SubcommandCommand } from '../../types/CommandTypes.js';
+import { SubcommandCommand } from '@/types/CommandTypes.js';
-import { getCountingData, setCount } from '../../util/countingManager.js';
+import { getCountingData, setCount } from '@/util/countingManager.js';
-import { loadConfig } from '../../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 
 const command: SubcommandCommand = {
   data: new SlashCommandBuilder()

src/commands/fun/fact.ts

@@ -13,10 +13,10 @@ import {
   approveFact,
   deleteFact,
   getLastInsertedFactId,
-} from '../../db/db.js';
+} from '@/db/db.js';
-import { postFactOfTheDay } from '../../util/factManager.js';
+import { postFactOfTheDay } from '@/util/factManager.js';
-import { loadConfig } from '../../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
-import { SubcommandCommand } from '../../types/CommandTypes.js';
+import { SubcommandCommand } from '@/types/CommandTypes.js';
 
 const command: SubcommandCommand = {
   data: new SlashCommandBuilder()

src/commands/fun/leaderboard.ts

@@ -9,8 +9,8 @@ import {
   JSONEncodable,
 } from 'discord.js';
 
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
-import { getLevelLeaderboard } from '../../db/db.js';
+import { getLevelLeaderboard } from '@/db/db.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/fun/rank.ts

@@ -1,11 +1,8 @@
-import { GuildMember, SlashCommandBuilder } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
-import {
+import { generateRankCard, getXpToNextLevel } from '@/util/levelingSystem.js';
-  generateRankCard,
+import { getUserLevel } from '@/db/db.js';
-  getXpToNextLevel,
-} from '../../util/levelingSystem.js';
-import { getUserLevel } from '../../db/db.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/moderation/ban.ts

@@ -1,9 +1,9 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { updateMember, updateMemberModerationHistory } from '../../db/db.js';
+import { updateMember, updateMemberModerationHistory } from '@/db/db.js';
-import { parseDuration, scheduleUnban } from '../../util/helpers.js';
+import { parseDuration, scheduleUnban } from '@/util/helpers.js';
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
-import logAction from '../../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/moderation/unban.ts

@@ -1,7 +1,7 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { executeUnban } from '../../util/helpers.js';
+import { executeUnban } from '@/util/helpers.js';
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/moderation/warn.ts

@@ -1,8 +1,8 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { updateMemberModerationHistory } from '../../db/db.js';
+import { updateMemberModerationHistory } from '@/db/db.js';
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
-import logAction from '../../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/testing/testJoin.ts

@@ -1,6 +1,6 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/testing/testLeave.ts

@@ -1,7 +1,7 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { updateMember } from '../../db/db.js';
+import { updateMember } from '@/db/db.js';
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/members.ts

@@ -9,8 +9,8 @@ import {
   JSONEncodable,
 } from 'discord.js';
 
-import { getAllMembers } from '../../db/db.js';
+import { getAllMembers } from '@/db/db.js';
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/ping.ts

@@ -1,6 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/recalculatelevels.ts

@@ -1,7 +1,7 @@
 import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
-import { recalculateUserLevels } from '../../util/levelingSystem.js';
+import { recalculateUserLevels } from '@/util/levelingSystem.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/reconnect.ts

@@ -4,17 +4,14 @@ import {
   SlashCommandBuilder,
 } from 'discord.js';
 
-import { SubcommandCommand } from '../../types/CommandTypes.js';
+import { SubcommandCommand } from '@/types/CommandTypes.js';
-import { loadConfig } from '../../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
-import {
+import { initializeDatabaseConnection, ensureDbInitialized } from '@/db/db.js';
-  initializeDatabaseConnection,
+import { isRedisConnected } from '@/db/redis.js';
-  ensureDbInitialized,
-} from '../../db/db.js';
-import { isRedisConnected } from '../../db/redis.js';
 import {
   NotificationType,
   notifyManagers,
-} from '../../util/notificationHandler.js';
+} from '@/util/notificationHandler.js';
 
 const command: SubcommandCommand = {
   data: new SlashCommandBuilder()
@@ -123,7 +120,7 @@ async function handleRedisReconnect(interaction: CommandInteraction) {
   await interaction.editReply('Attempting to reconnect to Redis...');
 
   try {
-    const redisModule = await import('../../db/redis.js');
+    const redisModule = await import('@/db/redis.js');
 
     await redisModule.ensureRedisConnection();
 

src/commands/util/restart.ts

@@ -2,14 +2,14 @@ import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
-import { loadConfig } from '../../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 import {
   NotificationType,
   notifyManagers,
-} from '../../util/notificationHandler.js';
+} from '@/util/notificationHandler.js';
-import { isRedisConnected } from '../../db/redis.js';
+import { isRedisConnected } from '@/db/redis.js';
-import { ensureDatabaseConnection } from '../../db/db.js';
+import { ensureDatabaseConnection } from '@/db/db.js';
 
 const execAsync = promisify(exec);
 

src/commands/util/rules.ts

@@ -1,6 +1,6 @@
 import { SlashCommandBuilder, EmbedBuilder } from 'discord.js';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const rulesEmbed = new EmbedBuilder()
   .setColor(0x0099ff)

src/commands/util/server.ts

@@ -1,6 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 
-import { Command } from '../../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/user-info.ts

@@ -5,8 +5,8 @@ import {
   PermissionsBitField,
 } from 'discord.js';
 
-import { getMember } from '../../db/db.js';
+import { getMember } from '@/db/db.js';
-import { OptionsCommand } from '../../types/CommandTypes.js';
+import { OptionsCommand } from '@/types/CommandTypes.js';
 
 const command: OptionsCommand = {
   data: new SlashCommandBuilder()

src/commands/util/xp.ts

@@ -1,8 +1,8 @@
 import { SlashCommandBuilder } from 'discord.js';
 
-import { SubcommandCommand } from '../../types/CommandTypes.js';
+import { SubcommandCommand } from '@/types/CommandTypes.js';
-import { addXpToUser, getUserLevel } from '../../db/db.js';
+import { addXpToUser, getUserLevel } from '@/db/db.js';
-import { loadConfig } from '../../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 
 const command: SubcommandCommand = {
   data: new SlashCommandBuilder()

src/db/redis.ts

@@ -1,12 +1,12 @@
 import Redis from 'ioredis';
 import { Client } from 'discord.js';
 
-import { loadConfig } from '../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 import {
   logManagerNotification,
   NotificationType,
   notifyManagers,
-} from '../util/notificationHandler.js';
+} from '@/util/notificationHandler.js';
 
 const config = loadConfig();
 

src/discord-bot.ts

@@ -1,6 +1,6 @@
 import { GatewayIntentBits } from 'discord.js';
-import { ExtendedClient } from './structures/ExtendedClient.js';
+import { ExtendedClient } from '@/structures/ExtendedClient.js';
-import { loadConfig } from './util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 
 async function startBot() {
   try {

src/events/channelEvents.ts

@@ -7,9 +7,9 @@ import {
   PermissionOverwrites,
 } from 'discord.js';
 
-import { ChannelLogAction } from '../util/logging/types.js';
+import { ChannelLogAction } from '@/util/logging/types.js';
-import { Event } from '../types/EventTypes.js';
+import { Event } from '@/types/EventTypes.js';
-import logAction from '../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 
 function arePermissionsEqual(
   oldPerms: Map<string, PermissionOverwrites>,

src/events/memberEvents.ts

@@ -1,16 +1,15 @@
 import {
   Collection,
   Events,
-  Guild,
   GuildMember,
   PartialGuildMember,
 } from 'discord.js';
 
-import { updateMember, setMembers } from '../db/db.js';
+import { updateMember, setMembers } from '@/db/db.js';
-import { generateMemberBanner } from '../util/helpers.js';
+import { generateMemberBanner } from '@/util/helpers.js';
-import { loadConfig } from '../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
-import { Event } from '../types/EventTypes.js';
+import { Event } from '@/types/EventTypes.js';
-import logAction from '../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 
 export const memberJoin: Event<typeof Events.GuildMemberAdd> = {
   name: Events.GuildMemberAdd,

src/events/messageEvents.ts

@@ -1,17 +1,17 @@
 import { AuditLogEvent, Events, Message, PartialMessage } from 'discord.js';
 
-import { Event } from '../types/EventTypes.js';
+import { Event } from '@/types/EventTypes.js';
-import { loadConfig } from '../util/configLoader.js';
+import { loadConfig } from '@/util/configLoader.js';
 import {
   addCountingReactions,
   processCountingMessage,
   resetCounting,
-} from '../util/countingManager.js';
+} from '@/util/countingManager.js';
-import logAction from '../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 import {
   checkAndAssignLevelRoles,
   processMessage,
-} from '../util/levelingSystem.js';
+} from '@/util/levelingSystem.js';
 
 export const messageDelete: Event<typeof Events.MessageDelete> = {
   name: Events.MessageDelete,

src/events/roleEvents.ts

@@ -1,7 +1,7 @@
 import { AuditLogEvent, Events, Role } from 'discord.js';
 
-import { Event } from '../types/EventTypes.js';
+import { Event } from '@/types/EventTypes.js';
-import logAction from '../util/logging/logAction.js';
+import logAction from '@/util/logging/logAction.js';
 
 const convertRoleProperties = (role: Role) => ({
   name: role.name,

src/structures/ExtendedClient.ts

@@ -1,8 +1,8 @@
 import { Client, ClientOptions, Collection } from 'discord.js';
-import { Command } from '../types/CommandTypes.js';
+import { Command } from '@/types/CommandTypes.js';
-import { Config } from '../types/ConfigTypes.js';
+import { Config } from '@/types/ConfigTypes.js';
-import { deployCommands } from '../util/deployCommand.js';
+import { deployCommands } from '@/util/deployCommand.js';
-import { registerEvents } from '../util/eventLoader.js';
+import { registerEvents } from '@/util/eventLoader.js';
 
 /**
  * Extended client class that extends the default Client class

src/util/configLoader.ts

@@ -1,7 +1,8 @@
-import { Config } from '../types/ConfigTypes.js';
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { Config } from '@/types/ConfigTypes.js';
+
 /**
  * Loads the config file from the root directory
  * @returns - The loaded config object

src/util/countingManager.ts

@@ -1,6 +1,6 @@
 import { Message } from 'discord.js';
 
-import { getJson, setJson } from '../db/redis.js';
+import { getJson, setJson } from '@/db/redis.js';
 
 interface CountingData {
   currentCount: number;

src/util/factManager.ts

@@ -1,6 +1,6 @@
 import { EmbedBuilder, Client } from 'discord.js';
 
-import { getRandomUnusedFact, markFactAsUsed } from '../db/db.js';
+import { getRandomUnusedFact, markFactAsUsed } from '@/db/db.js';
 import { loadConfig } from './configLoader.js';
 
 let isFactScheduled = false;

src/util/levelingSystem.ts

@@ -8,8 +8,8 @@ import {
   getUserLevel,
   getUserRank,
   handleDbError,
-} from '../db/db.js';
+} from '@/db/db.js';
-import * as schema from '../db/schema.js';
+import * as schema from '@/db/schema.js';
 import { loadConfig } from './configLoader.js';
 import { roundRect } from './helpers.js';