refactor: initial moves

.gitignore

@@ -1,7 +1,8 @@
 .env
 node_modules
-db-logs
-db-data
+shared/db-logs
+shared/db/data
+shared/db/loga
 .cursor
 # dependencies (bun install)
 

bot/commands/admin/case.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import { getCaseEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const moderationCase = createCommand({

bot/commands/admin/cases.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import { getCasesListEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const cases = createCommand({

bot/commands/admin/clearwarning.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import { getClearSuccessEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const clearwarning = createCommand({

bot/commands/admin/config.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, ModalBuilder, TextInputBuilder, TextInputStyle, ActionRowBuilder, ModalSubmitInteraction } from "discord.js";
 import { config, saveConfig } from "@lib/config";
 import type { GameConfigType } from "@lib/config";

bot/commands/admin/create_color.ts

@@ -1,8 +1,8 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, AttachmentBuilder } from "discord.js";
 import { config, saveConfig } from "@/lib/config";
-import { DrizzleClient } from "@/lib/DrizzleClient";
-import { items } from "@/db/schema";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
+import { items } from "@db/schema";
 import { createSuccessEmbed, createErrorEmbed } from "@lib/embeds";
 
 export const createColor = createCommand({

bot/commands/admin/create_item.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
 import { renderWizard } from "@/modules/admin/item_wizard";
 

bot/commands/admin/features.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
 import { createBaseEmbed } from "@lib/embeds";
 import { configManager } from "@/lib/configManager";

bot/commands/admin/health.test.ts

@@ -5,7 +5,7 @@ import { AuroraClient } from "@/lib/BotClient";
 
 // Mock DrizzleClient
 const executeMock = mock(() => Promise.resolve());
-mock.module("@/lib/DrizzleClient", () => ({
+mock.module("@shared/db/DrizzleClient", () => ({
     DrizzleClient: {
         execute: executeMock
     }

bot/commands/admin/health.ts

@@ -1,7 +1,7 @@
-import { createCommand } from "@lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { AuroraClient } from "@/lib/BotClient";
 import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, Colors } from "discord.js";
-import { DrizzleClient } from "@/lib/DrizzleClient";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
 import { sql } from "drizzle-orm";
 import { createBaseEmbed } from "@lib/embeds";
 

bot/commands/admin/listing.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import {
     SlashCommandBuilder,
     ActionRowBuilder,
@@ -8,12 +8,12 @@ import {
     PermissionFlagsBits,
     MessageFlags
 } from "discord.js";
-import { inventoryService } from "@/modules/inventory/inventory.service";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
 import { createSuccessEmbed, createErrorEmbed, createBaseEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
-import { items } from "@/db/schema";
+import { items } from "@db/schema";
 import { ilike, isNotNull, and } from "drizzle-orm";
-import { DrizzleClient } from "@/lib/DrizzleClient";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
 import { getShopListingMessage } from "@/modules/economy/shop.view";
 
 export const listing = createCommand({

bot/commands/admin/note.ts

@@ -1,7 +1,7 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
-import { CaseType } from "@/lib/constants";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
+import { CaseType } from "@shared/lib/constants";
 import { getNoteSuccessEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const note = createCommand({

bot/commands/admin/notes.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import { getCasesListEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const notes = createCommand({

bot/commands/admin/prune.ts

@@ -1,7 +1,7 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags, ComponentType } from "discord.js";
 import { config } from "@/lib/config";
-import { PruneService } from "@/modules/moderation/prune.service";
+import { PruneService } from "@shared/modules/moderation/prune.service";
 import {
     getConfirmationMessage,
     getProgressEmbed,

bot/commands/admin/refresh.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { AuroraClient } from "@/lib/BotClient";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
 import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";

bot/commands/admin/terminal.ts

@@ -1,7 +1,7 @@
 
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, ChannelType, TextChannel } from "discord.js";
-import { terminalService } from "@/modules/terminal/terminal.service";
+import { terminalService } from "@shared/modules/terminal/terminal.service";
 import { createBaseEmbed, createErrorEmbed } from "@/lib/embeds";
 
 export const terminal = createCommand({

bot/commands/admin/update.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags, ComponentType } from "discord.js";
-import { UpdateService } from "@/modules/admin/update.service";
+import { UpdateService } from "@shared/modules/admin/update.service";
 import {
     getCheckingEmbed,
     getNoUpdatesEmbed,

bot/commands/admin/warn.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import {
     getWarnSuccessEmbed,
     getModerationErrorEmbed,

bot/commands/admin/warnings.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
-import { ModerationService } from "@/modules/moderation/moderation.service";
+import { ModerationService } from "@shared/modules/moderation/moderation.service";
 import { getWarningsEmbed, getModerationErrorEmbed } from "@/modules/moderation/moderation.view";
 
 export const warnings = createCommand({

bot/commands/admin/webhook.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
 import { createErrorEmbed } from "@/lib/embeds";
 import { sendWebhookMessage } from "@/lib/webhookUtils";

bot/commands/economy/balance.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { userService } from "@/modules/user/user.service";
+import { userService } from "@shared/modules/user/user.service";
 import { createBaseEmbed } from "@lib/embeds";
 
 export const balance = createCommand({

bot/commands/economy/daily.ts

@@ -1,7 +1,7 @@
 
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { economyService } from "@/modules/economy/economy.service";
+import { economyService } from "@shared/modules/economy/economy.service";
 import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 

bot/commands/economy/exam.ts

@@ -1,13 +1,13 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { userService } from "@/modules/user/user.service";
+import { userService } from "@shared/modules/user/user.service";
 import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
-import { userTimers, users } from "@/db/schema";
+import { userTimers, users } from "@db/schema";
 import { eq, and, sql } from "drizzle-orm";
-import { DrizzleClient } from "@/lib/DrizzleClient";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
 import { config } from "@lib/config";
-import { TimerType } from "@/lib/constants";
+import { TimerType } from "@shared/lib/constants";
 
 const EXAM_TIMER_TYPE = TimerType.EXAM_SYSTEM;
 const EXAM_TIMER_KEY = 'default';

bot/commands/economy/pay.ts

@@ -1,8 +1,8 @@
 
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, MessageFlags } from "discord.js";
-import { economyService } from "@/modules/economy/economy.service";
-import { userService } from "@/modules/user/user.service";
+import { economyService } from "@shared/modules/economy/economy.service";
+import { userService } from "@shared/modules/user/user.service";
 import { config } from "@/lib/config";
 import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";

bot/commands/economy/trade.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, ChannelType, ThreadAutoArchiveDuration, MessageFlags } from "discord.js";
-import { tradeService } from "@/modules/trade/trade.service";
+import { tradeService } from "@shared/modules/trade/trade.service";
 import { getTradeDashboard } from "@/modules/trade/trade.view";
 import { createErrorEmbed, createWarningEmbed } from "@lib/embeds";
 

bot/commands/feedback/feedback.ts

@@ -1,4 +1,4 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
 import { config } from "@/lib/config";
 import { createErrorEmbed } from "@/lib/embeds";

bot/commands/inventory/inventory.ts

@@ -1,7 +1,7 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { inventoryService } from "@/modules/inventory/inventory.service";
-import { userService } from "@/modules/user/user.service";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
+import { userService } from "@shared/modules/user/user.service";
 import { createWarningEmbed } from "@lib/embeds";
 import { getInventoryEmbed } from "@/modules/inventory/inventory.view";
 

bot/commands/inventory/use.ts

@@ -1,10 +1,10 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { inventoryService } from "@/modules/inventory/inventory.service";
-import { userService } from "@/modules/user/user.service";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
+import { userService } from "@shared/modules/user/user.service";
 import { createErrorEmbed } from "@lib/embeds";
 import { getItemUseResultEmbed } from "@/modules/inventory/inventory.view";
-import type { ItemUsageData } from "@/lib/types";
+import type { ItemUsageData } from "@shared/lib/types";
 import { UserError } from "@/lib/errors";
 import { config } from "@/lib/config";
 

bot/commands/leveling/leaderboard.ts

@@ -1,7 +1,7 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder } from "discord.js";
-import { DrizzleClient } from "@/lib/DrizzleClient";
-import { users, items, inventory } from "@/db/schema";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
+import { users, items, inventory } from "@db/schema";
 import { desc, sql, eq } from "drizzle-orm";
 import { createWarningEmbed } from "@lib/embeds";
 import { getLeaderboardEmbed } from "@/modules/leveling/leveling.view";

bot/commands/quest/quests.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, MessageFlags } from "discord.js";
-import { questService } from "@/modules/quest/quest.service";
+import { questService } from "@shared/modules/quest/quest.service";
 import { createWarningEmbed } from "@lib/embeds";
 import { getQuestListEmbed } from "@/modules/quest/quest.view";
 

bot/commands/user/profile.ts

@@ -1,6 +1,6 @@
-import { createCommand } from "@/lib/utils";
+import { createCommand } from "@shared/lib/utils";
 import { SlashCommandBuilder, AttachmentBuilder } from "discord.js";
-import { userService } from "@/modules/user/user.service";
+import { userService } from "@shared/modules/user/user.service";
 import { generateStudentIdCard } from "@/graphics/studentID";
 import { createWarningEmbed } from "@/lib/embeds";
 

bot/events/guildMemberAdd.ts

@@ -1,7 +1,7 @@
 import { Events } from "discord.js";
-import type { Event } from "@lib/types";
+import type { Event } from "@shared/lib/types";
 import { config } from "@lib/config";
-import { userService } from "@modules/user/user.service";
+import { userService } from "@shared/modules/user/user.service";
 
 // Visitor role 
 const event: Event<Events.GuildMemberAdd> = {

bot/events/interactionCreate.ts

@@ -1,6 +1,6 @@
 import { Events } from "discord.js";
 import { ComponentInteractionHandler, AutocompleteHandler, CommandHandler } from "@/lib/handlers";
-import type { Event } from "@lib/types";
+import type { Event } from "@shared/lib/types";
 
 const event: Event<Events.InteractionCreate> = {
     name: Events.InteractionCreate,

bot/events/messageCreate.ts

@@ -1,7 +1,7 @@
 import { Events } from "discord.js";
-import { userService } from "@/modules/user/user.service";
-import { levelingService } from "@/modules/leveling/leveling.service";
-import type { Event } from "@lib/types";
+import { userService } from "@shared/modules/user/user.service";
+import { levelingService } from "@shared/modules/leveling/leveling.service";
+import type { Event } from "@shared/lib/types";
 
 const event: Event<Events.MessageCreate> = {
     name: Events.MessageCreate,

bot/events/ready.ts

@@ -1,6 +1,6 @@
 import { Events } from "discord.js";
 import { schedulerService } from "@/modules/system/scheduler";
-import type { Event } from "@lib/types";
+import type { Event } from "@shared/lib/types";
 
 const event: Event<Events.ClientReady> = {
     name: Events.ClientReady,

bot/graphics/studentID.ts

@@ -1,5 +1,5 @@
 import { GlobalFonts, createCanvas, loadImage } from '@napi-rs/canvas';
-import { levelingService } from '@/modules/leveling/leveling.service';
+import { levelingService } from '@shared/modules/leveling/leveling.service';
 import path from 'path';
 
 // Register Fonts

bot/index.ts

@@ -1,8 +1,8 @@
 import { AuroraClient } from "@/lib/BotClient";
-import { env } from "@lib/env";
+import { env } from "@shared/lib/env";
 import { join } from "node:path";
 
-import { startWebServerFromRoot } from "./web/src/server";
+import { startWebServerFromRoot } from "../web/src/server";
 
 // Load commands & events
 await AuroraClient.loadCommands();
@@ -13,7 +13,7 @@ console.log("🌐 Starting web server...");
 
 let shuttingDown = false;
 
-const webProjectPath = join(import.meta.dir, "web");
+const webProjectPath = join(import.meta.dir, "../web");
 const webPort = Number(process.env.WEB_PORT) || 3000;
 const webHost = process.env.HOST || "0.0.0.0";
 

bot/lib/BotClient.ts

@@ -1,7 +1,7 @@
 import { Client as DiscordClient, Collection, GatewayIntentBits, REST, Routes } from "discord.js";
 import { join } from "node:path";
-import type { Command } from "@lib/types";
-import { env } from "@lib/env";
+import type { Command } from "@shared/lib/types";
+import { env } from "@shared/lib/env";
 import { CommandLoader } from "@lib/loaders/CommandLoader";
 import { EventLoader } from "@lib/loaders/EventLoader";
 
@@ -96,7 +96,7 @@ export class Client extends DiscordClient {
 
     async shutdown() {
         const { setShuttingDown, waitForTransactions } = await import("./shutdown");
-        const { closeDatabase } = await import("./DrizzleClient");
+        const { closeDatabase } = await import("@shared/db/DrizzleClient");
 
         console.log("🛑 Shutdown signal received. Starting graceful shutdown...");
         setShuttingDown(true);

bot/lib/db.ts

@@ -1,5 +1,5 @@
-import { DrizzleClient } from "./DrizzleClient";
-import type { Transaction } from "./types";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
+import type { Transaction } from "@shared/lib/types";
 import { isShuttingDown, incrementTransactions, decrementTransactions } from "./shutdown";
 
 export const withTransaction = async <T>(

bot/lib/handlers/CommandHandler.ts

@@ -1,6 +1,6 @@
 import { ChatInputCommandInteraction, MessageFlags } from "discord.js";
 import { AuroraClient } from "@/lib/BotClient";
-import { userService } from "@/modules/user/user.service";
+import { userService } from "@shared/modules/user/user.service";
 import { createErrorEmbed } from "@lib/embeds";
  
 

bot/lib/loaders/CommandLoader.ts

@@ -1,6 +1,6 @@
 import { readdir } from "node:fs/promises";
 import { join } from "node:path";
-import type { Command } from "@lib/types";
+import type { Command } from "@shared/lib/types";
 import { config } from "@lib/config";
 import type { LoadResult, LoadError } from "./types";
 import type { Client } from "../BotClient";

bot/lib/loaders/EventLoader.ts

@@ -1,6 +1,6 @@
 import { readdir } from "node:fs/promises";
 import { join } from "node:path";
-import type { Event } from "@lib/types";
+import type { Event } from "@shared/lib/types";
 import type { LoadResult } from "./types";
 import type { Client } from "../BotClient";
  

bot/modules/admin/item_wizard.test.ts

@@ -6,13 +6,13 @@ import { ButtonInteraction, ModalSubmitInteraction, StringSelectMenuInteraction
 const valuesMock = mock((_args: any) => Promise.resolve());
 const insertMock = mock(() => ({ values: valuesMock }));
 
-mock.module("@/lib/DrizzleClient", () => ({
+mock.module("@shared/db/DrizzleClient", () => ({
     DrizzleClient: {
         insert: insertMock
     }
 }));
 
-mock.module("@/db/schema", () => ({
+mock.module("@db/schema", () => ({
     items: "items_schema"
 }));
 

bot/modules/admin/item_wizard.ts

@@ -1,10 +1,10 @@
 import { type Interaction } from "discord.js";
-import { items } from "@/db/schema";
-import { DrizzleClient } from "@/lib/DrizzleClient";
-import type { ItemUsageData, ItemEffect } from "@/lib/types";
+import { items } from "@db/schema";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
+import type { ItemUsageData, ItemEffect } from "@shared/lib/types";
 import { getItemWizardEmbed, getItemTypeSelection, getEffectTypeSelection, getDetailsModal, getEconomyModal, getVisualsModal, getEffectConfigModal } from "./item_wizard.view";
 import type { DraftItem } from "./item_wizard.types";
-import { ItemType, EffectType } from "@/lib/constants";
+import { ItemType, EffectType } from "@shared/lib/constants";
 
 // --- Types ---
 

bot/modules/admin/item_wizard.types.ts

@@ -1,4 +1,4 @@
-import type { ItemUsageData } from "@/lib/types";
+import type { ItemUsageData } from "@shared/lib/types";
 
 export interface DraftItem {
     name: string;

bot/modules/admin/item_wizard.view.ts

@@ -10,7 +10,7 @@ import {
 } from "discord.js";
 import { createBaseEmbed } from "@lib/embeds";
 import type { DraftItem } from "./item_wizard.types";
-import { ItemType } from "@/lib/constants";
+import { ItemType } from "@shared/lib/constants";
 
 const getItemTypeOptions = () => [
     { label: "Material", value: ItemType.MATERIAL, description: "Used for crafting or trading" },

bot/modules/admin/update.types.ts

@@ -0,0 +1,33 @@
+
+export interface RestartContext {
+    channelId: string;
+    userId: string;
+    timestamp: number;
+    runMigrations: boolean;
+    installDependencies: boolean;
+    previousCommit: string;
+    newCommit: string;
+}
+
+export interface UpdateCheckResult {
+    needsRootInstall: boolean;
+    needsWebInstall: boolean;
+    needsMigrations: boolean;
+    changedFiles: string[];
+    error?: Error;
+}
+
+export interface UpdateInfo {
+    hasUpdates: boolean;
+    branch: string;
+    currentCommit: string;
+    latestCommit: string;
+    commitCount: number;
+    commits: CommitInfo[];
+}
+
+export interface CommitInfo {
+    hash: string;
+    message: string;
+    author: string;
+}

bot/modules/admin/update.view.ts

@@ -1,6 +1,6 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 import { createInfoEmbed, createSuccessEmbed, createWarningEmbed, createErrorEmbed } from "@lib/embeds";
-import type { UpdateInfo, UpdateCheckResult } from "./update.service";
+import type { UpdateInfo, UpdateCheckResult } from "./update.types";
 
 // Constants for UI
 const LOG_TRUNCATE_LENGTH = 800;

bot/modules/economy/lootdrop.interaction.ts

@@ -1,5 +1,5 @@
 import { ButtonInteraction } from "discord.js";
-import { lootdropService } from "./lootdrop.service";
+import { lootdropService } from "@shared/modules/economy/lootdrop.service";
 import { UserError } from "@/lib/errors";
 import { getLootdropClaimedMessage } from "./lootdrop.view";
 

bot/modules/economy/shop.interaction.ts

@@ -1,6 +1,6 @@
 import { ButtonInteraction, MessageFlags } from "discord.js";
-import { inventoryService } from "@/modules/inventory/inventory.service";
-import { userService } from "@/modules/user/user.service";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
+import { userService } from "@shared/modules/user/user.service";
 import { UserError } from "@/lib/errors";
 
 export async function handleShopInteraction(interaction: ButtonInteraction) {

bot/modules/inventory/effects/handlers.ts

@@ -1,11 +1,11 @@
-import { levelingService } from "@/modules/leveling/leveling.service";
-import { economyService } from "@/modules/economy/economy.service";
-import { userTimers } from "@/db/schema";
+import { levelingService } from "@shared/modules/leveling/leveling.service";
+import { economyService } from "@shared/modules/economy/economy.service";
+import { userTimers } from "@db/schema";
 import type { EffectHandler } from "./types";
-import type { LootTableItem } from "@/lib/types";
-import { inventoryService } from "@/modules/inventory/inventory.service";
-import { inventory, items } from "@/db/schema";
-import { TimerType, TransactionType, LootType } from "@/lib/constants";
+import type { LootTableItem } from "@shared/lib/types";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
+import { inventory, items } from "@db/schema";
+import { TimerType, TransactionType, LootType } from "@shared/lib/constants";
 
 
 // Helper to extract duration in seconds
@@ -120,7 +120,7 @@ export const handleLootbox: EffectHandler = async (userId, effect, txFn) => {
             // Try to fetch item name for the message
             try {
                 const item = await txFn.query.items.findFirst({
-                    where: (items, { eq }) => eq(items.id, winner.itemId!)
+                    where: (items: any, { eq }: any) => eq(items.id, winner.itemId!)
                 });
                 if (item) {
                     return winner.message || `You found ${quantity > 1 ? quantity + 'x ' : ''}**${item.name}**!`;

bot/modules/inventory/effects/types.ts

@@ -1,4 +1,4 @@
 
-import type { Transaction } from "@/lib/types";
+import type { Transaction } from "@shared/lib/types";
 
 export type EffectHandler = (userId: string, effect: any, txFn: Transaction) => Promise<string>;

bot/modules/inventory/inventory.view.ts

@@ -1,6 +1,6 @@
 import { EmbedBuilder } from "discord.js";
-import type { ItemUsageData } from "@/lib/types";
-import { EffectType } from "@/lib/constants";
+import type { ItemUsageData } from "@shared/lib/types";
+import { EffectType } from "@shared/lib/constants";
 
 /**
  * Inventory entry with item details

bot/modules/moderation/moderation.types.ts

@@ -1,4 +1,4 @@
-import { CaseType } from "@/lib/constants";
+import { CaseType } from "@shared/lib/constants";
 
 export { CaseType };
 

bot/modules/system/scheduler.ts

@@ -1,4 +1,4 @@
-import { temporaryRoleService } from "./temp-role.service";
+import { temporaryRoleService } from "@shared/modules/system/temp-role.service";
 
 export const schedulerService = {
     start: () => {

bot/modules/trade/trade.interaction.ts

@@ -7,8 +7,8 @@ import {
     TextChannel,
     EmbedBuilder
 } from "discord.js";
-import { tradeService } from "./trade.service";
-import { inventoryService } from "@/modules/inventory/inventory.service";
+import { tradeService } from "@shared/modules/trade/trade.service";
+import { inventoryService } from "@shared/modules/inventory/inventory.service";
 import { createErrorEmbed, createWarningEmbed, createSuccessEmbed, createInfoEmbed } from "@lib/embeds";
 import { UserError } from "@lib/errors";
 import { getTradeDashboard, getTradeMoneyModal, getItemSelectMenu, getTradeCompletedEmbed } from "./trade.view";
@@ -101,7 +101,7 @@ async function handleAddItemClick(interaction: ButtonInteraction, threadId: stri
     }
 
     // Slice top 25 for select menu
-    const options = inventory.slice(0, 25).map(entry => ({
+    const options = inventory.slice(0, 25).map((entry: any) => ({
         label: `${entry.item.name} (${entry.quantity})`,
         value: entry.item.id.toString(),
         description: `Rarity: ${entry.item.rarity} `

bot/modules/user/enrollment.interaction.ts

@@ -1,8 +1,8 @@
 import { ButtonInteraction, MessageFlags } from "discord.js";
 import { config } from "@/lib/config";
 import { getEnrollmentSuccessMessage } from "./enrollment.view";
-import { classService } from "@modules/class/class.service";
-import { userService } from "@modules/user/user.service";
+import { classService } from "@shared/modules/class/class.service";
+import { userService } from "@shared/modules/user/user.service";
 import { UserError } from "@/lib/errors";
 import { sendWebhookMessage } from "@/lib/webhookUtils";
 
@@ -37,7 +37,7 @@ export async function handleEnrollmentInteraction(interaction: ButtonInteraction
 
     // 2. Get available classes
     const allClasses = await classService.getAllClasses();
-    const validClasses = allClasses.filter(c => c.roleId);
+    const validClasses = allClasses.filter((c: any) => c.roleId);
 
     if (validClasses.length === 0) {
         throw new UserError("No classes with specified roles found in database.");

bot/modules/user/user.timers.ts

@@ -1,7 +1,7 @@
-import { userTimers } from "@/db/schema";
+import { userTimers } from "@db/schema";
 import { eq, and } from "drizzle-orm";
-import { DrizzleClient } from "@/lib/DrizzleClient";
-import { TimerType } from "@/lib/constants";
+import { DrizzleClient } from "@shared/db/DrizzleClient";
+import { TimerType } from "@shared/lib/constants";
 
 export { TimerType };
 
@@ -33,7 +33,7 @@ export const userTimerService = {
         if (tx) {
             return await execute(tx);
         } else {
-            return await DrizzleClient.transaction(async (t) => {
+            return await DrizzleClient.transaction(async (t: any) => {
                 return await execute(t);
             });
         }
@@ -89,7 +89,7 @@ export const userTimerService = {
         if (tx) {
             return await execute(tx);
         } else {
-            return await DrizzleClient.transaction(async (t) => {
+            return await DrizzleClient.transaction(async (t: any) => {
                 return await execute(t);
             });
         }

docker-compose.yml

@@ -10,8 +10,8 @@ services:
     # ports:
     #   - "127.0.0.1:${DB_PORT}:5432"
     volumes:
-      - ./src/db/data:/var/lib/postgresql/data
-      - ./src/db/log:/var/log/postgresql
+      - ./shared/db/data:/var/lib/postgresql/data
+      - ./shared/db/log:/var/log/postgresql
     networks:
       - internal
     healthcheck:
@@ -33,7 +33,7 @@ services:
     volumes:
       - .:/app
       - /app/node_modules
-      - /app/src/web/node_modules
+      - /app/web/node_modules
     environment:
       - HOST=0.0.0.0
       - DB_USER=${DB_USER}
@@ -71,7 +71,7 @@ services:
     volumes:
       - .:/app
       - /app/node_modules
-      - /app/src/web/node_modules
+      - /app/web/node_modules
     environment:
       - DB_USER=${DB_USER}
       - DB_PASSWORD=${DB_PASSWORD}

drizzle.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from "drizzle-kit";
-import { env } from "./src/lib/env";
+import { env } from "./shared/lib/env";
 
 // @ts-expect-error - Polyfill for BigInt serialization
 BigInt.prototype.toJSON = function () {
@@ -7,7 +7,7 @@ BigInt.prototype.toJSON = function () {
 };
 
 export default defineConfig({
-    schema: "./src/db/schema.ts",
+    schema: "./shared/db/schema.ts",
     out: "./drizzle",
     dialect: "postgresql",
     dbCredentials: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "module": "index.ts",
+  "module": "bot/index.ts",
   "type": "module",
   "private": true,
   "devDependencies": {
@@ -15,7 +15,7 @@
     "migrate": "docker compose run --rm app drizzle-kit migrate",
     "db:push": "docker compose run --rm app drizzle-kit push",
     "db:push:local": "drizzle-kit push",
-    "dev": "bun --watch src/index.ts",
+    "dev": "bun --watch bot/index.ts",
     "db:studio": "drizzle-kit studio --host 0.0.0.0",
     "studio:remote": "bash scripts/remote-studio.sh",
     "dashboard:remote": "bash scripts/remote-dashboard.sh",

shared/db/DrizzleClient.ts

@@ -1,7 +1,7 @@
 import { drizzle } from "drizzle-orm/bun-sql";
 import { SQL } from "bun";
-import * as schema from "@db/schema";
-import { env } from "@lib/env";
+import * as schema from "./schema";
+import { env } from "@shared/lib/env";
 
 const connectionString = env.DATABASE_URL;
 export const postgres = new SQL(connectionString);