refactor: replace direct EmbedBuilder usage with a new createBaseEmbed helper for consistent embed creation

src/commands/admin/features.ts

@@ -1,5 +1,6 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, PermissionFlagsBits, EmbedBuilder, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from "discord.js";
+import { createBaseEmbed } from "@lib/embeds";
 import { configManager } from "@/lib/configManager";
 import { config, reloadConfig } from "@/lib/config";
 import { AuroraClient } from "@/lib/BotClient";
@@ -45,9 +46,7 @@ export const features = createCommand({
             const overrides = Object.entries(config.commands)
                 .map(([name, enabled]) => `• **${name}**: ${enabled ? "✅ Enabled (Override)" : "❌ Disabled"}`);
 
-            const embed = new EmbedBuilder()
+            const embed = createBaseEmbed("Command Features", undefined, "Blue");
-                .setTitle("Command Features")
-                .setColor("Blue");
 
             // Add fields for each category
             const sortedCategories = [...categories.keys()].sort();

src/commands/admin/listing.ts

@@ -1,7 +1,6 @@
 import { createCommand } from "@/lib/utils";
 import {
     SlashCommandBuilder,
-    EmbedBuilder,
     ActionRowBuilder,
     ButtonBuilder,
     ButtonStyle,
@@ -10,7 +9,7 @@ import {
     MessageFlags
 } from "discord.js";
 import { inventoryService } from "@/modules/inventory/inventory.service";
-import { createSuccessEmbed, createErrorEmbed } from "@lib/embeds";
+import { createSuccessEmbed, createErrorEmbed, createBaseEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 import { items } from "@/db/schema";
 import { ilike, isNotNull, and } from "drizzle-orm";
@@ -54,11 +53,8 @@ export const listing = createCommand({
             return;
         }
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed(`Shop: ${item.name}`, item.description || "No description available.", "Green")
-            .setTitle(`Shop: ${item.name}`)
-            .setDescription(item.description || "No description available.")
             .addFields({ name: "Price", value: `${item.price} 🪙`, inline: true })
-            .setColor("Green")
             .setThumbnail(item.iconUrl || null)
             .setImage(item.imageUrl || null)
             .setFooter({ text: "Click the button below to purchase instantly." });

src/commands/economy/balance.ts

@@ -1,6 +1,7 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder } from "discord.js";
+import { SlashCommandBuilder } from "discord.js";
 import { userService } from "@/modules/user/user.service";
+import { createBaseEmbed } from "@lib/embeds";
 
 export const balance = createCommand({
     data: new SlashCommandBuilder()
@@ -22,10 +23,8 @@ export const balance = createCommand({
 
         const user = await userService.getOrCreateUser(targetUser.id, targetUser.username);
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed(undefined, `**Balance**: ${user.balance || 0n} AU`, "Yellow")
-            .setAuthor({ name: targetUser.username, iconURL: targetUser.displayAvatarURL() })
+            .setAuthor({ name: targetUser.username, iconURL: targetUser.displayAvatarURL() });
-            .setDescription(`**Balance**: ${user.balance || 0n} AU`)
-            .setColor("Yellow");
 
         await interaction.editReply({ embeds: [embed] });
     }

src/commands/economy/daily.ts

@@ -1,8 +1,8 @@
 
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder } from "discord.js";
+import { SlashCommandBuilder } from "discord.js";
 import { economyService } from "@/modules/economy/economy.service";
-import { createErrorEmbed } from "@lib/embeds";
+import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 
 export const daily = createCommand({
@@ -13,16 +13,13 @@ export const daily = createCommand({
         try {
             const result = await economyService.claimDaily(interaction.user.id);
 
-            const embed = new EmbedBuilder()
+            const embed = createSuccessEmbed(`You claimed ** ${result.amount}** Astral Units!${result.isWeekly ? `\n🎉 **Weekly Bonus!** +${result.weeklyBonus} extra!` : ''}`, "💰 Daily Reward Claimed!")
-                .setTitle("💰 Daily Reward Claimed!")
-                .setDescription(`You claimed ** ${result.amount}** Astral Units!${result.isWeekly ? `\n🎉 **Weekly Bonus!** +${result.weeklyBonus} extra!` : ''}`)
                 .addFields(
                     { name: "Streak", value: `🔥 ${result.streak} days`, inline: true },
                     { name: "Weekly Progress", value: `${"🟩".repeat(result.streak % 7 || 7)}${"⬜".repeat(7 - (result.streak % 7 || 7))} (${result.streak % 7 || 7}/7)`, inline: true },
                     { name: "Next Reward", value: `<t:${Math.floor(result.nextReadyAt.getTime() / 1000)}:R> `, inline: true }
                 )
-                .setColor("Gold")
+                .setColor("Gold");
-                .setTimestamp();
 
             await interaction.reply({ embeds: [embed] });
 

src/commands/economy/pay.ts

@@ -1,10 +1,10 @@
 
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, MessageFlags } from "discord.js";
 import { economyService } from "@/modules/economy/economy.service";
 import { userService } from "@/modules/user/user.service";
 import { config } from "@/lib/config";
-import { createErrorEmbed } from "@lib/embeds";
+import { createErrorEmbed, createSuccessEmbed } from "@lib/embeds";
 import { UserError } from "@/lib/errors";
 
 export const pay = createCommand({
@@ -49,12 +49,7 @@ export const pay = createCommand({
             await interaction.deferReply();
             await economyService.transfer(senderId, receiverId, amount);
 
-            const embed = new EmbedBuilder()
+            const embed = createSuccessEmbed(`Successfully sent ** ${amount}** Astral Units to <@${targetUser.id}>.`, "💸 Transfer Successful");
-                .setTitle("💸 Transfer Successful")
-                .setDescription(`Successfully sent ** ${amount}** Astral Units to <@${targetUser.id}>.`)
-                .setColor("Green")
-                .setTimestamp();
-
             await interaction.editReply({ embeds: [embed], content: `<@${receiverId}>` });
 
         } catch (error: any) {

src/commands/economy/trade.ts

@@ -1,7 +1,7 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, ChannelType, ActionRowBuilder, ButtonBuilder, ButtonStyle, ThreadAutoArchiveDuration, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, ChannelType, ActionRowBuilder, ButtonBuilder, ButtonStyle, ThreadAutoArchiveDuration, MessageFlags } from "discord.js";
 import { TradeService } from "@/modules/trade/trade.service";
-import { createErrorEmbed, createWarningEmbed } from "@lib/embeds";
+import { createErrorEmbed, createWarningEmbed, createBaseEmbed } from "@lib/embeds";
 
 export const trade = createCommand({
     data: new SlashCommandBuilder()
@@ -64,10 +64,7 @@ export const trade = createCommand({
         );
 
         // Send Dashboard to Thread
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed("🤝 Trading Session", `Trade started between ${interaction.user} and ${targetUser}.\nUse the controls below to build your offer.`, 0xFFD700)
-            .setTitle("🤝 Trading Session")
-            .setDescription(`Trade started between ${interaction.user} and ${targetUser}.\nUse the controls below to build your offer.`)
-            .setColor(0xFFD700)
             .addFields(
                 { name: interaction.user.username, value: "*Empty Offer*", inline: true },
                 { name: targetUser.username, value: "*Empty Offer*", inline: true }

src/commands/inventory/inventory.ts

@@ -1,8 +1,8 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder } from "discord.js";
+import { SlashCommandBuilder } from "discord.js";
 import { inventoryService } from "@/modules/inventory/inventory.service";
 import { userService } from "@/modules/user/user.service";
-import { createWarningEmbed } from "@lib/embeds";
+import { createWarningEmbed, createBaseEmbed } from "@lib/embeds";
 
 export const inventory = createCommand({
     data: new SlashCommandBuilder()
@@ -35,11 +35,7 @@ export const inventory = createCommand({
             return `**${entry.item.name}** x${entry.quantity}`;
         }).join("\n");
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed(`${user.username}'s Inventory`, description, "Blue");
-            .setTitle(`${user.username}'s Inventory`)
-            .setDescription(description)
-            .setColor("Blue")
-            .setTimestamp();
 
         await interaction.editReply({ embeds: [embed] });
     }

src/commands/leveling/leaderboard.ts

@@ -1,9 +1,9 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder } from "discord.js";
+import { SlashCommandBuilder } from "discord.js";
 import { DrizzleClient } from "@/lib/DrizzleClient";
 import { users } from "@/db/schema";
 import { desc } from "drizzle-orm";
-import { createWarningEmbed } from "@lib/embeds";
+import { createWarningEmbed, createBaseEmbed } from "@lib/embeds";
 
 export const leaderboard = createCommand({
     data: new SlashCommandBuilder()
@@ -40,11 +40,7 @@ export const leaderboard = createCommand({
             return `${medal} **${user.username}** — ${value}`;
         }).join("\n");
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed(isXp ? "🏆 XP Leaderboard" : "💰 Richest Players", description, "Gold");
-            .setTitle(isXp ? "🏆 XP Leaderboard" : "💰 Richest Players")
-            .setDescription(description)
-            .setColor("Gold")
-            .setTimestamp();
 
         await interaction.editReply({ embeds: [embed] });
     }

src/commands/quest/quests.ts

@@ -1,7 +1,7 @@
 import { createCommand } from "@/lib/utils";
-import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
+import { SlashCommandBuilder, MessageFlags } from "discord.js";
 import { questService } from "@/modules/quest/quest.service";
-import { createWarningEmbed } from "@lib/embeds";
+import { createWarningEmbed, createBaseEmbed } from "@lib/embeds";
 
 export const quests = createCommand({
     data: new SlashCommandBuilder()
@@ -17,10 +17,7 @@ export const quests = createCommand({
             return;
         }
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed("📜 Quest Log", undefined, "Blue");
-            .setTitle("📜 Quest Log")
-            .setColor("Blue")
-            .setTimestamp();
 
         userQuests.forEach(entry => {
             const status = entry.completedAt ? "✅ Completed" : "In Progress";

src/lib/embeds.ts

@@ -1,4 +1,4 @@
-import { EmbedBuilder, Colors } from "discord.js";
+import { Colors, type ColorResolvable, EmbedBuilder } from "discord.js";
 
 /**
  * Creates a standardized error embed.
@@ -55,3 +55,21 @@ export function createInfoEmbed(message: string, title: string = "Info"): EmbedB
         .setColor(Colors.Blue)
         .setTimestamp();
 }
+
+/**
+ * Creates a standardized base embed with common configuration.
+ * @param title Optional title for the embed.
+ * @param description Optional description for the embed.
+ * @param color Optional color for the embed.
+ * @returns An EmbedBuilder instance with base configuration.
+ */
+export function createBaseEmbed(title?: string, description?: string, color?: ColorResolvable): EmbedBuilder {
+    const embed = new EmbedBuilder()
+        .setTimestamp();
+
+    if (title) embed.setTitle(title);
+    if (description) embed.setDescription(description);
+    if (color) embed.setColor(color);
+
+    return embed;
+}

src/modules/admin/item_wizard.ts

@@ -2,7 +2,6 @@ import {
     ActionRowBuilder,
     ButtonBuilder,
     ButtonStyle,
-    EmbedBuilder,
     ModalBuilder,
     StringSelectMenuBuilder,
     TextInputBuilder,
@@ -13,6 +12,7 @@ import {
 import { items } from "@/db/schema";
 import { DrizzleClient } from "@/lib/DrizzleClient";
 import type { ItemUsageData, ItemEffect } from "@/lib/types";
+import { createBaseEmbed } from "@lib/embeds";
 
 // --- Types ---
 export interface DraftItem {
@@ -66,9 +66,7 @@ export const renderWizard = (userId: string, isDraft = true) => {
         draftSession.set(userId, draft);
     }
 
-    const embed = new EmbedBuilder()
+    const embed = createBaseEmbed(`🛠️ Item Creator: ${draft.name}`, undefined, "Blue")
-        .setTitle(`🛠️ Item Creator: ${draft.name}`)
-        .setColor("Blue")
         .addFields(
             { name: "General", value: `**Type:** ${draft.type}\n**Rarity:** ${draft.rarity}\n**Desc:** ${draft.description}`, inline: true },
             { name: "Economy", value: `**Price:** ${draft.price ? `${draft.price} 🪙` : "Not for sale"}`, inline: true },

src/modules/economy/lootdrop.interaction.ts

@@ -1,6 +1,6 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, EmbedBuilder, ButtonStyle } from "discord.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle } from "discord.js";
 import { lootdropService } from "./lootdrop.service";
-import { createErrorEmbed } from "@/lib/embeds";
+import { createErrorEmbed, createSuccessEmbed, createBaseEmbed } from "@/lib/embeds";
 
 export async function handleLootdropInteraction(interaction: ButtonInteraction) {
     if (interaction.customId === "lootdrop_claim") {
@@ -17,9 +17,7 @@ export async function handleLootdropInteraction(interaction: ButtonInteraction)
             const originalEmbed = interaction.message.embeds[0];
             if (!originalEmbed) return;
 
-            const newEmbed = new EmbedBuilder(originalEmbed.data)
+            const newEmbed = createBaseEmbed(originalEmbed.title || "💰 LOOTDROP!", `✅ Claimed by <@${interaction.user.id}> for **${result.amount} ${result.currency}**!`, "#00FF00");
-                .setDescription(`✅ Claimed by <@${interaction.user.id}> for **${result.amount} ${result.currency}**!`)
-                .setColor("#00FF00");
 
             // Disable button
             // We reconstruct the button using builders for safety

src/modules/economy/lootdrop.service.ts

@@ -2,6 +2,7 @@
 import { Message, TextChannel, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType } from "discord.js";
 import { config } from "@/lib/config";
 import { economyService } from "./economy.service";
+import { createBaseEmbed } from "@lib/embeds";
 
 import { lootdrops } from "@/db/schema";
 import { DrizzleClient } from "@/lib/DrizzleClient";
@@ -91,11 +92,7 @@ class LootdropService {
         const reward = Math.floor(Math.random() * (max - min + 1)) + min;
         const currency = config.lootdrop.reward.currency;
 
-        const embed = new EmbedBuilder()
+        const embed = createBaseEmbed("💰 LOOTDROP!", `A lootdrop has appeared! Click the button below to claim **${reward} ${currency}**!`, "#FFD700");
-            .setTitle("💰 LOOTDROP!")
-            .setDescription(`A lootdrop has appeared! Click the button below to claim **${reward} ${currency}**!`)
-            .setColor("#FFD700")
-            .setTimestamp();
 
         const claimButton = new ButtonBuilder()
             .setCustomId("lootdrop_claim")

src/modules/trade/trade.interaction.ts

@@ -3,7 +3,6 @@ import {
     ModalSubmitInteraction,
     StringSelectMenuInteraction,
     type Interaction,
-    EmbedBuilder,
     ActionRowBuilder,
     ButtonBuilder,
     ButtonStyle,
@@ -13,10 +12,11 @@ import {
     TextInputStyle,
     ThreadChannel,
     TextChannel,
+    EmbedBuilder
 } from "discord.js";
 import { TradeService } from "./trade.service";
 import { inventoryService } from "@/modules/inventory/inventory.service";
-import { createErrorEmbed, createWarningEmbed, createSuccessEmbed, createInfoEmbed } from "@lib/embeds";
+import { createErrorEmbed, createWarningEmbed, createSuccessEmbed, createInfoEmbed, createBaseEmbed } from "@lib/embeds";
 
 const EMBED_COLOR = 0xFFD700; // Gold
 
@@ -207,9 +207,7 @@ export async function updateTradeDashboard(interaction: Interaction, threadId: s
         // Execute Trade
         try {
             await TradeService.executeTrade(threadId);
-            const embed = new EmbedBuilder()
+            const embed = createBaseEmbed("✅ Trade Completed", undefined, "Green")
-                .setTitle("✅ Trade Completed")
-                .setColor("Green")
                 .addFields(
                     { name: session.userA.username, value: formatOffer(session.userA), inline: true },
                     { name: session.userB.username, value: formatOffer(session.userB), inline: true }
@@ -246,9 +244,7 @@ export async function updateTradeDashboard(interaction: Interaction, threadId: s
     }
 
     // Build Status Embed
-    const embed = new EmbedBuilder()
+    const embed = createBaseEmbed("🤝 Trading Session", undefined, EMBED_COLOR)
-        .setTitle("🤝 Trading Session")
-        .setColor(EMBED_COLOR)
         .addFields(
             {
                 name: `${session.userA.username} ${session.userA.locked ? '✅ (Ready)' : '✏️ (Editing)'}`,