From 017f5ad8181b410fe995bccbb3bed1fa2646676d Mon Sep 17 00:00:00 2001 From: syntaxbullet Date: Thu, 8 Jan 2026 16:39:34 +0100 Subject: [PATCH] refactor: fix stale imports --- bot/events/messageCreate.ts | 2 +- bot/events/ready.ts | 2 +- bot/lib/handlers/CommandHandler.test.ts | 2 +- bot/modules/system/scheduler.ts | 2 +- shared/modules/admin/update.service.ts | 6 +++--- shared/modules/class/class.service.ts | 2 +- shared/modules/economy/economy.service.test.ts | 2 +- shared/modules/economy/economy.service.ts | 4 ++-- shared/modules/economy/lootdrop.service.test.ts | 2 +- shared/modules/economy/lootdrop.service.ts | 7 ++----- shared/modules/inventory/inventory.service.test.ts | 2 +- shared/modules/inventory/inventory.service.ts | 6 +++--- shared/modules/leveling/leveling.service.test.ts | 2 +- shared/modules/leveling/leveling.service.ts | 2 +- shared/modules/moderation/moderation.service.test.ts | 2 +- shared/modules/moderation/moderation.service.ts | 6 +++--- shared/modules/moderation/prune.service.ts | 4 ++-- shared/modules/quest/quest.service.ts | 2 +- shared/modules/terminal/terminal.service.ts | 2 +- shared/modules/trade/trade.service.ts | 2 +- 20 files changed, 29 insertions(+), 32 deletions(-) diff --git a/bot/events/messageCreate.ts b/bot/events/messageCreate.ts index aa252b4..59cdefe 100644 --- a/bot/events/messageCreate.ts +++ b/bot/events/messageCreate.ts @@ -15,7 +15,7 @@ const event: Event = { levelingService.processChatXp(message.author.id); // Activity Tracking for Lootdrops - import("@/modules/economy/lootdrop.service").then(m => m.lootdropService.processMessage(message)); + import("@shared/modules/economy/lootdrop.service").then(m => m.lootdropService.processMessage(message)); }, }; diff --git a/bot/events/ready.ts b/bot/events/ready.ts index dd897aa..159d8de 100644 --- a/bot/events/ready.ts +++ b/bot/events/ready.ts @@ -10,7 +10,7 @@ const event: Event = { schedulerService.start(); // Handle post-update tasks - const { UpdateService } = await import("@/modules/admin/update.service"); + const { UpdateService } = await import("@shared/modules/admin/update.service"); await UpdateService.handlePostRestart(c); }, }; diff --git a/bot/lib/handlers/CommandHandler.test.ts b/bot/lib/handlers/CommandHandler.test.ts index d56906c..2a9e93b 100644 --- a/bot/lib/handlers/CommandHandler.test.ts +++ b/bot/lib/handlers/CommandHandler.test.ts @@ -4,7 +4,7 @@ import { AuroraClient } from "@/lib/BotClient"; import { ChatInputCommandInteraction } from "discord.js"; // Mock UserService -mock.module("@/modules/user/user.service", () => ({ +mock.module("@shared/modules/user/user.service", () => ({ userService: { getOrCreateUser: mock(() => Promise.resolve()) } diff --git a/bot/modules/system/scheduler.ts b/bot/modules/system/scheduler.ts index 32d5854..069d387 100644 --- a/bot/modules/system/scheduler.ts +++ b/bot/modules/system/scheduler.ts @@ -10,7 +10,7 @@ export const schedulerService = { }, 60 * 1000); // 2. Terminal Update Loop (every 60s) - const { terminalService } = require("@/modules/terminal/terminal.service"); + const { terminalService } = require("@shared/modules/terminal/terminal.service"); setInterval(() => { terminalService.update(); }, 60 * 1000); diff --git a/shared/modules/admin/update.service.ts b/shared/modules/admin/update.service.ts index 665bed0..2b4f1c2 100644 --- a/shared/modules/admin/update.service.ts +++ b/shared/modules/admin/update.service.ts @@ -2,9 +2,9 @@ import { exec } from "child_process"; import { promisify } from "util"; import { writeFile, readFile, unlink } from "fs/promises"; import { Client, TextChannel } from "discord.js"; -import { getPostRestartEmbed, getInstallingDependenciesEmbed, getRunningMigrationsEmbed } from "./update.view"; -import type { PostRestartResult } from "./update.view"; -import type { RestartContext, UpdateCheckResult, UpdateInfo, CommitInfo } from "./update.types"; +import { getPostRestartEmbed, getInstallingDependenciesEmbed, getRunningMigrationsEmbed } from "@/modules/admin/update.view"; +import type { PostRestartResult } from "@/modules/admin/update.view"; +import type { RestartContext, UpdateCheckResult, UpdateInfo, CommitInfo } from "@/modules/admin/update.types"; const execAsync = promisify(exec); diff --git a/shared/modules/class/class.service.ts b/shared/modules/class/class.service.ts index 5b668c0..6425dc2 100644 --- a/shared/modules/class/class.service.ts +++ b/shared/modules/class/class.service.ts @@ -1,7 +1,7 @@ import { classes, users } from "@db/schema"; import { eq, sql } from "drizzle-orm"; import { DrizzleClient } from "@shared/db/DrizzleClient"; -import { UserError } from "@/lib/errors"; +import { UserError } from "@shared/lib/errors"; import { withTransaction } from "@/lib/db"; import type { Transaction } from "@shared/lib/types"; diff --git a/shared/modules/economy/economy.service.test.ts b/shared/modules/economy/economy.service.test.ts index 6682e63..10236d5 100644 --- a/shared/modules/economy/economy.service.test.ts +++ b/shared/modules/economy/economy.service.test.ts @@ -56,7 +56,7 @@ mock.module("@shared/db/DrizzleClient", () => { }); // Mock Config -mock.module("@/lib/config", () => ({ +mock.module("@shared/lib/config", () => ({ config: { economy: { daily: { diff --git a/shared/modules/economy/economy.service.ts b/shared/modules/economy/economy.service.ts index d00b242..fb3eb4b 100644 --- a/shared/modules/economy/economy.service.ts +++ b/shared/modules/economy/economy.service.ts @@ -1,9 +1,9 @@ import { users, transactions, userTimers } from "@db/schema"; import { eq, sql, and } from "drizzle-orm"; -import { config } from "@/lib/config"; +import { config } from "@shared/lib/config"; import { withTransaction } from "@/lib/db"; import type { Transaction } from "@shared/lib/types"; -import { UserError } from "@/lib/errors"; +import { UserError } from "@shared/lib/errors"; import { TimerType, TransactionType } from "@shared/lib/constants"; export const economyService = { diff --git a/shared/modules/economy/lootdrop.service.test.ts b/shared/modules/economy/lootdrop.service.test.ts index fd08dca..3fa0c60 100644 --- a/shared/modules/economy/lootdrop.service.test.ts +++ b/shared/modules/economy/lootdrop.service.test.ts @@ -35,7 +35,7 @@ mock.module("@shared/db/DrizzleClient", () => { }); // Mock Config -mock.module("@/lib/config", () => ({ +mock.module("@shared/lib/config", () => ({ config: { lootdrop: { activityWindowMs: 60000, diff --git a/shared/modules/economy/lootdrop.service.ts b/shared/modules/economy/lootdrop.service.ts index da4ab80..171684e 100644 --- a/shared/modules/economy/lootdrop.service.ts +++ b/shared/modules/economy/lootdrop.service.ts @@ -1,11 +1,8 @@ - import { Message, TextChannel } from "discord.js"; -import { getLootdropMessage } from "./lootdrop.view"; -import { config } from "@/lib/config"; +import { getLootdropMessage } from "@/modules/economy/lootdrop.view"; +import { config } from "@shared/lib/config"; import { economyService } from "./economy.service"; import { terminalService } from "@shared/modules/terminal/terminal.service"; - - import { lootdrops } from "@db/schema"; import { DrizzleClient } from "@shared/db/DrizzleClient"; import { eq, and, isNull, lt } from "drizzle-orm"; diff --git a/shared/modules/inventory/inventory.service.test.ts b/shared/modules/inventory/inventory.service.test.ts index 41dde49..59ea7f6 100644 --- a/shared/modules/inventory/inventory.service.test.ts +++ b/shared/modules/inventory/inventory.service.test.ts @@ -63,7 +63,7 @@ mock.module("@shared/db/DrizzleClient", () => { }; }); -mock.module("@/lib/config", () => ({ +mock.module("@shared/lib/config", () => ({ config: { inventory: { maxStackSize: 100n, diff --git a/shared/modules/inventory/inventory.service.ts b/shared/modules/inventory/inventory.service.ts index bead578..7f702d4 100644 --- a/shared/modules/inventory/inventory.service.ts +++ b/shared/modules/inventory/inventory.service.ts @@ -3,8 +3,8 @@ import { eq, and, sql, count, ilike } from "drizzle-orm"; import { DrizzleClient } from "@shared/db/DrizzleClient"; import { economyService } from "@shared/modules/economy/economy.service"; import { levelingService } from "@shared/modules/leveling/leveling.service"; -import { config } from "@/lib/config"; -import { UserError } from "@/lib/errors"; +import { config } from "@shared/lib/config"; +import { UserError } from "@shared/lib/errors"; import { withTransaction } from "@/lib/db"; import type { Transaction, ItemUsageData } from "@shared/lib/types"; import { TransactionType } from "@shared/lib/constants"; @@ -161,7 +161,7 @@ export const inventoryService = { const results: string[] = []; // 2. Apply Effects - const { effectHandlers } = await import("./effects/registry"); + const { effectHandlers } = await import("@/modules/inventory/effects/registry"); for (const effect of usageData.effects) { const handler = effectHandlers[effect.type]; diff --git a/shared/modules/leveling/leveling.service.test.ts b/shared/modules/leveling/leveling.service.test.ts index e2545b8..93cfd1e 100644 --- a/shared/modules/leveling/leveling.service.test.ts +++ b/shared/modules/leveling/leveling.service.test.ts @@ -39,7 +39,7 @@ mock.module("@shared/db/DrizzleClient", () => { }; }); -mock.module("@/lib/config", () => ({ +mock.module("@shared/lib/config", () => ({ config: { leveling: { base: 100, diff --git a/shared/modules/leveling/leveling.service.ts b/shared/modules/leveling/leveling.service.ts index f6f9f19..f6af7e5 100644 --- a/shared/modules/leveling/leveling.service.ts +++ b/shared/modules/leveling/leveling.service.ts @@ -1,7 +1,7 @@ import { users, userTimers } from "@db/schema"; import { eq, sql, and } from "drizzle-orm"; import { withTransaction } from "@/lib/db"; -import { config } from "@/lib/config"; +import { config } from "@shared/lib/config"; import type { Transaction } from "@shared/lib/types"; import { TimerType } from "@shared/lib/constants"; diff --git a/shared/modules/moderation/moderation.service.test.ts b/shared/modules/moderation/moderation.service.test.ts index 00130f7..7404f0b 100644 --- a/shared/modules/moderation/moderation.service.test.ts +++ b/shared/modules/moderation/moderation.service.test.ts @@ -24,7 +24,7 @@ const mockConfig = { } }; -mock.module("@/lib/config", () => ({ +mock.module("@shared/lib/config", () => ({ config: mockConfig })); diff --git a/shared/modules/moderation/moderation.service.ts b/shared/modules/moderation/moderation.service.ts index 4e1c63e..4537df2 100644 --- a/shared/modules/moderation/moderation.service.ts +++ b/shared/modules/moderation/moderation.service.ts @@ -1,9 +1,9 @@ import { moderationCases } from "@db/schema"; import { eq, and, desc } from "drizzle-orm"; import { DrizzleClient } from "@shared/db/DrizzleClient"; -import type { CreateCaseOptions, ClearCaseOptions, SearchCasesFilter } from "./moderation.types"; -import { config } from "@/lib/config"; -import { getUserWarningEmbed } from "./moderation.view"; +import type { CreateCaseOptions, ClearCaseOptions, SearchCasesFilter } from "@/modules/moderation/moderation.types"; +import { config } from "@shared/lib/config"; +import { getUserWarningEmbed } from "@/modules/moderation/moderation.view"; import { CaseType } from "@shared/lib/constants"; export class ModerationService { diff --git a/shared/modules/moderation/prune.service.ts b/shared/modules/moderation/prune.service.ts index 539a360..6d756b9 100644 --- a/shared/modules/moderation/prune.service.ts +++ b/shared/modules/moderation/prune.service.ts @@ -1,7 +1,7 @@ import { Collection, Message, PermissionFlagsBits } from "discord.js"; import type { TextBasedChannel } from "discord.js"; -import type { PruneOptions, PruneResult, PruneProgress } from "./prune.types"; -import { config } from "@/lib/config"; +import type { PruneOptions, PruneResult, PruneProgress } from "@/modules/moderation/prune.types"; +import { config } from "@shared/lib/config"; export class PruneService { /** diff --git a/shared/modules/quest/quest.service.ts b/shared/modules/quest/quest.service.ts index 486dcd1..db1199b 100644 --- a/shared/modules/quest/quest.service.ts +++ b/shared/modules/quest/quest.service.ts @@ -1,6 +1,6 @@ import { userQuests } from "@db/schema"; import { eq, and } from "drizzle-orm"; -import { UserError } from "@/lib/errors"; +import { UserError } from "@shared/lib/errors"; import { DrizzleClient } from "@shared/db/DrizzleClient"; import { economyService } from "@shared/modules/economy/economy.service"; import { levelingService } from "@shared/modules/leveling/leveling.service"; diff --git a/shared/modules/terminal/terminal.service.ts b/shared/modules/terminal/terminal.service.ts index 2a260a4..0fe9c59 100644 --- a/shared/modules/terminal/terminal.service.ts +++ b/shared/modules/terminal/terminal.service.ts @@ -12,7 +12,7 @@ import { AuroraClient } from "@/lib/BotClient"; import { DrizzleClient } from "@shared/db/DrizzleClient"; import { users, transactions, lootdrops, inventory } from "@db/schema"; import { desc, sql } from "drizzle-orm"; -import { config, saveConfig } from "@/lib/config"; +import { config, saveConfig } from "@shared/lib/config"; // Color palette for containers (hex as decimal) const COLORS = { diff --git a/shared/modules/trade/trade.service.ts b/shared/modules/trade/trade.service.ts index 237f1df..e5805e3 100644 --- a/shared/modules/trade/trade.service.ts +++ b/shared/modules/trade/trade.service.ts @@ -1,4 +1,4 @@ -import type { TradeSession, TradeParticipant } from "./trade.types"; +import type { TradeSession, TradeParticipant } from "@/modules/trade/trade.types"; import { economyService } from "@shared/modules/economy/economy.service"; import { inventoryService } from "@shared/modules/inventory/inventory.service"; import { itemTransactions } from "@db/schema";