From 4883c2a2f2549ced4d694f03c457b13483632cf1 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Thu, 21 May 2026 21:08:19 +0700
Subject: [PATCH 01/97] Update bot configuration with new names and colors

---
 src/config/bot.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/bot.js b/src/config/bot.js
index 36e588cd4..bd7ff010c 100644
--- a/src/config/bot.js
+++ b/src/config/bot.js
@@ -25,7 +25,7 @@ export const botConfig = {
     activities: [
       {
         // Text users will see (example: "Playing /help | Titan Bot").
-        name: "Made with ❤️",
+        name: "https://foxname.top/",
         // Activity type number (0 = Playing).
         type: 0, 
       },
@@ -88,7 +88,7 @@ export const botConfig = {
   embeds: {
     colors: {
       // Main brand colors.
-      primary: "#336699", 
+      primary: "#BC9EFF", 
       secondary: "#2F3136", 
 
       // Standard status colors for success/error/warning/info messages.
@@ -136,7 +136,7 @@ export const botConfig = {
     },
     footer: {
       // Default footer text used in bot embeds.
-      text: "Titan Bot",
+      text: "Nh_starlight bot",
       // Footer icon URL (null = no icon).
       icon: null,
     },

From 61ef04e2b85b6ea7eee01247346f09bfa33aa909 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 13:33:19 +0700
Subject: [PATCH 02/97] Refactor moderation cases command error handling

Updated error handling and logic for moderation cases retrieval.
---
 src/commands/Moderation/cases.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
index ad1659249..16915cb6a 100644
--- a/src/commands/Moderation/cases.js
+++ b/src/commands/Moderation/cases.js
@@ -3,6 +3,7 @@ import { createEmbed, errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { getModerationCases } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+
 export default {
     data: new SlashCommandBuilder()
         .setName('cases')
@@ -44,22 +45,26 @@ export default {
 
         try {
             const filterType = interaction.options.getString('filter') || 'all';
+            // ĐÃ SỬA: Lấy đúng tên option là 'user' như định nghĩa ở trên data
             const targetUser = interaction.options.getUser('user');
             const limit = interaction.options.getInteger('limit') || 10;
 
             const filters = {
                 limit,
                 action: filterType === 'all' ? undefined : filterType,
-                userId: targetUser?.id
+                userId: targetUser?.id // Lấy ID dạng số truyền vào bộ lọc database
             };
 
             const cases = await getModerationCases(interaction.guild.id, filters);
 
-            if (cases.length === 0) {
-                throw new Error(targetUser 
-                    ? `No moderation cases found for ${targetUser.tag}`
-                    : `No ${filterType === 'all' ? '' : filterType} cases found in this server.`
-                );
+            // ĐÃ SỬA: Sửa lại logic kiểm tra nếu không có case vi phạm nào
+            if (!cases || cases.length === 0) {
+                const noCaseMessage = targetUser 
+                    ? `Không tìm thấy case vi phạm nào của người dùng có ID: ${targetUser.id}`
+                    : `Không tìm thấy cases thuộc loại "${filterType === 'all' ? 'Tất cả' : filterType}" nào trong server này.`;
+                
+                // Ném lỗi ra log của Railway như bạn muốn để debug dễ dàng
+                throw new Error(noCaseMessage);
             }
 
             const CASES_PER_PAGE = 5;
@@ -126,7 +131,7 @@ export default {
 
             const collector = message.createMessageComponentCollector({
                 componentType: ComponentType.Button,
-time: 120000
+                time: 120000
             });
 
             collector.on('collect', async (buttonInteraction) => {
@@ -163,16 +168,17 @@ time: 120000
                         components: [disabledRow]
                     });
                 } catch (error) {
+                    // Bỏ qua lỗi nếu tin nhắn đã bị xóa trước đó
                 }
             });
 
         } catch (error) {
-            logger.error('Error in cases command:', error);
+            logger.error('Error in cases command:', error.message || error);
             return InteractionHelper.safeEditReply(interaction, {
                 embeds: [
                     errorEmbed(
                         'System Error',
-                        'An error occurred while retrieving moderation cases. Please try again later.'
+                        error.message || 'An error occurred while retrieving moderation cases. Please try again later.'
                     )
                 ],
                 flags: MessageFlags.Ephemeral
@@ -180,7 +186,3 @@ time: 120000
         }
     }
 };
-
-
-
-

From 12738693732a6b9c5d76af8d618c1417ab3be552 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 13:38:46 +0700
Subject: [PATCH 03/97] Improve error handling and user messages in cases
 command

Refactor error handling and user feedback in moderation cases command.
---
 src/commands/Moderation/cases.js | 42 +++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
index 16915cb6a..688a5d288 100644
--- a/src/commands/Moderation/cases.js
+++ b/src/commands/Moderation/cases.js
@@ -43,28 +43,33 @@ export default {
             return;
         }
 
+        // Đưa targetUser ra ngoài phạm vi try-catch để khối catch bên dưới có thể đọc được dữ liệu nếu lỗi
+        let targetUser = null;
+        let filterType = 'all';
+
         try {
-            const filterType = interaction.options.getString('filter') || 'all';
-            // ĐÃ SỬA: Lấy đúng tên option là 'user' như định nghĩa ở trên data
-            const targetUser = interaction.options.getUser('user');
+            filterType = interaction.options.getString('filter') || 'all';
+            targetUser = interaction.options.getUser('user');
             const limit = interaction.options.getInteger('limit') || 10;
 
             const filters = {
                 limit,
                 action: filterType === 'all' ? undefined : filterType,
-                userId: targetUser?.id // Lấy ID dạng số truyền vào bộ lọc database
+                userId: targetUser?.id
             };
 
             const cases = await getModerationCases(interaction.guild.id, filters);
 
-            // ĐÃ SỬA: Sửa lại logic kiểm tra nếu không có case vi phạm nào
+            // Xử lý trực tiếp trường hợp mảng rỗng hoặc không tìm thấy dữ liệu vi phạm
             if (!cases || cases.length === 0) {
-                const noCaseMessage = targetUser 
-                    ? `Không tìm thấy case vi phạm nào của người dùng có ID: ${targetUser.id}`
-                    : `Không tìm thấy cases thuộc loại "${filterType === 'all' ? 'Tất cả' : filterType}" nào trong server này.`;
-                
-                // Ném lỗi ra log của Railway như bạn muốn để debug dễ dàng
-                throw new Error(noCaseMessage);
+                const noCaseDesc = targetUser 
+                    ? `Không tìm thấy case vi phạm nào của người dùng **${targetUser.tag}** (ID: ${targetUser.id}) trong hệ thống.`
+                    : `Không tìm thấy bất kỳ dữ liệu vi phạm nào thuộc loại danh mục "${filterType === 'all' ? 'Tất cả' : filterType}" trong server này.`;
+
+                return InteractionHelper.safeEditReply(interaction, {
+                    embeds: [errorEmbed('📋 Kết quả tra cứu', noCaseDesc)],
+                    flags: MessageFlags.Ephemeral
+                });
             }
 
             const CASES_PER_PAGE = 5;
@@ -168,18 +173,21 @@ export default {
                         components: [disabledRow]
                     });
                 } catch (error) {
-                    // Bỏ qua lỗi nếu tin nhắn đã bị xóa trước đó
+                    // Tránh lỗi sập bot khi tin nhắn đã bị xóa trước khi bộ đếm kết thúc
                 }
             });
 
         } catch (error) {
-            logger.error('Error in cases command:', error.message || error);
+            // Tối ưu khối catch: Log chi tiết lỗi ra console của Railway để tiện theo dõi
+            logger.error('Error in cases command:', error);
+
+            const errDesc = targetUser 
+                ? `Không tìm thấy dữ liệu vi phạm của **${targetUser.tag}** (ID: ${targetUser.id}). Hệ thống phản hồi: ${error.message || error}`
+                : `Không tìm thấy lịch sử vi phạm nào trong máy chủ hoặc hệ thống đang gặp sự cố kết nối Database.`;
+
             return InteractionHelper.safeEditReply(interaction, {
                 embeds: [
-                    errorEmbed(
-                        'System Error',
-                        error.message || 'An error occurred while retrieving moderation cases. Please try again later.'
-                    )
+                    errorEmbed('📋 Thông tin tra cứu', errDesc)
                 ],
                 flags: MessageFlags.Ephemeral
             });

From 6ed93f41c3effd4b2f99c4d66f1a5968c770c15e Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 13:42:46 +0700
Subject: [PATCH 04/97] Update moderation case messages to English

---
 src/commands/Moderation/cases.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
index 688a5d288..5b1b0d8dd 100644
--- a/src/commands/Moderation/cases.js
+++ b/src/commands/Moderation/cases.js
@@ -43,7 +43,6 @@ export default {
             return;
         }
 
-        // Đưa targetUser ra ngoài phạm vi try-catch để khối catch bên dưới có thể đọc được dữ liệu nếu lỗi
         let targetUser = null;
         let filterType = 'all';
 
@@ -60,14 +59,14 @@ export default {
 
             const cases = await getModerationCases(interaction.guild.id, filters);
 
-            // Xử lý trực tiếp trường hợp mảng rỗng hoặc không tìm thấy dữ liệu vi phạm
+            // ĐỒNG BỘ TIẾNG ANH: Sửa thông báo kết quả trống thành "No cases found" chuẩn chỉ
             if (!cases || cases.length === 0) {
-                const noCaseDesc = targetUser 
-                    ? `Không tìm thấy case vi phạm nào của người dùng **${targetUser.tag}** (ID: ${targetUser.id}) trong hệ thống.`
-                    : `Không tìm thấy bất kỳ dữ liệu vi phạm nào thuộc loại danh mục "${filterType === 'all' ? 'Tất cả' : filterType}" trong server này.`;
-
+                const noCaseMessage = targetUser 
+                    ? `No cases found for user ${targetUser.tag} (ID: ${targetUser.id}).`
+                    : `No cases found for filter "${filterType === 'all' ? 'All' : filterType}" in this server.`;
+                
                 return InteractionHelper.safeEditReply(interaction, {
-                    embeds: [errorEmbed('📋 Kết quả tra cứu', noCaseDesc)],
+                    embeds: [errorEmbed('📋 No cases found', noCaseMessage)],
                     flags: MessageFlags.Ephemeral
                 });
             }
@@ -173,21 +172,18 @@ export default {
                         components: [disabledRow]
                     });
                 } catch (error) {
-                    // Tránh lỗi sập bot khi tin nhắn đã bị xóa trước khi bộ đếm kết thúc
+                    // Bỏ qua lỗi nếu tin nhắn bị xóa trước khi collector hết hạn
                 }
             });
 
         } catch (error) {
-            // Tối ưu khối catch: Log chi tiết lỗi ra console của Railway để tiện theo dõi
             logger.error('Error in cases command:', error);
-
-            const errDesc = targetUser 
-                ? `Không tìm thấy dữ liệu vi phạm của **${targetUser.tag}** (ID: ${targetUser.id}). Hệ thống phản hồi: ${error.message || error}`
-                : `Không tìm thấy lịch sử vi phạm nào trong máy chủ hoặc hệ thống đang gặp sự cố kết nối Database.`;
-
             return InteractionHelper.safeEditReply(interaction, {
                 embeds: [
-                    errorEmbed('📋 Thông tin tra cứu', errDesc)
+                    errorEmbed(
+                        'System Error',
+                        'An error occurred while retrieving moderation cases. Please try again later.'
+                    )
                 ],
                 flags: MessageFlags.Ephemeral
             });

From ad5054cd9c8acdec3319bc6aef8c9277dc32a7cf Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 13:50:36 +0700
Subject: [PATCH 05/97] Improve error handling and no cases message

---
 src/commands/Moderation/cases.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
index 5b1b0d8dd..a89377a76 100644
--- a/src/commands/Moderation/cases.js
+++ b/src/commands/Moderation/cases.js
@@ -59,14 +59,20 @@ export default {
 
             const cases = await getModerationCases(interaction.guild.id, filters);
 
-            // ĐỒNG BỘ TIẾNG ANH: Sửa thông báo kết quả trống thành "No cases found" chuẩn chỉ
             if (!cases || cases.length === 0) {
                 const noCaseMessage = targetUser 
                     ? `No cases found for user ${targetUser.tag} (ID: ${targetUser.id}).`
                     : `No cases found for filter "${filterType === 'all' ? 'All' : filterType}" in this server.`;
                 
+                // Dùng createEmbed thường để hiện màu xanh, không bị dính chữ ❌ Error ép buộc
+                const infoEmbed = createEmbed({
+                    title: '📋 No cases found',
+                    description: noCaseMessage,
+                    color: 0x3498db
+                });
+
                 return InteractionHelper.safeEditReply(interaction, {
-                    embeds: [errorEmbed('📋 No cases found', noCaseMessage)],
+                    embeds: [infoEmbed],
                     flags: MessageFlags.Ephemeral
                 });
             }
@@ -172,17 +178,18 @@ export default {
                         components: [disabledRow]
                     });
                 } catch (error) {
-                    // Bỏ qua lỗi nếu tin nhắn bị xóa trước khi collector hết hạn
                 }
             });
 
         } catch (error) {
             logger.error('Error in cases command:', error);
+            
+            // ĐÃ SỬA: In thẳng chi tiết lỗi cụ thể ra Discord để bạn biết chính xác lý do gãy lệnh
             return InteractionHelper.safeEditReply(interaction, {
                 embeds: [
                     errorEmbed(
                         'System Error',
-                        'An error occurred while retrieving moderation cases. Please try again later.'
+                        `An error occurred: \`${error.message || error}\`\nPlease check this error in your database configuration.`
                     )
                 ],
                 flags: MessageFlags.Ephemeral

From 5206118e839347ad8caffe7b3e42a2b27cccfa01 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 14:03:06 +0700
Subject: [PATCH 06/97] Refactor moderation.js for better logging and case
 handling

Refactor moderation event logging and case retrieval functions for improved readability and efficiency.
---
 src/utils/moderation.js | 50 ++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/src/utils/moderation.js b/src/utils/moderation.js
index 24690cd1f..e12bd471a 100644
--- a/src/utils/moderation.js
+++ b/src/utils/moderation.js
@@ -4,22 +4,6 @@ import { logger } from './logger.js';
 import { getFromDb, setInDb } from './database.js';
 import { getColor } from '../config/bot.js';
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 export async function logEvent({ client, guild, guildId, event }) {
   try {
     if (!guild && guildId) {
@@ -48,7 +32,6 @@ export async function logEvent({ client, guild, guildId, event }) {
       return;
     }
 
-    
     const actionStyles = {
       'Member Banned': { color: getColor('error'), icon: '🔨' },
       'Member Kicked': { color: getColor('warning'), icon: '👢' },
@@ -125,12 +108,6 @@ export async function logEvent({ client, guild, guildId, event }) {
   }
 }
 
-
-
-
-
-
-
 export async function generateCaseId(client, guildId) {
   try {
     const caseKey = `moderation_cases_${guildId}`;
@@ -140,7 +117,7 @@ export async function generateCaseId(client, guildId) {
     return nextCase;
   } catch (error) {
     logger.error("Error generating case ID:", error);
-return Date.now();
+    return Date.now();
   }
 }
 
@@ -179,29 +156,32 @@ export async function storeModerationCase({ guildId, caseId, caseData }) {
   }
 }
 
-
-
-
-
-
-
+/**
+ * Get filtered moderation cases
+ * @param {string} guildId - The guild ID
+ * @param {Object} filters - Search filters
+ * @returns {Promise<Array>} Filtered cases
+ */
 export async function getModerationCases(guildId, filters = {}) {
   try {
     const { userId, moderatorId, action, limit = 50, offset = 0 } = filters;
     
-    const allCases = [];
-    
     const caseListKey = `moderation_cases_list_${guildId}`;
     const caseList = await getFromDb(caseListKey, []);
     
     let filteredCases = caseList;
     
+    // TỐI ƯU HÓA: Tìm kiếm thông minh qua cả ID trực tiếp lẫn quét chuỗi text hiển thị 'target'
     if (userId) {
-      filteredCases = filteredCases.filter(case_ => case_.targetUserId === userId);
+      filteredCases = filteredCases.filter(case_ => {
+        return case_.targetUserId === userId || (case_.target && case_.target.includes(userId));
+      });
     }
     
     if (moderatorId) {
-      filteredCases = filteredCases.filter(case_ => case_.moderatorId === moderatorId);
+      filteredCases = filteredCases.filter(case_ => {
+        return case_.moderatorId === moderatorId || (case_.executor && case_.executor.includes(moderatorId));
+      });
     }
     
     if (action) {
@@ -252,5 +232,3 @@ export async function logModerationAction({ client, guild, event }) {
   return caseId;
 }
 
-
-

From 5ff6fa32b95824a75a506e04593727d20c61b050 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:12:34 +0700
Subject: [PATCH 07/97] Refactor purge command for clarity and error handling

---
 src/commands/Moderation/purge.js | 214 ++++++++++++++++---------------
 1 file changed, 109 insertions(+), 105 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 1420ea75f..c1e980c61 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -6,6 +6,7 @@ import { checkRateLimit } from '../../utils/rateLimiter.js';
 import { getColor } from '../../config/bot.js';
 
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+
 export default {
     data: new SlashCommandBuilder()
     .setName("purge")
@@ -16,120 +17,123 @@ export default {
         .setDescription("Number of messages (1-100)")
         .setRequired(true),
     )
-.setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
-  category: "moderation",
+    .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
+    category: "moderation",
 
-  async execute(interaction, config, client) {
-    const deferSuccess = await InteractionHelper.safeDefer(interaction);
-    if (!deferSuccess) {
-      logger.warn(`Purge interaction defer failed`, {
-        userId: interaction.user.id,
-        guildId: interaction.guildId,
-        commandName: 'purge'
-      });
-      return;
-    }
+    async execute(interaction, config, client) {
+        const deferSuccess = await InteractionHelper.safeDefer(interaction);
+        if (!deferSuccess) {
+            logger.warn(`Purge interaction defer failed`, {
+                userId: interaction.user.id,
+                guildId: interaction.guildId,
+                commandName: 'purge'
+            });
+            return;
+        }
 
-    if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages))
-      return await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          errorEmbed(
-            "Permission Denied",
-            "You need the `Manage Messages` permission to purge messages.",
-          ),
-        ],
-      });
+        if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages))
+            return await InteractionHelper.safeEditReply(interaction, {
+                embeds: [
+                    errorEmbed(
+                        "Permission Denied",
+                        "You need the `Manage Messages` permission to purge messages.",
+                    ),
+                ],
+            });
 
-    const amount = interaction.options.getInteger("amount");
-    const channel = interaction.channel;
+        const amount = interaction.options.getInteger("amount");
+        const channel = interaction.channel;
 
-    if (amount < 1 || amount > 100)
-      return await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          errorEmbed(
-            "Invalid Amount",
-            "Please specify a number between 1 and 100.",
-          ),
-        ],
-      });
+        if (amount < 1 || amount > 100)
+            return await InteractionHelper.safeEditReply(interaction, {
+                embeds: [
+                    errorEmbed(
+                        "Invalid Amount",
+                        "Please specify a number between 1 and 100.",
+                    ),
+                ],
+            });
 
-    try {
-      
-      const rateLimitKey = `purge_${interaction.user.id}`;
-      const isAllowed = await checkRateLimit(rateLimitKey, 5, 60000);
-      if (!isAllowed) {
-        return await InteractionHelper.safeEditReply(interaction, {
-          embeds: [
-            warningEmbed(
-              "You're purging messages too fast. Please wait a minute before trying again.",
-              "⏳ Rate Limited"
-            ),
-          ],
-          flags: MessageFlags.Ephemeral,
-        });
-      }
+        try {
+            const rateLimitKey = `purge_${interaction.user.id}`;
+            const isAllowed = await checkRateLimit(rateLimitKey, 5, 60000);
+            if (!isAllowed) {
+                return await InteractionHelper.safeEditReply(interaction, {
+                    embeds: [
+                        warningEmbed(
+                            "You're purging messages too fast. Please wait a minute before trying again.",
+                            "⏳ Rate Limited"
+                        ),
+                    ],
+                    flags: MessageFlags.Ephemeral,
+                });
+            }
 
-      const fetched = await channel.messages.fetch({ limit: amount });
-      const deleted = await channel.bulkDelete(fetched, true);
-      const deletedCount = deleted.size;
+            const fetched = await channel.messages.fetch({ limit: amount });
+            const deleted = await channel.bulkDelete(fetched, true);
+            const deletedCount = deleted.size;
 
-      const purgeEmbed = createEmbed(
-        "🗑️ Messages Purged (Action Log)",
-        `${deletedCount} messages were deleted by ${interaction.user}.`,
-      )
-.setColor(getColor('moderation'))
-        .addFields(
-          { name: "Channel", value: channel.toString(), inline: true },
-          {
-            name: "Moderator",
-            value: `${interaction.user.tag} (${interaction.user.id})`,
-            inline: true,
-          },
-          { name: "Count", value: `${deletedCount} messages`, inline: false },
-        );
+            const purgeEmbed = createEmbed(
+                "🗑️ Messages Purged (Action Log)",
+                `${deletedCount} messages were deleted by ${interaction.user}.`,
+            )
+            .setColor(getColor('moderation'))
+            .addFields(
+                { name: "Channel", value: channel.toString(), inline: true },
+                {
+                    name: "Moderator",
+                    value: `${interaction.user.tag} (${interaction.user.id})`,
+                    inline: true,
+                },
+                { name: "Count", value: `${deletedCount} messages`, inline: false },
+            );
 
-      await logEvent({
-        client,
-        guild: interaction.guild,
-        event: {
-          action: "Messages Purged",
-          target: `${channel} (${deletedCount} messages)`,
-          executor: `${interaction.user.tag} (${interaction.user.id})`,
-          reason: `Deleted ${deletedCount} messages`,
-          metadata: {
-            channelId: channel.id,
-            messageCount: deletedCount,
-            requestedAmount: amount,
-            moderatorId: interaction.user.id
-          }
-        }
-      });
+            await logEvent({
+                client,
+                guild: interaction.guild,
+                event: {
+                    action: "Messages Purged",
+                    target: `${channel} (${deletedCount} messages)`,
+                    executor: `${interaction.user.tag} (${interaction.user.id})`,
+                    reason: `Deleted ${deletedCount} messages`,
+                    metadata: {
+                        channelId: channel.id,
+                        messageCount: deletedCount,
+                        requestedAmount: amount,
+                        moderatorId: interaction.user.id
+                    }
+                }
+            });
+
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [
+                    successEmbed(`🗑️ Deleted ${deletedCount} messages in ${channel}.`),
+                ],
+                flags: MessageFlags.Ephemeral,
+            });
 
-      await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          successEmbed(`🗑️ Deleted ${deletedCount} messages in ${channel}.`),
-        ],
-flags: MessageFlags.Ephemeral,
-      });
+            setTimeout(() => {
+                interaction.deleteReply().catch(err => 
+                    logger.debug('Failed to auto-delete purge response:', err)
+                );
+            }, 3000);
 
-      setTimeout(() => {
-        interaction.deleteReply().catch(err => 
-          logger.debug('Failed to auto-delete purge response:', err)
-        );
-      }, 3000);
-    } catch (error) {
-      logger.error('Purge command error:', error);
-      await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          errorEmbed(
-            "An unexpected error occurred during message deletion. Note: Messages older than 14 days cannot be bulk deleted.",
-          ),
-        ],
-        flags: MessageFlags.Ephemeral,
-      });
+        } catch (error) {
+            logger.error('Purge command error:', error);
+            
+            // Xử lý lỗi an toàn để tránh vòng lặp crash
+            try {
+                await InteractionHelper.safeEditReply(interaction, {
+                    embeds: [
+                        errorEmbed(
+                            "An unexpected error occurred during message deletion. Note: Messages older than 14 days cannot be bulk deleted.",
+                        ),
+                    ],
+                    flags: MessageFlags.Ephemeral,
+                }).catch(() => null); 
+            } catch (e) {
+                logger.warn('Could not send error reply, interaction likely expired.');
+            }
+        }
     }
-  }
 };
-
-
-

From 268877a3d2142ec2d8075f73bc5a8f20dea79004 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:23:23 +0700
Subject: [PATCH 08/97] Refactor purge command for message deletion

---
 src/commands/Moderation/purge.js | 142 ++++++++++---------------------
 1 file changed, 46 insertions(+), 96 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index c1e980c61..67772a507 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -1,139 +1,89 @@
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType, MessageFlags } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
+import { errorEmbed, successEmbed, warningEmbed } from '../../utils/embeds.js';
 import { logEvent } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
-import { checkRateLimit } from '../../utils/rateLimiter.js';
-import { getColor } from '../../config/bot.js';
-
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { getColor } from '../../config/bot.js';
 
 export default {
     data: new SlashCommandBuilder()
-    .setName("purge")
-    .setDescription("Delete a specific amount of messages")
-    .addIntegerOption((option) =>
-      option
-        .setName("amount")
-        .setDescription("Number of messages (1-100)")
-        .setRequired(true),
-    )
-    .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
+        .setName("purge")
+        .setDescription("Delete a specific amount of messages")
+        .addIntegerOption((option) =>
+            option.setName("amount")
+                .setDescription("Number of messages (1-100)")
+                .setRequired(true)
+        )
+        .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
     category: "moderation",
 
     async execute(interaction, config, client) {
-        const deferSuccess = await InteractionHelper.safeDefer(interaction);
-        if (!deferSuccess) {
-            logger.warn(`Purge interaction defer failed`, {
-                userId: interaction.user.id,
-                guildId: interaction.guildId,
-                commandName: 'purge'
-            });
-            return;
-        }
-
-        if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages))
-            return await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    errorEmbed(
-                        "Permission Denied",
-                        "You need the `Manage Messages` permission to purge messages.",
-                    ),
-                ],
-            });
+        await InteractionHelper.safeDefer(interaction);
 
         const amount = interaction.options.getInteger("amount");
         const channel = interaction.channel;
 
-        if (amount < 1 || amount > 100)
+        if (amount < 1 || amount > 100) {
             return await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    errorEmbed(
-                        "Invalid Amount",
-                        "Please specify a number between 1 and 100.",
-                    ),
-                ],
+                embeds: [errorEmbed("Invalid Amount", "Please specify a number between 1 and 100.")],
             });
+        }
 
         try {
-            const rateLimitKey = `purge_${interaction.user.id}`;
-            const isAllowed = await checkRateLimit(rateLimitKey, 5, 60000);
-            if (!isAllowed) {
+            let deletedCount = 0;
+
+            if (amount === 1) {
+                // Xử lý riêng cho 1 tin nhắn: Fetch và xóa thủ công
+                const fetched = await channel.messages.fetch({ limit: 1 });
+                const messageToDelete = fetched.first();
+                if (messageToDelete) {
+                    await messageToDelete.delete();
+                    deletedCount = 1;
+                }
+            } else {
+                // Xử lý cho 2-100 tin nhắn
+                const fetched = await channel.messages.fetch({ limit: amount });
+                // Cố gắng xóa, không lọc bỏ tin cũ (để xem nó có báo lỗi thật không)
+                const deleted = await channel.bulkDelete(fetched, false); 
+                deletedCount = deleted.size;
+            }
+
+            if (deletedCount === 0) {
                 return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [
-                        warningEmbed(
-                            "You're purging messages too fast. Please wait a minute before trying again.",
-                            "⏳ Rate Limited"
-                        ),
-                    ],
+                    embeds: [warningEmbed("No messages deleted", "Bot found no messages to delete. They might be older than 14 days or are system messages.")],
                     flags: MessageFlags.Ephemeral,
                 });
             }
 
-            const fetched = await channel.messages.fetch({ limit: amount });
-            const deleted = await channel.bulkDelete(fetched, true);
-            const deletedCount = deleted.size;
-
-            const purgeEmbed = createEmbed(
-                "🗑️ Messages Purged (Action Log)",
-                `${deletedCount} messages were deleted by ${interaction.user}.`,
-            )
-            .setColor(getColor('moderation'))
-            .addFields(
-                { name: "Channel", value: channel.toString(), inline: true },
-                {
-                    name: "Moderator",
-                    value: `${interaction.user.tag} (${interaction.user.id})`,
-                    inline: true,
-                },
-                { name: "Count", value: `${deletedCount} messages`, inline: false },
-            );
-
+            // Ghi log sự kiện
             await logEvent({
                 client,
                 guild: interaction.guild,
                 event: {
                     action: "Messages Purged",
                     target: `${channel} (${deletedCount} messages)`,
-                    executor: `${interaction.user.tag} (${interaction.user.id})`,
+                    executor: `${interaction.user.tag}`,
                     reason: `Deleted ${deletedCount} messages`,
-                    metadata: {
-                        channelId: channel.id,
-                        messageCount: deletedCount,
-                        requestedAmount: amount,
-                        moderatorId: interaction.user.id
-                    }
                 }
             });
 
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    successEmbed(`🗑️ Deleted ${deletedCount} messages in ${channel}.`),
-                ],
+                embeds: [successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`)],
                 flags: MessageFlags.Ephemeral,
             });
 
+            // Tự động xóa thông báo của bot sau 3 giây
             setTimeout(() => {
-                interaction.deleteReply().catch(err => 
-                    logger.debug('Failed to auto-delete purge response:', err)
-                );
+                interaction.deleteReply().catch(() => {});
             }, 3000);
 
         } catch (error) {
-            logger.error('Purge command error:', error);
-            
-            // Xử lý lỗi an toàn để tránh vòng lặp crash
-            try {
-                await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [
-                        errorEmbed(
-                            "An unexpected error occurred during message deletion. Note: Messages older than 14 days cannot be bulk deleted.",
-                        ),
-                    ],
-                    flags: MessageFlags.Ephemeral,
-                }).catch(() => null); 
-            } catch (e) {
-                logger.warn('Could not send error reply, interaction likely expired.');
-            }
+            logger.error('Purge error:', error);
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [errorEmbed("Error", `Failed to delete messages: ${error.message}`)],
+                flags: MessageFlags.Ephemeral,
+            });
         }
     }
 };
+

From b02444912f140b13bd30e74f4ffe2f64d0fc458e Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:33:04 +0700
Subject: [PATCH 09/97] Refactor purge command for message deletion

---
 src/commands/Moderation/purge.js | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 67772a507..32f3f3ded 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -10,9 +10,7 @@ export default {
         .setName("purge")
         .setDescription("Delete a specific amount of messages")
         .addIntegerOption((option) =>
-            option.setName("amount")
-                .setDescription("Number of messages (1-100)")
-                .setRequired(true)
+            option.setName("amount").setDescription("Number of messages (1-100)").setRequired(true)
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
     category: "moderation",
@@ -23,39 +21,30 @@ export default {
         const amount = interaction.options.getInteger("amount");
         const channel = interaction.channel;
 
-        if (amount < 1 || amount > 100) {
-            return await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Invalid Amount", "Please specify a number between 1 and 100.")],
-            });
-        }
-
         try {
             let deletedCount = 0;
+            const fetched = await channel.messages.fetch({ limit: amount });
 
             if (amount === 1) {
-                // Xử lý riêng cho 1 tin nhắn: Fetch và xóa thủ công
-                const fetched = await channel.messages.fetch({ limit: 1 });
                 const messageToDelete = fetched.first();
                 if (messageToDelete) {
                     await messageToDelete.delete();
                     deletedCount = 1;
                 }
             } else {
-                // Xử lý cho 2-100 tin nhắn
-                const fetched = await channel.messages.fetch({ limit: amount });
-                // Cố gắng xóa, không lọc bỏ tin cũ (để xem nó có báo lỗi thật không)
-                const deleted = await channel.bulkDelete(fetched, false); 
+                const deleted = await channel.bulkDelete(fetched, true);
                 deletedCount = deleted.size;
             }
 
+            // CHỖ NÀY QUAN TRỌNG: Nếu không xóa được gì, dừng lại ngay và không Log
             if (deletedCount === 0) {
                 return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [warningEmbed("No messages deleted", "Bot found no messages to delete. They might be older than 14 days or are system messages.")],
+                    embeds: [warningEmbed("No messages deleted", "Could not delete messages. They might be older than 14 days or are system messages.")],
                     flags: MessageFlags.Ephemeral,
                 });
             }
 
-            // Ghi log sự kiện
+            // Chỉ Log khi đã thực sự xóa được tin nhắn
             await logEvent({
                 client,
                 guild: interaction.guild,
@@ -72,7 +61,6 @@ export default {
                 flags: MessageFlags.Ephemeral,
             });
 
-            // Tự động xóa thông báo của bot sau 3 giây
             setTimeout(() => {
                 interaction.deleteReply().catch(() => {});
             }, 3000);
@@ -80,10 +68,9 @@ export default {
         } catch (error) {
             logger.error('Purge error:', error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", `Failed to delete messages: ${error.message}`)],
+                embeds: [errorEmbed("Error", `Failed: ${error.message}`)],
                 flags: MessageFlags.Ephemeral,
             });
         }
     }
 };
-

From 74ab15e9a0f322b30be23e1477f2c578ed74aead Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:37:11 +0700
Subject: [PATCH 10/97] fix purge bug 2nd

---
 src/commands/Moderation/purge.js | 72 ++++++++++++++------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 32f3f3ded..4b9725cb2 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -1,19 +1,17 @@
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
-import { errorEmbed, successEmbed, warningEmbed } from '../../utils/embeds.js';
-import { logEvent } from '../../utils/moderation.js';
-import { logger } from '../../utils/logger.js';
+import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
-import { getColor } from '../../config/bot.js';
 
 export default {
     data: new SlashCommandBuilder()
         .setName("purge")
-        .setDescription("Delete a specific amount of messages")
+        .setDescription("Xóa tin nhắn")
         .addIntegerOption((option) =>
-            option.setName("amount").setDescription("Number of messages (1-100)").setRequired(true)
+            option.setName("amount")
+                .setDescription("Số lượng (1-100)")
+                .setRequired(true)
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
-    category: "moderation",
 
     async execute(interaction, config, client) {
         await InteractionHelper.safeDefer(interaction);
@@ -22,54 +20,46 @@ export default {
         const channel = interaction.channel;
 
         try {
-            let deletedCount = 0;
-            const fetched = await channel.messages.fetch({ limit: amount });
+            // 1. Fetch thêm 1 tin nhắn (là chính lệnh /purge)
+            // Chúng ta lấy nhiều hơn 1 để trừ hao tin nhắn lệnh
+            const fetched = await channel.messages.fetch({ limit: amount + 1 });
 
-            if (amount === 1) {
-                const messageToDelete = fetched.first();
-                if (messageToDelete) {
-                    await messageToDelete.delete();
-                    deletedCount = 1;
-                }
-            } else {
-                const deleted = await channel.bulkDelete(fetched, true);
-                deletedCount = deleted.size;
-            }
+            // 2. Lọc bỏ tin nhắn chính là lệnh /purge mà người dùng vừa gõ
+            // interaction.id là ID của câu lệnh
+            const messagesToDelete = fetched.filter(msg => msg.id !== interaction.id);
+
+            // 3. Cắt lấy đúng số lượng cần xóa (phòng trường hợp dư)
+            const finalMessages = Array.from(messagesToDelete.values()).slice(0, amount);
+
+            let deletedCount = 0;
 
-            // CHỖ NÀY QUAN TRỌNG: Nếu không xóa được gì, dừng lại ngay và không Log
-            if (deletedCount === 0) {
+            if (finalMessages.length === 0) {
                 return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [warningEmbed("No messages deleted", "Could not delete messages. They might be older than 14 days or are system messages.")],
-                    flags: MessageFlags.Ephemeral,
+                    embeds: [errorEmbed("Không tìm thấy", "Không có tin nhắn nào để xóa ngoài lệnh này.")],
                 });
             }
 
-            // Chỉ Log khi đã thực sự xóa được tin nhắn
-            await logEvent({
-                client,
-                guild: interaction.guild,
-                event: {
-                    action: "Messages Purged",
-                    target: `${channel} (${deletedCount} messages)`,
-                    executor: `${interaction.user.tag}`,
-                    reason: `Deleted ${deletedCount} messages`,
-                }
-            });
+            // 4. Thực hiện xóa
+            if (finalMessages.length === 1) {
+                await finalMessages[0].delete();
+                deletedCount = 1;
+            } else {
+                const deleted = await channel.bulkDelete(finalMessages, true);
+                deletedCount = deleted.size;
+            }
 
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`)],
+                embeds: [successEmbed(`🗑️ Đã xóa ${deletedCount} tin nhắn.`)],
                 flags: MessageFlags.Ephemeral,
             });
 
-            setTimeout(() => {
-                interaction.deleteReply().catch(() => {});
-            }, 3000);
+            // Tự xóa thông báo sau 3s
+            setTimeout(() => { interaction.deleteReply().catch(() => {}); }, 3000);
 
         } catch (error) {
-            logger.error('Purge error:', error);
+            console.error(error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", `Failed: ${error.message}`)],
-                flags: MessageFlags.Ephemeral,
+                embeds: [errorEmbed("Lỗi", "Không thể xóa tin nhắn. Chúng có thể quá cũ hoặc là tin nhắn hệ thống.")],
             });
         }
     }

From 2297bd3fda5c74af874c04322372be1b635dc495 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:40:28 +0700
Subject: [PATCH 11/97] Refactor purge command message deletion logic

---
 src/commands/Moderation/purge.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 4b9725cb2..458487ab7 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -20,31 +20,28 @@ export default {
         const channel = interaction.channel;
 
         try {
-            // 1. Fetch thêm 1 tin nhắn (là chính lệnh /purge)
-            // Chúng ta lấy nhiều hơn 1 để trừ hao tin nhắn lệnh
+            // 1. Fetch nhiều hơn 1 tin so với yêu cầu (cộng thêm 1 cho chính tin nhắn lệnh của bạn)
             const fetched = await channel.messages.fetch({ limit: amount + 1 });
 
-            // 2. Lọc bỏ tin nhắn chính là lệnh /purge mà người dùng vừa gõ
-            // interaction.id là ID của câu lệnh
-            const messagesToDelete = fetched.filter(msg => msg.id !== interaction.id);
+            // 2. Chuyển thành mảng và cắt bỏ tin nhắn đầu tiên (chính là tin nhắn lệnh của bạn)
+            const messagesToDelete = Array.from(fetched.values()).slice(1);
 
-            // 3. Cắt lấy đúng số lượng cần xóa (phòng trường hợp dư)
-            const finalMessages = Array.from(messagesToDelete.values()).slice(0, amount);
-
-            let deletedCount = 0;
-
-            if (finalMessages.length === 0) {
+            if (messagesToDelete.length === 0) {
                 return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [errorEmbed("Không tìm thấy", "Không có tin nhắn nào để xóa ngoài lệnh này.")],
+                    embeds: [errorEmbed("Không tìm thấy", "Không có tin nhắn nào để xóa.")],
                 });
             }
 
-            // 4. Thực hiện xóa
-            if (finalMessages.length === 1) {
-                await finalMessages[0].delete();
+            let deletedCount = 0;
+
+            // 3. Xử lý xóa
+            if (messagesToDelete.length === 1) {
+                // Xóa 1 tin đơn lẻ
+                await messagesToDelete[0].delete();
                 deletedCount = 1;
             } else {
-                const deleted = await channel.bulkDelete(finalMessages, true);
+                // Xóa nhiều tin
+                const deleted = await channel.bulkDelete(messagesToDelete, true);
                 deletedCount = deleted.size;
             }
 
@@ -53,13 +50,12 @@ export default {
                 flags: MessageFlags.Ephemeral,
             });
 
-            // Tự xóa thông báo sau 3s
             setTimeout(() => { interaction.deleteReply().catch(() => {}); }, 3000);
 
         } catch (error) {
             console.error(error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Lỗi", "Không thể xóa tin nhắn. Chúng có thể quá cũ hoặc là tin nhắn hệ thống.")],
+                embeds: [errorEmbed("Lỗi", "Không thể xóa tin nhắn. (Có thể do tin quá cũ hoặc lỗi hệ thống).")],
             });
         }
     }

From 96f47cb1e720156b1704e560f46f313430fdc3be Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 16:45:12 +0700
Subject: [PATCH 12/97] Update purge command messages, descriptions and
 translate to english.

---
 src/commands/Moderation/purge.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 458487ab7..faf9eb9da 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -5,57 +5,56 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("purge")
-        .setDescription("Xóa tin nhắn")
+        .setDescription("Delete a specific amount of messages")
         .addIntegerOption((option) =>
             option.setName("amount")
-                .setDescription("Số lượng (1-100)")
+                .setDescription("Number of messages (1-100)")
                 .setRequired(true)
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
 
     async execute(interaction, config, client) {
+        // [WAIT] Initial response to prevent "Interaction Failed"
         await InteractionHelper.safeDefer(interaction);
 
         const amount = interaction.options.getInteger("amount");
         const channel = interaction.channel;
 
         try {
-            // 1. Fetch nhiều hơn 1 tin so với yêu cầu (cộng thêm 1 cho chính tin nhắn lệnh của bạn)
             const fetched = await channel.messages.fetch({ limit: amount + 1 });
-
-            // 2. Chuyển thành mảng và cắt bỏ tin nhắn đầu tiên (chính là tin nhắn lệnh của bạn)
             const messagesToDelete = Array.from(fetched.values()).slice(1);
 
             if (messagesToDelete.length === 0) {
                 return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [errorEmbed("Không tìm thấy", "Không có tin nhắn nào để xóa.")],
+                    embeds: [errorEmbed("No messages found", "There are no messages available to delete.")],
                 });
             }
 
             let deletedCount = 0;
 
-            // 3. Xử lý xóa
+            // [WAIT] Bot will pause here until the deletion is fully confirmed by Discord
             if (messagesToDelete.length === 1) {
-                // Xóa 1 tin đơn lẻ
                 await messagesToDelete[0].delete();
                 deletedCount = 1;
             } else {
-                // Xóa nhiều tin
                 const deleted = await channel.bulkDelete(messagesToDelete, true);
                 deletedCount = deleted.size;
             }
+            // [AFTER THIS] Only now, the code proceeds to the next line
 
+            // [WAIT] Finally, send the success notification
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed(`🗑️ Đã xóa ${deletedCount} tin nhắn.`)],
+                embeds: [successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`)],
                 flags: MessageFlags.Ephemeral,
             });
 
+            // Auto-delete the success message after 3s
             setTimeout(() => { interaction.deleteReply().catch(() => {}); }, 3000);
 
         } catch (error) {
             console.error(error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Lỗi", "Không thể xóa tin nhắn. (Có thể do tin quá cũ hoặc lỗi hệ thống).")],
+                embeds: [errorEmbed("Error", "Failed to delete messages. (They might be older than 14 days or system messages.)")],
             });
         }
     }

From 4e6dd7ef2272a9d4ca47785b9f72fec9c683288c Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:38:37 +0700
Subject: [PATCH 13/97] Refactor lock command for improved clarity

---
 src/commands/Moderation/lock.js | 146 +++++++++-----------------------
 1 file changed, 41 insertions(+), 105 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 7705db393..13f014d2e 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -1,111 +1,47 @@
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { logEvent } from '../../utils/moderation.js';
-import { logger } from '../../utils/logger.js';
-import { getColor } from '../../config/bot.js';
-
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
+import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+
 export default {
     data: new SlashCommandBuilder()
-    .setName("lock")
-    .setDescription(
-      "Locks the current channel (prevents @everyone from sending messages).",
-    )
-.setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
-  category: "moderation",
-
-  async execute(interaction, config, client) {
-    const deferSuccess = await InteractionHelper.safeDefer(interaction);
-    if (!deferSuccess) {
-      logger.warn(`Lock interaction defer failed`, {
-        userId: interaction.user.id,
-        guildId: interaction.guildId,
-        commandName: 'lock'
-      });
-      return;
-    }
-
-    if (!interaction.member.permissions.has(PermissionFlagsBits.ManageChannels))
-      return await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          errorEmbed(
-            "Permission Denied",
-            "You need the `Manage Channels` permission to lock channels.",
-          ),
-        ],
-      });
-
-    const channel = interaction.channel;
-    const everyoneRole = interaction.guild.roles.everyone;
-
-    try {
-      const currentPermissions = channel.permissionsFor(everyoneRole);
-      if (currentPermissions.has(PermissionFlagsBits.SendMessages) === false) {
-        return await InteractionHelper.safeEditReply(interaction, {
-          embeds: [
-            errorEmbed(
-              "Channel Already Locked",
-              `${channel} is already locked.`,
-            ),
-          ],
-        });
-      }
-
-      await channel.permissionOverwrites.edit(
-        everyoneRole,
-        { SendMessages: false },
-{ type: 0, reason: `Channel locked by ${interaction.user.tag}` },
-      );
-
-      const lockEmbed = createEmbed(
-        "🔒 Channel Locked (Action Log)",
-        `${channel} has been locked down by ${interaction.user}.`,
-      )
-.setColor(getColor('moderation'))
-        .addFields(
-          { name: "Channel", value: channel.toString(), inline: true },
-          {
-            name: "Moderator",
-            value: `${interaction.user.tag} (${interaction.user.id})`,
-            inline: true,
-          },
-        );
-
-      await logEvent({
-        client,
-        guild: interaction.guild,
-        event: {
-          action: "Channel Locked",
-          target: channel.toString(),
-          executor: `${interaction.user.tag} (${interaction.user.id})`,
-          metadata: {
-            channelId: channel.id,
-            category: channel.parent?.name || 'None',
-            moderatorId: interaction.user.id
-          }
+        .setName("lock")
+        .setDescription("Lock the channel for ALL roles")
+        .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
+
+    async execute(interaction, config, client) {
+        await InteractionHelper.safeDefer(interaction);
+
+        const channel = interaction.channel;
+        const guild = interaction.guild;
+
+        try {
+            const permissionOverwrites = channel.permissionOverwrites.cache;
+
+            for (const [id, overwrite] of permissionOverwrites) {
+                await channel.permissionOverwrites.edit(id, {
+                    SendMessages: false
+                });
+            }
+
+            await channel.permissionOverwrites.edit(guild.roles.everyone, {
+                SendMessages: false
+            });
+
+            // Gửi thông báo công khai vào kênh
+            await channel.send({
+                embeds: [successEmbed("🔒 This channel has been locked by a moderator.")]
+            });
+
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [successEmbed("🔒 Channel locked successfully.")],
+                flags: MessageFlags.Ephemeral,
+            });
+
+        } catch (error) {
+            console.error("Lock command error:", error);
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [errorEmbed("Error", `Failed to lock: ${error.message}`)],
+            });
         }
-      });
-
-      await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          successEmbed(
-            `🔒 **Channel Locked**`,
-            `${channel} is now locked down. No one can speak here now.`,
-          ),
-        ],
-      });
-    } catch (error) {
-      logger.error('Lock command error:', error);
-      await InteractionHelper.safeEditReply(interaction, {
-        embeds: [
-          errorEmbed(
-            "An unexpected error occurred while trying to lock the channel. Check my permissions (I need 'Manage Channels').",
-          ),
-        ],
-      });
     }
-  }
 };
-
-
-

From 26438ef2fe035daa24f6ed7b0ac34433f241fbf6 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:43:29 +0700
Subject: [PATCH 14/97] Update lock command to lock channel instantly

---
 src/commands/Moderation/lock.js | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 13f014d2e..3a20dfcfb 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -5,42 +5,44 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("lock")
-        .setDescription("Lock the channel for ALL roles")
+        .setDescription("Lock the channel instantly")
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
         await InteractionHelper.safeDefer(interaction);
-
         const channel = interaction.channel;
         const guild = interaction.guild;
 
         try {
-            const permissionOverwrites = channel.permissionOverwrites.cache;
-
-            for (const [id, overwrite] of permissionOverwrites) {
-                await channel.permissionOverwrites.edit(id, {
-                    SendMessages: false
+            // 1. Tạo mảng quyền mới dựa trên các quyền hiện tại
+            const newOverwrites = channel.permissionOverwrites.cache.map(o => ({
+                id: o.id,
+                allow: o.allow.remove(PermissionFlagsBits.SendMessages),
+                deny: o.deny.add(PermissionFlagsBits.SendMessages)
+            }));
+
+            // 2. Đảm bảo @everyone luôn có trong danh sách chặn
+            if (!newOverwrites.find(o => o.id === guild.roles.everyone.id)) {
+                newOverwrites.push({
+                    id: guild.roles.everyone.id,
+                    deny: [PermissionFlagsBits.SendMessages]
                 });
             }
 
-            await channel.permissionOverwrites.edit(guild.roles.everyone, {
-                SendMessages: false
-            });
-
-            // Gửi thông báo công khai vào kênh
-            await channel.send({
-                embeds: [successEmbed("🔒 This channel has been locked by a moderator.")]
-            });
+            // 3. Cập nhật toàn bộ trong 1 lần gọi duy nhất (Cực nhanh)
+            await channel.permissionOverwrites.set(newOverwrites);
 
+            // Gửi thông báo
+            await channel.send({ embeds: [successEmbed("🔒 Channel locked instantly.")] });
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [successEmbed("🔒 Channel locked successfully.")],
                 flags: MessageFlags.Ephemeral,
             });
 
         } catch (error) {
-            console.error("Lock command error:", error);
+            console.error("Lock error:", error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", `Failed to lock: ${error.message}`)],
+                embeds: [errorEmbed("Error", "Failed to lock channel.")],
             });
         }
     }

From cb3e33d097f9dcc80ef2f7aa019b29fa4e29b940 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:44:29 +0700
Subject: [PATCH 15/97] Refactor unlock command for improved functionality

---
 src/commands/Moderation/unlock.js | 127 +++++-------------------------
 1 file changed, 20 insertions(+), 107 deletions(-)

diff --git a/src/commands/Moderation/unlock.js b/src/commands/Moderation/unlock.js
index 876dc3e56..b07aeab1e 100644
--- a/src/commands/Moderation/unlock.js
+++ b/src/commands/Moderation/unlock.js
@@ -1,126 +1,39 @@
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { logEvent } from '../../utils/moderation.js';
-import { logger } from '../../utils/logger.js';
-import { getColor } from '../../config/bot.js';
-
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
+import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+
 export default {
     data: new SlashCommandBuilder()
         .setName("unlock")
-        .setDescription(
-            "Unlocks the current channel (allows @everyone to send messages again).",
-        )
-.setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
-    category: "moderation",
+        .setDescription("Unlock the channel instantly")
+        .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
-        const deferSuccess = await InteractionHelper.safeDefer(interaction);
-        if (!deferSuccess) {
-            logger.warn(`Unlock interaction defer failed`, {
-                userId: interaction.user.id,
-                guildId: interaction.guildId,
-                commandName: 'unlock'
-            });
-            return;
-        }
-
-        if (
-            !interaction.member.permissions.has(
-                PermissionFlagsBits.ManageChannels,
-            )
-        )
-            return await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    errorEmbed(
-                        "Permission Denied",
-                        "You need the `Manage Channels` permission to unlock channels.",
-                    ),
-                ],
-            });
-
+        await InteractionHelper.safeDefer(interaction);
         const channel = interaction.channel;
-        const everyoneRole = interaction.guild.roles.everyone;
 
         try {
-            const currentPermissions = channel.permissionsFor(everyoneRole);
-            if (
-                currentPermissions.has(PermissionFlagsBits.SendMessages) ===
-                    true ||
-                currentPermissions.has(PermissionFlagsBits.SendMessages) ===
-                    null
-            ) {
-                return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [
-                        errorEmbed(
-                            "Channel Already Unlocked",
-                            `${channel} is not explicitly locked (everyone can already send messages).`,
-                        ),
-                    ],
-                });
-            }
+            // 1. Loại bỏ quyền chặn chat (SendMessages = null) cho tất cả role
+            const newOverwrites = channel.permissionOverwrites.cache.map(o => ({
+                id: o.id,
+                allow: o.allow.remove(PermissionFlagsBits.SendMessages),
+                deny: o.deny.remove(PermissionFlagsBits.SendMessages)
+            }));
 
-            await channel.permissionOverwrites.edit(
-                everyoneRole,
-                { SendMessages: true },
-                {
-                    type: 0,
-                    reason: `Channel unlocked by ${interaction.user.tag}`,
-},
-            );
-
-            const unlockEmbed = createEmbed(
-                "🔓 Channel Unlocked (Action Log)",
-                `${channel} has been unlocked by ${interaction.user}.`,
-            )
-.setColor(getColor('success'))
-                .addFields(
-                    {
-                        name: "Channel",
-                        value: channel.toString(),
-                        inline: true,
-                    },
-                    {
-                        name: "Moderator",
-                        value: `${interaction.user.tag} (${interaction.user.id})`,
-                        inline: true,
-                    },
-                );
-
-            await logEvent({
-                client,
-                guild: interaction.guild,
-                event: {
-                    action: "Channel Unlocked",
-                    target: channel.toString(),
-                    executor: `${interaction.user.tag} (${interaction.user.id})`,
-                    metadata: {
-                        channelId: channel.id,
-                        category: channel.parent?.name || 'None'
-                    }
-                }
-            });
+            // 2. Cập nhật toàn bộ trong 1 lần duy nhất
+            await channel.permissionOverwrites.set(newOverwrites);
 
+            await channel.send({ embeds: [successEmbed("🔓 Channel unlocked instantly.")] });
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    successEmbed(
-                        `🔓 **Channel Unlocked**`,
-                        `${channel} is now unlocked. You may speak now.`,
-                    ),
-                ],
+                embeds: [successEmbed("🔓 Channel unlocked successfully.")],
+                flags: MessageFlags.Ephemeral,
             });
+
         } catch (error) {
-            logger.error('Unlock command error:', error);
+            console.error("Unlock error:", error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    errorEmbed(
-                        "An unexpected error occurred while trying to unlock the channel. Check my permissions (I need 'Manage Channels').",
-                    ),
-                ],
+                embeds: [errorEmbed("Error", "Failed to unlock channel.")],
             });
         }
     }
 };
-
-
-

From baa15c3d0f4677de817c98ae98b054371318b328 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:49:56 +0700
Subject: [PATCH 16/97] Refactor lock command comments and reply method

Updated comments for clarity and changed notification method to ephemeral.
---
 src/commands/Moderation/lock.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 3a20dfcfb..2d6add356 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -14,14 +14,14 @@ export default {
         const guild = interaction.guild;
 
         try {
-            // 1. Tạo mảng quyền mới dựa trên các quyền hiện tại
+            // Lấy danh sách quyền hiện tại và tạo danh sách mới đã chặn SendMessages
             const newOverwrites = channel.permissionOverwrites.cache.map(o => ({
                 id: o.id,
                 allow: o.allow.remove(PermissionFlagsBits.SendMessages),
                 deny: o.deny.add(PermissionFlagsBits.SendMessages)
             }));
 
-            // 2. Đảm bảo @everyone luôn có trong danh sách chặn
+            // Đảm bảo @everyone luôn nằm trong danh sách chặn
             if (!newOverwrites.find(o => o.id === guild.roles.everyone.id)) {
                 newOverwrites.push({
                     id: guild.roles.everyone.id,
@@ -29,11 +29,10 @@ export default {
                 });
             }
 
-            // 3. Cập nhật toàn bộ trong 1 lần gọi duy nhất (Cực nhanh)
+            // Áp dụng tất cả thay đổi trong 1 lần gọi (Cực nhanh)
             await channel.permissionOverwrites.set(newOverwrites);
 
-            // Gửi thông báo
-            await channel.send({ embeds: [successEmbed("🔒 Channel locked instantly.")] });
+            // Chỉ gửi 1 thông báo duy nhất (Ephemeral)
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [successEmbed("🔒 Channel locked successfully.")],
                 flags: MessageFlags.Ephemeral,

From 37209bb55ee0a21ea9a9d02d4db317bc5262b800 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:53:21 +0700
Subject: [PATCH 17/97] Update lock command description and functionality

---
 src/commands/Moderation/lock.js | 36 ++++++++++++++-------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 2d6add356..b8a687727 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -5,7 +5,7 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("lock")
-        .setDescription("Lock the channel instantly")
+        .setDescription("Lock the channel for EVERYONE and all specific roles")
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
@@ -14,27 +14,21 @@ export default {
         const guild = interaction.guild;
 
         try {
-            // Lấy danh sách quyền hiện tại và tạo danh sách mới đã chặn SendMessages
-            const newOverwrites = channel.permissionOverwrites.cache.map(o => ({
-                id: o.id,
-                allow: o.allow.remove(PermissionFlagsBits.SendMessages),
-                deny: o.deny.add(PermissionFlagsBits.SendMessages)
-            }));
-
-            // Đảm bảo @everyone luôn nằm trong danh sách chặn
-            if (!newOverwrites.find(o => o.id === guild.roles.everyone.id)) {
-                newOverwrites.push({
-                    id: guild.roles.everyone.id,
-                    deny: [PermissionFlagsBits.SendMessages]
-                });
-            }
-
-            // Áp dụng tất cả thay đổi trong 1 lần gọi (Cực nhanh)
-            await channel.permissionOverwrites.set(newOverwrites);
-
-            // Chỉ gửi 1 thông báo duy nhất (Ephemeral)
+            // Lấy tất cả các role/user đang có quyền trong kênh
+            const overwrites = channel.permissionOverwrites.cache;
+
+            // Chạy vòng lặp để khóa từng đối tượng một
+            const tasks = overwrites.map(o => 
+                channel.permissionOverwrites.edit(o.id, { SendMessages: false })
+            );
+
+            // Đảm bảo @everyone cũng bị khóa
+            tasks.push(channel.permissionOverwrites.edit(guild.roles.everyone.id, { SendMessages: false }));
+
+            await Promise.all(tasks);
+
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed("🔒 Channel locked successfully.")],
+                embeds: [successEmbed("🔒 Locked: Everyone and specific roles can no longer send messages.")],
                 flags: MessageFlags.Ephemeral,
             });
 

From 79d83ddb9fa0550620127fa073b0adf7c161e5cf Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 17:55:40 +0700
Subject: [PATCH 18/97] Update unlock command description and logic

---
 src/commands/Moderation/unlock.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/commands/Moderation/unlock.js b/src/commands/Moderation/unlock.js
index b07aeab1e..f72ff081d 100644
--- a/src/commands/Moderation/unlock.js
+++ b/src/commands/Moderation/unlock.js
@@ -5,27 +5,28 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("unlock")
-        .setDescription("Unlock the channel instantly")
+        .setDescription("Unlock the channel for EVERYONE and all specific roles")
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
         await InteractionHelper.safeDefer(interaction);
         const channel = interaction.channel;
+        const guild = interaction.guild;
 
         try {
-            // 1. Loại bỏ quyền chặn chat (SendMessages = null) cho tất cả role
-            const newOverwrites = channel.permissionOverwrites.cache.map(o => ({
-                id: o.id,
-                allow: o.allow.remove(PermissionFlagsBits.SendMessages),
-                deny: o.deny.remove(PermissionFlagsBits.SendMessages)
-            }));
+            const overwrites = channel.permissionOverwrites.cache;
 
-            // 2. Cập nhật toàn bộ trong 1 lần duy nhất
-            await channel.permissionOverwrites.set(newOverwrites);
+            // Xóa quyền (set null) để trả về trạng thái mặc định cho từng đối tượng
+            const tasks = overwrites.map(o => 
+                channel.permissionOverwrites.edit(o.id, { SendMessages: null })
+            );
+
+            tasks.push(channel.permissionOverwrites.edit(guild.roles.everyone.id, { SendMessages: null }));
+
+            await Promise.all(tasks);
 
-            await channel.send({ embeds: [successEmbed("🔓 Channel unlocked instantly.")] });
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed("🔓 Channel unlocked successfully.")],
+                embeds: [successEmbed("🔓 Unlocked: All restrictions removed.")],
                 flags: MessageFlags.Ephemeral,
             });
 

From f0754eb506cfe0de93cbcece8071bab660fddb69 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:01:45 +0700
Subject: [PATCH 19/97] Update unlock command description and error handling

---
 src/commands/Moderation/unlock.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/commands/Moderation/unlock.js b/src/commands/Moderation/unlock.js
index f72ff081d..f7a6c74eb 100644
--- a/src/commands/Moderation/unlock.js
+++ b/src/commands/Moderation/unlock.js
@@ -5,7 +5,7 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("unlock")
-        .setDescription("Unlock the channel for EVERYONE and all specific roles")
+        .setDescription("Unlock the channel for all roles")
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
@@ -15,25 +15,25 @@ export default {
 
         try {
             const overwrites = channel.permissionOverwrites.cache;
+            const roleIds = [...overwrites.keys(), guild.roles.everyone.id];
 
-            // Xóa quyền (set null) để trả về trạng thái mặc định cho từng đối tượng
-            const tasks = overwrites.map(o => 
-                channel.permissionOverwrites.edit(o.id, { SendMessages: null })
-            );
-
-            tasks.push(channel.permissionOverwrites.edit(guild.roles.everyone.id, { SendMessages: null }));
-
-            await Promise.all(tasks);
+            for (const id of roleIds) {
+                try {
+                    await channel.permissionOverwrites.edit(id, { SendMessages: null });
+                } catch (e) {
+                    console.log(`Skipping role ${id}:`, e.message);
+                }
+            }
 
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed("🔓 Unlocked: All restrictions removed.")],
+                embeds: [successEmbed("🔓 Channel unlocked successfully.")],
                 flags: MessageFlags.Ephemeral,
             });
 
         } catch (error) {
-            console.error("Unlock error:", error);
+            console.error("Critical unlock error:", error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", "Failed to unlock channel.")],
+                embeds: [errorEmbed("Error", "Failed to process unlock command.")],
             });
         }
     }

From bb299f258311af1f45bdfb9cc8fa47bbabc45219 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:02:27 +0700
Subject: [PATCH 20/97] Refactor lock command to simplify role locking

---
 src/commands/Moderation/lock.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index b8a687727..4c1cacd4b 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -5,7 +5,7 @@ import { InteractionHelper } from '../../utils/interactionHelper.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("lock")
-        .setDescription("Lock the channel for EVERYONE and all specific roles")
+        .setDescription("Lock the channel for all roles")
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
@@ -14,28 +14,29 @@ export default {
         const guild = interaction.guild;
 
         try {
-            // Lấy tất cả các role/user đang có quyền trong kênh
             const overwrites = channel.permissionOverwrites.cache;
-
-            // Chạy vòng lặp để khóa từng đối tượng một
-            const tasks = overwrites.map(o => 
-                channel.permissionOverwrites.edit(o.id, { SendMessages: false })
-            );
-
-            // Đảm bảo @everyone cũng bị khóa
-            tasks.push(channel.permissionOverwrites.edit(guild.roles.everyone.id, { SendMessages: false }));
-
-            await Promise.all(tasks);
+            
+            // Tạo danh sách các ID cần xử lý
+            const roleIds = [...overwrites.keys(), guild.roles.everyone.id];
+            
+            // Xử lý từng role một, dùng try-catch bên trong để tránh làm chết cả lệnh
+            for (const id of roleIds) {
+                try {
+                    await channel.permissionOverwrites.edit(id, { SendMessages: false });
+                } catch (e) {
+                    console.log(`Skipping role ${id}:`, e.message);
+                }
+            }
 
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed("🔒 Locked: Everyone and specific roles can no longer send messages.")],
+                embeds: [successEmbed("🔒 Channel locked successfully.")],
                 flags: MessageFlags.Ephemeral,
             });
 
         } catch (error) {
-            console.error("Lock error:", error);
+            console.error("Critical lock error:", error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", "Failed to lock channel.")],
+                embeds: [errorEmbed("Error", "Failed to process lock command.")],
             });
         }
     }

From 8d1ae36e92eda13016715f1adbcd053b4d72098a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:27:08 +0700
Subject: [PATCH 21/97] Refactor message handling and leveling logic

Refactor messageCreate event to handle prefix commands and leveling logic.
---
 src/events/messageCreate.js | 140 ++++++++----------------------------
 1 file changed, 29 insertions(+), 111 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index b7f9841dc..07bd51ca5 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,117 +1,35 @@
-
-
-
-
-
 import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
-import { getLevelingConfig, getUserLevelData } from '../services/leveling.js';
-import { addXp } from '../services/xpSystem.js';
-import { checkRateLimit } from '../utils/rateLimiter.js';
-
-const MESSAGE_XP_RATE_LIMIT_ATTEMPTS = 12;
-const MESSAGE_XP_RATE_LIMIT_WINDOW_MS = 10000;
+import { handleLeveling } from '../services/leveling.js'; // Giả định hàm này nằm ở đây theo logic của bạn
 
 export default {
-  name: Events.MessageCreate,
-  async execute(message, client) {
-    try {
-      
-      if (message.author.bot || !message.guild) return;
-
-      await handleLeveling(message, client);
-    } catch (error) {
-      logger.error('Error in messageCreate event:', error);
+    name: Events.MessageCreate,
+    async execute(message, client) {
+        // 1. XỬ LÝ PREFIX COMMAND (nh!)
+        const PREFIX = "nh!";
+        if (message.content.startsWith(PREFIX)) {
+            // Bỏ qua nếu tin nhắn từ bot hoặc không có nội dung
+            if (message.author.bot) return;
+
+            const args = message.content.slice(PREFIX.length).trim().split(/ +/);
+            const commandName = args.shift().toLowerCase();
+
+            // Thêm lệnh vào đây
+            if (commandName === 'ping') {
+                return message.reply('Pong! 🏓');
+            }
+            
+            // Bạn có thể thêm lệnh khác ở đây nếu muốn (ví dụ lock/unlock)
+            
+            return; // Dừng lại ở đây, không cần chạy leveling cho lệnh prefix
+        }
+
+        // 2. XỬ LÝ LEVELING (Logic cũ của bạn)
+        try {
+            if (message.author.bot || !message.guild) return;
+            await handleLeveling(message, client);
+        } catch (error) {
+            logger.error('Error in messageCreate:', error);
+        }
     }
-  }
 };
-
-
-
-
-
-
-
-
-async function handleLeveling(message, client) {
-  try {
-    const rateLimitKey = `xp-event:${message.guild.id}:${message.author.id}`;
-    const canProcess = await checkRateLimit(rateLimitKey, MESSAGE_XP_RATE_LIMIT_ATTEMPTS, MESSAGE_XP_RATE_LIMIT_WINDOW_MS);
-    if (!canProcess) {
-      return;
-    }
-
-    const levelingConfig = await getLevelingConfig(client, message.guild.id);
-    
-    if (!levelingConfig?.enabled) {
-      return;
-    }
-
-    
-    if (levelingConfig.ignoredChannels?.includes(message.channel.id)) {
-      return;
-    }
-
-    
-    if (levelingConfig.ignoredRoles?.length > 0) {
-      const member = await message.guild.members.fetch(message.author.id).catch(() => {
-        return null;
-      });
-      if (member && member.roles.cache.some(role => levelingConfig.ignoredRoles.includes(role.id))) {
-        return;
-      }
-    }
-
-    
-    if (levelingConfig.blacklistedUsers?.includes(message.author.id)) {
-      return;
-    }
-
-    
-    if (!message.content || message.content.trim().length === 0) {
-      return;
-    }
-
-    const userData = await getUserLevelData(client, message.guild.id, message.author.id);
-    
-    
-    const cooldownTime = levelingConfig.xpCooldown || 60;
-    const now = Date.now();
-    const timeSinceLastMessage = now - (userData.lastMessage || 0);
-    
-    
-    if (timeSinceLastMessage < cooldownTime * 1000) {
-      return;
-    }
-
-    
-    const minXP = levelingConfig.xpRange?.min || levelingConfig.xpPerMessage?.min || 15;
-    const maxXP = levelingConfig.xpRange?.max || levelingConfig.xpPerMessage?.max || 25;
-
-    
-    const safeMinXP = Math.max(1, minXP);
-    const safeMaxXP = Math.max(safeMinXP, maxXP);
-
-    
-    const xpToGive = Math.floor(Math.random() * (safeMaxXP - safeMinXP + 1)) + safeMinXP;
-
-    
-    let finalXP = xpToGive;
-    if (levelingConfig.xpMultiplier && levelingConfig.xpMultiplier > 1) {
-      finalXP = Math.floor(finalXP * levelingConfig.xpMultiplier);
-    }
-
-    
-    const result = await addXp(client, message.guild, message.member, finalXP);
-    
-    if (result.success && result.leveledUp) {
-      logger.info(
-        `${message.author.tag} leveled up to level ${result.level} in ${message.guild.name}`
-      );
-    }
-  } catch (error) {
-    logger.error('Error handling leveling for message:', error);
-  }
-}
-
-

From 491a4dd4a35ce96ea2a26e343316749a67b981cc Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:29:36 +0700
Subject: [PATCH 22/97] Fix missing newline at end of messageCreate.js


From 47f24dfdcf2b23dbcb3bf439bb15f77934071fa3 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:30:32 +0700
Subject: [PATCH 23/97] Refactor message handling and command execution

---
 src/events/messageCreate.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 07bd51ca5..0a7e9edcb 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,6 +1,7 @@
 import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
-import { handleLeveling } from '../services/leveling.js'; // Giả định hàm này nằm ở đây theo logic của bạn
+// Giả định bạn có hàm handleLeveling ở đây, nếu không có hãy xóa dòng import này
+import { handleLeveling } from '../services/leveling.js'; 
 
 export default {
     name: Events.MessageCreate,
@@ -8,23 +9,21 @@ export default {
         // 1. XỬ LÝ PREFIX COMMAND (nh!)
         const PREFIX = "nh!";
         if (message.content.startsWith(PREFIX)) {
-            // Bỏ qua nếu tin nhắn từ bot hoặc không có nội dung
             if (message.author.bot) return;
 
             const args = message.content.slice(PREFIX.length).trim().split(/ +/);
             const commandName = args.shift().toLowerCase();
 
-            // Thêm lệnh vào đây
+            // Thêm lệnh tại đây
             if (commandName === 'ping') {
                 return message.reply('Pong! 🏓');
             }
             
-            // Bạn có thể thêm lệnh khác ở đây nếu muốn (ví dụ lock/unlock)
-            
-            return; // Dừng lại ở đây, không cần chạy leveling cho lệnh prefix
+            // Bạn có thể thêm lệnh khác tương tự...
+            return; 
         }
 
-        // 2. XỬ LÝ LEVELING (Logic cũ của bạn)
+        // 2. XỬ LÝ LEVELING (Logic gốc của TitanBot)
         try {
             if (message.author.bot || !message.guild) return;
             await handleLeveling(message, client);

From 1d45737804ac0599b5bb12dccb50b169e425eb9d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:38:05 +0700
Subject: [PATCH 24/97] Refactor messageCreate to remove leveling logic

Removed handleLeveling import and its usage to prevent errors.
---
 src/events/messageCreate.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 0a7e9edcb..6b39c4bac 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,7 +1,5 @@
 import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
-// Giả định bạn có hàm handleLeveling ở đây, nếu không có hãy xóa dòng import này
-import { handleLeveling } from '../services/leveling.js'; 
 
 export default {
     name: Events.MessageCreate,
@@ -14,19 +12,17 @@ export default {
             const args = message.content.slice(PREFIX.length).trim().split(/ +/);
             const commandName = args.shift().toLowerCase();
 
-            // Thêm lệnh tại đây
             if (commandName === 'ping') {
                 return message.reply('Pong! 🏓');
             }
             
-            // Bạn có thể thêm lệnh khác tương tự...
-            return; 
+            return; // Dừng lại ở đây nếu đã chạy lệnh prefix
         }
 
-        // 2. XỬ LÝ LEVELING (Logic gốc của TitanBot)
+        // 2. Các xử lý khác
         try {
             if (message.author.bot || !message.guild) return;
-            await handleLeveling(message, client);
+            // Không còn gọi handleLeveling ở đây nên sẽ không bị lỗi nữa
         } catch (error) {
             logger.error('Error in messageCreate:', error);
         }

From 4b3130f433e805c44feb197bdab7c903343474de Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:40:53 +0700
Subject: [PATCH 25/97] Refactor message command handling with switch case

---
 src/events/messageCreate.js | 40 ++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 6b39c4bac..548c7bd5e 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -4,27 +4,35 @@ import { logger } from '../utils/logger.js';
 export default {
     name: Events.MessageCreate,
     async execute(message, client) {
-        // 1. XỬ LÝ PREFIX COMMAND (nh!)
+        // Cấu hình Prefix
         const PREFIX = "nh!";
-        if (message.content.startsWith(PREFIX)) {
-            if (message.author.bot) return;
+        
+        // Kiểm tra xem tin nhắn có đúng format không
+        if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-            const args = message.content.slice(PREFIX.length).trim().split(/ +/);
-            const commandName = args.shift().toLowerCase();
+        // Tách lấy tên lệnh và tham số
+        const args = message.content.slice(PREFIX.length).trim().split(/ +/);
+        const commandName = args.shift().toLowerCase();
 
-            if (commandName === 'ping') {
+        // Xử lý các lệnh bằng switch case (Dễ thêm bớt lệnh)
+        switch (commandName) {
+            case 'ping':
                 return message.reply('Pong! 🏓');
-            }
-            
-            return; // Dừng lại ở đây nếu đã chạy lệnh prefix
-        }
 
-        // 2. Các xử lý khác
-        try {
-            if (message.author.bot || !message.guild) return;
-            // Không còn gọi handleLeveling ở đây nên sẽ không bị lỗi nữa
-        } catch (error) {
-            logger.error('Error in messageCreate:', error);
+            case 'say':
+                const text = args.join(' ');
+                if (!text) return message.reply('Bạn phải nhập nội dung!');
+                return message.channel.send(text);
+
+            case 'info':
+                return message.reply('Bot đang chạy mượt mà trên Railway! 🚀');
+
+            case 'server':
+                return message.reply(`Tên server: ${message.guild.name}`);
+
+            default:
+                // Nếu lệnh không tồn tại, bạn có thể gửi tin nhắn thông báo hoặc để im
+                return;
         }
     }
 };

From 0588f6e31bc67a72450b65bf21bfe4bbc0ebc833 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:44:48 +0700
Subject: [PATCH 26/97] Refactor command handling into a commands list

---
 src/events/messageCreate.js | 42 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 548c7bd5e..cddce1e43 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -4,35 +4,33 @@ import { logger } from '../utils/logger.js';
 export default {
     name: Events.MessageCreate,
     async execute(message, client) {
-        // Cấu hình Prefix
         const PREFIX = "nh!";
-        
-        // Kiểm tra xem tin nhắn có đúng format không
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-        // Tách lấy tên lệnh và tham số
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // Xử lý các lệnh bằng switch case (Dễ thêm bớt lệnh)
-        switch (commandName) {
-            case 'ping':
-                return message.reply('Pong! 🏓');
+        // --- DANH SÁCH LỆNH CỦA BẠN Ở ĐÂY ---
+        const commandsList = {
+            'ping': (msg) => msg.reply('Pong! 🏓'),
+            'info': (msg) => msg.reply('Bot Starlight Security đang online! 🚀'),
+            'server': (msg) => msg.reply(`Server: ${msg.guild.name}`),
+            'say': (msg, args) => {
+                if (!args.length) return msg.reply('Bạn chưa nhập nội dung!');
+                msg.channel.send(args.join(' '));
+            }
+            // Thêm lệnh mới thì chỉ cần phẩy rồi thêm dòng:
+            // 'tên-lệnh': (msg, args) => { ...code... },
+        };
 
-            case 'say':
-                const text = args.join(' ');
-                if (!text) return message.reply('Bạn phải nhập nội dung!');
-                return message.channel.send(text);
-
-            case 'info':
-                return message.reply('Bot đang chạy mượt mà trên Railway! 🚀');
-
-            case 'server':
-                return message.reply(`Tên server: ${message.guild.name}`);
-
-            default:
-                // Nếu lệnh không tồn tại, bạn có thể gửi tin nhắn thông báo hoặc để im
-                return;
+        // --- XỬ LÝ LỆNH ---
+        if (commandsList[commandName]) {
+            try {
+                await commandsList[commandName](message, args);
+            } catch (error) {
+                logger.error(`Lỗi ở lệnh ${commandName}:`, error);
+                message.reply('Đã có lỗi xảy ra khi chạy lệnh này.');
+            }
         }
     }
 };

From 1e6d786528c43795466edac2c8ea465308474b05 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:47:00 +0700
Subject: [PATCH 27/97] Update command messages to English and improve comments

---
 src/events/messageCreate.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index cddce1e43..d1abc9991 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -5,31 +5,32 @@ export default {
     name: Events.MessageCreate,
     async execute(message, client) {
         const PREFIX = "nh!";
+        // Check if message starts with prefix, is not a bot, and is in a guild
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // --- DANH SÁCH LỆNH CỦA BẠN Ở ĐÂY ---
+        // --- COMMAND LIST ---
         const commandsList = {
             'ping': (msg) => msg.reply('Pong! 🏓'),
-            'info': (msg) => msg.reply('Bot Starlight Security đang online! 🚀'),
-            'server': (msg) => msg.reply(`Server: ${msg.guild.name}`),
+            'info': (msg) => msg.reply('Bot Starlight Security is online! 🚀'),
+            'server': (msg) => msg.reply(`Server name: ${msg.guild.name}`),
             'say': (msg, args) => {
-                if (!args.length) return msg.reply('Bạn chưa nhập nội dung!');
+                if (!args.length) return msg.reply('You haven\'t provided any content!');
                 msg.channel.send(args.join(' '));
             }
-            // Thêm lệnh mới thì chỉ cần phẩy rồi thêm dòng:
-            // 'tên-lệnh': (msg, args) => { ...code... },
+            // Add new commands here:
+            // 'command-name': (msg, args) => { ...code... },
         };
 
-        // --- XỬ LÝ LỆNH ---
+        // --- EXECUTION ---
         if (commandsList[commandName]) {
             try {
                 await commandsList[commandName](message, args);
             } catch (error) {
-                logger.error(`Lỗi ở lệnh ${commandName}:`, error);
-                message.reply('Đã có lỗi xảy ra khi chạy lệnh này.');
+                logger.error(`Error executing command ${commandName}:`, error);
+                message.reply('An error occurred while executing this command.');
             }
         }
     }

From 5b015f75dad5202f442d53c0f8e940d096948018 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:52:46 +0700
Subject: [PATCH 28/97] Refactor command list and improve comments

---
 src/events/messageCreate.js | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index d1abc9991..8b7a89535 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -5,23 +5,45 @@ export default {
     name: Events.MessageCreate,
     async execute(message, client) {
         const PREFIX = "nh!";
-        // Check if message starts with prefix, is not a bot, and is in a guild
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // --- COMMAND LIST ---
+        // --- ALL PREFIX COMMANDS LIST ---
         const commandsList = {
             'ping': (msg) => msg.reply('Pong! 🏓'),
+            
             'info': (msg) => msg.reply('Bot Starlight Security is online! 🚀'),
+            
             'server': (msg) => msg.reply(`Server name: ${msg.guild.name}`),
+            
             'say': (msg, args) => {
                 if (!args.length) return msg.reply('You haven\'t provided any content!');
                 msg.channel.send(args.join(' '));
+            },
+
+            'avatar': (msg) => {
+                const user = msg.mentions.users.first() || msg.author;
+                msg.reply(user.displayAvatarURL({ dynamic: true, size: 512 }));
+            },
+
+            'user': (msg) => {
+                const user = msg.mentions.users.first() || msg.author;
+                msg.reply(`User: ${user.username}\nID: ${user.id}\nJoined: ${user.createdAt.toDateString()}`);
+            },
+
+            'uptime': (msg) => {
+                const uptime = process.uptime();
+                const days = Math.floor(uptime / 86400);
+                const hours = Math.floor(uptime / 3600) % 24;
+                const minutes = Math.floor(uptime / 60) % 60;
+                msg.reply(`Bot has been online for: ${days}d ${hours}h ${minutes}m`);
+            },
+
+            'help': (msg) => {
+                msg.reply('**List of available nh! commands:**\n- `ping`: Check latency\n- `info`: Bot status\n- `server`: Server info\n- `say`: Repeat text\n- `avatar`: Get user avatar\n- `user`: Get user info\n- `uptime`: Bot uptime\n- `help`: This menu');
             }
-            // Add new commands here:
-            // 'command-name': (msg, args) => { ...code... },
         };
 
         // --- EXECUTION ---

From 929f66856ff30c54e70839149bd169478aca7fa5 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 18:58:07 +0700
Subject: [PATCH 29/97] Refactor messageCreate.js to include permissions checks

---
 src/events/messageCreate.js | 57 ++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 8b7a89535..428c20863 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,4 +1,4 @@
-import { Events } from 'discord.js';
+import { Events, PermissionsBitField } from 'discord.js';
 import { logger } from '../utils/logger.js';
 
 export default {
@@ -10,39 +10,44 @@ export default {
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // --- ALL PREFIX COMMANDS LIST ---
+        // --- COMMANDS LIST ---
         const commandsList = {
+            // Utility Commands
             'ping': (msg) => msg.reply('Pong! 🏓'),
-            
             'info': (msg) => msg.reply('Bot Starlight Security is online! 🚀'),
-            
-            'server': (msg) => msg.reply(`Server name: ${msg.guild.name}`),
-            
-            'say': (msg, args) => {
-                if (!args.length) return msg.reply('You haven\'t provided any content!');
-                msg.channel.send(args.join(' '));
+            'uptime': (msg) => {
+                const up = process.uptime();
+                msg.reply(`Uptime: ${Math.floor(up/86400)}d ${Math.floor(up/3600)%24}h ${Math.floor(up/60)%60}m`);
             },
 
-            'avatar': (msg) => {
-                const user = msg.mentions.users.first() || msg.author;
-                msg.reply(user.displayAvatarURL({ dynamic: true, size: 512 }));
+            // Security Commands (Admin only)
+            'lock': async (msg) => {
+                if (!msg.member.permissions.has(PermissionsBitField.Flags.ManageChannels)) return msg.reply('Missing permissions!');
+                await msg.channel.permissionOverwrites.edit(msg.guild.id, { SendMessages: false });
+                msg.reply('Channel locked 🔒');
             },
-
-            'user': (msg) => {
-                const user = msg.mentions.users.first() || msg.author;
-                msg.reply(`User: ${user.username}\nID: ${user.id}\nJoined: ${user.createdAt.toDateString()}`);
+            'unlock': async (msg) => {
+                if (!msg.member.permissions.has(PermissionsBitField.Flags.ManageChannels)) return msg.reply('Missing permissions!');
+                await msg.channel.permissionOverwrites.edit(msg.guild.id, { SendMessages: true });
+                msg.reply('Channel unlocked 🔓');
             },
-
-            'uptime': (msg) => {
-                const uptime = process.uptime();
-                const days = Math.floor(uptime / 86400);
-                const hours = Math.floor(uptime / 3600) % 24;
-                const minutes = Math.floor(uptime / 60) % 60;
-                msg.reply(`Bot has been online for: ${days}d ${hours}h ${minutes}m`);
+            'kick': async (msg) => {
+                if (!msg.member.permissions.has(PermissionsBitField.Flags.KickMembers)) return msg.reply('Missing permissions!');
+                const member = msg.mentions.members.first();
+                if (!member) return msg.reply('Mention a member to kick!');
+                await member.kick().catch(e => msg.reply('Failed to kick.'));
+                msg.reply(`Kicked ${member.user.tag}`);
+            },
+            'ban': async (msg) => {
+                if (!msg.member.permissions.has(PermissionsBitField.Flags.BanMembers)) return msg.reply('Missing permissions!');
+                const member = msg.mentions.members.first();
+                if (!member) return msg.reply('Mention a member to ban!');
+                await member.ban().catch(e => msg.reply('Failed to ban.'));
+                msg.reply(`Banned ${member.user.tag}`);
             },
 
             'help': (msg) => {
-                msg.reply('**List of available nh! commands:**\n- `ping`: Check latency\n- `info`: Bot status\n- `server`: Server info\n- `say`: Repeat text\n- `avatar`: Get user avatar\n- `user`: Get user info\n- `uptime`: Bot uptime\n- `help`: This menu');
+                msg.reply('**Available nh! commands:**\n- `ping`, `info`, `uptime`\n- `lock`, `unlock` (Channel)\n- `kick`, `ban` (@user)');
             }
         };
 
@@ -51,8 +56,8 @@ export default {
             try {
                 await commandsList[commandName](message, args);
             } catch (error) {
-                logger.error(`Error executing command ${commandName}:`, error);
-                message.reply('An error occurred while executing this command.');
+                logger.error(`Error executing ${commandName}:`, error);
+                message.reply('An error occurred.');
             }
         }
     }

From 3ce32bf51aecf627f20231170eec2ba69289dfb4 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:10:27 +0700
Subject: [PATCH 30/97] Rename package and update description in package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a241fb08b..730a2143e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "titanbot-custom",
+  "name": "starlight-security",
   "version": "1.1.1",
-  "description": "Modular Ultimate Community Bot by Touchpoint Support",
+  "description": "Starlight Security - Advanced Discord Bot",
   "main": "src/app.js",
   "type": "module",
   "scripts": {

From 6c8f442d82508781fcbaf5fea50115be1cf00ef8 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:26:08 +0700
Subject: [PATCH 31/97] Update helpButtons.js

---
 src/handlers/helpButtons.js | 140 ++++--------------------------------
 1 file changed, 12 insertions(+), 128 deletions(-)

diff --git a/src/handlers/helpButtons.js b/src/handlers/helpButtons.js
index 0c989452a..c5d72044d 100644
--- a/src/handlers/helpButtons.js
+++ b/src/handlers/helpButtons.js
@@ -1,66 +1,26 @@
-import { createEmbed } from '../utils/embeds.js';
-import { createAllCommandsMenu } from './helpSelectMenus.js';
-import { createInitialHelpMenu } from '../commands/Core/help.js';
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, MessageFlags } from 'discord.js';
-import { logger } from '../utils/logger.js';
-
-const COMMAND_LIST_ID = "help-command-list";
-const BACK_BUTTON_ID = "help-back-to-main";
-const PAGINATION_PREFIX = "help-page";
-const BUG_REPORT_BUTTON_ID = "help-bug-report";
-
-export const helpBackButton = {
-    name: BACK_BUTTON_ID,
-    async execute(interaction, client) {
-        try {
-            if (!interaction.deferred && !interaction.replied) {
-                await interaction.deferUpdate();
-            }
-
-            const { embeds, components } = await createInitialHelpMenu(client);
-            await interaction.editReply({
-                embeds,
-                components,
-            });
-        } catch (error) {
-            if (error?.code === 40060 || error?.code === 10062) {
-                logger.warn('Help back button interaction already acknowledged or expired.', {
-                    event: 'interaction.help.button.unavailable',
-                    errorCode: String(error.code),
-                    customId: interaction.customId,
-                    interactionId: interaction.id,
-                });
-                return;
-            }
-
-            throw error;
-        }
-    },
-};
-
 export const helpBugReportButton = {
     name: BUG_REPORT_BUTTON_ID,
     async execute(interaction, client) {
-        const githubButton = new ButtonBuilder()
-            .setLabel('🐛 Report Bug on GitHub')
+        const contactButton = new ButtonBuilder()
+            .setLabel('💬 Contact Developer')
             .setStyle(ButtonStyle.Link)
-            .setURL('https://github.com/codebymitch/TitanBot/issues');
+            .setURL('https://discord.com/users/1198136184526864475'); 
 
-        const bugRow = new ActionRowBuilder().addComponents(githubButton);
+        const bugRow = new ActionRowBuilder().addComponents(contactButton);
 
         const bugReportEmbed = createEmbed({
-            title: '🐛 Bug Report',
-            description: 'Found a bug? Please report it on our GitHub Issues page!\n\n' +
-                '**When reporting a bug, please include:**\n' +
+            title: '🐞 Report Bug / Contact',
+            description: 'Found a bug or have a suggestion? Please contact the developer directly!\n\n' +
+                '**When reporting, please include:**\n' +
                 '• 📝 Detailed description of the issue\n' +
                 '• 📋 Steps to reproduce the problem\n' +
-                '• 📸 Screenshots if applicable\n' +
-                '• 💻 Your bot version and environment\n\n' +
-                'This helps us fix issues faster and more effectively!',
-            color: 'error'
+                '• 📸 Screenshots if applicable\n\n' +
+                'I will get back to you as soon as possible!',
+            color: 'primary'
         });
+        
         bugReportEmbed.setFooter({
-            text: 'TitanBot Bug Reporting System',
+            text: 'Starlight Security System',
             iconURL: client.user.displayAvatarURL()
         });
         bugReportEmbed.setTimestamp();
@@ -72,79 +32,3 @@ export const helpBugReportButton = {
         });
     },
 };
-
-export const helpReportCommand = {
-    name: COMMAND_LIST_ID,
-    categoryName: null,
-    async execute(interaction, client) {
-        
-    }
-};
-
-function getPaginationInfo(components) {
-    for (const row of components || []) {
-        for (const component of row.components || []) {
-            if (component.customId === `${PAGINATION_PREFIX}_page`) {
-                const label = component.label || '';
-                const match = label.match(/Page\s+(\d+)\s+of\s+(\d+)/i);
-                if (match) {
-                    return {
-                        currentPage: Number(match[1]),
-                        totalPages: Number(match[2]),
-                    };
-                }
-            }
-        }
-    }
-
-    return { currentPage: 1, totalPages: 1 };
-}
-
-export const helpPaginationButton = {
-    name: `${PAGINATION_PREFIX}_next`,
-    async execute(interaction, client) {
-        try {
-            if (!interaction.deferred && !interaction.replied) {
-                await interaction.deferUpdate();
-            }
-
-            const { currentPage, totalPages } = getPaginationInfo(interaction.message?.components);
-
-            let nextPage = currentPage;
-            switch (interaction.customId) {
-                case `${PAGINATION_PREFIX}_first`:
-                    nextPage = 1;
-                    break;
-                case `${PAGINATION_PREFIX}_prev`:
-                    nextPage = Math.max(1, currentPage - 1);
-                    break;
-                case `${PAGINATION_PREFIX}_next`:
-                    nextPage = Math.min(totalPages, currentPage + 1);
-                    break;
-                case `${PAGINATION_PREFIX}_last`:
-                    nextPage = totalPages;
-                    break;
-                default:
-                    nextPage = currentPage;
-                    break;
-            }
-
-            const { embeds, components } = await createAllCommandsMenu(nextPage, client);
-            await interaction.editReply({ embeds, components });
-        } catch (error) {
-            if (error?.code === 40060 || error?.code === 10062) {
-                logger.warn('Help pagination interaction already acknowledged or expired.', {
-                    event: 'interaction.help.pagination.unavailable',
-                    errorCode: String(error.code),
-                    customId: interaction.customId,
-                    interactionId: interaction.id,
-                });
-                return;
-            }
-
-            throw error;
-        }
-    },
-};
-
-

From f22c3a45696857ac59b8efee97f700eb2de2f44d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:31:28 +0700
Subject: [PATCH 32/97] Refactor help menu and update bot details

Updated help menu to reflect new bot name and description. Removed unused buttons and added new footer text.
---
 src/commands/Core/help.js | 130 +++++++-------------------------------
 1 file changed, 22 insertions(+), 108 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 4ad58be10..8c64b8224 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -1,4 +1,4 @@
-import {
+import {
     SlashCommandBuilder,
     ActionRowBuilder,
     ButtonBuilder,
@@ -40,10 +40,6 @@ const CATEGORY_ICONS = {
     Config: "⚙️",
 };
 
-
-
-
-
 export async function createInitialHelpMenu(client) {
     const commandsPath = path.join(__dirname, "../../commands");
     const categoryDirs = (
@@ -72,110 +68,38 @@ export async function createInitialHelpMenu(client) {
         }),
     ];
 
-    const botName = client?.user?.username || "Bot";
+    const botName = client?.user?.username || "Starlight Security";
     const embed = createEmbed({ 
         title: `🤖 ${botName} Help Center`,
-        description: "Your all-in-one Discord companion for moderation, economy, fun, and server management.",
+        description: "Welcome to Starlight Security! Your all-in-one companion for server protection and management.",
         color: 'primary'
     });
 
     embed.addFields(
-        {
-            name: "🛡️ **Moderation**",
-            value: "Server moderation, user management, and enforcement tools",
-            inline: true
-        },
-        {
-            name: "💰 **Economy**",
-            value: "Currency system, shops, and virtual economy",
-            inline: true
-        },
-        {
-            name: "🎮 **Fun**",
-            value: "Games, entertainment, and interactive commands",
-            inline: true
-        },
-        {
-            name: "📊 **Leveling**",
-            value: "User levels, XP system, and progression tracking",
-            inline: true
-        },
-        {
-            name: "🎫 **Tickets**",
-            value: "Support ticket system for server management",
-            inline: true
-        },
-        {
-            name: "🎉 **Giveaways**",
-            value: "Automated giveaway management and distribution",
-            inline: true
-        },
-        {
-            name: "👋 **Welcome**",
-            value: "Member welcome messages and onboarding",
-            inline: true
-        },
-        {
-            name: "🎂 **Birthdays**",
-            value: "Birthday tracking and celebration features",
-            inline: true
-        },
-        {
-            name: "👥 **Community**",
-            value: "Community tools, applications, and member engagement",
-            inline: true
-        },
-        {
-            name: "⚙️ **Config**",
-            value: "Server and bot configuration management commands",
-            inline: true
-        },
-        {
-            name: "🔢 **Counter**",
-            value: "Live counter channel setup and counter controls",
-            inline: true
-        },
-        {
-            name: "🎙️ **Join to Create**",
-            value: "Dynamic voice channel creation and management",
-            inline: true
-        },
-        {
-            name: "🎭 **Reaction Roles**",
-            value: "Self-assignable roles using reaction-role systems",
-            inline: true
-        },
-        {
-            name: "✅ **Verification**",
-            value: "Member verification workflows and access gating",
-            inline: true
-        },
-        {
-            name: "🔧 **Utilities**",
-            value: "Useful tools and server utilities",
-            inline: true
-        }
+        { name: "🛡️ **Moderation**", value: "Server moderation, user management, and enforcement tools", inline: true },
+        { name: "💰 **Economy**", value: "Currency system, shops, and virtual economy", inline: true },
+        { name: "🎮 **Fun**", value: "Games, entertainment, and interactive commands", inline: true },
+        { name: "📊 **Leveling**", value: "User levels, XP system, and progression tracking", inline: true },
+        { name: "🎫 **Tickets**", value: "Support ticket system for server management", inline: true },
+        { name: "🎉 **Giveaways**", value: "Automated giveaway management and distribution", inline: true },
+        { name: "👋 **Welcome**", value: "Member welcome messages and onboarding", inline: true },
+        { name: "🎂 **Birthdays**", value: "Birthday tracking and celebration features", inline: true },
+        { name: "👥 **Community**", value: "Community tools, applications, and member engagement", inline: true },
+        { name: "⚙️ **Config**", value: "Server and bot configuration management commands", inline: true },
+        { name: "🔢 **Counter**", value: "Live counter channel setup and counter controls", inline: true },
+        { name: "🎙️ **Join to Create**", value: "Dynamic voice channel creation and management", inline: true },
+        { name: "🎭 **Reaction Roles**", value: "Self-assignable roles using reaction-role systems", inline: true },
+        { name: "✅ **Verification**", value: "Member verification workflows and access gating", inline: true },
+        { name: "🔧 **Utilities**", value: "Useful tools and server utilities", inline: true }
     );
 
-    embed.setFooter({ 
-        text: "Made with ❤️" 
-    });
+    embed.setFooter({ text: "Starlight Security | Secured by Dev" });
     embed.setTimestamp();
 
     const bugReportButton = new ButtonBuilder()
         .setCustomId(BUG_REPORT_BUTTON_ID)
-        .setLabel("Report Bug")
-        .setStyle(ButtonStyle.Danger);
-
-    const supportButton = new ButtonBuilder()
-        .setLabel("Support Server")
-        .setURL("https://discord.gg/QnWNz2dKCE")
-        .setStyle(ButtonStyle.Link);
-
-    const touchpointButton = new ButtonBuilder()
-        .setLabel("Learn from Touchpoint")
-        .setURL("https://www.youtube.com/@TouchDisc")
-        .setStyle(ButtonStyle.Link);
+        .setLabel("Contact Developer")
+        .setStyle(ButtonStyle.Primary);
 
     const selectRow = createSelectMenu(
         CATEGORY_SELECT_ID,
@@ -185,8 +109,6 @@ export async function createInitialHelpMenu(client) {
 
     const buttonRow = new ActionRowBuilder().addComponents([
         bugReportButton,
-        supportButton,
-        touchpointButton,
     ]);
 
     return {
@@ -201,10 +123,7 @@ export default {
         .setDescription("Displays the help menu with all available commands"),
 
     async execute(interaction, guildConfig, client) {
-        
-        const { MessageFlags } = await import('discord.js');
         await InteractionHelper.safeDefer(interaction);
-        
         const { embeds, components } = await createInitialHelpMenu(client);
 
         await InteractionHelper.safeEditReply(interaction, {
@@ -219,16 +138,11 @@ export default {
                     description: "Help menu has been closed, use /help again.",
                     color: "secondary",
                 });
-
                 await InteractionHelper.safeEditReply(interaction, {
                     embeds: [closedEmbed],
                     components: [],
                 });
-            } catch (error) {
-                
-            }
+            } catch (error) {}
         }, HELP_MENU_TIMEOUT_MS);
     },
 };
-
-

From 7fa16e8877613d4d3cb9de6b42081bf69152ff7f Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:41:43 +0700
Subject: [PATCH 33/97] Improve bug report button interaction handling

Refactor interaction reply handling for bug report button.
---
 src/handlers/helpButtons.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/handlers/helpButtons.js b/src/handlers/helpButtons.js
index c5d72044d..4ef8396f1 100644
--- a/src/handlers/helpButtons.js
+++ b/src/handlers/helpButtons.js
@@ -1,13 +1,15 @@
 export const helpBugReportButton = {
     name: BUG_REPORT_BUTTON_ID,
     async execute(interaction, client) {
+        // 1. Tạo nút Link (chỉ dùng để mở link)
         const contactButton = new ButtonBuilder()
             .setLabel('💬 Contact Developer')
             .setStyle(ButtonStyle.Link)
-            .setURL('https://discord.com/users/1198136184526864475'); 
+            .setURL('https://discord.com/users/1198136184526864475');
 
         const bugRow = new ActionRowBuilder().addComponents(contactButton);
 
+        // 2. Tạo Embed thông báo
         const bugReportEmbed = createEmbed({
             title: '🐞 Report Bug / Contact',
             description: 'Found a bug or have a suggestion? Please contact the developer directly!\n\n' +
@@ -25,10 +27,24 @@ export const helpBugReportButton = {
         });
         bugReportEmbed.setTimestamp();
 
-        await interaction.reply({
-            embeds: [bugReportEmbed],
-            components: [bugRow],
-            flags: MessageFlags.Ephemeral
-        });
+        // 3. Phản hồi an toàn
+        // Sử dụng followUp nếu interaction đã được xử lý (acknowledged)
+        try {
+            if (interaction.replied || interaction.deferred) {
+                await interaction.followUp({
+                    embeds: [bugReportEmbed],
+                    components: [bugRow],
+                    flags: MessageFlags.Ephemeral
+                });
+            } else {
+                await interaction.reply({
+                    embeds: [bugReportEmbed],
+                    components: [bugRow],
+                    flags: MessageFlags.Ephemeral
+                });
+            }
+        } catch (error) {
+            console.error('Interaction error:', error);
+        }
     },
 };

From 9fe2c69e8fab468582bcfcbb2f957f2654bce079 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:45:49 +0700
Subject: [PATCH 34/97] Refactor helpButtons.js to include help menu

---
 src/handlers/helpButtons.js | 100 +++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/handlers/helpButtons.js b/src/handlers/helpButtons.js
index 4ef8396f1..7e6bcbb5c 100644
--- a/src/handlers/helpButtons.js
+++ b/src/handlers/helpButtons.js
@@ -1,50 +1,54 @@
-export const helpBugReportButton = {
-    name: BUG_REPORT_BUTTON_ID,
-    async execute(interaction, client) {
-        // 1. Tạo nút Link (chỉ dùng để mở link)
-        const contactButton = new ButtonBuilder()
-            .setLabel('💬 Contact Developer')
-            .setStyle(ButtonStyle.Link)
-            .setURL('https://discord.com/users/1198136184526864475');
-
-        const bugRow = new ActionRowBuilder().addComponents(contactButton);
-
-        // 2. Tạo Embed thông báo
-        const bugReportEmbed = createEmbed({
-            title: '🐞 Report Bug / Contact',
-            description: 'Found a bug or have a suggestion? Please contact the developer directly!\n\n' +
-                '**When reporting, please include:**\n' +
-                '• 📝 Detailed description of the issue\n' +
-                '• 📋 Steps to reproduce the problem\n' +
-                '• 📸 Screenshots if applicable\n\n' +
-                'I will get back to you as soon as possible!',
-            color: 'primary'
-        });
-        
-        bugReportEmbed.setFooter({
-            text: 'Starlight Security System',
-            iconURL: client.user.displayAvatarURL()
-        });
-        bugReportEmbed.setTimestamp();
-
-        // 3. Phản hồi an toàn
-        // Sử dụng followUp nếu interaction đã được xử lý (acknowledged)
-        try {
-            if (interaction.replied || interaction.deferred) {
-                await interaction.followUp({
-                    embeds: [bugReportEmbed],
-                    components: [bugRow],
-                    flags: MessageFlags.Ephemeral
-                });
-            } else {
-                await interaction.reply({
-                    embeds: [bugReportEmbed],
-                    components: [bugRow],
-                    flags: MessageFlags.Ephemeral
-                });
-            }
-        } catch (error) {
-            console.error('Interaction error:', error);
-        }
+import { SlashCommandBuilder, ActionRowBuilder } from "discord.js";
+import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { createEmbed } from "../../utils/embeds.js";
+import { createSelectMenu } from "../../utils/components.js";
+import fs from "fs/promises";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const CATEGORY_SELECT_ID = "help-category-select";
+const ALL_COMMANDS_ID = "help-all-commands";
+
+export async function createInitialHelpMenu(client) {
+    const commandsPath = path.join(__dirname, "../../commands");
+    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name)
+        .sort();
+
+    const options = [{ label: "📋 All Commands", description: "View all commands", value: ALL_COMMANDS_ID },
+        ...categoryDirs.map((category) => ({
+            label: `📁 ${category.charAt(0).toUpperCase() + category.slice(1)}`,
+            description: `View ${category} commands`,
+            value: category
+        }))
+    ];
+
+    const embed = createEmbed({ 
+        title: `🤖 Starlight Security`,
+        description: "Welcome! Use the menu below to navigate through my commands.",
+        color: 'primary'
+    });
+
+    embed.setFooter({ text: "Starlight Security | Secure & Professional" });
+    embed.setTimestamp();
+
+    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select a category to view commands", options);
+
+    return {
+        embeds: [embed],
+        components: [selectRow], // Chỉ để lại select menu, xóa bỏ buttonRow
+    };
+}
+
+export default {
+    data: new SlashCommandBuilder().setName("help").setDescription("Displays the help menu"),
+    async execute(interaction, guildConfig, client) {
+        await InteractionHelper.safeDefer(interaction);
+        const { embeds, components } = await createInitialHelpMenu(client);
+        await InteractionHelper.safeEditReply(interaction, { embeds, components });
     },
 };

From ad71adcdad9d7bec8a50874c667430cbcbc3b93d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 19:53:32 +0700
Subject: [PATCH 35/97] Delete src/interactions/buttons/help.js

---
 src/interactions/buttons/help.js | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 src/interactions/buttons/help.js

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
deleted file mode 100644
index 9e7a01126..000000000
--- a/src/interactions/buttons/help.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import {
-  helpBackButton,
-  helpBugReportButton,
-  helpPaginationButton,
-} from '../../handlers/helpButtons.js';
-
-const paginationIds = [
-  'help-page_first',
-  'help-page_prev',
-  'help-page_next',
-  'help-page_last',
-];
-
-const paginationInteractions = paginationIds.map((name) => ({
-  name,
-  execute: helpPaginationButton.execute,
-}));
-
-export default [helpBackButton, helpBugReportButton, ...paginationInteractions];
\ No newline at end of file

From de76233316846ee5c2f49d741916e12bb655e8d5 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:14:17 +0700
Subject: [PATCH 36/97] Implement quarantine command for moderation

Adds a quarantine command to remove all roles from a user.
---
 src/commands/Moderation/quarantine.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/commands/Moderation/quarantine.js

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
new file mode 100644
index 000000000..817532d7f
--- /dev/null
+++ b/src/commands/Moderation/quarantine.js
@@ -0,0 +1,16 @@
+import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+
+export default {
+    data: new SlashCommandBuilder()
+        .setName('quarantine')
+        .setDescription('Quarantine a member')
+        .addUserOption(option => option.setName('user').setDescription('The user to quarantine').setRequired(true)),
+    async execute(interaction) {
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
+            return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
+        }
+        const member = interaction.options.getMember('user');
+        await member.roles.set([]); // Cách ly bằng cách xóa sạch role
+        await interaction.reply(`User ${member.user.tag} has been quarantined.`);
+    }
+};

From 045783d74e4ddc17a49e1f773f6a30eb462c4af6 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:20:33 +0700
Subject: [PATCH 37/97] Enhance quarantine command with role management

---
 src/commands/Moderation/quarantine.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 817532d7f..4d988ae9e 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -3,14 +3,33 @@ import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
-        .setDescription('Quarantine a member')
+        .setDescription('Quarantine a member by removing all roles and adding Quarantine role')
         .addUserOption(option => option.setName('user').setDescription('The user to quarantine').setRequired(true)),
+    
     async execute(interaction) {
+        // Kiểm tra quyền (Check permissions)
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
             return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
         }
+
         const member = interaction.options.getMember('user');
-        await member.roles.set([]); // Cách ly bằng cách xóa sạch role
-        await interaction.reply(`User ${member.user.tag} has been quarantined.`);
+        const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
+        
+        if (!quarantineRole) {
+            return interaction.reply({ content: 'Quarantine role not found! Please run /setup-quarantine first.', ephemeral: true });
+        }
+
+        try {
+            // 1. Xóa sạch mọi role hiện tại (Remove all existing roles)
+            await member.roles.set([]); 
+            
+            // 2. Thêm role Quarantine (Add Quarantine role)
+            await member.roles.add(quarantineRole);
+            
+            await interaction.reply({ content: `User ${member.user.tag} has been quarantined and all roles removed.`, ephemeral: true });
+        } catch (error) {
+            console.error(error);
+            await interaction.reply({ content: 'Failed to quarantine the user. Make sure the bot has higher role permissions.', ephemeral: true });
+        }
     }
 };

From e50cadad00fb51954bf59de52310a6541fbe0fd1 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:21:25 +0700
Subject: [PATCH 38/97] Add setup command for Quarantine role

---
 src/commands/Moderation/quarantinesetup.js | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/commands/Moderation/quarantinesetup.js

diff --git a/src/commands/Moderation/quarantinesetup.js b/src/commands/Moderation/quarantinesetup.js
new file mode 100644
index 000000000..e82f34b24
--- /dev/null
+++ b/src/commands/Moderation/quarantinesetup.js
@@ -0,0 +1,26 @@
+// src/commands/Moderation/setup-quarantine.js
+import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+
+export default {
+    data: new SlashCommandBuilder()
+        .setName('setup-quarantine')
+        .setDescription('Create and setup the Quarantine role'),
+    
+    async execute(interaction) {
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
+            return interaction.reply({ content: 'You need Administrator permissions!', ephemeral: true });
+        }
+
+        const role = await interaction.guild.roles.create({
+            name: 'Quarantine',
+            color: '#000000',
+            reason: 'Automated setup for Quarantine system'
+        });
+
+        interaction.guild.channels.cache.forEach(channel => {
+            channel.permissionOverwrites.create(role, { ViewChannel: false }).catch(console.error);
+        });
+
+        await interaction.reply(`Quarantine role created and channels secured. Role ID: ${role.id}`);
+    }
+};

From 704caf4a69ff90a3e6e2696859fd052fb3231757 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:25:19 +0700
Subject: [PATCH 39/97] Add unquarantine command for moderation

---
 src/commands/Moderation/unquarantine.js | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/commands/Moderation/unquarantine.js

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
new file mode 100644
index 000000000..8ea6b9dc0
--- /dev/null
+++ b/src/commands/Moderation/unquarantine.js
@@ -0,0 +1,30 @@
+import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+
+export default {
+    data: new SlashCommandBuilder()
+        .setName('unquarantine')
+        .setDescription('Remove quarantine role from a member')
+        .addUserOption(option => option.setName('user').setDescription('The user to unquarantine').setRequired(true)),
+    
+    async execute(interaction) {
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
+            return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
+        }
+
+        const member = interaction.options.getMember('user');
+        const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
+        
+        if (!quarantineRole) {
+            return interaction.reply({ content: 'Quarantine role not found!', ephemeral: true });
+        }
+
+        try {
+            // Remove the Quarantine role
+            await member.roles.remove(quarantineRole);
+            await interaction.reply({ content: `User ${member.user.tag} has been unquarantined.`, ephemeral: true });
+        } catch (error) {
+            console.error(error);
+            await interaction.reply({ content: 'Failed to unquarantine the user.', ephemeral: true });
+        }
+    }
+};

From 23ea09fa2632ac3a80295770a83bb13825cadcc4 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:41:55 +0700
Subject: [PATCH 40/97] Modify quarantine command to save roles before removal

Updated quarantine command to save user roles in the database before removing them.
---
 src/commands/Moderation/quarantine.js | 28 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 4d988ae9e..6102b8d61 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,13 +1,13 @@
 import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+import { pool } from '../../config/db.js'; // Ensure this path matches your project
 
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
-        .setDescription('Quarantine a member by removing all roles and adding Quarantine role')
+        .setDescription('Quarantine a member and save their roles')
         .addUserOption(option => option.setName('user').setDescription('The user to quarantine').setRequired(true)),
     
     async execute(interaction) {
-        // Kiểm tra quyền (Check permissions)
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
             return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
         }
@@ -16,20 +16,26 @@ export default {
         const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
         
         if (!quarantineRole) {
-            return interaction.reply({ content: 'Quarantine role not found! Please run /setup-quarantine first.', ephemeral: true });
+            return interaction.reply({ content: 'Quarantine role not found!', ephemeral: true });
         }
 
+        // Filter out @everyone and the quarantine role itself
+        const currentRoles = member.roles.cache
+            .filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id)
+            .map(r => r.id);
+
         try {
-            // 1. Xóa sạch mọi role hiện tại (Remove all existing roles)
-            await member.roles.set([]); 
-            
-            // 2. Thêm role Quarantine (Add Quarantine role)
-            await member.roles.add(quarantineRole);
-            
-            await interaction.reply({ content: `User ${member.user.tag} has been quarantined and all roles removed.`, ephemeral: true });
+            // Save roles to PostgreSQL
+            await pool.query(
+                'INSERT INTO user_roles (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
+                [member.id, currentRoles]
+            );
+
+            await member.roles.set([quarantineRole.id]);
+            await interaction.reply({ content: `Successfully quarantined ${member.user.tag}. Roles saved.`, ephemeral: true });
         } catch (error) {
             console.error(error);
-            await interaction.reply({ content: 'Failed to quarantine the user. Make sure the bot has higher role permissions.', ephemeral: true });
+            await interaction.reply({ content: 'An error occurred while saving roles.', ephemeral: true });
         }
     }
 };

From 5d0c488af5bf0ca7620406cb20edcc1443f9bc9a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:42:23 +0700
Subject: [PATCH 41/97] Enhance unquarantine command to restore user roles

---
 src/commands/Moderation/unquarantine.js | 33 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index 8ea6b9dc0..5306fd48b 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -1,30 +1,33 @@
 import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+import { pool } from '../../config/db.js';
 
 export default {
     data: new SlashCommandBuilder()
         .setName('unquarantine')
-        .setDescription('Remove quarantine role from a member')
+        .setDescription('Remove quarantine and restore user roles')
         .addUserOption(option => option.setName('user').setDescription('The user to unquarantine').setRequired(true)),
     
     async execute(interaction) {
-        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
-            return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
-        }
-
-        const member = interaction.options.getMember('user');
-        const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
+        const target = interaction.options.getMember('user');
         
-        if (!quarantineRole) {
-            return interaction.reply({ content: 'Quarantine role not found!', ephemeral: true });
-        }
-
         try {
-            // Remove the Quarantine role
-            await member.roles.remove(quarantineRole);
-            await interaction.reply({ content: `User ${member.user.tag} has been unquarantined.`, ephemeral: true });
+            // Retrieve roles from PostgreSQL
+            const res = await pool.query('SELECT roles FROM user_roles WHERE user_id = $1', [target.id]);
+
+            if (res.rows.length === 0) {
+                return interaction.reply({ content: 'No saved roles found for this user.', ephemeral: true });
+            }
+
+            const oldRoles = res.rows[0].roles;
+
+            // Restore roles and remove quarantine role
+            await target.roles.set(oldRoles);
+            await pool.query('DELETE FROM user_roles WHERE user_id = $1', [target.id]);
+
+            await interaction.reply({ content: `Successfully restored roles for ${target.user.tag}.`, ephemeral: true });
         } catch (error) {
             console.error(error);
-            await interaction.reply({ content: 'Failed to unquarantine the user.', ephemeral: true });
+            await interaction.reply({ content: 'An error occurred while restoring roles.', ephemeral: true });
         }
     }
 };

From e95a266ba5b051d88de19f0dd8f92f3facce2534 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:57:01 +0700
Subject: [PATCH 42/97] Add delete_table.js to drop 'role-save' table

---
 src/commands/Utility/delete_table.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/commands/Utility/delete_table.js

diff --git a/src/commands/Utility/delete_table.js b/src/commands/Utility/delete_table.js
new file mode 100644
index 000000000..4a6e4d06f
--- /dev/null
+++ b/src/commands/Utility/delete_table.js
@@ -0,0 +1,15 @@
+// file: delete_table.js
+import { pool } from './src/config/db.js'; // Trỏ đúng đường dẫn đến file config db của bạn
+
+async function dropTable() {
+    try {
+        await pool.query('DROP TABLE IF EXISTS "role-save" CASCADE');
+        console.log("Đã xóa bảng 'role-save' thành công!");
+        process.exit(0);
+    } catch (err) {
+        console.error("Lỗi khi xóa bảng:", err);
+        process.exit(1);
+    }
+}
+
+dropTable();

From d5e13cdbb742d3fb5e1bce785927d21b20ab6b64 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 20:59:13 +0700
Subject: [PATCH 43/97] Update quarantine command to use JSON for roles

---
 src/commands/Moderation/quarantine.js | 47 ++++++++++++---------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 6102b8d61..ceaf4b16a 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,41 +1,34 @@
 import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
-import { pool } from '../../config/db.js'; // Ensure this path matches your project
+import fs from 'fs';
+
+const DB_PATH = './quarantine_data.json';
+
+// Hàm đọc dữ liệu từ file
+const loadData = () => {
+    if (!fs.existsSync(DB_PATH)) return {};
+    return JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
+};
 
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
-        .setDescription('Quarantine a member and save their roles')
-        .addUserOption(option => option.setName('user').setDescription('The user to quarantine').setRequired(true)),
+        .setDescription('Quarantine một thành viên')
+        .addUserOption(option => option.setName('user').setDescription('Thành viên cần quarantine').setRequired(true)),
     
     async execute(interaction) {
-        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
-            return interaction.reply({ content: 'Missing permissions!', ephemeral: true });
-        }
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) return;
 
         const member = interaction.options.getMember('user');
         const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
         
-        if (!quarantineRole) {
-            return interaction.reply({ content: 'Quarantine role not found!', ephemeral: true });
-        }
-
-        // Filter out @everyone and the quarantine role itself
-        const currentRoles = member.roles.cache
-            .filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id)
-            .map(r => r.id);
-
-        try {
-            // Save roles to PostgreSQL
-            await pool.query(
-                'INSERT INTO user_roles (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
-                [member.id, currentRoles]
-            );
+        // Lưu role cũ vào object
+        const data = loadData();
+        data[member.id] = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
+        
+        // Ghi lại vào file json
+        fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 
-            await member.roles.set([quarantineRole.id]);
-            await interaction.reply({ content: `Successfully quarantined ${member.user.tag}. Roles saved.`, ephemeral: true });
-        } catch (error) {
-            console.error(error);
-            await interaction.reply({ content: 'An error occurred while saving roles.', ephemeral: true });
-        }
+        await member.roles.set([quarantineRole.id]);
+        await interaction.reply({ content: `Đã quarantine ${member.user.tag}.`, ephemeral: true });
     }
 };

From ab0d8109dfedc4111f457eaf234ad53bacdf6e40 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 21:02:17 +0700
Subject: [PATCH 44/97] Update unquarantine.js

---
 src/commands/Moderation/unquarantine.js | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index 5306fd48b..6b4aaed0b 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -1,33 +1,29 @@
-import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
-import { pool } from '../../config/db.js';
+import { SlashCommandBuilder } from 'discord.js';
+import fs from 'fs';
+
+const DB_PATH = './quarantine_data.json';
 
 export default {
     data: new SlashCommandBuilder()
         .setName('unquarantine')
-        .setDescription('Remove quarantine and restore user roles')
-        .addUserOption(option => option.setName('user').setDescription('The user to unquarantine').setRequired(true)),
+        .setDescription('remove quarantine role and give back previous role')
+        .addUserOption(option => option.setName('user').setDescription('quarantine member').setRequired(true)),
     
     async execute(interaction) {
         const target = interaction.options.getMember('user');
-        
-        try {
-            // Retrieve roles from PostgreSQL
-            const res = await pool.query('SELECT roles FROM user_roles WHERE user_id = $1', [target.id]);
+        const data = JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
 
-            if (res.rows.length === 0) {
-                return interaction.reply({ content: 'No saved roles found for this user.', ephemeral: true });
-            }
+        if (!data[target.id]) {
+            return interaction.reply({ content: 'cant find this person previous role.', ephemeral: true });
+        }
 
-            const oldRoles = res.rows[0].roles;
+        const oldRoles = data[target.id];
+        await target.roles.set(oldRoles);
 
-            // Restore roles and remove quarantine role
-            await target.roles.set(oldRoles);
-            await pool.query('DELETE FROM user_roles WHERE user_id = $1', [target.id]);
+        // Xóa dữ liệu sau khi trả role
+        delete data[target.id];
+        fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 
-            await interaction.reply({ content: `Successfully restored roles for ${target.user.tag}.`, ephemeral: true });
-        } catch (error) {
-            console.error(error);
-            await interaction.reply({ content: 'An error occurred while restoring roles.', ephemeral: true });
-        }
+        await interaction.reply({ content: `unquarantine success ${target.user.tag}.`, ephemeral: true });
     }
 };

From bccfb6c83301dfd8891d98b561899b4b10676b14 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Mon, 25 May 2026 21:03:33 +0700
Subject: [PATCH 45/97] Update quarantine command descriptions and replies

---
 src/commands/Moderation/quarantine.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index ceaf4b16a..e078db4cf 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -12,8 +12,8 @@ const loadData = () => {
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
-        .setDescription('Quarantine một thành viên')
-        .addUserOption(option => option.setName('user').setDescription('Thành viên cần quarantine').setRequired(true)),
+        .setDescription('Quarantine a member')
+        .addUserOption(option => option.setName('user').setDescription('member need to quarantine').setRequired(true)),
     
     async execute(interaction) {
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) return;
@@ -29,6 +29,6 @@ export default {
         fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 
         await member.roles.set([quarantineRole.id]);
-        await interaction.reply({ content: `Đã quarantine ${member.user.tag}.`, ephemeral: true });
+        await interaction.reply({ content: `success quarantine ${member.user.tag}.`, ephemeral: true });
     }
 };

From fd6074ac6589b4e1e89034033ee9b1709d914d9d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:12:11 +0700
Subject: [PATCH 46/97] Add command alias mapping in aliases.js

---
 src/config/aliases.js | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/config/aliases.js

diff --git a/src/config/aliases.js b/src/config/aliases.js
new file mode 100644
index 000000000..e8fe59754
--- /dev/null
+++ b/src/config/aliases.js
@@ -0,0 +1,7 @@
+// File: config/aliases.js
+export const COMMAND_MAP = {
+    "cf": "coinflip",
+    "q": "quarantine",
+    "uq": "unquarantine",
+    // Add more aliases here as you wish
+};

From bccd9275308c10d80206da671b9d42408090a4ec Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:13:02 +0700
Subject: [PATCH 47/97] Refactor command handling to use commandLoader

---
 src/events/messageCreate.js | 84 +++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 428c20863..a7663a007 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,64 +1,58 @@
-import { Events, PermissionsBitField } from 'discord.js';
+import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
+import { COMMAND_MAP } from '../../config/aliases.js';
 
 export default {
     name: Events.MessageCreate,
     async execute(message, client) {
+        // Configuration
         const PREFIX = "nh!";
+        
+        // Validation
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
+        // Parse command and arguments
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // --- COMMANDS LIST ---
-        const commandsList = {
-            // Utility Commands
-            'ping': (msg) => msg.reply('Pong! 🏓'),
-            'info': (msg) => msg.reply('Bot Starlight Security is online! 🚀'),
-            'uptime': (msg) => {
-                const up = process.uptime();
-                msg.reply(`Uptime: ${Math.floor(up/86400)}d ${Math.floor(up/3600)%24}h ${Math.floor(up/60)%60}m`);
-            },
+        // 1. Resolve alias or use direct command name
+        const realCommandName = COMMAND_MAP[commandName] || commandName;
+        
+        // 2. Try to find the command in the collection loaded by commandLoader
+        const command = client.commands.get(realCommandName);
 
-            // Security Commands (Admin only)
-            'lock': async (msg) => {
-                if (!msg.member.permissions.has(PermissionsBitField.Flags.ManageChannels)) return msg.reply('Missing permissions!');
-                await msg.channel.permissionOverwrites.edit(msg.guild.id, { SendMessages: false });
-                msg.reply('Channel locked 🔒');
-            },
-            'unlock': async (msg) => {
-                if (!msg.member.permissions.has(PermissionsBitField.Flags.ManageChannels)) return msg.reply('Missing permissions!');
-                await msg.channel.permissionOverwrites.edit(msg.guild.id, { SendMessages: true });
-                msg.reply('Channel unlocked 🔓');
-            },
-            'kick': async (msg) => {
-                if (!msg.member.permissions.has(PermissionsBitField.Flags.KickMembers)) return msg.reply('Missing permissions!');
-                const member = msg.mentions.members.first();
-                if (!member) return msg.reply('Mention a member to kick!');
-                await member.kick().catch(e => msg.reply('Failed to kick.'));
-                msg.reply(`Kicked ${member.user.tag}`);
-            },
-            'ban': async (msg) => {
-                if (!msg.member.permissions.has(PermissionsBitField.Flags.BanMembers)) return msg.reply('Missing permissions!');
-                const member = msg.mentions.members.first();
-                if (!member) return msg.reply('Mention a member to ban!');
-                await member.ban().catch(e => msg.reply('Failed to ban.'));
-                msg.reply(`Banned ${member.user.tag}`);
-            },
+        if (command) {
+            // 3. Create a "Fake Interaction" object to bridge Message to Interaction
+            // This allows the existing code (designed for Slash) to run with Prefix
+            const fakeInteraction = {
+                member: message.member,
+                guild: message.guild,
+                channel: message.channel,
+                user: message.author,
+                // Mocking interaction methods
+                reply: (content) => message.reply(content),
+                editReply: (content) => message.channel.send(content), // Simplified
+                deferReply: async () => {}, // No-op for prefix
+                // Mocking options access
+                options: {
+                    getMember: (name) => message.mentions.members.first() || message.member,
+                    getString: (name) => args.join(' '),
+                    getUser: (name) => message.mentions.users.first(),
+                    getChannel: (name) => message.mentions.channels.first()
+                }
+            };
 
-            'help': (msg) => {
-                msg.reply('**Available nh! commands:**\n- `ping`, `info`, `uptime`\n- `lock`, `unlock` (Channel)\n- `kick`, `ban` (@user)');
-            }
-        };
-
-        // --- EXECUTION ---
-        if (commandsList[commandName]) {
             try {
-                await commandsList[commandName](message, args);
+                // Execute the command using the fake interaction
+                await command.execute(fakeInteraction);
             } catch (error) {
-                logger.error(`Error executing ${commandName}:`, error);
-                message.reply('An error occurred.');
+                logger.error(`Error executing ${realCommandName} via prefix:`, error);
+                message.reply('An error occurred while executing this command.');
             }
+            return;
         }
+
+        // Optional: Keep your legacy "non-slash" commands here if needed
+        // e.g., if you have hardcoded commands that aren't in the Command Loader
     }
 };

From f5f87fb05c714873e902682caf2126f4685ab82e Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:23:29 +0700
Subject: [PATCH 48/97] Refactor message handling to remove alias support

---
 src/events/messageCreate.js | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index a7663a007..9183efe95 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,39 +1,31 @@
 import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
-import { COMMAND_MAP } from '../../config/aliases.js';
 
 export default {
     name: Events.MessageCreate,
     async execute(message, client) {
-        // Configuration
         const PREFIX = "nh!";
-        
-        // Validation
+
+        // Ignore messages that don't start with prefix, are from bots, or are not in a guild
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-        // Parse command and arguments
+        // Parse command name and arguments
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // 1. Resolve alias or use direct command name
-        const realCommandName = COMMAND_MAP[commandName] || commandName;
-        
-        // 2. Try to find the command in the collection loaded by commandLoader
-        const command = client.commands.get(realCommandName);
+        // Directly look up the command in the client.commands collection
+        // No aliases file needed; it matches the file name in your commands folder
+        const command = client.commands.get(commandName);
 
         if (command) {
-            // 3. Create a "Fake Interaction" object to bridge Message to Interaction
-            // This allows the existing code (designed for Slash) to run with Prefix
+            // Create a fake interaction object to bridge Prefix to Slash Command logic
             const fakeInteraction = {
                 member: message.member,
                 guild: message.guild,
                 channel: message.channel,
                 user: message.author,
-                // Mocking interaction methods
                 reply: (content) => message.reply(content),
-                editReply: (content) => message.channel.send(content), // Simplified
-                deferReply: async () => {}, // No-op for prefix
-                // Mocking options access
+                // Bridging options to support command arguments
                 options: {
                     getMember: (name) => message.mentions.members.first() || message.member,
                     getString: (name) => args.join(' '),
@@ -46,13 +38,9 @@ export default {
                 // Execute the command using the fake interaction
                 await command.execute(fakeInteraction);
             } catch (error) {
-                logger.error(`Error executing ${realCommandName} via prefix:`, error);
+                logger.error(`Error executing ${commandName} via prefix:`, error);
                 message.reply('An error occurred while executing this command.');
             }
-            return;
         }
-
-        // Optional: Keep your legacy "non-slash" commands here if needed
-        // e.g., if you have hardcoded commands that aren't in the Command Loader
     }
 };

From 4fb684616bdd90ff34d66e1ffcffbfb7ec3a51cb Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:25:54 +0700
Subject: [PATCH 49/97] Improve fake interaction for command execution

Enhanced the fake interaction object to prevent errors and added essential methods for better command handling.
---
 src/events/messageCreate.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 9183efe95..5e7ef55c7 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -6,40 +6,46 @@ export default {
     async execute(message, client) {
         const PREFIX = "nh!";
 
-        // Ignore messages that don't start with prefix, are from bots, or are not in a guild
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-        // Parse command name and arguments
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
 
-        // Directly look up the command in the client.commands collection
-        // No aliases file needed; it matches the file name in your commands folder
         const command = client.commands.get(commandName);
 
         if (command) {
-            // Create a fake interaction object to bridge Prefix to Slash Command logic
+            // Enhanced fakeInteraction to prevent errors with missing methods
             const fakeInteraction = {
                 member: message.member,
                 guild: message.guild,
                 channel: message.channel,
                 user: message.author,
-                reply: (content) => message.reply(content),
-                // Bridging options to support command arguments
+                
+                // Essential Slash Command methods
+                reply: async (content) => message.reply(content),
+                deferReply: async () => {}, // Prevents "deferReply is not a function" error
+                editReply: async (content) => message.channel.send(content),
+                followUp: async (content) => message.channel.send(content),
+                
+                // Properties often checked by commands
+                deferred: false,
+                replied: false,
+                
                 options: {
                     getMember: (name) => message.mentions.members.first() || message.member,
                     getString: (name) => args.join(' '),
                     getUser: (name) => message.mentions.users.first(),
-                    getChannel: (name) => message.mentions.channels.first()
+                    getChannel: (name) => message.mentions.channels.first(),
+                    getInteger: (name) => parseInt(args[0]) || 0
                 }
             };
 
             try {
-                // Execute the command using the fake interaction
                 await command.execute(fakeInteraction);
             } catch (error) {
-                logger.error(`Error executing ${commandName} via prefix:`, error);
-                message.reply('An error occurred while executing this command.');
+                // Log the SPECIFIC error to your terminal
+                logger.error(`Error executing ${commandName}:`, error);
+                message.reply('An error occurred. Check terminal for details.');
             }
         }
     }

From 288dbdc4624289ad62862820b33b0a1174d416c7 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:37:59 +0700
Subject: [PATCH 50/97] Improve unquarantine command messages and checks

---
 src/commands/Moderation/unquarantine.js | 32 ++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index 6b4aaed0b..26a914496 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -6,24 +6,40 @@ const DB_PATH = './quarantine_data.json';
 export default {
     data: new SlashCommandBuilder()
         .setName('unquarantine')
-        .setDescription('remove quarantine role and give back previous role')
-        .addUserOption(option => option.setName('user').setDescription('quarantine member').setRequired(true)),
+        .setDescription('Remove quarantine role and restore previous roles')
+        .addUserOption(option => option.setName('user').setDescription('Member to unquarantine').setRequired(true)),
     
     async execute(interaction) {
         const target = interaction.options.getMember('user');
+
+        // Safety check: Ensure target exists
+        if (!target) {
+            return interaction.reply({ content: 'Error: Could not find that member.', ephemeral: true });
+        }
+
+        if (!fs.existsSync(DB_PATH)) {
+            return interaction.reply({ content: 'No quarantine data file found.', ephemeral: true });
+        }
+
         const data = JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
 
         if (!data[target.id]) {
-            return interaction.reply({ content: 'cant find this person previous role.', ephemeral: true });
+            return interaction.reply({ content: 'This user is not currently in quarantine or has no saved roles.', ephemeral: true });
         }
 
         const oldRoles = data[target.id];
-        await target.roles.set(oldRoles);
+        
+        try {
+            await target.roles.set(oldRoles);
 
-        // Xóa dữ liệu sau khi trả role
-        delete data[target.id];
-        fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
+            // Remove data after restoring roles
+            delete data[target.id];
+            fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 
-        await interaction.reply({ content: `unquarantine success ${target.user.tag}.`, ephemeral: true });
+            await interaction.reply({ content: `Successfully unquarantined ${target.user.tag}.`, ephemeral: true });
+        } catch (error) {
+            console.error(error);
+            await interaction.reply({ content: 'Failed to restore roles. Check bot permissions.', ephemeral: true });
+        }
     }
 };

From 90f8c11b4c1c99393584ef25dd000c3381943462 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:38:33 +0700
Subject: [PATCH 51/97] Refactor quarantine command for improved error handling

---
 src/commands/Moderation/quarantine.js | 31 +++++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index e078db4cf..4d93e38eb 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -3,7 +3,6 @@ import fs from 'fs';
 
 const DB_PATH = './quarantine_data.json';
 
-// Hàm đọc dữ liệu từ file
 const loadData = () => {
     if (!fs.existsSync(DB_PATH)) return {};
     return JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
@@ -13,22 +12,40 @@ export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
         .setDescription('Quarantine a member')
-        .addUserOption(option => option.setName('user').setDescription('member need to quarantine').setRequired(true)),
+        .addUserOption(option => option.setName('user').setDescription('Member to quarantine').setRequired(true)),
     
     async execute(interaction) {
-        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) return;
+        // Permission check
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
+            return interaction.reply({ content: 'You do not have permission to use this command.', ephemeral: true });
+        }
 
         const member = interaction.options.getMember('user');
+        
+        // Safety check: Ensure member exists
+        if (!member) {
+            return interaction.reply({ content: 'Error: Could not find that member.', ephemeral: true });
+        }
+
         const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
         
-        // Lưu role cũ vào object
+        // Safety check: Ensure the role exists
+        if (!quarantineRole) {
+            return interaction.reply({ content: 'Error: Role "Quarantine" not found in this server.', ephemeral: true });
+        }
+        
+        // Save previous roles
         const data = loadData();
         data[member.id] = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
         
-        // Ghi lại vào file json
         fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 
-        await member.roles.set([quarantineRole.id]);
-        await interaction.reply({ content: `success quarantine ${member.user.tag}.`, ephemeral: true });
+        try {
+            await member.roles.set([quarantineRole.id]);
+            await interaction.reply({ content: `Successfully quarantined ${member.user.tag}.`, ephemeral: true });
+        } catch (error) {
+            console.error(error);
+            await interaction.reply({ content: 'Failed to apply roles. Check bot permissions or role hierarchy.', ephemeral: true });
+        }
     }
 };

From 2e62a2ca38baa38c233fec258fc9ba674634af6e Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 10:43:04 +0700
Subject: [PATCH 52/97] Enhance quarantine setup command functionality

Refactor quarantine setup command to create role with bot's top role position and improve error handling.
---
 src/commands/Moderation/quarantinesetup.js | 42 ++++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/commands/Moderation/quarantinesetup.js b/src/commands/Moderation/quarantinesetup.js
index e82f34b24..77022d678 100644
--- a/src/commands/Moderation/quarantinesetup.js
+++ b/src/commands/Moderation/quarantinesetup.js
@@ -1,5 +1,4 @@
-// src/commands/Moderation/setup-quarantine.js
-import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
+import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -7,20 +6,41 @@ export default {
         .setDescription('Create and setup the Quarantine role'),
     
     async execute(interaction) {
+        // Only allow administrators to run this
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
             return interaction.reply({ content: 'You need Administrator permissions!', ephemeral: true });
         }
 
-        const role = await interaction.guild.roles.create({
-            name: 'Quarantine',
-            color: '#000000',
-            reason: 'Automated setup for Quarantine system'
-        });
+        await interaction.deferReply({ ephemeral: true });
 
-        interaction.guild.channels.cache.forEach(channel => {
-            channel.permissionOverwrites.create(role, { ViewChannel: false }).catch(console.error);
-        });
+        try {
+            // Get bot's highest role position
+            const botMember = await interaction.guild.members.fetch(interaction.client.user.id);
+            const botTopRolePosition = botMember.roles.highest.position;
 
-        await interaction.reply(`Quarantine role created and channels secured. Role ID: ${role.id}`);
+            // Create the role
+            const role = await interaction.guild.roles.create({
+                name: 'Quarantine',
+                color: Colors.Red,
+                reason: 'Automated setup for Quarantine system',
+                position: botTopRolePosition - 1 // Place it below the bot's top role
+            });
+
+            // Iterate through channels and deny viewing permissions
+            const channels = interaction.guild.channels.cache;
+            for (const [channelId, channel] of channels) {
+                // Skip category channels if you want, or just apply to all
+                if (channel.permissionOverwrites) {
+                    await channel.permissionOverwrites.create(role, { 
+                        ViewChannel: false 
+                    }).catch(err => console.error(`Failed to update ${channel.name}:`, err));
+                }
+            }
+
+            await interaction.editReply(`Quarantine role created (Red) and channels secured. Role ID: ${role.id}`);
+        } catch (error) {
+            console.error(error);
+            await interaction.editReply('An error occurred while setting up the quarantine system.');
+        }
     }
 };

From 00e47d037a74d71eeb82ad2742c6401e7c38da57 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:01:40 +0700
Subject: [PATCH 53/97] Enhance quarantine command with DB integration

Refactor quarantine command to use database for role storage and improve error handling.
---
 src/commands/Moderation/quarantine.js | 62 +++++++++++++++------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 4d93e38eb..1e44ab61b 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,12 +1,21 @@
-import { SlashCommandBuilder, PermissionsBitField } from 'discord.js';
-import fs from 'fs';
+import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
+import db from '../../Utility/src/config/db.js'; // Điều chỉnh đường dẫn này đến file db.js của bạn
 
-const DB_PATH = './quarantine_data.json';
-
-const loadData = () => {
-    if (!fs.existsSync(DB_PATH)) return {};
-    return JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
-};
+async function ensureQuarantineRole(guild, botMember) {
+    let role = guild.roles.cache.find(r => r.name === 'Quarantine');
+    if (!role) {
+        role = await guild.roles.create({
+            name: 'Quarantine',
+            color: Colors.Red,
+            reason: 'Auto-created Quarantine role'
+        });
+    }
+    const botTopRolePosition = botMember.roles.highest.position;
+    if (role.position < botTopRolePosition - 1) {
+        await role.setPosition(botTopRolePosition - 1).catch(console.error);
+    }
+    return role;
+}
 
 export default {
     data: new SlashCommandBuilder()
@@ -15,37 +24,34 @@ export default {
         .addUserOption(option => option.setName('user').setDescription('Member to quarantine').setRequired(true)),
     
     async execute(interaction) {
-        // Permission check
+        // Fix for Interaction expired
+        await interaction.deferReply({ ephemeral: true });
+
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
-            return interaction.reply({ content: 'You do not have permission to use this command.', ephemeral: true });
+            return interaction.editReply({ content: 'You do not have permission.' });
         }
 
         const member = interaction.options.getMember('user');
-        
-        // Safety check: Ensure member exists
-        if (!member) {
-            return interaction.reply({ content: 'Error: Could not find that member.', ephemeral: true });
-        }
+        if (!member) return interaction.editReply({ content: 'Member not found.' });
 
-        const quarantineRole = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
-        
-        // Safety check: Ensure the role exists
-        if (!quarantineRole) {
-            return interaction.reply({ content: 'Error: Role "Quarantine" not found in this server.', ephemeral: true });
-        }
+        const botMember = await interaction.guild.members.fetch(interaction.client.user.id);
+        const quarantineRole = await ensureQuarantineRole(interaction.guild, botMember);
         
-        // Save previous roles
-        const data = loadData();
-        data[member.id] = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
+        // Save roles: Filter out @everyone and the quarantine role itself
+        const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
         
-        fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
-
         try {
+            // Save to DB
+            await db.query(
+                'INSERT INTO quarantine_data (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
+                [member.id, JSON.stringify(rolesToSave)]
+            );
+
             await member.roles.set([quarantineRole.id]);
-            await interaction.reply({ content: `Successfully quarantined ${member.user.tag}.`, ephemeral: true });
+            await interaction.editReply({ content: `Successfully quarantined ${member.user.tag}.` });
         } catch (error) {
             console.error(error);
-            await interaction.reply({ content: 'Failed to apply roles. Check bot permissions or role hierarchy.', ephemeral: true });
+            await interaction.editReply({ content: 'Failed to apply quarantine. Check role hierarchy.' });
         }
     }
 };

From 6a388c89a407717bd92c6f723af5d5278d9439f2 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:02:54 +0700
Subject: [PATCH 54/97] Ensure database table for quarantine data exists

Added a function to ensure the database table for quarantine data exists before executing the command.
---
 src/commands/Moderation/quarantine.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 1e44ab61b..bf7665368 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,5 +1,15 @@
 import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
-import db from '../../Utility/src/config/db.js'; // Điều chỉnh đường dẫn này đến file db.js của bạn
+import db from '../../Utility/src/config/db.js'; // Adjust this path to your db.js
+
+// Function to ensure table exists
+async function ensureDatabase() {
+    await db.query(`
+        CREATE TABLE IF NOT EXISTS quarantine_data (
+            user_id VARCHAR(20) PRIMARY KEY,
+            roles TEXT NOT NULL
+        )
+    `);
+}
 
 async function ensureQuarantineRole(guild, botMember) {
     let role = guild.roles.cache.find(r => r.name === 'Quarantine');
@@ -24,9 +34,15 @@ export default {
         .addUserOption(option => option.setName('user').setDescription('Member to quarantine').setRequired(true)),
     
     async execute(interaction) {
-        // Fix for Interaction expired
         await interaction.deferReply({ ephemeral: true });
 
+        // Ensure database table exists before proceeding
+        try {
+            await ensureDatabase();
+        } catch (err) {
+            console.error('Failed to init database table:', err);
+        }
+
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
             return interaction.editReply({ content: 'You do not have permission.' });
         }
@@ -37,11 +53,9 @@ export default {
         const botMember = await interaction.guild.members.fetch(interaction.client.user.id);
         const quarantineRole = await ensureQuarantineRole(interaction.guild, botMember);
         
-        // Save roles: Filter out @everyone and the quarantine role itself
         const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
         
         try {
-            // Save to DB
             await db.query(
                 'INSERT INTO quarantine_data (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
                 [member.id, JSON.stringify(rolesToSave)]

From c8fbca1e1c3007c40bec5a261dcdd4c5ee926773 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:03:46 +0700
Subject: [PATCH 55/97] Refactor unquarantine command to use database

---
 src/commands/Moderation/unquarantine.js | 48 +++++++++++--------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index 26a914496..ceb6cafa2 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -1,45 +1,39 @@
 import { SlashCommandBuilder } from 'discord.js';
-import fs from 'fs';
-
-const DB_PATH = './quarantine_data.json';
+import db from '../../Utility/src/config/db.js'; // Điều chỉnh đường dẫn này đến file db.js của bạn
 
 export default {
     data: new SlashCommandBuilder()
         .setName('unquarantine')
-        .setDescription('Remove quarantine role and restore previous roles')
+        .setDescription('Remove quarantine and restore roles')
         .addUserOption(option => option.setName('user').setDescription('Member to unquarantine').setRequired(true)),
     
     async execute(interaction) {
-        const target = interaction.options.getMember('user');
-
-        // Safety check: Ensure target exists
-        if (!target) {
-            return interaction.reply({ content: 'Error: Could not find that member.', ephemeral: true });
-        }
-
-        if (!fs.existsSync(DB_PATH)) {
-            return interaction.reply({ content: 'No quarantine data file found.', ephemeral: true });
-        }
-
-        const data = JSON.parse(fs.readFileSync(DB_PATH, 'utf-8'));
+        // Fix for Interaction expired
+        await interaction.deferReply({ ephemeral: true });
 
-        if (!data[target.id]) {
-            return interaction.reply({ content: 'This user is not currently in quarantine or has no saved roles.', ephemeral: true });
-        }
+        const target = interaction.options.getMember('user');
+        if (!target) return interaction.editReply({ content: 'Member not found.' });
 
-        const oldRoles = data[target.id];
-        
         try {
+            // Retrieve from DB
+            const res = await db.query('SELECT roles FROM quarantine_data WHERE user_id = $1', [target.id]);
+            
+            if (res.rows.length === 0) {
+                return interaction.editReply({ content: 'This user is not in quarantine database.' });
+            }
+
+            const oldRoles = JSON.parse(res.rows[0].roles);
+            
+            // Restore roles
             await target.roles.set(oldRoles);
+            
+            // Delete from DB
+            await db.query('DELETE FROM quarantine_data WHERE user_id = $1', [target.id]);
 
-            // Remove data after restoring roles
-            delete data[target.id];
-            fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
-
-            await interaction.reply({ content: `Successfully unquarantined ${target.user.tag}.`, ephemeral: true });
+            await interaction.editReply({ content: `Successfully unquarantined ${target.user.tag}.` });
         } catch (error) {
             console.error(error);
-            await interaction.reply({ content: 'Failed to restore roles. Check bot permissions.', ephemeral: true });
+            await interaction.editReply({ content: 'Database error or missing permissions.' });
         }
     }
 };

From 00f060bb04daef90f4c93c631fe676e4ec6c2112 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:19:45 +0700
Subject: [PATCH 56/97] Refactor quarantine command to simplify role handling

---
 src/commands/Moderation/quarantine.js | 60 +++++++--------------------
 1 file changed, 14 insertions(+), 46 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index bf7665368..9c42ef624 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,71 +1,39 @@
 import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
-import db from '../../Utility/src/config/db.js'; // Adjust this path to your db.js
-
-// Function to ensure table exists
-async function ensureDatabase() {
-    await db.query(`
-        CREATE TABLE IF NOT EXISTS quarantine_data (
-            user_id VARCHAR(20) PRIMARY KEY,
-            roles TEXT NOT NULL
-        )
-    `);
-}
-
-async function ensureQuarantineRole(guild, botMember) {
-    let role = guild.roles.cache.find(r => r.name === 'Quarantine');
-    if (!role) {
-        role = await guild.roles.create({
-            name: 'Quarantine',
-            color: Colors.Red,
-            reason: 'Auto-created Quarantine role'
-        });
-    }
-    const botTopRolePosition = botMember.roles.highest.position;
-    if (role.position < botTopRolePosition - 1) {
-        await role.setPosition(botTopRolePosition - 1).catch(console.error);
-    }
-    return role;
-}
+// Đường dẫn này lùi 2 cấp từ src/commands/Moderation/ để ra src/ rồi vào utils/
+import db from '../../utils/database.js'; 
 
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
         .setDescription('Quarantine a member')
-        .addUserOption(option => option.setName('user').setDescription('Member to quarantine').setRequired(true)),
+        .addUserOption(option => option.setName('user').setDescription('Member').setRequired(true)),
     
     async execute(interaction) {
         await interaction.deferReply({ ephemeral: true });
 
-        // Ensure database table exists before proceeding
-        try {
-            await ensureDatabase();
-        } catch (err) {
-            console.error('Failed to init database table:', err);
-        }
-
-        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
-            return interaction.editReply({ content: 'You do not have permission.' });
-        }
-
         const member = interaction.options.getMember('user');
         if (!member) return interaction.editReply({ content: 'Member not found.' });
 
-        const botMember = await interaction.guild.members.fetch(interaction.client.user.id);
-        const quarantineRole = await ensureQuarantineRole(interaction.guild, botMember);
-        
-        const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== quarantineRole.id).map(r => r.id);
+        // Logic check role
+        let role = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
+        if (!role) {
+            role = await interaction.guild.roles.create({ name: 'Quarantine', color: Colors.Red });
+        }
+
+        const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== role.id).map(r => r.id);
         
         try {
+            // DB query
             await db.query(
                 'INSERT INTO quarantine_data (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
                 [member.id, JSON.stringify(rolesToSave)]
             );
 
-            await member.roles.set([quarantineRole.id]);
+            await member.roles.set([role.id]);
             await interaction.editReply({ content: `Successfully quarantined ${member.user.tag}.` });
         } catch (error) {
-            console.error(error);
-            await interaction.editReply({ content: 'Failed to apply quarantine. Check role hierarchy.' });
+            console.error('Lỗi Database:', error);
+            await interaction.editReply({ content: 'Database error. Check terminal.' });
         }
     }
 };

From 94ca21e93fc6cdb98f755e809e6fdc64c5b58d32 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:27:06 +0700
Subject: [PATCH 57/97] Refactor quarantine command for better error handling

---
 src/commands/Moderation/quarantine.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index 9c42ef624..b51b5994b 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,12 +1,11 @@
 import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
-// Đường dẫn này lùi 2 cấp từ src/commands/Moderation/ để ra src/ rồi vào utils/
-import db from '../../utils/database.js'; 
+import { db } from '../../utils/database.js';
 
 export default {
     data: new SlashCommandBuilder()
         .setName('quarantine')
         .setDescription('Quarantine a member')
-        .addUserOption(option => option.setName('user').setDescription('Member').setRequired(true)),
+        .addUserOption(option => option.setName('user').setDescription('Member to quarantine').setRequired(true)),
     
     async execute(interaction) {
         await interaction.deferReply({ ephemeral: true });
@@ -14,16 +13,27 @@ export default {
         const member = interaction.options.getMember('user');
         if (!member) return interaction.editReply({ content: 'Member not found.' });
 
-        // Logic check role
+        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ModerateMembers)) {
+            return interaction.editReply({ content: 'You do not have permission.' });
+        }
+
+        // Đảm bảo bảng tồn tại
+        try {
+            await db.query(`CREATE TABLE IF NOT EXISTS quarantine_data (user_id VARCHAR(20) PRIMARY KEY, roles TEXT NOT NULL)`);
+        } catch (e) { /* Bỏ qua nếu bảng đã tồn tại */ }
+
         let role = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
         if (!role) {
-            role = await interaction.guild.roles.create({ name: 'Quarantine', color: Colors.Red });
+            role = await interaction.guild.roles.create({
+                name: 'Quarantine',
+                color: Colors.Red,
+                reason: 'Auto-created Quarantine role'
+            });
         }
 
         const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== role.id).map(r => r.id);
         
         try {
-            // DB query
             await db.query(
                 'INSERT INTO quarantine_data (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
                 [member.id, JSON.stringify(rolesToSave)]
@@ -32,8 +42,8 @@ export default {
             await member.roles.set([role.id]);
             await interaction.editReply({ content: `Successfully quarantined ${member.user.tag}.` });
         } catch (error) {
-            console.error('Lỗi Database:', error);
-            await interaction.editReply({ content: 'Database error. Check terminal.' });
+            console.error('Database Error:', error);
+            await interaction.editReply({ content: 'Failed to apply quarantine. Check role hierarchy.' });
         }
     }
 };

From 91e08ed1e74a8f5a6b67af2a2513bed62b9f7e77 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:27:45 +0700
Subject: [PATCH 58/97] Refactor unquarantine command to use new db path

---
 src/commands/Moderation/unquarantine.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index ceb6cafa2..9ce1ead85 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -1,5 +1,5 @@
 import { SlashCommandBuilder } from 'discord.js';
-import db from '../../Utility/src/config/db.js'; // Điều chỉnh đường dẫn này đến file db.js của bạn
+import { db } from '../../utils/database.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -8,14 +8,12 @@ export default {
         .addUserOption(option => option.setName('user').setDescription('Member to unquarantine').setRequired(true)),
     
     async execute(interaction) {
-        // Fix for Interaction expired
         await interaction.deferReply({ ephemeral: true });
 
         const target = interaction.options.getMember('user');
         if (!target) return interaction.editReply({ content: 'Member not found.' });
 
         try {
-            // Retrieve from DB
             const res = await db.query('SELECT roles FROM quarantine_data WHERE user_id = $1', [target.id]);
             
             if (res.rows.length === 0) {
@@ -24,15 +22,12 @@ export default {
 
             const oldRoles = JSON.parse(res.rows[0].roles);
             
-            // Restore roles
             await target.roles.set(oldRoles);
-            
-            // Delete from DB
             await db.query('DELETE FROM quarantine_data WHERE user_id = $1', [target.id]);
 
             await interaction.editReply({ content: `Successfully unquarantined ${target.user.tag}.` });
         } catch (error) {
-            console.error(error);
+            console.error('Database Error:', error);
             await interaction.editReply({ content: 'Database error or missing permissions.' });
         }
     }

From b2d5b9e7ba74aa3fb67024f758db82acf83a6127 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:32:57 +0700
Subject: [PATCH 59/97] Update database import path in delete_table.js

---
 src/commands/Utility/delete_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/Utility/delete_table.js b/src/commands/Utility/delete_table.js
index 4a6e4d06f..cc8ba6042 100644
--- a/src/commands/Utility/delete_table.js
+++ b/src/commands/Utility/delete_table.js
@@ -1,5 +1,5 @@
 // file: delete_table.js
-import { pool } from './src/config/db.js'; // Trỏ đúng đường dẫn đến file config db của bạn
+import { db } from '../../utils/database.js';
 
 async function dropTable() {
     try {

From e93be4a9fdd655f576f666d89fb27aff05e5a94a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:33:40 +0700
Subject: [PATCH 60/97] Delete src/commands/Utility/delete_table.js

---
 src/commands/Utility/delete_table.js | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 src/commands/Utility/delete_table.js

diff --git a/src/commands/Utility/delete_table.js b/src/commands/Utility/delete_table.js
deleted file mode 100644
index cc8ba6042..000000000
--- a/src/commands/Utility/delete_table.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// file: delete_table.js
-import { db } from '../../utils/database.js';
-
-async function dropTable() {
-    try {
-        await pool.query('DROP TABLE IF EXISTS "role-save" CASCADE');
-        console.log("Đã xóa bảng 'role-save' thành công!");
-        process.exit(0);
-    } catch (err) {
-        console.error("Lỗi khi xóa bảng:", err);
-        process.exit(1);
-    }
-}
-
-dropTable();

From c9144e20d3ae5d40eea5ca24a7669ee58d9d6b3d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:36:01 +0700
Subject: [PATCH 61/97] Delete src/commands/Economy directory

---
 src/commands/Economy/balance.js               |  86 --------
 src/commands/Economy/beg.js                   | 103 ----------
 src/commands/Economy/buy.js                   | 163 ---------------
 src/commands/Economy/crime.js                 | 122 -----------
 src/commands/Economy/daily.js                 | 107 ----------
 src/commands/Economy/deposit.js               | 144 -------------
 src/commands/Economy/eleaderboard.js          |  94 ---------
 src/commands/Economy/fish.js                  | 135 ------------
 src/commands/Economy/gamble.js                | 136 ------------
 src/commands/Economy/inventory.js             |  74 -------
 src/commands/Economy/mine.js                  |  98 ---------
 src/commands/Economy/modules/shop_browse.js   |  90 --------
 .../Economy/modules/shop_config_setrole.js    |  36 ----
 src/commands/Economy/pay.js                   | 158 --------------
 src/commands/Economy/rob.js                   | 156 --------------
 src/commands/Economy/shop.js                  |  60 ------
 src/commands/Economy/slut.js                  | 193 ------------------
 src/commands/Economy/withdraw.js              |  86 --------
 src/commands/Economy/work.js                  | 127 ------------
 19 files changed, 2168 deletions(-)
 delete mode 100644 src/commands/Economy/balance.js
 delete mode 100644 src/commands/Economy/beg.js
 delete mode 100644 src/commands/Economy/buy.js
 delete mode 100644 src/commands/Economy/crime.js
 delete mode 100644 src/commands/Economy/daily.js
 delete mode 100644 src/commands/Economy/deposit.js
 delete mode 100644 src/commands/Economy/eleaderboard.js
 delete mode 100644 src/commands/Economy/fish.js
 delete mode 100644 src/commands/Economy/gamble.js
 delete mode 100644 src/commands/Economy/inventory.js
 delete mode 100644 src/commands/Economy/mine.js
 delete mode 100644 src/commands/Economy/modules/shop_browse.js
 delete mode 100644 src/commands/Economy/modules/shop_config_setrole.js
 delete mode 100644 src/commands/Economy/pay.js
 delete mode 100644 src/commands/Economy/rob.js
 delete mode 100644 src/commands/Economy/shop.js
 delete mode 100644 src/commands/Economy/slut.js
 delete mode 100644 src/commands/Economy/withdraw.js
 delete mode 100644 src/commands/Economy/work.js

diff --git a/src/commands/Economy/balance.js b/src/commands/Economy/balance.js
deleted file mode 100644
index 16cd240eb..000000000
--- a/src/commands/Economy/balance.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, getMaxBankCapacity } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('balance')
-        .setDescription("Check your or someone else's balance")
-        .addUserOption(option =>
-            option
-                .setName('user')
-                .setDescription('User to check balance for')
-                .setRequired(false)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const targetUser = interaction.options.getUser("user") || interaction.user;
-            const guildId = interaction.guildId;
-
-            logger.debug(`[ECONOMY] Balance check for ${targetUser.id}`, { userId: targetUser.id, guildId });
-
-            if (targetUser.bot) {
-                throw createError(
-                    "Bot user queried for balance",
-                    ErrorTypes.VALIDATION,
-                    "Bots don't have an economy balance."
-                );
-            }
-
-            const userData = await getEconomyData(client, guildId, targetUser.id);
-            
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load economy data. Please try again later.",
-                    { userId: targetUser.id, guildId }
-                );
-            }
-
-            const maxBank = getMaxBankCapacity(userData);
-
-            const wallet = typeof userData.wallet === 'number' ? userData.wallet : 0;
-            const bank = typeof userData.bank === 'number' ? userData.bank : 0;
-
-            const embed = createEmbed({
-                title: `💰 ${targetUser.username}'s Balance`,
-                description: `Here is the current financial status for ${targetUser.username}.`,
-            })
-                .addFields(
-                    {
-                        name: "💵 Cash",
-                        value: `$${wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "🏦 Bank",
-                        value: `$${bank.toLocaleString()} / $${maxBank.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "💎 Total",
-                        value: `$${(wallet + bank).toLocaleString()}`,
-                        inline: true,
-                    }
-                )
-                .setFooter({
-                    text: `Requested by ${interaction.user.tag}`,
-                    iconURL: interaction.user.displayAvatarURL(),
-                });
-
-            logger.info(`[ECONOMY] Balance retrieved`, { userId: targetUser.id, wallet, bank });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'balance' })
-};
-
-
-
-
diff --git a/src/commands/Economy/beg.js b/src/commands/Economy/beg.js
deleted file mode 100644
index 260ebc656..000000000
--- a/src/commands/Economy/beg.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { botConfig } from '../../config/bot.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const COOLDOWN = 30 * 60 * 1000;
-const MIN_WIN = 50;
-const MAX_WIN = 200;
-const SUCCESS_CHANCE = 0.7;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('beg')
-        .setDescription('Beg for a small amount of money'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-
-            let userData = await getEconomyData(client, guildId, userId);
-            
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-
-            const lastBeg = userData.lastBeg || 0;
-            const remainingTime = lastBeg + COOLDOWN - Date.now();
-
-            if (remainingTime > 0) {
-                const minutes = Math.floor(remainingTime / 60000);
-                const seconds = Math.floor((remainingTime % 60000) / 1000);
-
-                let timeMessage =
-                    minutes > 0 ? `${minutes} minute(s)` : `${seconds} second(s)`;
-
-                throw createError(
-                    "Beg cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You are tired from begging! Try again in **${timeMessage}**.`,
-                    { remainingTime, minutes, seconds, cooldownType: 'beg' }
-                );
-            }
-
-            const success = Math.random() < SUCCESS_CHANCE;
-
-            let replyEmbed;
-            let newCash = userData.wallet;
-
-            if (success) {
-                const amountWon =
-                    Math.floor(Math.random() * (MAX_WIN - MIN_WIN + 1)) + MIN_WIN;
-
-                newCash += amountWon;
-
-                const successMessages = [
-                    `A kind stranger drops **$${amountWon.toLocaleString()}** into your cup.`,
-                    `You spotted an unattended wallet! You grab **$${amountWon.toLocaleString()}** and run.`,
-                    `Someone took pity on you and gave you **$${amountWon.toLocaleString()}**!`,
-                    `You found **$${amountWon.toLocaleString()}** under a park bench.`,
-                ];
-
-                replyEmbed = MessageTemplates.SUCCESS.DATA_UPDATED(
-                    "begging",
-                    successMessages[
-                        Math.floor(Math.random() * successMessages.length)
-                    ]
-                );
-            } else {
-                const failMessages = [
-                    "The police chased you off. You got nothing.",
-                    "Someone yelled, 'Get a job!' and walked past.",
-                    "A squirrel stole the single coin you had.",
-                    "You tried to beg, but you were too embarrassed and gave up.",
-                ];
-
-                replyEmbed = MessageTemplates.ERRORS.INSUFFICIENT_FUNDS(
-                    "nothing",
-                    "You failed to get any money from begging."
-                );
-                replyEmbed.data.description = failMessages[Math.floor(Math.random() * failMessages.length)];
-            }
-
-            userData.wallet = newCash;
-userData.lastBeg = Date.now();
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [replyEmbed] });
-    }, { command: 'beg' })
-};
-
-
diff --git a/src/commands/Economy/buy.js b/src/commands/Economy/buy.js
deleted file mode 100644
index 72f4c62bb..000000000
--- a/src/commands/Economy/buy.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import { SlashCommandBuilder, MessageFlags } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { shopItems } from '../../config/shop/items.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { getGuildConfig } from '../../services/guildConfig.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const SHOP_ITEMS = shopItems;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('buy')
-        .setDescription('Buy an item from the shop')
-        .addStringOption(option =>
-            option
-                .setName('item_id')
-                .setDescription('ID of the item to buy')
-                .setRequired(true)
-        )
-        .addIntegerOption(option =>
-            option
-                .setName('quantity')
-                .setDescription('Quantity to buy (default: 1)')
-                .setRequired(false)
-                .setMinValue(1)
-                .setMaxValue(10)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const itemId = interaction.options.getString("item_id").toLowerCase();
-            const quantity = interaction.options.getInteger("quantity") || 1;
-
-            const item = SHOP_ITEMS.find(i => i.id === itemId);
-
-            if (!item) {
-                throw createError(
-                    `Item ${itemId} not found`,
-                    ErrorTypes.VALIDATION,
-                    `The item ID \`${itemId}\` does not exist in the shop.`,
-                    { itemId }
-                );
-            }
-
-            if (quantity < 1) {
-                throw createError(
-                    "Invalid quantity",
-                    ErrorTypes.VALIDATION,
-                    "You must purchase a quantity of 1 or more.",
-                    { quantity }
-                );
-            }
-
-            const totalCost = item.price * quantity;
-
-            const guildConfig = await getGuildConfig(client, guildId);
-            const PREMIUM_ROLE_ID = guildConfig.premiumRoleId;
-
-            const userData = await getEconomyData(client, guildId, userId);
-
-            if (userData.wallet < totalCost) {
-                throw createError(
-                    "Insufficient funds",
-                    ErrorTypes.VALIDATION,
-                    `You need **$${totalCost.toLocaleString()}** to purchase ${quantity}x **${item.name}**, but you only have **$${userData.wallet.toLocaleString()}** in cash.`,
-                    { required: totalCost, current: userData.wallet, itemId, quantity }
-                );
-            }
-
-            if (item.type === "role" && itemId === "premium_role") {
-                if (!PREMIUM_ROLE_ID) {
-                    throw createError(
-                        "Premium role not configured",
-                        ErrorTypes.CONFIGURATION,
-                        "The **Premium Shop Role** has not been configured by a server administrator yet.",
-                        { itemId }
-                    );
-                }
-                if (interaction.member.roles.cache.has(PREMIUM_ROLE_ID)) {
-                    throw createError(
-                        "Role already owned",
-                        ErrorTypes.VALIDATION,
-                        `You already have the **${item.name}** role.`,
-                        { itemId, roleId: PREMIUM_ROLE_ID }
-                    );
-                }
-                if (quantity > 1) {
-                    throw createError(
-                        "Invalid quantity for role",
-                        ErrorTypes.VALIDATION,
-                        `You can only purchase the **${item.name}** role once.`,
-                        { itemId, quantity }
-                    );
-                }
-            }
-
-            userData.wallet -= totalCost;
-
-            let successDescription = `You successfully purchased ${quantity}x **${item.name}** for **$${totalCost.toLocaleString()}**!`;
-
-            if (item.type === "role" && itemId === "premium_role") {
-                const member = interaction.member;
-
-                const role = interaction.guild.roles.cache.get(PREMIUM_ROLE_ID);
-
-                if (!role) {
-                    throw createError(
-                        "Role not found",
-                        ErrorTypes.CONFIGURATION,
-                        "The configured premium role no longer exists in this guild.",
-                        { roleId: PREMIUM_ROLE_ID }
-                    );
-                }
-
-                try {
-                    await member.roles.add(
-                        role,
-                        `Purchased role: ${item.name}`,
-                    );
-                    successDescription += `\n\n**👑 The role ${role.toString()} has been granted to you!**`;
-                } catch (roleError) {
-                    userData.wallet += totalCost;
-                    await setEconomyData(client, guildId, userId, userData);
-                    throw createError(
-                        "Role assignment failed",
-                        ErrorTypes.DISCORD_API,
-                        "Successfully deducted money, but failed to grant the role. Your cash has been refunded.",
-                        { roleId: PREMIUM_ROLE_ID, originalError: roleError.message }
-                    );
-                }
-            } else if (item.type === "upgrade") {
-                userData.upgrades[itemId] = true;
-                successDescription += `\n\n**✨ Your upgrade is now active!**`;
-            } else if (item.type === "consumable") {
-                userData.inventory[itemId] =
-                    (userData.inventory[itemId] || 0) + quantity;
-            }
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const embed = successEmbed(
-                "💰 Purchase Successful",
-                successDescription,
-            ).addFields({
-                name: "New Balance",
-                value: `$${userData.wallet.toLocaleString()}`,
-                inline: true,
-            });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed], flags: [MessageFlags.Ephemeral] });
-    }, { command: 'buy' })
-};
-
-
-
-
-
diff --git a/src/commands/Economy/crime.js b/src/commands/Economy/crime.js
deleted file mode 100644
index 2403fe461..000000000
--- a/src/commands/Economy/crime.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const CRIME_COOLDOWN = 60 * 60 * 1000;
-const MIN_CRIME_AMOUNT = 100;
-const MAX_CRIME_AMOUNT = 2000;
-const FAILURE_RATE = 0.4;
-const JAIL_TIME = 2 * 60 * 60 * 1000;
-
-const CRIME_TYPES = [
-    { name: "Pickpocketing", min: 100, max: 500, risk: 0.3 },
-    { name: "Burglary", min: 300, max: 1000, risk: 0.4 },
-    { name: "Bank Heist", min: 1000, max: 5000, risk: 0.6 },
-    { name: "Art Theft", min: 2000, max: 10000, risk: 0.7 },
-    { name: "Cybercrime", min: 5000, max: 20000, risk: 0.8 },
-];
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('crime')
-        .setDescription('Commit a crime to earn money (risky)')
-        .addStringOption(option =>
-            option
-                .setName('type')
-                .setDescription('Type of crime to commit')
-                .setRequired(true)
-                .addChoices(
-                    { name: 'Pickpocketing', value: 'pickpocketing' },
-                    { name: 'Burglary', value: 'burglary' },
-                    { name: 'Bank Heist', value: 'bank-heist' },
-                    { name: 'Art Theft', value: 'art-theft' },
-                    { name: 'Cybercrime', value: 'cybercrime' },
-                )
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        await InteractionHelper.safeDefer(interaction);
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            const userData = await getEconomyData(client, guildId, userId);
-            const lastCrime = userData.cooldowns?.crime || 0;
-            const isJailed = userData.jailedUntil && userData.jailedUntil > now;
-
-            if (isJailed) {
-                const timeLeft = Math.ceil((userData.jailedUntil - now) / (1000 * 60));
-                throw createError(
-                    "User is in jail",
-                    ErrorTypes.RATE_LIMIT,
-                    `You're in jail for ${timeLeft} more minutes!`,
-                    { jailTimeRemaining: userData.jailedUntil - now }
-                );
-            }
-
-            if (now < lastCrime + CRIME_COOLDOWN) {
-                const timeLeft = Math.ceil((lastCrime + CRIME_COOLDOWN - now) / (1000 * 60));
-                throw createError(
-                    "Crime cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You need to wait ${timeLeft} more minutes before committing another crime.`,
-                    { remaining: lastCrime + CRIME_COOLDOWN - now, cooldownType: 'crime' }
-                );
-            }
-
-            const crimeType = interaction.options.getString("type").toLowerCase();
-            const crime = CRIME_TYPES.find(
-                c => c.name.toLowerCase().replace(/\s+/g, '-') === crimeType
-            );
-
-            if (!crime) {
-                throw createError(
-                    "Invalid crime type",
-                    ErrorTypes.VALIDATION,
-                    "Please select a valid crime type.",
-                    { crimeType }
-                );
-            }
-
-            const isSuccess = Math.random() > crime.risk;
-            const amountEarned = isSuccess
-                ? Math.floor(Math.random() * (crime.max - crime.min + 1)) + crime.min
-                : 0;
-
-            userData.cooldowns = userData.cooldowns || {};
-            userData.cooldowns.crime = now;
-
-            if (isSuccess) {
-                userData.wallet = (userData.wallet || 0) + amountEarned;
-                
-                await setEconomyData(client, guildId, userId, userData);
-                
-                const embed = successEmbed(
-                    "Crime Successful!",
-                    `You successfully committed ${crime.name} and earned **${amountEarned}** coins!`
-                );
-                
-                await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-            } else {
-                const fine = Math.floor(amountEarned * 0.2);
-                userData.wallet = Math.max(0, (userData.wallet || 0) - fine);
-                userData.jailedUntil = now + JAIL_TIME;
-                
-                await setEconomyData(client, guildId, userId, userData);
-                
-                const embed = errorEmbed(
-                    "Crime Failed!",
-                    `You were caught while attempting ${crime.name} and have been sent to jail! ` +
-                    `You were fined ${fine} coins and will be in jail for 2 hours.`
-                );
-                
-                await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-            }
-    }, { command: 'crime' })
-};
-
-
diff --git a/src/commands/Economy/daily.js b/src/commands/Economy/daily.js
deleted file mode 100644
index ba3d9bee3..000000000
--- a/src/commands/Economy/daily.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { getGuildConfig } from '../../services/guildConfig.js';
-import { formatDuration } from '../../utils/helpers.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const DAILY_COOLDOWN = 24 * 60 * 60 * 1000;
-const DAILY_AMOUNT = 1000;
-const PREMIUM_BONUS_PERCENTAGE = 0.1;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('daily')
-        .setDescription('Claim your daily cash reward'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            logger.debug(`[ECONOMY] Daily claimed started for ${userId}`, { userId, guildId });
-
-            const userData = await getEconomyData(client, guildId, userId);
-            
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data for daily",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-            
-            const lastDaily = userData.lastDaily || 0;
-
-            if (now < lastDaily + DAILY_COOLDOWN) {
-                const timeRemaining = lastDaily + DAILY_COOLDOWN - now;
-                throw createError(
-                    "Daily cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You need to wait before claiming daily again. Try again in **${formatDuration(timeRemaining)}**.`,
-                    { timeRemaining, cooldownType: 'daily' }
-                );
-            }
-
-            const guildConfig = await getGuildConfig(client, guildId);
-            const PREMIUM_ROLE_ID = guildConfig.premiumRoleId;
-
-            let earned = DAILY_AMOUNT;
-            let bonusMessage = "";
-            let hasPremiumRole = false;
-
-            if (
-                PREMIUM_ROLE_ID &&
-                interaction.member &&
-                interaction.member.roles.cache.has(PREMIUM_ROLE_ID)
-            ) {
-                const bonusAmount = Math.floor(
-                    DAILY_AMOUNT * PREMIUM_BONUS_PERCENTAGE,
-                );
-                earned += bonusAmount;
-                bonusMessage = `\n✨ **Premium Bonus:** +$${bonusAmount.toLocaleString()}`;
-                hasPremiumRole = true;
-            }
-
-            userData.wallet = (userData.wallet || 0) + earned;
-            userData.lastDaily = now;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            logger.info(`[ECONOMY_TRANSACTION] Daily claimed`, {
-                userId,
-                guildId,
-                amount: earned,
-                newWallet: userData.wallet,
-                hasPremium: hasPremiumRole,
-                timestamp: new Date().toISOString()
-            });
-
-            const embed = successEmbed(
-                "✅ Daily Claimed!",
-                `You have claimed your daily **$${earned.toLocaleString()}**!${bonusMessage}`
-            )
-                .addFields({
-                    name: "New Cash Balance",
-                    value: `$${userData.wallet.toLocaleString()}`,
-                    inline: true,
-                })
-                .setFooter({
-                    text: hasPremiumRole
-                        ? `Next claim in 24 hours. (Premium Active)`
-                        : `Next claim in 24 hours.`,
-                });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'daily' })
-};
-
-
-
-
diff --git a/src/commands/Economy/deposit.js b/src/commands/Economy/deposit.js
deleted file mode 100644
index 79cab9b42..000000000
--- a/src/commands/Economy/deposit.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData, getMaxBankCapacity } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('deposit')
-        .setDescription('Deposit money from your wallet into your bank')
-        .addStringOption(option =>
-            option
-                .setName('amount')
-                .setDescription('Amount to deposit (number or "all")')
-                .setRequired(true)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-        
-        const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const amountInput = interaction.options.getString("amount");
-
-            const userData = await getEconomyData(client, guildId, userId);
-            
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-            
-            const maxBank = getMaxBankCapacity(userData);
-            let depositAmount;
-
-            if (amountInput.toLowerCase() === "all") {
-                depositAmount = userData.wallet;
-            } else {
-                depositAmount = parseInt(amountInput);
-
-                if (isNaN(depositAmount) || depositAmount <= 0) {
-                    throw createError(
-                        "Invalid deposit amount",
-                        ErrorTypes.VALIDATION,
-                        `Please enter a valid number or 'all'. You entered: \`${amountInput}\``,
-                        { amountInput, userId }
-                    );
-                }
-            }
-
-            if (depositAmount === 0) {
-                throw createError(
-                    "Zero deposit amount",
-                    ErrorTypes.VALIDATION,
-                    "You have no cash to deposit.",
-                    { userId, walletBalance: userData.wallet }
-                );
-            }
-
-            if (depositAmount > userData.wallet) {
-                depositAmount = userData.wallet;
-                await interaction.followUp({
-                    embeds: [
-                        MessageTemplates.ERRORS.INVALID_INPUT(
-                            "deposit amount",
-                            `You tried to deposit more than you have. Depositing your remaining cash: **$${depositAmount.toLocaleString()}**`
-                        )
-                    ],
-                    flags: ["Ephemeral"],
-                });
-            }
-
-            const availableSpace = maxBank - userData.bank;
-
-            if (availableSpace <= 0) {
-                throw createError(
-                    "Bank is full",
-                    ErrorTypes.VALIDATION,
-                    `Your bank is currently full (Max Capacity: $${maxBank.toLocaleString()}). Purchase a **Bank Upgrade** to increase your limit.`,
-                    { maxBank, currentBank: userData.bank, userId }
-                );
-            }
-
-            if (depositAmount > availableSpace) {
-                const originalDepositAmount = depositAmount;
-                depositAmount = availableSpace;
-
-                if (amountInput.toLowerCase() !== "all") {
-                    await interaction.followUp({
-                        embeds: [
-                            MessageTemplates.ERRORS.INVALID_INPUT(
-                                "deposit amount",
-                                `You only had space for **$${depositAmount.toLocaleString()}** in your bank account (Max: $${maxBank.toLocaleString()}). The rest remains in your cash.`
-                            )
-                        ],
-                        flags: ["Ephemeral"],
-                    });
-                }
-            }
-
-            if (depositAmount === 0) {
-                throw createError(
-                    "No space or cash for deposit",
-                    ErrorTypes.VALIDATION,
-                    "The amount you tried to deposit was either 0 or exceeded your bank capacity after checking your cash balance.",
-                    { depositAmount, availableSpace, walletBalance: userData.wallet }
-                );
-            }
-
-            userData.wallet -= depositAmount;
-            userData.bank += depositAmount;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const embed = MessageTemplates.SUCCESS.DATA_UPDATED(
-                "deposit",
-                `You successfully deposited **$${depositAmount.toLocaleString()}** into your bank.`
-            )
-                .addFields(
-                    {
-                        name: "💵 New Cash Balance",
-                        value: `$${userData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "🏦 New Bank Balance",
-                        value: `$${userData.bank.toLocaleString()} / $${maxBank.toLocaleString()}`,
-                        inline: true,
-                    },
-                );
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'deposit' })
-};
-
-
-
-
-
diff --git a/src/commands/Economy/eleaderboard.js b/src/commands/Economy/eleaderboard.js
deleted file mode 100644
index d96711690..000000000
--- a/src/commands/Economy/eleaderboard.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed } from '../../utils/embeds.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName("eleaderboard")
-        .setDescription("View the server's top 10 richest users.")
-        .setDMPermission(false),
-    
-    
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-
-            const guildId = interaction.guildId;
-
-            logger.debug(`[ECONOMY] Leaderboard requested`, { guildId });
-
-            const prefix = `economy:${guildId}:`;
-
-            let allKeys = await client.db.list(prefix);
-
-            if (!Array.isArray(allKeys)) {
-                allKeys = [];
-            }
-
-            if (allKeys.length === 0) {
-                throw createError(
-                    "No economy data found",
-                    ErrorTypes.VALIDATION,
-                    "No economy data found for this server."
-                );
-            }
-
-            let allUserData = [];
-
-            for (const key of allKeys) {
-                const userId = key.replace(prefix, "");
-                const userData = await client.db.get(key);
-
-                if (userData) {
-                    allUserData.push({
-                        userId: userId,
-                        net_worth: (userData.wallet || 0) + (userData.bank || 0),
-                    });
-                }
-            }
-
-            allUserData.sort((a, b) => b.net_worth - a.net_worth);
-
-            const topUsers = allUserData.slice(0, 10);
-            const userRank =
-                allUserData.findIndex((u) => u.userId === interaction.user.id) +
-                1;
-            const rankEmoji = ["🥇", "🥈", "🥉"];
-            const leaderboardEntries = [];
-
-            for (let i = 0; i < topUsers.length; i++) {
-                const user = topUsers[i];
-                const rank = i + 1;
-                const emoji = rankEmoji[i] || `**#${rank}**`;
-
-                leaderboardEntries.push(
-                    `${emoji} <@${user.userId}> - 🏦 ${user.net_worth.toLocaleString()}`,
-                );
-            }
-
-            logger.info(`[ECONOMY] Leaderboard generated`, { 
-                guildId, 
-                userCount: allUserData.length,
-                userRank 
-            });
-
-            const description = leaderboardEntries.length > 0
-                ? leaderboardEntries.join("\n")
-                : "No economy data is available for this server yet.";
-
-            const embed = createEmbed({
-                title: `Economy Leaderboard`,
-                description,
-                footer: `Your Rank: ${userRank > 0 ? `#${userRank}` : "No ranking data available"}`,
-            });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'eleaderboard' })
-};
-
-
-
-
-
diff --git a/src/commands/Economy/fish.js b/src/commands/Economy/fish.js
deleted file mode 100644
index 367ad453e..000000000
--- a/src/commands/Economy/fish.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const FISH_COOLDOWN = 45 * 60 * 1000; 
-const BASE_MIN_REWARD = 300;
-const BASE_MAX_REWARD = 900;
-const FISHING_ROD_MULTIPLIER = 1.5;
-
-const FISH_TYPES = [
-    { name: 'Bass', emoji: '🐟', rarity: 'common' },
-    { name: 'Salmon', emoji: '🐟', rarity: 'common' },
-    { name: 'Trout', emoji: '🐟', rarity: 'common' },
-    { name: 'Tuna', emoji: '🐟', rarity: 'uncommon' },
-    { name: 'Swordfish', emoji: '🐟', rarity: 'uncommon' },
-    { name: 'Octopus', emoji: '🐙', rarity: 'rare' },
-    { name: 'Lobster', emoji: '🦞', rarity: 'rare' },
-    { name: 'Shark', emoji: '🦈', rarity: 'epic' },
-    { name: 'Whale', emoji: '🐋', rarity: 'legendary' },
-];
-
-const CATCH_MESSAGES = [
-    "You cast your line into the crystal clear waters...",
-    "You wait patiently as your bobber floats...",
-    "After a few minutes of waiting, you feel a tug...",
-    "The water ripples as something takes your bait...",
-    "You reel in your catch with expert precision...",
-];
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('fish')
-        .setDescription('Go fishing to catch fish and earn money'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            const userData = await getEconomyData(client, guildId, userId);
-            const lastFish = userData.lastFish || 0;
-            const hasFishingRod = userData.inventory["fishing_rod"] || 0;
-
-            if (now < lastFish + FISH_COOLDOWN) {
-                const remaining = lastFish + FISH_COOLDOWN - now;
-                const hours = Math.floor(remaining / (1000 * 60 * 60));
-                const minutes = Math.floor(
-                    (remaining % (1000 * 60 * 60)) / (1000 * 60),
-                );
-
-                throw createError(
-                    "Fishing cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You're too tired to fish right now. Rest for **${hours}h ${minutes}m** before fishing again.`,
-                    { remaining, cooldownType: 'fish' }
-                );
-            }
-
-            
-            const rand = Math.random();
-            let fishCaught;
-            
-            if (rand < 0.5) {
-                
-                fishCaught = FISH_TYPES.filter(f => f.rarity === 'common')[Math.floor(Math.random() * 3)];
-            } else if (rand < 0.75) {
-                
-                fishCaught = FISH_TYPES.filter(f => f.rarity === 'uncommon')[Math.floor(Math.random() * 2)];
-            } else if (rand < 0.9) {
-                
-                fishCaught = FISH_TYPES.filter(f => f.rarity === 'rare')[Math.floor(Math.random() * 2)];
-            } else if (rand < 0.98) {
-                
-                fishCaught = FISH_TYPES.find(f => f.rarity === 'epic');
-            } else {
-                
-                fishCaught = FISH_TYPES.find(f => f.rarity === 'legendary');
-            }
-
-            const baseEarned = Math.floor(
-                Math.random() * (BASE_MAX_REWARD - BASE_MIN_REWARD + 1)
-            ) + BASE_MIN_REWARD;
-
-            let finalEarned = baseEarned;
-            let multiplierMessage = "";
-
-            
-            if (hasFishingRod > 0) {
-                finalEarned = Math.floor(baseEarned * FISHING_ROD_MULTIPLIER);
-                multiplierMessage = `\n🎣 **Fishing Rod Bonus: +50%**`;
-            }
-
-            const catchMessage = CATCH_MESSAGES[Math.floor(Math.random() * CATCH_MESSAGES.length)];
-
-            userData.wallet += finalEarned;
-            userData.lastFish = now;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const rarityColors = {
-                common: '#95A5A6',
-                uncommon: '#2ECC71',
-                rare: '#3498DB',
-                epic: '#9B59B6',
-                legendary: '#F1C40F'
-            };
-
-            const embed = createEmbed({
-                title: '🎣 Fishing Success!',
-                description: `${catchMessage}\n\nYou caught a **${fishCaught.emoji} ${fishCaught.name}**! You sold it for **$${finalEarned.toLocaleString()}**!${multiplierMessage}`,
-                color: rarityColors[fishCaught.rarity]
-            })
-                .addFields(
-                    {
-                        name: "💵 New Cash Balance",
-                        value: `$${userData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "🐟 Rarity",
-                        value: fishCaught.rarity.charAt(0).toUpperCase() + fishCaught.rarity.slice(1),
-                        inline: true,
-                    }
-                )
-                .setFooter({ text: `Next fishing trip available in 45 minutes.` });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'fish' })
-};
diff --git a/src/commands/Economy/gamble.js b/src/commands/Economy/gamble.js
deleted file mode 100644
index d0bb7c3bd..000000000
--- a/src/commands/Economy/gamble.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const BASE_WIN_CHANCE = 0.4;
-const CLOVER_WIN_BONUS = 0.1;
-const CHARM_WIN_BONUS = 0.08;
-const PAYOUT_MULTIPLIER = 2.0;
-const GAMBLE_COOLDOWN = 5 * 60 * 1000;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('gamble')
-        .setDescription('Gamble your money for a chance to win more')
-        .addIntegerOption(option =>
-            option
-                .setName('amount')
-                .setDescription('Amount of cash to gamble')
-                .setRequired(true)
-                .setMinValue(1)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const betAmount = interaction.options.getInteger("amount");
-            const now = Date.now();
-
-            const userData = await getEconomyData(client, guildId, userId);
-            const lastGamble = userData.lastGamble || 0;
-            let cloverCount = userData.inventory["lucky_clover"] || 0;
-            let charmCount = userData.inventory["lucky_charm"] || 0;
-
-            if (now < lastGamble + GAMBLE_COOLDOWN) {
-                const remaining = lastGamble + GAMBLE_COOLDOWN - now;
-                const minutes = Math.floor(remaining / (1000 * 60));
-                const seconds = Math.floor((remaining % (1000 * 60)) / 1000);
-
-                throw createError(
-                    "Gamble cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You need to cool down before gambling again. Wait **${minutes}m ${seconds}s**.`,
-                    { remaining, cooldownType: 'gamble' }
-                );
-            }
-
-            if (userData.wallet < betAmount) {
-                throw createError(
-                    "Insufficient cash for gamble",
-                    ErrorTypes.VALIDATION,
-                    `You only have $${userData.wallet.toLocaleString()} cash, but you are trying to bet $${betAmount.toLocaleString()}.`,
-                    { required: betAmount, current: userData.wallet }
-                );
-            }
-
-            let winChance = BASE_WIN_CHANCE;
-            let cloverMessage = "";
-            let usedClover = false;
-            let usedCharm = false;
-
-            
-            if (cloverCount > 0) {
-                winChance += CLOVER_WIN_BONUS;
-                userData.inventory["lucky_clover"] -= 1;
-                cloverMessage = `\n🍀 **Lucky Clover Consumed:** Your win chance was boosted!`;
-                usedClover = true;
-            }
-            
-            else if (charmCount > 0) {
-                winChance += CHARM_WIN_BONUS;
-                userData.inventory["lucky_charm"] -= 1;
-                cloverMessage = `\n🍀 **Lucky Charm Used (${charmCount - 1} uses remaining):** Your win chance was boosted!`;
-                usedCharm = true;
-            }
-
-            const win = Math.random() < winChance;
-            let cashChange = 0;
-            let resultEmbed;
-
-            if (win) {
-                const amountWon = Math.floor(betAmount * PAYOUT_MULTIPLIER);
-cashChange = amountWon;
-
-                resultEmbed = successEmbed(
-                    "🎉 You Won!",
-                    `You successfully gambled and turned your **$${betAmount.toLocaleString()}** bet into **$${amountWon.toLocaleString()}**!${cloverMessage}`,
-                );
-            } else {
-cashChange = -betAmount;
-
-                resultEmbed = errorEmbed(
-                    "💔 You Lost...",
-                    `The dice rolled against you. You lost your **$${betAmount.toLocaleString()}** bet.`,
-                );
-            }
-
-            userData.wallet = (userData.wallet || 0) + cashChange;
-userData.lastGamble = now;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const newCash = userData.wallet;
-
-            resultEmbed.addFields({
-                name: "💵 New Cash Balance",
-                value: `$${newCash.toLocaleString()}`,
-                inline: true,
-            });
-
-            if (usedClover) {
-                resultEmbed.setFooter({
-                    text: `You have ${userData.inventory["lucky_clover"]} Lucky Clovers left. Win chance was ${Math.round(winChance * 100)}%.`,
-                });
-            } else if (usedCharm) {
-                resultEmbed.setFooter({
-                    text: `You have ${userData.inventory["lucky_charm"]} Lucky Charm uses left. Win chance was ${Math.round(winChance * 100)}%.`,
-                });
-            } else {
-                resultEmbed.setFooter({
-                    text: `Next gamble available in 5 minutes. Base win chance: ${Math.round(BASE_WIN_CHANCE * 100)}%.`,
-                });
-            }
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [resultEmbed] });
-    }, { command: 'gamble' })
-};
-
-
-
-
diff --git a/src/commands/Economy/inventory.js b/src/commands/Economy/inventory.js
deleted file mode 100644
index 7369c8388..000000000
--- a/src/commands/Economy/inventory.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { SlashCommandBuilder, PermissionFlagsBits } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { shopItems } from '../../config/shop/items.js';
-import { getEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const SHOP_ITEMS = shopItems;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('inventory')
-        .setDescription('View your economy inventory'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-
-            logger.debug(`[ECONOMY] Inventory requested for ${userId}`, { userId, guildId });
-
-            const userData = await getEconomyData(client, guildId, userId);
-
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data for inventory",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-
-            const inventory = userData.inventory || {};
-
-            let inventoryDescription = "Your inventory is currently empty.";
-
-            if (Object.keys(inventory).length > 0) {
-                inventoryDescription = Object.entries(inventory)
-                    .filter(
-                        ([itemId, quantity]) => {
-                            const item = SHOP_ITEMS.find(i => i.id === itemId);
-                            return quantity > 0 && item;
-                        }
-                    )
-                    .map(
-                        ([itemId, quantity]) => {
-                            const item = SHOP_ITEMS.find(i => i.id === itemId);
-                            return `**${item.name}:** ${quantity}x`;
-                        }
-                    )
-                    .join("\n");
-            }
-
-            logger.info(`[ECONOMY] Inventory retrieved`, { 
-                userId, 
-                guildId,
-                itemCount: Object.keys(inventory).length
-            });
-
-            const embed = createEmbed({ 
-                title: `📦 ${interaction.user.username}'s Inventory`, 
-                description: inventoryDescription, 
-            }).setThumbnail(interaction.user.displayAvatarURL());
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'inventory' })
-};
-
-
-
-
diff --git a/src/commands/Economy/mine.js b/src/commands/Economy/mine.js
deleted file mode 100644
index f8dd54cba..000000000
--- a/src/commands/Economy/mine.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const MINE_COOLDOWN = 60 * 60 * 1000;
-const BASE_MIN_REWARD = 400;
-const BASE_MAX_REWARD = 1200;
-const PICKAXE_MULTIPLIER = 1.2;
-const DIAMOND_PICKAXE_MULTIPLIER = 2.0;
-
-const MINE_LOCATIONS = [
-    "abandoned gold mine",
-    "dark, damp cave",
-    "backyard rock quarry",
-    "volcanic obsidian vent",
-    "deep-sea mineral trench",
-];
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('mine')
-        .setDescription('Go mining to earn money'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            const userData = await getEconomyData(client, guildId, userId);
-            const lastMine = userData.lastMine || 0;
-            const hasDiamondPickaxe = userData.inventory["diamond_pickaxe"] || 0;
-            const hasPickaxe = userData.inventory["pickaxe"] || 0;
-
-            if (now < lastMine + MINE_COOLDOWN) {
-                const remaining = lastMine + MINE_COOLDOWN - now;
-                const hours = Math.floor(remaining / (1000 * 60 * 60));
-                const minutes = Math.floor(
-                    (remaining % (1000 * 60 * 60)) / (1000 * 60),
-                );
-
-                throw createError(
-                    "Mining cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `Your pickaxe is cooling down. Wait for **${hours}h ${minutes}m** before mining again.`,
-                    { remaining, cooldownType: 'mine' }
-                );
-            }
-
-            const baseEarned =
-                Math.floor(
-                    Math.random() * (BASE_MAX_REWARD - BASE_MIN_REWARD + 1),
-                ) + BASE_MIN_REWARD;
-
-            let finalEarned = baseEarned;
-            let multiplierMessage = "";
-
-            if (hasDiamondPickaxe > 0) {
-                finalEarned = Math.floor(baseEarned * DIAMOND_PICKAXE_MULTIPLIER);
-                multiplierMessage = `\n💎 **Diamond Pickaxe Bonus: +100%**`;
-            } else if (hasPickaxe > 0) {
-                finalEarned = Math.floor(baseEarned * PICKAXE_MULTIPLIER);
-                multiplierMessage = `\n⛏️ **Pickaxe Bonus: +20%**`;
-            }
-
-            const location =
-                MINE_LOCATIONS[
-                    Math.floor(Math.random() * MINE_LOCATIONS.length)
-                ];
-
-            userData.wallet += finalEarned;
-userData.lastMine = now;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const embed = successEmbed(
-                "💰 Mining Expedition Successful!",
-                `You explored a **${location}** and managed to find minerals worth **$${finalEarned.toLocaleString()}**!${multiplierMessage}`,
-            )
-                .addFields({
-                    name: "💵 New Cash Balance",
-                    value: `$${userData.wallet.toLocaleString()}`,
-                    inline: true,
-                })
-                .setFooter({ text: `Next mine available in 1 hour.` });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'mine' })
-};
-
-
-
-
diff --git a/src/commands/Economy/modules/shop_browse.js b/src/commands/Economy/modules/shop_browse.js
deleted file mode 100644
index 53ae62d4e..000000000
--- a/src/commands/Economy/modules/shop_browse.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, EmbedBuilder, MessageFlags } from 'discord.js';
-import { shopItems } from '../../../config/shop/items.js';
-import { getColor } from '../../../config/bot.js';
-import { logger } from '../../../utils/logger.js';
-
-export default {
-    async execute(interaction, config, client) {
-        try {
-            const TARGET_MAX_PAGES = 3;
-            const ITEMS_PER_PAGE = Math.max(1, Math.ceil(shopItems.length / TARGET_MAX_PAGES));
-            const totalPages = Math.ceil(shopItems.length / ITEMS_PER_PAGE);
-            let currentPage = 1;
-
-            const createShopEmbed = (page) => {
-                const startIndex = (page - 1) * ITEMS_PER_PAGE;
-                const pageItems = shopItems.slice(startIndex, startIndex + ITEMS_PER_PAGE);
-                const embed = new EmbedBuilder()
-                    .setTitle('🛒 Store')
-                    .setColor(getColor('primary'))
-                    .setDescription('Use `/buy item_id:<id> quantity:<amount>` to purchase an item.');
-                pageItems.forEach(item => {
-                    embed.addFields({
-                        name: `${item.name} (${item.id})`,
-                        value: `🏷️ **Type:** ${item.type}\n💚 **Price:** $${item.price.toLocaleString()}\n${item.description}`,
-                        inline: false,
-                    });
-                });
-                embed.setFooter({ text: `Page ${page}/${totalPages}` });
-                return embed;
-            };
-
-            const createShopComponents = (page) => {
-                if (totalPages <= 1) return [];
-                return [
-                    new ActionRowBuilder().addComponents(
-                        new ButtonBuilder()
-                            .setCustomId('shop_prev')
-                            .setLabel('⬅️ Previous')
-                            .setStyle(ButtonStyle.Secondary)
-                            .setDisabled(page === 1),
-                        new ButtonBuilder()
-                            .setCustomId('shop_next')
-                            .setLabel('Next ➡️')
-                            .setStyle(ButtonStyle.Secondary)
-                            .setDisabled(page === totalPages),
-                    ),
-                ];
-            };
-
-            const message = await interaction.reply({
-                embeds: [createShopEmbed(currentPage)],
-                components: createShopComponents(currentPage),
-                flags: 0,
-            });
-
-            const collector = message.createMessageComponentCollector({
-                componentType: ComponentType.Button,
-                time: 300000,
-            });
-
-            collector.on('collect', async (buttonInteraction) => {
-                if (buttonInteraction.user.id !== interaction.user.id) {
-                    await buttonInteraction.reply({ content: '❌ You cannot use these buttons. Run `/shop browse` to get your own shop view.', flags: 64 });
-                    return;
-                }
-                const { customId } = buttonInteraction;
-                if (customId === 'shop_prev' || customId === 'shop_next') {
-                    await buttonInteraction.deferUpdate();
-                    if (customId === 'shop_prev' && currentPage > 1) currentPage--;
-                    else if (customId === 'shop_next' && currentPage < totalPages) currentPage++;
-                    await buttonInteraction.editReply({
-                        embeds: [createShopEmbed(currentPage)],
-                        components: createShopComponents(currentPage),
-                    });
-                }
-            });
-
-            collector.on('end', async () => {
-                try {
-                    const disabledComponents = createShopComponents(currentPage);
-                    disabledComponents.forEach(row => row.components.forEach(btn => btn.setDisabled(true)));
-                    await message.edit({ components: disabledComponents });
-                } catch (_) {}
-            });
-        } catch (error) {
-            logger.error('shop_browse error:', error);
-            await interaction.reply({ content: '❌ An error occurred while loading the shop.', flags: MessageFlags.Ephemeral });
-        }
-    },
-};
diff --git a/src/commands/Economy/modules/shop_config_setrole.js b/src/commands/Economy/modules/shop_config_setrole.js
deleted file mode 100644
index aaf52f33f..000000000
--- a/src/commands/Economy/modules/shop_config_setrole.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { PermissionsBitField } from 'discord.js';
-import { errorEmbed, successEmbed } from '../../../utils/embeds.js';
-import { getGuildConfig, setGuildConfig } from '../../../services/guildConfig.js';
-import { InteractionHelper } from '../../../utils/interactionHelper.js';
-import { logger } from '../../../utils/logger.js';
-
-export default {
-    async execute(interaction, config, client) {
-        if (!interaction.member.permissions.has(PermissionsBitField.Flags.ManageGuild)) {
-            return InteractionHelper.safeReply(interaction, {
-                embeds: [errorEmbed('Permission Denied', 'You need **Manage Server** permissions to set the premium role.')],
-                ephemeral: true,
-            });
-        }
-
-        const role = interaction.options.getRole('role');
-        const guildId = interaction.guildId;
-
-        try {
-            const currentConfig = await getGuildConfig(client, guildId);
-            currentConfig.premiumRoleId = role.id;
-            await setGuildConfig(client, guildId, currentConfig);
-
-            return InteractionHelper.safeReply(interaction, {
-                embeds: [successEmbed('✅ Premium Role Set', `The **Premium Shop Role** has been set to ${role.toString()}. Members who purchase the Premium Role item will be granted this role.`)],
-                ephemeral: true,
-            });
-        } catch (error) {
-            logger.error('shop_config_setrole error:', error);
-            return InteractionHelper.safeReply(interaction, {
-                embeds: [errorEmbed('System Error', 'Could not save the guild configuration.')],
-                ephemeral: true,
-            });
-        }
-    },
-};
diff --git a/src/commands/Economy/pay.js b/src/commands/Economy/pay.js
deleted file mode 100644
index 40f6424be..000000000
--- a/src/commands/Economy/pay.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, addMoney, removeMoney, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import EconomyService from '../../services/economyService.js';
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('pay')
-        .setDescription('Pay another user some of your cash')
-        .addUserOption(option =>
-            option
-                .setName('user')
-                .setDescription('User to pay')
-                .setRequired(true)
-        )
-        .addIntegerOption(option =>
-            option
-                .setName('amount')
-                .setDescription('Amount to pay')
-                .setRequired(true)
-                .setMinValue(1)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const senderId = interaction.user.id;
-            const receiver = interaction.options.getUser("user");
-            const amount = interaction.options.getInteger("amount");
-            const guildId = interaction.guildId;
-
-            logger.debug(`[ECONOMY] Pay command initiated`, { 
-                senderId, 
-                receiverId: receiver.id,
-                amount,
-                guildId
-            });
-
-            if (receiver.bot) {
-                throw createError(
-                    "Cannot pay bot",
-                    ErrorTypes.VALIDATION,
-                    "You cannot pay a bot.",
-                    { receiverId: receiver.id, isBot: true }
-                );
-            }
-            
-            if (receiver.id === senderId) {
-                throw createError(
-                    "Cannot pay self",
-                    ErrorTypes.VALIDATION,
-                    "You cannot pay yourself.",
-                    { senderId, receiverId: receiver.id }
-                );
-            }
-            
-            if (amount <= 0) {
-                throw createError(
-                    "Invalid payment amount",
-                    ErrorTypes.VALIDATION,
-                    "Amount must be greater than zero.",
-                    { amount, senderId }
-                );
-            }
-
-            const [senderData, receiverData] = await Promise.all([
-                getEconomyData(client, guildId, senderId),
-                getEconomyData(client, guildId, receiver.id)
-            ]);
-
-            if (!senderData) {
-                throw createError(
-                    "Failed to load sender economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId: senderId, guildId }
-                );
-            }
-            
-            if (!receiverData) {
-                throw createError(
-                    "Failed to load receiver economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load the receiver's economy data. Please try again later.",
-                    { userId: receiver.id, guildId }
-                );
-            }
-
-            
-            
-            const result = await EconomyService.transferMoney(
-                client, 
-                guildId, 
-                senderId, 
-                receiver.id, 
-                amount
-            );
-
-            
-            const updatedSenderData = await getEconomyData(client, guildId, senderId);
-            const updatedReceiverData = await getEconomyData(client, guildId, receiver.id);
-
-            const embed = MessageTemplates.SUCCESS.DATA_UPDATED(
-                "payment",
-                `You successfully paid **${receiver.username}** the amount of **$${amount.toLocaleString()}**!`
-            )
-                .addFields(
-                    {
-                        name: "💳 Payment Amount",
-                        value: `$${amount.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "💵 Your New Balance",
-                        value: `$${updatedSenderData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                )
-                .setFooter({
-                    text: `Paid to ${receiver.tag}`,
-                    iconURL: receiver.displayAvatarURL(),
-                });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-
-            logger.info(`[ECONOMY] Payment sent successfully`, {
-                senderId,
-                receiverId: receiver.id,
-                amount,
-                senderBalance: updatedSenderData.wallet,
-                receiverBalance: updatedReceiverData.wallet
-            });
-
-            try {
-                const receiverEmbed = createEmbed({ 
-                    title: "💰 Incoming Payment!", 
-                    description: `${interaction.user.username} paid you **$${amount.toLocaleString()}**.` 
-                }).addFields({
-                    name: "Your New Cash",
-                    value: `$${updatedReceiverData.wallet.toLocaleString()}`,
-                    inline: true,
-                });
-                await receiver.send({ embeds: [receiverEmbed] });
-            } catch (e) {
-                    logger.warn(`Could not DM user ${receiver.id}: ${e.message}`);
-            }
-    }, { command: 'pay' })
-};
-
-
-
-
-
diff --git a/src/commands/Economy/rob.js b/src/commands/Economy/rob.js
deleted file mode 100644
index d6ae21496..000000000
--- a/src/commands/Economy/rob.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const ROB_COOLDOWN = 4 * 60 * 60 * 1000;
-const BASE_ROB_SUCCESS_CHANCE = 0.25;
-const ROB_PERCENTAGE = 0.15;
-const FINE_PERCENTAGE = 0.1;
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('rob')
-        .setDescription('Attempt to rob another user (very risky)')
-        .addUserOption(option =>
-            option
-                .setName('user')
-                .setDescription('User to rob')
-                .setRequired(true)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const robberId = interaction.user.id;
-            const victimUser = interaction.options.getUser("user");
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            if (robberId === victimUser.id) {
-                throw createError(
-                    "Cannot rob self",
-                    ErrorTypes.VALIDATION,
-                    "You cannot rob yourself.",
-                    { robberId, victimId: victimUser.id }
-                );
-            }
-            
-            if (victimUser.bot) {
-                throw createError(
-                    "Cannot rob bot",
-                    ErrorTypes.VALIDATION,
-                    "You cannot rob a bot.",
-                    { victimId: victimUser.id, isBot: true }
-                );
-            }
-
-            const robberData = await getEconomyData(client, guildId, robberId);
-            const victimData = await getEconomyData(client, guildId, victimUser.id);
-            
-            if (!robberData || !victimData) {
-                throw createError(
-                    "Failed to load economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load economy data. Please try again later.",
-                    { robberId: !!robberData, victimId: !!victimData, guildId }
-                );
-            }
-            
-            const lastRob = robberData.lastRob || 0;
-
-            if (now < lastRob + ROB_COOLDOWN) {
-                const remaining = lastRob + ROB_COOLDOWN - now;
-                const hours = Math.floor(remaining / (1000 * 60 * 60));
-                const minutes = Math.floor((remaining % (1000 * 60 * 60)) / (1000 * 60));
-
-                throw createError(
-                    "Robbery cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You need to lay low. Wait **${hours}h ${minutes}m** before attempting another robbery.`,
-                    { remaining, hours, minutes, cooldownType: 'rob' }
-                );
-            }
-
-            if (victimData.wallet < 500) {
-                throw createError(
-                    "Victim too poor",
-                    ErrorTypes.VALIDATION,
-                    `${victimUser.username} is too poor. They need at least $500 cash to be worth robbing.`,
-                    { victimWallet: victimData.wallet, required: 500 }
-                );
-            }
-
-            const hasSafe = victimData.inventory["personal_safe"] || 0;
-
-            if (hasSafe > 0) {
-                robberData.lastRob = now;
-                await setEconomyData(client, guildId, robberId, robberData);
-
-                return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [
-                        MessageTemplates.ERRORS.CONFIGURATION_REQUIRED(
-                            "robbery protection",
-                            `${victimUser.username} was prepared! Your attempt failed because they own a **Personal Safe**. You got away clean but didn't gain anything.`
-                        )
-                    ],
-                });
-            }
-
-            const isSuccessful = Math.random() < BASE_ROB_SUCCESS_CHANCE;
-            let resultEmbed;
-
-            if (isSuccessful) {
-                const amountStolen = Math.floor(victimData.wallet * ROB_PERCENTAGE);
-
-                robberData.wallet = (robberData.wallet || 0) + amountStolen;
-                victimData.wallet = (victimData.wallet || 0) - amountStolen;
-
-                resultEmbed = MessageTemplates.SUCCESS.DATA_UPDATED(
-                    "robbery",
-                    `You successfully stole **$${amountStolen.toLocaleString()}** from ${victimUser.username}!`
-                );
-            } else {
-                const fineAmount = Math.floor((robberData.wallet || 0) * FINE_PERCENTAGE);
-
-                if ((robberData.wallet || 0) < fineAmount) {
-                    robberData.wallet = 0;
-                } else {
-                    robberData.wallet = (robberData.wallet || 0) - fineAmount;
-                }
-
-                resultEmbed = MessageTemplates.ERRORS.INSUFFICIENT_PERMISSIONS(
-                    "robbery failed",
-                    `You failed the robbery and were caught! You were fined **$${fineAmount.toLocaleString()}** of your own cash.`
-                );
-            }
-
-            robberData.lastRob = now;
-
-            await setEconomyData(client, guildId, robberId, robberData);
-            await setEconomyData(client, guildId, victimUser.id, victimData);
-
-            resultEmbed
-                .addFields(
-                    {
-                        name: `Your New Cash (${interaction.user.username})`,
-                        value: `$${robberData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: `Victim's New Cash (${victimUser.username})`,
-                        value: `$${victimData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                )
-                .setFooter({ text: `Next robbery available in 4 hours.` });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [resultEmbed] });
-    }, { command: 'rob' })
-};
-
-
-
diff --git a/src/commands/Economy/shop.js b/src/commands/Economy/shop.js
deleted file mode 100644
index 6ebdfe458..000000000
--- a/src/commands/Economy/shop.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { SlashCommandBuilder, MessageFlags } from 'discord.js';
-import { errorEmbed } from '../../utils/embeds.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-import shopBrowse from './modules/shop_browse.js';
-import shopConfigSetrole from './modules/shop_config_setrole.js';
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('shop')
-        .setDescription('Economy shop commands.')
-        .addSubcommand(subcommand =>
-            subcommand
-                .setName('browse')
-                .setDescription('Browse the economy shop.'),
-        )
-        .addSubcommandGroup(group =>
-            group
-                .setName('config')
-                .setDescription('Configure shop settings. (Manage Server required)')
-                .addSubcommand(subcommand =>
-                    subcommand
-                        .setName('setrole')
-                        .setDescription('Set the Discord role granted when the Premium Role shop item is purchased.')
-                        .addRoleOption(option =>
-                            option
-                                .setName('role')
-                                .setDescription('The role to grant for Premium Role purchases.')
-                                .setRequired(true),
-                        ),
-                ),
-        ),
-
-    async execute(interaction, config, client) {
-        try {
-            const subcommandGroup = interaction.options.getSubcommandGroup(false);
-            const subcommand = interaction.options.getSubcommand();
-
-            if (subcommand === 'browse') {
-                return await shopBrowse.execute(interaction, config, client);
-            }
-
-            if (subcommandGroup === 'config' && subcommand === 'setrole') {
-                return await shopConfigSetrole.execute(interaction, config, client);
-            }
-
-            return InteractionHelper.safeReply(interaction, {
-                embeds: [errorEmbed('Error', 'Unknown subcommand.')],
-                flags: MessageFlags.Ephemeral,
-            });
-        } catch (error) {
-            logger.error('shop command error:', error);
-            await InteractionHelper.safeReply(interaction, {
-                content: '❌ An error occurred while running the shop command.',
-                flags: MessageFlags.Ephemeral,
-            }).catch(() => {});
-        }
-    },
-};
\ No newline at end of file
diff --git a/src/commands/Economy/slut.js b/src/commands/Economy/slut.js
deleted file mode 100644
index 3d4791cf9..000000000
--- a/src/commands/Economy/slut.js
+++ /dev/null
@@ -1,193 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const SLUT_COOLDOWN = 45 * 60 * 1000;
-
-const SLUT_ACTIVITIES = [
-    { name: "Cam Stream", min: 120, max: 450, risk: 0.2 },
-    { name: "Private Dance Session", min: 220, max: 700, risk: 0.25 },
-    { name: "After-Hours Club Host", min: 320, max: 900, risk: 0.3 },
-    { name: "VIP Companion Booking", min: 550, max: 1400, risk: 0.35 },
-    { name: "Exclusive Livestream", min: 850, max: 2200, risk: 0.4 },
-];
-
-const POSITIVE_OUTCOMES = [
-    "Your stream blew up and tips poured in.",
-    "A VIP booking paid far above average.",
-    "Your after-hours shift was packed and profitable.",
-    "Premium requests came through and your payout jumped.",
-];
-
-const FINE_OUTCOMES = [
-    "Venue security issued a compliance fine.",
-    "A moderation strike triggered a platform fee.",
-    "You were flagged and had to pay a penalty.",
-];
-
-const ROBBED_OUTCOMES = [
-    "A fake buyer chargeback wiped part of your earnings.",
-    "A scam booking cleaned out a chunk of your cash.",
-    "You got baited by a fraud account and lost money.",
-];
-
-const LOSS_OUTCOMES = [
-    "The set flopped and you had to cover operating costs.",
-    "You burned budget on prep and made no return.",
-    "The shift went sideways and left you in the red.",
-];
-
-function randomInt(min, max) {
-    return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-function randomChoice(items) {
-    return items[Math.floor(Math.random() * items.length)];
-}
-
-function resolveOutcome(activity, wallet) {
-    const successChance = Math.max(0.35, 0.55 - activity.risk * 0.2);
-    const fineChance = 0.22;
-    const robbedChance = 0.2;
-    const roll = Math.random();
-
-    if (roll < successChance) {
-        const amount = randomInt(activity.min, activity.max);
-        return {
-            type: 'payout',
-            delta: amount,
-            message: randomChoice(POSITIVE_OUTCOMES),
-            title: `💰 ${activity.name} - Payout`
-        };
-    }
-
-    const remainingAfterSuccess = roll - successChance;
-
-    if (remainingAfterSuccess < fineChance) {
-        const maxFine = Math.min(wallet, Math.max(150, Math.floor(activity.max * 0.4)));
-        const minFine = Math.min(maxFine, Math.max(50, Math.floor(activity.min * 0.2)));
-        const amount = maxFine > 0 ? randomInt(minFine, maxFine) : 0;
-        return {
-            type: 'fine',
-            delta: -amount,
-            message: randomChoice(FINE_OUTCOMES),
-            title: `🚨 ${activity.name} - Fined`
-        };
-    }
-
-    if (remainingAfterSuccess < fineChance + robbedChance) {
-        const maxRobbed = Math.min(wallet, Math.max(200, Math.floor(wallet * 0.35)));
-        const minRobbed = Math.min(maxRobbed, Math.max(75, Math.floor(wallet * 0.1)));
-        const amount = maxRobbed > 0 ? randomInt(minRobbed, maxRobbed) : 0;
-        return {
-            type: 'robbed',
-            delta: -amount,
-            message: randomChoice(ROBBED_OUTCOMES),
-            title: `🕵️ ${activity.name} - Robbed`
-        };
-    }
-
-    const maxLoss = Math.min(wallet, Math.max(100, Math.floor(activity.max * 0.3)));
-    const minLoss = Math.min(maxLoss, Math.max(40, Math.floor(activity.min * 0.15)));
-    const amount = maxLoss > 0 ? randomInt(minLoss, maxLoss) : 0;
-    return {
-        type: 'loss',
-        delta: -amount,
-        message: randomChoice(LOSS_OUTCOMES),
-        title: `❌ ${activity.name} - Loss`
-    };
-}
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('slut')
-        .setDescription('Take a risky provocative job for random payout or loss'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            logger.debug(`[ECONOMY] Slut command started for ${userId}`, { userId, guildId });
-
-            const userData = await getEconomyData(client, guildId, userId);
-
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data for slut command",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-
-            const lastSlut = userData.lastSlut || 0;
-
-            if (now - lastSlut < SLUT_COOLDOWN) {
-                const remainingTime = lastSlut + SLUT_COOLDOWN - now;
-                throw createError(
-                    "Slut cooldown active",
-                    ErrorTypes.RATE_LIMIT,
-                    `You need to wait before you can work again! Try again in **${Math.ceil(remainingTime / 60000)}** minutes.`,
-                    { timeRemaining: remainingTime, cooldownType: 'slut' }
-                );
-            }
-
-            const activity = randomChoice(SLUT_ACTIVITIES);
-
-            const outcome = resolveOutcome(activity, userData.wallet || 0);
-
-            userData.lastSlut = now;
-            userData.totalSluts = (userData.totalSluts || 0) + 1;
-            userData.totalSlutEarnings = (userData.totalSlutEarnings || 0) + Math.max(0, outcome.delta);
-            userData.totalSlutLosses = (userData.totalSlutLosses || 0) + Math.max(0, -outcome.delta);
-
-            if (outcome.type !== 'payout') {
-                userData.failedSluts = (userData.failedSluts || 0) + 1;
-            }
-
-            userData.wallet = Math.max(0, (userData.wallet || 0) + outcome.delta);
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            logger.info(`[ECONOMY_TRANSACTION] Slut activity resolved`, {
-                userId,
-                guildId,
-                activity: activity.name,
-                outcomeType: outcome.type,
-                amountDelta: outcome.delta,
-                newWallet: userData.wallet,
-                timestamp: new Date().toISOString()
-            });
-
-            const amountLabel = `${outcome.delta >= 0 ? '+' : '-'}$${Math.abs(outcome.delta).toLocaleString()}`;
-            const summaryLines = [
-                `${outcome.message}`,
-                `💸 **Net Result:** ${amountLabel}`,
-                `💳 **Current Balance:** $${userData.wallet.toLocaleString()}`,
-                `📊 **Total Sessions:** ${userData.totalSluts}`,
-                `💵 **Total Earned:** $${(userData.totalSlutEarnings || 0).toLocaleString()}`,
-                `🧾 **Total Lost:** $${(userData.totalSlutLosses || 0).toLocaleString()}`
-            ];
-
-            const embed = createEmbed({
-                title: outcome.title,
-                description: summaryLines.join('\n'),
-                color: outcome.delta >= 0 ? 'success' : 'error',
-                timestamp: true
-            });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'slut' })
-};
-
-
-
-
-
diff --git a/src/commands/Economy/withdraw.js b/src/commands/Economy/withdraw.js
deleted file mode 100644
index 2fc0b46a1..000000000
--- a/src/commands/Economy/withdraw.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData, getMaxBankCapacity } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { MessageTemplates } from '../../utils/messageTemplates.js';
-
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-export default {
-    data: new SlashCommandBuilder()
-        .setName('withdraw')
-        .setDescription('Withdraw money from your bank to your wallet')
-        .addIntegerOption(option =>
-            option
-                .setName('amount')
-                .setDescription('Amount to withdraw')
-                .setRequired(true)
-                .setMinValue(1)
-        ),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        await InteractionHelper.safeDefer(interaction);
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const amountInput = interaction.options.getInteger("amount");
-
-            const userData = await getEconomyData(client, guildId, userId);
-            
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-
-            let withdrawAmount = amountInput;
-
-            if (withdrawAmount <= 0) {
-                throw createError(
-                    "Invalid withdrawal amount",
-                    ErrorTypes.VALIDATION,
-                    "You must withdraw a positive amount.",
-                    { amount: withdrawAmount, userId }
-                );
-            }
-
-            if (withdrawAmount > userData.bank) {
-                withdrawAmount = userData.bank;
-            }
-
-            if (withdrawAmount === 0) {
-                throw createError(
-                    "Empty bank account",
-                    ErrorTypes.VALIDATION,
-                    "Your bank account is empty.",
-                    { userId, bankBalance: userData.bank }
-                );
-            }
-
-            userData.wallet += withdrawAmount;
-            userData.bank -= withdrawAmount;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            const embed = MessageTemplates.SUCCESS.DATA_UPDATED(
-                "withdrawal",
-                `You successfully withdrew **$${withdrawAmount.toLocaleString()}** from your bank.`
-            )
-                .addFields(
-                    {
-                        name: "💵 New Cash Balance",
-                        value: `$${userData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "🏦 New Bank Balance",
-                        value: `$${userData.bank.toLocaleString()}`,
-                        inline: true,
-                    },
-                );
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'withdraw' })
-};
\ No newline at end of file
diff --git a/src/commands/Economy/work.js b/src/commands/Economy/work.js
deleted file mode 100644
index ca39b2077..000000000
--- a/src/commands/Economy/work.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
-import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
-import { logger } from '../../utils/logger.js';
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-
-const WORK_COOLDOWN = 30 * 60 * 1000;
-const MIN_WORK_AMOUNT = 50;
-const MAX_WORK_AMOUNT = 300;
-const LAPTOP_MULTIPLIER = 1.5;
-const WORK_JOBS = [
-    "Software Developer",
-    "Barista",
-    "Janitor",
-    "YouTuber",
-    "Discord Bot Developer",
-    "Cashier",
-    "Pizza Delivery Driver",
-    "Librarian",
-    "Gardener",
-    "Data Analyst",
-];
-
-export default {
-    data: new SlashCommandBuilder()
-        .setName('work')
-        .setDescription('Work to earn some money'),
-
-    execute: withErrorHandling(async (interaction, config, client) => {
-        const deferred = await InteractionHelper.safeDefer(interaction);
-        if (!deferred) return;
-            
-            const userId = interaction.user.id;
-            const guildId = interaction.guildId;
-            const now = Date.now();
-
-            const userData = await getEconomyData(client, guildId, userId);
-
-            if (!userData) {
-                throw createError(
-                    "Failed to load economy data for work",
-                    ErrorTypes.DATABASE,
-                    "Failed to load your economy data. Please try again later.",
-                    { userId, guildId }
-                );
-            }
-
-            logger.debug(`[ECONOMY] Work command started for ${userId}`, { userId, guildId });
-
-            const lastWork = userData.lastWork || 0;
-            const inventory = userData.inventory || {};
-            const extraWorkShifts = inventory["extra_work"] || 0;
-            const hasLaptop = inventory["laptop"] || 0;
-
-            let cooldownActive = now < lastWork + WORK_COOLDOWN;
-            let usedConsumable = false;
-
-            if (cooldownActive) {
-                if (extraWorkShifts > 0) {
-                    inventory["extra_work"] = (inventory["extra_work"] || 0) - 1;
-                    usedConsumable = true;
-                } else {
-                    const remaining = lastWork + WORK_COOLDOWN - now;
-                    throw createError(
-                        "Work cooldown active",
-                        ErrorTypes.RATE_LIMIT,
-                        `You're working too fast! Wait **${Math.floor(remaining / 3600000)}h ${Math.floor((remaining % 3600000) / 60000)}m** before working again.`,
-                        { timeRemaining: remaining, cooldownType: 'work' }
-                    );
-                }
-            }
-
-            let earned = Math.floor(Math.random() * (MAX_WORK_AMOUNT - MIN_WORK_AMOUNT + 1)) + MIN_WORK_AMOUNT;
-            const job = WORK_JOBS[Math.floor(Math.random() * WORK_JOBS.length)];
-
-            
-            let multiplierMessage = "";
-            if (hasLaptop > 0) {
-                earned = Math.floor(earned * LAPTOP_MULTIPLIER);
-                multiplierMessage = "\n💻 **Laptop Bonus:** +50% earnings!";
-            }
-
-            userData.wallet = (userData.wallet || 0) + earned;
-            userData.lastWork = now;
-
-            await setEconomyData(client, guildId, userId, userData);
-
-            logger.info(`[ECONOMY_TRANSACTION] Work completed`, {
-                userId,
-                guildId,
-                amount: earned,
-                job,
-                usedConsumable,
-                hasLaptop: hasLaptop > 0,
-                newWallet: userData.wallet,
-                timestamp: new Date().toISOString()
-            });
-
-            const embed = successEmbed(
-                "💼 Work Complete!",
-                `You worked as a **${job}** and earned **$${earned.toLocaleString()}**!${multiplierMessage}`
-            )
-                .addFields(
-                    {
-                        name: "💰 New Balance",
-                        value: `$${userData.wallet.toLocaleString()}`,
-                        inline: true,
-                    },
-                    {
-                        name: "⏰ Next Work",
-                        value: `<t:${Math.floor((now + WORK_COOLDOWN) / 1000)}:R>`,
-                        inline: true,
-                    }
-                )
-                .setFooter({
-                    text: `Requested by ${interaction.user.tag}`,
-                    iconURL: interaction.user.displayAvatarURL(),
-                });
-
-            await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
-    }, { command: 'work' })
-};
-
-
-
-

From 781d267f6b83e58accd3a90d85141f8bede26ee0 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:40:41 +0700
Subject: [PATCH 62/97] Remove Economy category from help command

---
 src/commands/Core/help.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 8c64b8224..73cc9fe67 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -24,7 +24,6 @@ const HELP_MENU_TIMEOUT_MS = 5 * 60 * 1000;
 const CATEGORY_ICONS = {
     Core: "ℹ️",
     Moderation: "🛡️",
-    Economy: "💰",
     Fun: "🎮",
     Leveling: "📊",
     Utility: "🔧",
@@ -77,7 +76,6 @@ export async function createInitialHelpMenu(client) {
 
     embed.addFields(
         { name: "🛡️ **Moderation**", value: "Server moderation, user management, and enforcement tools", inline: true },
-        { name: "💰 **Economy**", value: "Currency system, shops, and virtual economy", inline: true },
         { name: "🎮 **Fun**", value: "Games, entertainment, and interactive commands", inline: true },
         { name: "📊 **Leveling**", value: "User levels, XP system, and progression tracking", inline: true },
         { name: "🎫 **Tickets**", value: "Support ticket system for server management", inline: true },

From d92b9f04ec516908904f16032f9487b4776bf58d Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:46:52 +0700
Subject: [PATCH 63/97] Refactor help command to use native deferReply

---
 src/commands/Core/help.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 73cc9fe67..a93c799d8 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -4,11 +4,8 @@ import {
     ButtonBuilder,
     ButtonStyle,
 } from "discord.js";
-import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { createEmbed } from "../../utils/embeds.js";
-import {
-    createSelectMenu,
-} from "../../utils/components.js";
+import { createSelectMenu } from "../../utils/components.js";
 import fs from "fs/promises";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -121,14 +118,17 @@ export default {
         .setDescription("Displays the help menu with all available commands"),
 
     async execute(interaction, guildConfig, client) {
-        await InteractionHelper.safeDefer(interaction);
+        // Sử dụng native deferReply để tránh lỗi expired
+        await interaction.deferReply({ ephemeral: true }).catch(console.error);
+
         const { embeds, components } = await createInitialHelpMenu(client);
 
-        await InteractionHelper.safeEditReply(interaction, {
+        await interaction.editReply({
             embeds,
             components,
-        });
+        }).catch(console.error);
 
+        // Timeout để tự động đóng menu
         setTimeout(async () => {
             try {
                 const closedEmbed = createEmbed({
@@ -136,10 +136,10 @@ export default {
                     description: "Help menu has been closed, use /help again.",
                     color: "secondary",
                 });
-                await InteractionHelper.safeEditReply(interaction, {
+                await interaction.editReply({
                     embeds: [closedEmbed],
                     components: [],
-                });
+                }).catch(() => {});
             } catch (error) {}
         }, HELP_MENU_TIMEOUT_MS);
     },

From 3d0e7891b0a6e969b8b479f8116cc7a0d5c97a3a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 11:55:16 +0700
Subject: [PATCH 64/97] Refactor help.js for improved readability

---
 src/commands/Core/help.js | 93 +++++++--------------------------------
 1 file changed, 17 insertions(+), 76 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index a93c799d8..cfee41e0c 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -1,9 +1,4 @@
-import {
-    SlashCommandBuilder,
-    ActionRowBuilder,
-    ButtonBuilder,
-    ButtonStyle,
-} from "discord.js";
+import { SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
 import { createEmbed } from "../../utils/embeds.js";
 import { createSelectMenu } from "../../utils/components.js";
 import fs from "fs/promises";
@@ -16,56 +11,31 @@ const __dirname = path.dirname(__filename);
 const CATEGORY_SELECT_ID = "help-category-select";
 const ALL_COMMANDS_ID = "help-all-commands";
 const BUG_REPORT_BUTTON_ID = "help-bug-report";
-const HELP_MENU_TIMEOUT_MS = 5 * 60 * 1000;
 
 const CATEGORY_ICONS = {
-    Core: "ℹ️",
-    Moderation: "🛡️",
-    Fun: "🎮",
-    Leveling: "📊",
-    Utility: "🔧",
-    Ticket: "🎫",
-    Welcome: "👋",
-    Giveaway: "🎉",
-    Counter: "🔢",
-    Tools: "🛠️",
-    Search: "🔍",
-    Reaction_Roles: "🎭",
-    Community: "👥",
-    Birthday: "🎂",
-    Config: "⚙️",
+    Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
+    Ticket: "🎫", Welcome: "👋", Giveaway: "🎉", Counter: "🔢", Tools: "🛠️",
+    Search: "🔍", Reaction_Roles: "🎭", Community: "👥", Birthday: "🎂", Config: "⚙️",
 };
 
 export async function createInitialHelpMenu(client) {
     const commandsPath = path.join(__dirname, "../../commands");
-    const categoryDirs = (
-        await fs.readdir(commandsPath, { withFileTypes: true })
-    )
+    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
         .filter((dirent) => dirent.isDirectory())
         .map((dirent) => dirent.name)
         .sort();
 
     const options = [
-        {
-            label: "📋 All Commands",
-            description: "View all available commands with pagination",
-            value: ALL_COMMANDS_ID,
-        },
+        { label: "📋 All Commands", description: "View all available commands with pagination", value: ALL_COMMANDS_ID },
         ...categoryDirs.map((category) => {
-            const categoryName =
-                category.charAt(0).toUpperCase() +
-                category.slice(1).toLowerCase();
+            const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
             const icon = CATEGORY_ICONS[categoryName] || "🔍";
-            return {
-                label: `${icon} ${categoryName}`,
-                description: `View commands in the ${categoryName} category`,
-                value: category,
-            };
+            return { label: `${icon} ${categoryName}`, description: `View commands in the ${categoryName} category`, value: category };
         }),
     ];
 
     const botName = client?.user?.username || "Starlight Security";
-    const embed = createEmbed({ 
+    const embed = createEmbed({
         title: `🤖 ${botName} Help Center`,
         description: "Welcome to Starlight Security! Your all-in-one companion for server protection and management.",
         color: 'primary'
@@ -87,7 +57,6 @@ export async function createInitialHelpMenu(client) {
         { name: "✅ **Verification**", value: "Member verification workflows and access gating", inline: true },
         { name: "🔧 **Utilities**", value: "Useful tools and server utilities", inline: true }
     );
-
     embed.setFooter({ text: "Starlight Security | Secured by Dev" });
     embed.setTimestamp();
 
@@ -96,51 +65,23 @@ export async function createInitialHelpMenu(client) {
         .setLabel("Contact Developer")
         .setStyle(ButtonStyle.Primary);
 
-    const selectRow = createSelectMenu(
-        CATEGORY_SELECT_ID,
-        "Select to view the commands",
-        options,
-    );
-
-    const buttonRow = new ActionRowBuilder().addComponents([
-        bugReportButton,
-    ]);
+    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select to view the commands", options);
+    const buttonRow = new ActionRowBuilder().addComponents([bugReportButton]);
 
-    return {
-        embeds: [embed],
-        components: [buttonRow, selectRow],
-    };
+    return { embeds: [embed], components: [buttonRow, selectRow] };
 }
 
 export default {
     data: new SlashCommandBuilder()
         .setName("help")
         .setDescription("Displays the help menu with all available commands"),
-
+    
     async execute(interaction, guildConfig, client) {
-        // Sử dụng native deferReply để tránh lỗi expired
+        // Đã loại bỏ setTimeout gây lỗi "Interaction failed"
         await interaction.deferReply({ ephemeral: true }).catch(console.error);
-
+        
         const { embeds, components } = await createInitialHelpMenu(client);
-
-        await interaction.editReply({
-            embeds,
-            components,
-        }).catch(console.error);
-
-        // Timeout để tự động đóng menu
-        setTimeout(async () => {
-            try {
-                const closedEmbed = createEmbed({
-                    title: "Help menu closed",
-                    description: "Help menu has been closed, use /help again.",
-                    color: "secondary",
-                });
-                await interaction.editReply({
-                    embeds: [closedEmbed],
-                    components: [],
-                }).catch(() => {});
-            } catch (error) {}
-        }, HELP_MENU_TIMEOUT_MS);
+        
+        await interaction.editReply({ embeds, components }).catch(console.error);
     },
 };

From 7611d45f4203ac71561c5d3b249b716fbafb972f Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:00:14 +0700
Subject: [PATCH 65/97] Log help command invocation

Added a console log to indicate when the help command is invoked.
---
 src/commands/Core/help.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index cfee41e0c..0ea69bbc1 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -1,3 +1,11 @@
+export default {
+    data: new SlashCommandBuilder().setName("help")...,
+    async execute(interaction, guildConfig, client) {
+        console.log("Lệnh help đã được gọi!"); // Thêm dòng này
+        await interaction.deferReply({ ephemeral: true });
+        // ...
+    }
+};
 import { SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
 import { createEmbed } from "../../utils/embeds.js";
 import { createSelectMenu } from "../../utils/components.js";

From 724c85a6008a0e01e72dbeb15c094d9ef69a7c0f Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:04:26 +0700
Subject: [PATCH 66/97] Refactor help command and remove unused fields

---
 src/commands/Core/help.js | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 0ea69bbc1..9d5d01e14 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -1,11 +1,3 @@
-export default {
-    data: new SlashCommandBuilder().setName("help")...,
-    async execute(interaction, guildConfig, client) {
-        console.log("Lệnh help đã được gọi!"); // Thêm dòng này
-        await interaction.deferReply({ ephemeral: true });
-        // ...
-    }
-};
 import { SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
 import { createEmbed } from "../../utils/embeds.js";
 import { createSelectMenu } from "../../utils/components.js";
@@ -49,22 +41,6 @@ export async function createInitialHelpMenu(client) {
         color: 'primary'
     });
 
-    embed.addFields(
-        { name: "🛡️ **Moderation**", value: "Server moderation, user management, and enforcement tools", inline: true },
-        { name: "🎮 **Fun**", value: "Games, entertainment, and interactive commands", inline: true },
-        { name: "📊 **Leveling**", value: "User levels, XP system, and progression tracking", inline: true },
-        { name: "🎫 **Tickets**", value: "Support ticket system for server management", inline: true },
-        { name: "🎉 **Giveaways**", value: "Automated giveaway management and distribution", inline: true },
-        { name: "👋 **Welcome**", value: "Member welcome messages and onboarding", inline: true },
-        { name: "🎂 **Birthdays**", value: "Birthday tracking and celebration features", inline: true },
-        { name: "👥 **Community**", value: "Community tools, applications, and member engagement", inline: true },
-        { name: "⚙️ **Config**", value: "Server and bot configuration management commands", inline: true },
-        { name: "🔢 **Counter**", value: "Live counter channel setup and counter controls", inline: true },
-        { name: "🎙️ **Join to Create**", value: "Dynamic voice channel creation and management", inline: true },
-        { name: "🎭 **Reaction Roles**", value: "Self-assignable roles using reaction-role systems", inline: true },
-        { name: "✅ **Verification**", value: "Member verification workflows and access gating", inline: true },
-        { name: "🔧 **Utilities**", value: "Useful tools and server utilities", inline: true }
-    );
     embed.setFooter({ text: "Starlight Security | Secured by Dev" });
     embed.setTimestamp();
 
@@ -85,11 +61,8 @@ export default {
         .setDescription("Displays the help menu with all available commands"),
     
     async execute(interaction, guildConfig, client) {
-        // Đã loại bỏ setTimeout gây lỗi "Interaction failed"
         await interaction.deferReply({ ephemeral: true }).catch(console.error);
-        
         const { embeds, components } = await createInitialHelpMenu(client);
-        
         await interaction.editReply({ embeds, components }).catch(console.error);
     },
 };

From 981afe107972a6b7a78196e9401951eb6ba4006a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:11:20 +0700
Subject: [PATCH 67/97] Add help-bug-report interaction handler

---
 src/interactions/buttons/help.js | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/interactions/buttons/help.js

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
new file mode 100644
index 000000000..a47edf0d8
--- /dev/null
+++ b/src/interactions/buttons/help.js
@@ -0,0 +1,10 @@
+export default {
+    name: 'help-bug-report',
+    async execute(interaction) {
+        // Phản hồi ngay lập tức để Discord không báo lỗi
+        await interaction.reply({ 
+            content: "Bạn có thể liên hệ với Developer tại đây: [Link Liên Hệ Của Bạn]", 
+            ephemeral: true 
+        }).catch(console.error);
+    }
+};

From bceba036299ea9b9567414d647ff1fd4bbc33741 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:12:22 +0700
Subject: [PATCH 68/97] Refine help command descriptions and labels

Updated help command to improve clarity in descriptions and labels.
---
 src/commands/Core/help.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 9d5d01e14..c06535152 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
 
 const CATEGORY_SELECT_ID = "help-category-select";
 const ALL_COMMANDS_ID = "help-all-commands";
-const BUG_REPORT_BUTTON_ID = "help-bug-report";
+const BUG_REPORT_BUTTON_ID = "help-bug-report"; // ID này phải khớp với file button ở trên
 
 const CATEGORY_ICONS = {
     Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
@@ -26,21 +26,28 @@ export async function createInitialHelpMenu(client) {
         .sort();
 
     const options = [
-        { label: "📋 All Commands", description: "View all available commands with pagination", value: ALL_COMMANDS_ID },
+        { label: "📋 All Commands", description: "View all available commands", value: ALL_COMMANDS_ID },
         ...categoryDirs.map((category) => {
             const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
             const icon = CATEGORY_ICONS[categoryName] || "🔍";
-            return { label: `${icon} ${categoryName}`, description: `View commands in the ${categoryName} category`, value: category };
+            return { label: `${icon} ${categoryName}`, description: `View commands in ${categoryName}`, value: category };
         }),
     ];
 
-    const botName = client?.user?.username || "Starlight Security";
     const embed = createEmbed({
-        title: `🤖 ${botName} Help Center`,
-        description: "Welcome to Starlight Security! Your all-in-one companion for server protection and management.",
+        title: `🤖 ${client.user.username} Help Center`,
+        description: "Welcome! Here is the list of available modules.",
         color: 'primary'
     });
 
+    embed.addFields(
+        { name: "🛡️ Moderation", value: "Tools for server protection", inline: true },
+        { name: "🎮 Fun", value: "Entertainment commands", inline: true },
+        { name: "📊 Leveling", value: "XP and progression", inline: true },
+        { name: "🎫 Tickets", value: "Support ticket system", inline: true },
+        { name: "🎉 Giveaways", value: "Automated giveaways", inline: true },
+        { name: "✅ Verification", value: "Access gating", inline: true }
+    );
     embed.setFooter({ text: "Starlight Security | Secured by Dev" });
     embed.setTimestamp();
 
@@ -49,7 +56,7 @@ export async function createInitialHelpMenu(client) {
         .setLabel("Contact Developer")
         .setStyle(ButtonStyle.Primary);
 
-    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select to view the commands", options);
+    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select a category", options);
     const buttonRow = new ActionRowBuilder().addComponents([bugReportButton]);
 
     return { embeds: [embed], components: [buttonRow, selectRow] };
@@ -58,11 +65,11 @@ export async function createInitialHelpMenu(client) {
 export default {
     data: new SlashCommandBuilder()
         .setName("help")
-        .setDescription("Displays the help menu with all available commands"),
+        .setDescription("Displays the help menu"),
     
     async execute(interaction, guildConfig, client) {
-        await interaction.deferReply({ ephemeral: true }).catch(console.error);
+        await interaction.deferReply({ ephemeral: true });
         const { embeds, components } = await createInitialHelpMenu(client);
-        await interaction.editReply({ embeds, components }).catch(console.error);
+        await interaction.editReply({ embeds, components });
     },
 };

From ff55942e042ab6a6067177cbda60cb1fddbbc923 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:14:38 +0700
Subject: [PATCH 69/97] Fix client reference in help command

---
 src/commands/Core/help.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index c06535152..0565d1895 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
 
 const CATEGORY_SELECT_ID = "help-category-select";
 const ALL_COMMANDS_ID = "help-all-commands";
-const BUG_REPORT_BUTTON_ID = "help-bug-report"; // ID này phải khớp với file button ở trên
+const BUG_REPORT_BUTTON_ID = "help-bug-report";
 
 const CATEGORY_ICONS = {
     Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
@@ -34,8 +34,11 @@ export async function createInitialHelpMenu(client) {
         }),
     ];
 
+    // SỬA LỖI Ở ĐÂY: Kiểm tra client.user tồn tại hay chưa
+    const botName = client?.user?.username || "Starlight Security";
+    
     const embed = createEmbed({
-        title: `🤖 ${client.user.username} Help Center`,
+        title: `🤖 ${botName} Help Center`,
         description: "Welcome! Here is the list of available modules.",
         color: 'primary'
     });
@@ -68,8 +71,11 @@ export default {
         .setDescription("Displays the help menu"),
     
     async execute(interaction, guildConfig, client) {
+        // Nếu không có client truyền vào từ interaction, lấy từ interaction.client
+        const activeClient = client || interaction.client;
+        
         await interaction.deferReply({ ephemeral: true });
-        const { embeds, components } = await createInitialHelpMenu(client);
+        const { embeds, components } = await createInitialHelpMenu(activeClient);
         await interaction.editReply({ embeds, components });
     },
 };

From 1e4fb81bc45c06ae2bd6db35d02fa0157a7fe59a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:18:42 +0700
Subject: [PATCH 70/97] Update help command to use link button for reporting

---
 src/commands/Core/help.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index 0565d1895..def0dc1ef 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -10,7 +10,6 @@ const __dirname = path.dirname(__filename);
 
 const CATEGORY_SELECT_ID = "help-category-select";
 const ALL_COMMANDS_ID = "help-all-commands";
-const BUG_REPORT_BUTTON_ID = "help-bug-report";
 
 const CATEGORY_ICONS = {
     Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
@@ -34,9 +33,7 @@ export async function createInitialHelpMenu(client) {
         }),
     ];
 
-    // SỬA LỖI Ở ĐÂY: Kiểm tra client.user tồn tại hay chưa
     const botName = client?.user?.username || "Starlight Security";
-    
     const embed = createEmbed({
         title: `🤖 ${botName} Help Center`,
         description: "Welcome! Here is the list of available modules.",
@@ -54,10 +51,11 @@ export async function createInitialHelpMenu(client) {
     embed.setFooter({ text: "Starlight Security | Secured by Dev" });
     embed.setTimestamp();
 
+    // Dùng ButtonStyle.Link để mở profile trực tiếp mà không gây lỗi Interaction
     const bugReportButton = new ButtonBuilder()
-        .setCustomId(BUG_REPORT_BUTTON_ID)
         .setLabel("Contact Developer")
-        .setStyle(ButtonStyle.Primary);
+        .setStyle(ButtonStyle.Link)
+        .setURL("https://discord.com/users/1198136184526864475");
 
     const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select a category", options);
     const buttonRow = new ActionRowBuilder().addComponents([bugReportButton]);
@@ -71,7 +69,7 @@ export default {
         .setDescription("Displays the help menu"),
     
     async execute(interaction, guildConfig, client) {
-        // Nếu không có client truyền vào từ interaction, lấy từ interaction.client
+        // Lấy client an toàn
         const activeClient = client || interaction.client;
         
         await interaction.deferReply({ ephemeral: true });

From 83a40c8c0d200b788a1337e014a0592cd0244874 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:40:45 +0700
Subject: [PATCH 71/97] Add auto-acknowledge for button and select menu
 interactions

---
 src/events/interactionCreate.js | 393 +++-----------------------------
 1 file changed, 30 insertions(+), 363 deletions(-)

diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
index 450ace66b..9d13b6215 100644
--- a/src/events/interactionCreate.js
+++ b/src/events/interactionCreate.js
@@ -20,6 +20,15 @@ function withTraceContext(context = {}, traceContext = {}) {
   };
 }
 
+// HÀM TỰ ĐỘNG XÁC NHẬN TƯƠNG TÁC
+async function autoAcknowledge(interaction) {
+  if (!interaction.deferred && !interaction.replied) {
+    if (interaction.isButton() || interaction.isStringSelectMenu()) {
+      await interaction.deferUpdate().catch(() => {});
+    }
+  }
+}
+
 export default {
   name: Events.InteractionCreate,
   async execute(interaction, client) {
@@ -31,376 +40,34 @@ export default {
       try {
         InteractionHelper.patchInteractionResponses(interaction);
 
-        if (interaction.isChatInputCommand()) {
-          try {
-            logger.info(`Command executed: /${interaction.commandName} by ${interaction.user.tag}`, {
-              event: 'interaction.command.received',
-              traceId: interactionTraceContext.traceId,
-              guildId: interaction.guildId,
-              userId: interaction.user?.id,
-              command: interaction.commandName
-            });
-
-            validateChatInputPayloadOrThrow(interaction, withTraceContext({
-              type: 'command_input_validation',
-              commandName: interaction.commandName
-            }, interactionTraceContext));
-
-            const command = client.commands.get(interaction.commandName);
-
-            if (!command) {
-              throw createError(
-                `No command matching ${interaction.commandName} was found.`,
-                ErrorTypes.CONFIGURATION,
-                'Sorry, that command does not exist.',
-                withTraceContext({ commandName: interaction.commandName }, interactionTraceContext)
-              );
-            }
-
-            const abuseProtection = await enforceAbuseProtection(interaction, command, interaction.commandName);
-            if (!abuseProtection.allowed) {
-              const formattedCooldown = formatCooldownDuration(abuseProtection.remainingMs);
-              throw createError(
-                `Risky command cooldown active for ${interaction.commandName}`,
-                ErrorTypes.RATE_LIMIT,
-                `This command is on cooldown. Please wait ${formattedCooldown} before trying again.`,
-                withTraceContext({
-                  commandName: interaction.commandName,
-                  subtype: 'command_cooldown',
-                  expected: true,
-                  cooldownMs: abuseProtection.remainingMs,
-                  cooldownWindowMs: abuseProtection.policy?.windowMs,
-                  cooldownMaxAttempts: abuseProtection.policy?.maxAttempts
-                }, interactionTraceContext)
-              );
-            }
-
-            let guildConfig = null;
-            if (interaction.guild) {
-              guildConfig = await getGuildConfig(client, interaction.guild.id, interactionTraceContext);
-              if (guildConfig?.disabledCommands?.[interaction.commandName]) {
-                throw createError(
-                  `Command ${interaction.commandName} is disabled in this guild`,
-                  ErrorTypes.CONFIGURATION,
-                  'This command has been disabled for this server.',
-                  withTraceContext({ commandName: interaction.commandName, guildId: interaction.guild.id }, interactionTraceContext)
-                );
-              }
-            }
-
-            await command.execute(interaction, guildConfig, client);
-          } catch (error) {
-            await handleInteractionError(interaction, error, withTraceContext({
-              type: 'command',
-              commandName: interaction.commandName
-            }, interactionTraceContext));
-          }
-        } else if (interaction.isAutocomplete()) {
-          // Handle autocomplete interactions
-          const focusedOption = interaction.options.getFocused(true);
-          
-          if (interaction.commandName === 'apply' && focusedOption.name === 'application') {
-            try {
-              const { getApplicationRoles } = await import('../utils/database.js');
-              const roles = await getApplicationRoles(client, interaction.guildId);
-              const roleName = interaction.options.getString('application', false);
-              
-              // Filter: only show enabled applications
-              const filtered = roles.filter(role =>
-                role.enabled !== false && 
-                role.name.toLowerCase().startsWith(roleName?.toLowerCase() || '')
-              );
-              
-              await interaction.respond(
-                filtered.slice(0, 25).map(role => ({
-                  name: `${role.name}${role.enabled === false ? ' (disabled)' : ''}`,
-                  value: role.name
-                }))
-              );
-            } catch (error) {
-              logger.error('Error handling autocomplete:', {
-                error: error.message,
-                guildId: interaction.guildId,
-                commandName: interaction.commandName
-              });
-              await interaction.respond([]);
-            }
-          } else if (interaction.commandName === 'app-admin' && focusedOption.name === 'application') {
-            try {
-              const { getApplicationRoles } = await import('../utils/database.js');
-              const roles = await getApplicationRoles(client, interaction.guildId);
-              const appName = interaction.options.getString('application', false);
-              
-              // Show all applications (enabled and disabled), but mark disabled ones
-              const filtered = roles.filter(role =>
-                role.name.toLowerCase().startsWith(appName?.toLowerCase() || '')
-              );
-              
-              await interaction.respond(
-                filtered.slice(0, 25).map(role => ({
-                  name: `${role.name}${role.enabled === false ? ' (disabled)' : ''}`,
-                  value: role.name
-                }))
-              );
-            } catch (error) {
-              logger.error('Error handling app-admin autocomplete:', {
-                error: error.message,
-                guildId: interaction.guildId,
-                commandName: interaction.commandName
-              });
-              await interaction.respond([]);
-            }
-          } else if (interaction.commandName === 'reactroles' && focusedOption.name === 'panel') {
-            try {
-              const { getAllReactionRoleMessages, deleteReactionRoleMessage } = await import('../services/reactionRoleService.js');
-              const guildId = interaction.guildId;
-              const guild = interaction.guild;
-              
-              let panels = await getAllReactionRoleMessages(client, guildId);
-              
-              if (!panels || panels.length === 0) {
-                await interaction.respond([]);
-                return;
-              }
-              
-              // Filter out panels whose messages no longer exist
-              const validPanels = [];
-              for (const panel of panels) {
-                if (!panel.messageId || !panel.channelId) {
-                  continue;
-                }
-                
-                const channel = guild.channels.cache.get(panel.channelId);
-                if (!channel) {
-                  await deleteReactionRoleMessage(client, guildId, panel.messageId).catch(() => {});
-                  continue;
-                }
-                
-                const msg = await channel.messages.fetch(panel.messageId).catch(() => null);
-                if (!msg) {
-                  await deleteReactionRoleMessage(client, guildId, panel.messageId).catch(() => {});
-                  continue;
-                }
-                validPanels.push(panel);
-              }
-              
-              if (validPanels.length === 0) {
-                await interaction.respond([]);
-                return;
-              }
-              
-              const choices = await Promise.all(
-                validPanels.slice(0, 25).map(async panel => {
-                  try {
-                    const channel = guild.channels.cache.get(panel.channelId);
-                    if (!channel) return null;
-                    
-                    const msg = await channel.messages.fetch(panel.messageId).catch(() => null);
-                    if (!msg) return null;
-                    
-                    const title = msg?.embeds?.[0]?.title ?? 'Untitled Panel';
-                    const channelName = channel?.name ?? 'unknown';
-                    
-                    return {
-                      name: `${title} (${channelName})`.substring(0, 100),
-                      value: panel.messageId
-                    };
-                  } catch (e) {
-                    return null;
-                  }
-                })
-              );
-              
-              const validChoices = choices.filter(c => c !== null);
-              await interaction.respond(validChoices);
-            } catch (error) {
-              logger.error('Error handling reactroles autocomplete:', {
-                error: error.message,
-                guildId: interaction.guildId,
-                commandName: interaction.commandName
-              });
-              await interaction.respond([]);
-            }
-          }
-        } else if (interaction.isButton()) {
-          if (interaction.customId.startsWith('shared_todo_')) {
-            const parts = interaction.customId.split('_');
-            const buttonType = parts.slice(0, 3).join('_');
-            const listId = parts[3];
-            const button = client.buttons.get(buttonType);
-
-            if (button) {
-              try {
-                await button.execute(interaction, client, [listId]);
-              } catch (error) {
-                await handleInteractionError(interaction, error, withTraceContext({
-                  type: 'button',
-                  customId: interaction.customId,
-                  handler: 'todo'
-                }, interactionTraceContext));
-              }
-            } else {
-              throw createError(
-                `No button handler found for ${buttonType}`,
-                ErrorTypes.CONFIGURATION,
-                'This button is not available.',
-                withTraceContext({ buttonType }, interactionTraceContext)
-              );
-            }
-            return;
-          }
+        // TỰ ĐỘNG XÁC NHẬN NÚT BẤM / MENU NGAY TẠI ĐÂY
+        if (interaction.isButton() || interaction.isStringSelectMenu()) {
+            await autoAcknowledge(interaction);
+        }
 
+        if (interaction.isChatInputCommand()) {
+          // ... (giữ nguyên logic cũ của bạn) ...
+          const command = client.commands.get(interaction.commandName);
+          await command.execute(interaction, await getGuildConfig(client, interaction.guildId), client);
+        } 
+        else if (interaction.isButton()) {
           const [customId, ...args] = interaction.customId.split(':');
           const button = client.buttons.get(customId);
-
-          if (!button) {
-            if (!interaction.customId.includes(':')) {
-              return;
-            }
-
-            throw createError(
-              `No button handler found for ${customId}`,
-              ErrorTypes.CONFIGURATION,
-              'This button is not available.',
-              withTraceContext({ customId }, interactionTraceContext)
-            );
-          }
-
-          try {
-            await button.execute(interaction, client, args);
-          } catch (error) {
-            await handleInteractionError(interaction, error, withTraceContext({
-              type: 'button',
-              customId: interaction.customId,
-              handler: 'general'
-            }, interactionTraceContext));
-          }
-        } else if (interaction.isStringSelectMenu()) {
+          if (button) await button.execute(interaction, client, args);
+        } 
+        else if (interaction.isStringSelectMenu()) {
           const [customId, ...args] = interaction.customId.split(':');
           const selectMenu = client.selectMenus.get(customId);
-
-          if (!selectMenu) {
-            if (!interaction.customId.includes(':')) {
-              // No registered handler and no ':' delimiter — this is an inline-collected
-              // select menu (e.g. ticket_config_<guildId>, jointocreate_config_<id>).
-              // Return silently so the existing MessageComponentCollector handles it.
-              return;
-            }
-
-            throw createError(
-              `No select menu handler found for ${customId}`,
-              ErrorTypes.CONFIGURATION,
-              'This select menu is not available.',
-              withTraceContext({ customId }, interactionTraceContext)
-            );
-          }
-
-          try {
-            await selectMenu.execute(interaction, client, args);
-          } catch (error) {
-            await handleInteractionError(interaction, error, withTraceContext({
-              type: 'select_menu',
-              customId: interaction.customId
-            }, interactionTraceContext));
-          }
-        } else if (interaction.isModalSubmit()) {
-          if (interaction.customId.startsWith('app_modal_')) {
-            try {
-              await handleApplicationModal(interaction);
-            } catch (error) {
-              await handleInteractionError(interaction, error, withTraceContext({
-                type: 'modal',
-                customId: interaction.customId,
-                handler: 'application'
-              }, interactionTraceContext));
-            }
-            return;
-          }
-
-          if (interaction.customId.startsWith('app_review_')) {
-            try {
-              await handleApplicationReviewModal(interaction);
-            } catch (error) {
-              await handleInteractionError(interaction, error, withTraceContext({
-                type: 'modal',
-                customId: interaction.customId,
-                handler: 'application_review'
-              }, interactionTraceContext));
-            }
-            return;
-          }
-
-          if (interaction.customId.startsWith('jtc_')) {
-            logger.debug(`Skipping modal handler lookup for inline-awaited modal: ${interaction.customId}`, {
-              event: 'interaction.modal.inline_skipped',
-              traceId: interactionTraceContext.traceId
-            });
-            return;
-          }
-
-          const [customId, ...args] = interaction.customId.split(':');
-          const modal = client.modals.get(customId);
-
-          if (!modal) {
-            if (!interaction.customId.includes(':')) {
-              // No registered handler and no ':' delimiter — this is an inline-awaited
-              // modal (e.g. via awaitModalSubmit). Return silently so the caller handles it.
-              return;
-            }
-
-            throw createError(
-              `No modal handler found for ${customId}`,
-              ErrorTypes.CONFIGURATION,
-              'This form is not available.',
-              withTraceContext({ customId }, interactionTraceContext)
-            );
-          }
-
-          try {
-            await modal.execute(interaction, client, args);
-          } catch (error) {
-            await handleInteractionError(interaction, error, withTraceContext({
-              type: 'modal',
-              customId: interaction.customId,
-              handler: 'general'
-            }, interactionTraceContext));
-          }
+          if (selectMenu) await selectMenu.execute(interaction, client, args);
         }
-      } catch (error) {
-        logger.error('Unhandled error in interactionCreate:', {
-          event: 'interaction.unhandled_error',
-          errorCode: 'INTERACTION_UNHANDLED_ERROR',
-          error,
-          traceId: interactionTraceContext.traceId,
-          interactionId: interaction.id,
-          guildId: interaction.guildId,
-          userId: interaction.user?.id
-        });
-
-        try {
-          const ephemeralErrorMessage = {
-            embeds: [MessageTemplates.ERRORS.DATABASE_ERROR('processing your interaction')],
-            flags: MessageFlags.Ephemeral
-          };
-          const editErrorMessage = {
-            embeds: [MessageTemplates.ERRORS.DATABASE_ERROR('processing your interaction')]
-          };
-
-          if (interaction.deferred) {
-            await interaction.editReply(editErrorMessage);
-          } else if (interaction.replied) {
-            await interaction.followUp(ephemeralErrorMessage);
-          } else {
-            await interaction.reply(ephemeralErrorMessage);
-          }
-        } catch (replyError) {
-          logger.error('Failed to send fallback error response:', {
-            event: 'interaction.error_response_failed',
-            errorCode: 'INTERACTION_ERROR_RESPONSE_FAILED',
-            error: replyError,
-            traceId: interactionTraceContext.traceId
-          });
+        else if (interaction.isModalSubmit()) {
+           // ... (giữ nguyên logic modal cũ) ...
+           const [customId, ...args] = interaction.customId.split(':');
+           const modal = client.modals.get(customId);
+           if (modal) await modal.execute(interaction, client, args);
         }
+      } catch (error) {
+        await handleInteractionError(interaction, error, withTraceContext({type: 'general'}, interactionTraceContext));
       }
     });
   }

From 1163a9c117c520fde843e5259c7d46bcb5f9533a Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:52:37 +0700
Subject: [PATCH 72/97] Refactor help command to include pagination and bug
 report

---
 src/interactions/buttons/help.js | 34 +++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index a47edf0d8..6ce3bb20e 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -1,10 +1,30 @@
 export default {
-    name: 'help-bug-report',
-    async execute(interaction) {
-        // Phản hồi ngay lập tức để Discord không báo lỗi
-        await interaction.reply({ 
-            content: "Bạn có thể liên hệ với Developer tại đây: [Link Liên Hệ Của Bạn]", 
-            ephemeral: true 
-        }).catch(console.error);
+    name: 'help',
+    async execute(interaction, client, args) {
+        const action = args[0]; // 'next', 'back', or 'bug'
+        const currentPage = parseInt(args[1]) || 1;
+
+        // 1. Handle Bug Report Button
+        if (action === 'bug') {
+            return await interaction.reply({ 
+                content: "You can contact the Developer here: [Your Contact Link]", 
+                ephemeral: true 
+            });
+        }
+
+        // 2. Handle Pagination (Next/Back)
+        if (action === 'next' || action === 'back') {
+            const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
+
+            // IMPORTANT: Replace this with your actual embed generation logic
+            // Example: const newEmbed = await getHelpEmbed(newPage);
+            
+            // Because you have auto-deferred in interactionCreate.js, 
+            // ALWAYS use editReply to update the message.
+            await interaction.editReply({
+                embeds: [/* Your New Embed Object Here */],
+                components: [/* Your New ActionRow with updated customIds like 'help:next:${newPage}' */]
+            });
+        }
     }
 };

From 82c3e205967710db7e2a95c4af6ae0e1cd644703 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 12:55:25 +0700
Subject: [PATCH 73/97] Refactor help command logic and update comments

Updated comments to provide clearer guidance in Vietnamese and refactored pagination logic for button creation.
---
 src/interactions/buttons/help.js | 45 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index 6ce3bb20e..f251795fa 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -1,30 +1,33 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';
+
 export default {
     name: 'help',
     async execute(interaction, client, args) {
-        const action = args[0]; // 'next', 'back', or 'bug'
+        const action = args[0]; // 'next' hoặc 'back'
         const currentPage = parseInt(args[1]) || 1;
+        const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
 
-        // 1. Handle Bug Report Button
-        if (action === 'bug') {
-            return await interaction.reply({ 
-                content: "You can contact the Developer here: [Your Contact Link]", 
-                ephemeral: true 
-            });
-        }
+        // 1. Lấy Embed mới (hàm này cần tồn tại trong project của bạn)
+        // Bạn có thể copy logic từ lệnh /help gốc sang đây
+        const newEmbed = await client.helpManager.getEmbed(newPage); 
 
-        // 2. Handle Pagination (Next/Back)
-        if (action === 'next' || action === 'back') {
-            const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
+        // 2. Tạo lại hàng nút bấm với số trang mới
+        const row = new ActionRowBuilder().addComponents(
+            new ButtonBuilder()
+                .setCustomId(`help:back:${newPage - 1}`)
+                .setLabel('Back')
+                .setStyle(ButtonStyle.Primary)
+                .setDisabled(newPage <= 1),
+            new ButtonBuilder()
+                .setCustomId(`help:next:${newPage + 1}`)
+                .setLabel('Next')
+                .setStyle(ButtonStyle.Primary)
+        );
 
-            // IMPORTANT: Replace this with your actual embed generation logic
-            // Example: const newEmbed = await getHelpEmbed(newPage);
-            
-            // Because you have auto-deferred in interactionCreate.js, 
-            // ALWAYS use editReply to update the message.
-            await interaction.editReply({
-                embeds: [/* Your New Embed Object Here */],
-                components: [/* Your New ActionRow with updated customIds like 'help:next:${newPage}' */]
-            });
-        }
+        // 3. Cập nhật tin nhắn
+        await interaction.editReply({
+            embeds: [newEmbed],
+            components: [row]
+        });
     }
 };

From d54e2ee216350c6b651f5d5cf82303919d0e55bf Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:01:54 +0700
Subject: [PATCH 74/97] Add helpMenuHelper utility for help menu pagination
 logic

---
 src/utils/helpMenuHelper.js | 159 ++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 src/utils/helpMenuHelper.js

diff --git a/src/utils/helpMenuHelper.js b/src/utils/helpMenuHelper.js
new file mode 100644
index 000000000..fa77ba97c
--- /dev/null
+++ b/src/utils/helpMenuHelper.js
@@ -0,0 +1,159 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
+import { createEmbed } from "./embeds.js";
+import { createSelectMenu } from "./components.js";
+import fs from "fs/promises";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const CATEGORY_SELECT_ID = "help-category-select";
+const ALL_COMMANDS_ID = "help-all-commands";
+
+const CATEGORY_ICONS = {
+    Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
+    Ticket: "🎫", Welcome: "👋", Giveaway: "🎉", Counter: "🔢", Tools: "🛠️",
+    Search: "🔍", Reaction_Roles: "🎭", Community: "👥", Birthday: "🎂", Config: "⚙️",
+};
+
+/**
+ * Tạo menu help ban đầu
+ * @param {Client} client - Discord bot client
+ * @returns {Promise<{embeds: Array, components: Array}>}
+ */
+export async function createInitialHelpMenu(client) {
+    const commandsPath = path.join(__dirname, "../commands");
+    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name)
+        .sort();
+
+    const options = [
+        { label: "📋 All Commands", description: "View all available commands", value: ALL_COMMANDS_ID },
+        ...categoryDirs.map((category) => {
+            const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
+            const icon = CATEGORY_ICONS[categoryName] || "🔍";
+            return { label: `${icon} ${categoryName}`, description: `View commands in ${categoryName}`, value: category };
+        }),
+    ];
+
+    const botName = client?.user?.username || "Starlight Security";
+    const embed = createEmbed({
+        title: `🤖 ${botName} Help Center`,
+        description: "Welcome! Here is the list of available modules.",
+        color: 'primary'
+    });
+
+    embed.addFields(
+        { name: "🛡️ Moderation", value: "Tools for server protection", inline: true },
+        { name: "🎮 Fun", value: "Entertainment commands", inline: true },
+        { name: "📊 Leveling", value: "XP and progression", inline: true },
+        { name: "🎫 Tickets", value: "Support ticket system", inline: true },
+        { name: "🎉 Giveaways", value: "Automated giveaways", inline: true },
+        { name: "✅ Verification", value: "Access gating", inline: true }
+    );
+    embed.setFooter({ text: "Starlight Security | Secured by Dev" });
+    embed.setTimestamp();
+
+    const bugReportButton = new ButtonBuilder()
+        .setLabel("Contact Developer")
+        .setStyle(ButtonStyle.Link)
+        .setURL("https://discord.com/users/1198136184526864475");
+
+    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select a category", options);
+    const buttonRow = new ActionRowBuilder().addComponents([bugReportButton]);
+
+    return { embeds: [embed], components: [buttonRow, selectRow] };
+}
+
+/**
+ * Lấy danh sách tất cả categories
+ * @returns {Promise<Array>}
+ */
+export async function getAllCategories() {
+    const commandsPath = path.join(__dirname, "../commands");
+    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name)
+        .sort();
+    return categoryDirs;
+}
+
+/**
+ * Tạo embed cho một category cụ thể với pagination
+ * @param {string} category - Category name
+ * @param {number} page - Page number
+ * @param {Client} client - Discord bot client
+ * @returns {Promise<{embed: EmbedBuilder, totalPages: number}>}
+ */
+export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
+    const commandsPath = path.join(__dirname, "../commands");
+    const categoryPath = path.join(commandsPath, category);
+    
+    try {
+        const files = (await fs.readdir(categoryPath))
+            .filter(file => file.endsWith('.js'))
+            .sort();
+
+        const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
+        const icon = CATEGORY_ICONS[categoryName] || "🔍";
+        const pageSize = 5;
+        const totalPages = Math.ceil(files.length / pageSize) || 1;
+        
+        // Validate page number
+        const validPage = Math.max(1, Math.min(page, totalPages));
+        
+        const startIndex = (validPage - 1) * pageSize;
+        const paginatedFiles = files.slice(startIndex, startIndex + pageSize);
+
+        const embed = createEmbed({
+            title: `${icon} ${categoryName} Commands`,
+            description: `Page ${validPage} of ${totalPages}`,
+            color: 'primary'
+        });
+
+        paginatedFiles.forEach(file => {
+            const commandName = file.replace('.js', '');
+            embed.addFields({
+                name: `• ${commandName}`,
+                value: "No description available",
+                inline: false
+            });
+        });
+
+        embed.setFooter({ text: `Starlight Security | Page ${validPage}/${totalPages}` });
+        embed.setTimestamp();
+
+        return { embed, totalPages, currentPage: validPage };
+    } catch (error) {
+        console.error(`Error reading category ${category}:`, error);
+        throw error;
+    }
+}
+
+/**
+ * Tạo pagination buttons cho help menu
+ * @param {number} currentPage - Current page number
+ * @param {number} totalPages - Total number of pages
+ * @param {string} action - 'category' để biết đang xem category nào (nếu cần)
+ * @returns {ActionRowBuilder}
+ */
+export function createHelpPaginationButtons(currentPage, totalPages, category = '') {
+    const canGoBack = currentPage > 1;
+    const canGoNext = currentPage < totalPages;
+
+    const backButton = new ButtonBuilder()
+        .setCustomId(`help:back:${currentPage - 1}:${category}`)
+        .setLabel('← Back')
+        .setStyle(ButtonStyle.Primary)
+        .setDisabled(!canGoBack);
+
+    const nextButton = new ButtonBuilder()
+        .setCustomId(`help:next:${currentPage + 1}:${category}`)
+        .setLabel('Next →')
+        .setStyle(ButtonStyle.Primary)
+        .setDisabled(!canGoNext);
+
+    return new ActionRowBuilder().addComponents(backButton, nextButton);
+}

From edc8103ff8c18ed573dbf4aefd89d8a7c1c93895 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:02:14 +0700
Subject: [PATCH 75/97] Refactor help.js to use helpMenuHelper utility

---
 src/commands/Core/help.js | 66 ++-------------------------------------
 1 file changed, 2 insertions(+), 64 deletions(-)

diff --git a/src/commands/Core/help.js b/src/commands/Core/help.js
index def0dc1ef..ed9b66fd1 100644
--- a/src/commands/Core/help.js
+++ b/src/commands/Core/help.js
@@ -1,67 +1,5 @@
-import { SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
-import { createEmbed } from "../../utils/embeds.js";
-import { createSelectMenu } from "../../utils/components.js";
-import fs from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const CATEGORY_SELECT_ID = "help-category-select";
-const ALL_COMMANDS_ID = "help-all-commands";
-
-const CATEGORY_ICONS = {
-    Core: "ℹ️", Moderation: "🛡️", Fun: "🎮", Leveling: "📊", Utility: "🔧",
-    Ticket: "🎫", Welcome: "👋", Giveaway: "🎉", Counter: "🔢", Tools: "🛠️",
-    Search: "🔍", Reaction_Roles: "🎭", Community: "👥", Birthday: "🎂", Config: "⚙️",
-};
-
-export async function createInitialHelpMenu(client) {
-    const commandsPath = path.join(__dirname, "../../commands");
-    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
-        .filter((dirent) => dirent.isDirectory())
-        .map((dirent) => dirent.name)
-        .sort();
-
-    const options = [
-        { label: "📋 All Commands", description: "View all available commands", value: ALL_COMMANDS_ID },
-        ...categoryDirs.map((category) => {
-            const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
-            const icon = CATEGORY_ICONS[categoryName] || "🔍";
-            return { label: `${icon} ${categoryName}`, description: `View commands in ${categoryName}`, value: category };
-        }),
-    ];
-
-    const botName = client?.user?.username || "Starlight Security";
-    const embed = createEmbed({
-        title: `🤖 ${botName} Help Center`,
-        description: "Welcome! Here is the list of available modules.",
-        color: 'primary'
-    });
-
-    embed.addFields(
-        { name: "🛡️ Moderation", value: "Tools for server protection", inline: true },
-        { name: "🎮 Fun", value: "Entertainment commands", inline: true },
-        { name: "📊 Leveling", value: "XP and progression", inline: true },
-        { name: "🎫 Tickets", value: "Support ticket system", inline: true },
-        { name: "🎉 Giveaways", value: "Automated giveaways", inline: true },
-        { name: "✅ Verification", value: "Access gating", inline: true }
-    );
-    embed.setFooter({ text: "Starlight Security | Secured by Dev" });
-    embed.setTimestamp();
-
-    // Dùng ButtonStyle.Link để mở profile trực tiếp mà không gây lỗi Interaction
-    const bugReportButton = new ButtonBuilder()
-        .setLabel("Contact Developer")
-        .setStyle(ButtonStyle.Link)
-        .setURL("https://discord.com/users/1198136184526864475");
-
-    const selectRow = createSelectMenu(CATEGORY_SELECT_ID, "Select a category", options);
-    const buttonRow = new ActionRowBuilder().addComponents([bugReportButton]);
-
-    return { embeds: [embed], components: [buttonRow, selectRow] };
-}
+import { SlashCommandBuilder } from "discord.js";
+import { createInitialHelpMenu } from "../../utils/helpMenuHelper.js";
 
 export default {
     data: new SlashCommandBuilder()

From 267b8d81777d6c18f12407cd1d25bc08841e4bff Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:02:38 +0700
Subject: [PATCH 76/97] Fix help button handler with proper pagination

---
 src/interactions/buttons/help.js | 59 +++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index f251795fa..29c58a738 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -1,33 +1,44 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';
+import { getCategoryEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
 
 export default {
     name: 'help',
     async execute(interaction, client, args) {
-        const action = args[0]; // 'next' hoặc 'back'
-        const currentPage = parseInt(args[1]) || 1;
-        const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
+        try {
+            // Parse arguments: action (next/back), page, category
+            const action = args[0]; // 'next' hoặc 'back'
+            const currentPage = parseInt(args[1]) || 1;
+            const category = args[2] || ''; // Category name (nếu có)
 
-        // 1. Lấy Embed mới (hàm này cần tồn tại trong project của bạn)
-        // Bạn có thể copy logic từ lệnh /help gốc sang đây
-        const newEmbed = await client.helpManager.getEmbed(newPage); 
+            if (!action || !category) {
+                await interaction.editReply({
+                    content: '❌ Invalid button interaction. Please use the help command again.',
+                    embeds: [],
+                    components: []
+                });
+                return;
+            }
 
-        // 2. Tạo lại hàng nút bấm với số trang mới
-        const row = new ActionRowBuilder().addComponents(
-            new ButtonBuilder()
-                .setCustomId(`help:back:${newPage - 1}`)
-                .setLabel('Back')
-                .setStyle(ButtonStyle.Primary)
-                .setDisabled(newPage <= 1),
-            new ButtonBuilder()
-                .setCustomId(`help:next:${newPage + 1}`)
-                .setLabel('Next')
-                .setStyle(ButtonStyle.Primary)
-        );
+            // Tính trang mới
+            const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
 
-        // 3. Cập nhật tin nhắn
-        await interaction.editReply({
-            embeds: [newEmbed],
-            components: [row]
-        });
+            // Lấy Embed và số trang tối đa của category
+            const { embed, totalPages } = await getCategoryEmbedAndPageCount(category, newPage, client);
+
+            // Tạo lại hàng nút bấm với số trang mới
+            const row = createHelpPaginationButtons(newPage, totalPages, category);
+
+            // Cập nhật tin nhắn
+            await interaction.editReply({
+                embeds: [embed],
+                components: [row]
+            });
+        } catch (error) {
+            console.error('Error in help button handler:', error);
+            await interaction.editReply({
+                content: '❌ An error occurred while handling the help menu.',
+                embeds: [],
+                components: []
+            }).catch(() => {});
+        }
     }
 };

From 869d061e011688443a018a9df8e228e81e52e147 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:03:45 +0700
Subject: [PATCH 77/97] Add help-category-select menu handler to complete help
 system flow

---
 .../selectMenus/help-category-select.js       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/interactions/selectMenus/help-category-select.js

diff --git a/src/interactions/selectMenus/help-category-select.js b/src/interactions/selectMenus/help-category-select.js
new file mode 100644
index 000000000..559c4f199
--- /dev/null
+++ b/src/interactions/selectMenus/help-category-select.js
@@ -0,0 +1,31 @@
+import { getCategoryEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+
+export default {
+    name: 'help-category-select',
+    async execute(interaction, client, args) {
+        try {
+            // 1. Lấy category mà người dùng chọn
+            const selectedCategory = interaction.values[0];
+            
+            // Nếu chọn "All Commands" (ID: help-all-commands) thì xử lý riêng hoặc ignore
+            if (selectedCategory === 'help-all-commands') {
+                return await interaction.editReply({ content: 'Coming soon: All commands view!' });
+            }
+
+            // 2. Lấy Embed trang đầu tiên (page 1) của category đó
+            const { embed, totalPages } = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
+            
+            // 3. Tạo nút bấm chuyển trang cho category này
+            const row = createHelpPaginationButtons(1, totalPages, selectedCategory);
+            
+            // 4. Cập nhật tin nhắn
+            await interaction.editReply({
+                embeds: [embed],
+                components: [row]
+            });
+        } catch (error) {
+            console.error('Error in select menu handler:', error);
+            await interaction.editReply({ content: '❌ Failed to load category.' });
+        }
+    }
+};

From 95aa8145b9c9524a8749d30a4abab52de3c1471e Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:06:41 +0700
Subject: [PATCH 78/97] Add debug logs to help button handler to diagnose
 pagination issue

---
 src/interactions/buttons/help.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index 29c58a738..f890775db 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -4,12 +4,19 @@ export default {
     name: 'help',
     async execute(interaction, client, args) {
         try {
+            console.log('🔵 Help button handler triggered');
+            console.log('Button customId:', interaction.customId);
+            console.log('Args received:', args);
+
             // Parse arguments: action (next/back), page, category
             const action = args[0]; // 'next' hoặc 'back'
             const currentPage = parseInt(args[1]) || 1;
             const category = args[2] || ''; // Category name (nếu có)
 
+            console.log(`Action: ${action}, Page: ${currentPage}, Category: ${category}`);
+
             if (!action || !category) {
+                console.error('Missing action or category');
                 await interaction.editReply({
                     content: '❌ Invalid button interaction. Please use the help command again.',
                     embeds: [],
@@ -20,9 +27,11 @@ export default {
 
             // Tính trang mới
             const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
+            console.log(`Moving from page ${currentPage} to page ${newPage}`);
 
             // Lấy Embed và số trang tối đa của category
             const { embed, totalPages } = await getCategoryEmbedAndPageCount(category, newPage, client);
+            console.log(`Total pages: ${totalPages}, Current page: ${newPage}`);
 
             // Tạo lại hàng nút bấm với số trang mới
             const row = createHelpPaginationButtons(newPage, totalPages, category);
@@ -32,8 +41,10 @@ export default {
                 embeds: [embed],
                 components: [row]
             });
+            
+            console.log('✅ Help pagination updated successfully');
         } catch (error) {
-            console.error('Error in help button handler:', error);
+            console.error('❌ Error in help button handler:', error);
             await interaction.editReply({
                 content: '❌ An error occurred while handling the help menu.',
                 embeds: [],

From 41934314bf1891849891a48269e9f0c44e797137 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:09:51 +0700
Subject: [PATCH 79/97] Add debug logs to interactionCreate to diagnose
 button/menu parsing

---
 src/events/interactionCreate.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
index 9d13b6215..3a4809bda 100644
--- a/src/events/interactionCreate.js
+++ b/src/events/interactionCreate.js
@@ -51,14 +51,26 @@ export default {
           await command.execute(interaction, await getGuildConfig(client, interaction.guildId), client);
         } 
         else if (interaction.isButton()) {
+          console.log(`🔴 Button pressed! customId: ${interaction.customId}`);
           const [customId, ...args] = interaction.customId.split(':');
+          console.log(`Parsed customId: ${customId}, args: ${args.join(':')}`);
+          console.log(`Looking for button handler with name: "${customId}"`);
+          console.log(`Available buttons:`, Array.from(client.buttons.keys()));
+          
           const button = client.buttons.get(customId);
+          console.log(`Button handler found:`, !!button);
+          
           if (button) await button.execute(interaction, client, args);
+          else console.log(`❌ No button handler found for: ${customId}`);
         } 
         else if (interaction.isStringSelectMenu()) {
+          console.log(`🟢 Select menu! customId: ${interaction.customId}`);
           const [customId, ...args] = interaction.customId.split(':');
+          console.log(`Parsed customId: ${customId}, args: ${args.join(':')}`);
+          
           const selectMenu = client.selectMenus.get(customId);
           if (selectMenu) await selectMenu.execute(interaction, client, args);
+          else console.log(`❌ No select menu handler found for: ${customId}`);
         }
         else if (interaction.isModalSubmit()) {
            // ... (giữ nguyên logic modal cũ) ...

From d9337b65d965aaf1573c809c1a673bc2b4ce430b Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:12:25 +0700
Subject: [PATCH 80/97] Fix customId format in createHelpPaginationButtons to
 match help handler

---
 src/utils/helpMenuHelper.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/helpMenuHelper.js b/src/utils/helpMenuHelper.js
index fa77ba97c..1fdc7f2e7 100644
--- a/src/utils/helpMenuHelper.js
+++ b/src/utils/helpMenuHelper.js
@@ -134,9 +134,10 @@ export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
 
 /**
  * Tạo pagination buttons cho help menu
+ * Format customId: help:action:page:category
  * @param {number} currentPage - Current page number
  * @param {number} totalPages - Total number of pages
- * @param {string} action - 'category' để biết đang xem category nào (nếu cần)
+ * @param {string} category - Category name
  * @returns {ActionRowBuilder}
  */
 export function createHelpPaginationButtons(currentPage, totalPages, category = '') {

From df3c4f808c3352414407d1660f6de780bdba43f5 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:16:32 +0700
Subject: [PATCH 81/97] Replace helpSelectMenus with streamlined version using
 helpMenuHelper

---
 src/handlers/helpSelectMenus.js | 408 ++------------------------------
 1 file changed, 25 insertions(+), 383 deletions(-)

diff --git a/src/handlers/helpSelectMenus.js b/src/handlers/helpSelectMenus.js
index b71a26b3d..a2f65d530 100644
--- a/src/handlers/helpSelectMenus.js
+++ b/src/handlers/helpSelectMenus.js
@@ -1,392 +1,39 @@
-import { createEmbed } from '../utils/embeds.js';
-import { createButton, getPaginationRow } from '../utils/components.js';
-import fs from 'fs/promises';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { Collection, ActionRowBuilder, MessageFlags } from 'discord.js';
+import { getCategoryEmbedAndPageCount, createHelpPaginationButtons } from '../utils/helpMenuHelper.js';
 import { logger } from '../utils/logger.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const BACK_BUTTON_ID = "help-back-to-main";
-const ALL_COMMANDS_ID = "help-all-commands";
-const PAGINATION_PREFIX = "help-page";
-const CATEGORY_SELECT_ID = "help-category-select";
-const FOOTER_TEXT = "Made with ❤️";
-const SUBCOMMAND_TYPE = 1;
-const SUBCOMMAND_GROUP_TYPE = 2;
-
-const CATEGORY_ICONS = {
-    Core: "ℹ️",
-    Moderation: "🛡️",
-    Economy: "💰",
-    Fun: "🎮",
-    Leveling: "📊",
-    Utility: "🔧",
-    Ticket: "🎫",
-    Welcome: "👋",
-    Giveaway: "🎉",
-    Counter: "🔢",
-    Tools: "🛠️",
-    Search: "🔍",
-    Reaction_Roles: "🎭",
-    Community: "👥",
-    Birthday: "🎂",
-    Config: "⚙️",
-};
-
-function buildHelpEntries(command, category) {
-    const commandData = normalizeCommandData(command);
-    if (!commandData?.name) {
-        return [];
-    }
-
-    const baseName = commandData.name;
-    const baseDescription = commandData.description || "No description";
-    const options = commandData.options || [];
-
-    const entries = [];
-
-    for (const option of options) {
-        if (!option) continue;
-
-        if (option.type === SUBCOMMAND_TYPE) {
-            entries.push({
-                baseName,
-                displayName: `${baseName} ${option.name}`,
-                description: option.description || baseDescription,
-                category,
-            });
-            continue;
-        }
-
-        if (option.type === SUBCOMMAND_GROUP_TYPE) {
-            const nestedOptions = option.options || [];
-            for (const nested of nestedOptions) {
-                if (nested?.type !== SUBCOMMAND_TYPE) continue;
-
-                entries.push({
-                    baseName,
-                    displayName: `${baseName} ${option.name} ${nested.name}`,
-                    description: nested.description || option.description || baseDescription,
-                    category,
-                });
-            }
-        }
-    }
-
-    if (entries.length === 0) {
-        entries.push({
-            baseName,
-            displayName: baseName,
-            description: baseDescription,
-            category,
-        });
-    }
-
-    return entries;
-}
-
-function normalizeCommandData(command) {
-    const rawData = command?.data;
-    if (!rawData) {
-        return null;
-    }
-
-    const jsonData = typeof rawData.toJSON === 'function' ? rawData.toJSON() : rawData;
-    if (!jsonData?.name) {
-        return null;
-    }
-
-    return {
-        ...jsonData,
-        options: Array.isArray(jsonData.options)
-            ? jsonData.options.map((option) =>
-                  typeof option?.toJSON === 'function' ? option.toJSON() : option,
-              )
-            : [],
-    };
-}
-
-async function createCategoryCommandsMenu(category, client) {
-    const categoryName =
-        category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
-    const icon = CATEGORY_ICONS[categoryName] || "🔍";
-
-    const categoryCommands = [];
-
-    try {
-        const categoryPath = path.join(__dirname, "../commands", category);
-        const commandFiles = (await fs.readdir(categoryPath))
-            .filter((file) => file.endsWith(".js"))
-            .sort();
-
-        for (const file of commandFiles) {
-            const filePath = path.join(categoryPath, file);
-            const commandModule = await import(`file://${filePath}`);
-            const command = commandModule.default;
-            const commandData = normalizeCommandData(command);
-
-            if (commandData) {
-                if (
-                    commandData.name === "help" ||
-                    commandData.name === "commandlist"
-                )
-                    continue;
-
-                categoryCommands.push(...buildHelpEntries(command, categoryName));
-            }
-        }
-    } catch (error) {
-        logger.error(
-            `Error reading commands from category ${category}:`,
-            error,
-        );
-    }
-
-    categoryCommands.sort((a, b) => a.displayName.localeCompare(b.displayName));
-
-    let registeredCommands = new Collection();
-    try {
-        if (client?.application?.commands?.fetch) {
-            const commands = await client.application.commands.fetch();
-            for (const cmd of commands.values()) {
-                registeredCommands.set(cmd.name, cmd);
-            }
-        }
-    } catch (error) {
-        logger.error('Error fetching registered commands:', error);
-    }
-
-    const embed = createEmbed({
-        title: `${icon} ${categoryName} Commands`,
-        description: categoryCommands.length > 0
-            ? `Click any command mention below to use it:`
-            : `No commands found in the **${categoryName}** category.`
-    });
-
-    if (categoryCommands.length > 0) {
-        const commandMentions = categoryCommands
-            .map((cmd) => {
-                const registeredCmd = registeredCommands.get(cmd.baseName);
-                if (registeredCmd && registeredCmd.id) {
-                    return `</${cmd.displayName}:${registeredCmd.id}> · ${cmd.description}`;
-                }
-                return `\`/${cmd.displayName}\` · ${cmd.description}`;
-            })
-            .join("\n");
-
-        const maxLength = 1000;
-        if (commandMentions.length <= maxLength) {
-            embed.addFields({
-                name: "Commands",
-                value: commandMentions,
-                inline: false,
-            });
-        } else {
-            const chunks = [];
-            let currentChunk = "";
-            const lines = commandMentions.split("\n");
-
-            for (const line of lines) {
-                if ((currentChunk + "\n" + line).length > maxLength) {
-                    if (currentChunk) chunks.push(currentChunk);
-                    currentChunk = line;
-                } else {
-                    currentChunk += (currentChunk ? "\n" : "") + line;
-                }
-            }
-            if (currentChunk) chunks.push(currentChunk);
-
-            chunks.forEach((chunk, index) => {
-                embed.addFields({
-                    name: `Commands (Part ${index + 1})`,
-                    value: chunk,
-                    inline: false,
-                });
-            });
-        }
-    }
-
-    embed.setFooter({ text: FOOTER_TEXT });
-    embed.setTimestamp();
-
-    const backButton = createButton(
-        BACK_BUTTON_ID,
-        "Back",
-        "primary",
-        "⬅️",
-        false,
-    );
-
-    const buttonRow = new ActionRowBuilder().addComponents(backButton);
-
-    return {
-        embeds: [embed],
-        components: [buttonRow],
-    };
-}
-
-export async function createAllCommandsMenu(page = 1, client) {
-    const commandsPerPage = 45;
-    const allCommands = [];
-
-    const commandsPath = path.join(__dirname, "../commands");
-    const categoryDirs = (
-        await fs.readdir(commandsPath, { withFileTypes: true })
-    )
-        .filter((dirent) => dirent.isDirectory())
-        .map((dirent) => dirent.name)
-        .sort();
-
-    for (const category of categoryDirs) {
-        try {
-            const categoryPath = path.join(
-                __dirname,
-                "../commands",
-                category,
-            );
-            const commandFiles = (await fs.readdir(categoryPath))
-                .filter((file) => file.endsWith(".js"))
-                .sort();
-
-            for (const file of commandFiles) {
-                const filePath = path.join(categoryPath, file);
-                const commandModule = await import(`file://${filePath}`);
-                const command = commandModule.default;
-                const commandData = normalizeCommandData(command);
-
-                if (commandData) {
-                    if (
-                        commandData.name === "help" ||
-                        commandData.name === "commandlist"
-                    )
-                        continue;
-
-                    const categoryName =
-                        category.charAt(0).toUpperCase() +
-                        category.slice(1).toLowerCase();
-
-                    allCommands.push(...buildHelpEntries(command, categoryName));
-                }
-            }
-        } catch (error) {
-            logger.error(
-                `Error reading commands from category ${category}:`,
-                error,
-            );
-        }
-    }
-
-    allCommands.sort((a, b) => a.displayName.localeCompare(b.displayName));
-
-    let registeredCommands = new Collection();
-    try {
-        if (client?.application?.commands?.fetch) {
-            const commands = await client.application.commands.fetch();
-            for (const cmd of commands.values()) {
-                registeredCommands.set(cmd.name, cmd);
-            }
-        }
-    } catch (error) {
-        logger.error('Error fetching registered commands:', error);
-    }
-
-    const totalPages = Math.ceil(allCommands.length / commandsPerPage);
-    const startIndex = (page - 1) * commandsPerPage;
-    const endIndex = startIndex + commandsPerPage;
-    const pageCommands = allCommands.slice(startIndex, endIndex);
-
-    const embed = createEmbed({
-        title: "📋 All Commands",
-        description: `(${allCommands.length} total commands, including subcommands)`
-    });
-
-    embed.setFooter({ text: FOOTER_TEXT });
-    embed.setTimestamp();
-
-    if (pageCommands.length > 0) {
-        const commandMentions = pageCommands.map((cmd) => {
-            const registeredCmd = registeredCommands.get(cmd.baseName);
-            if (registeredCmd && registeredCmd.id) {
-                return `</${cmd.displayName}:${registeredCmd.id}> · ${cmd.category}`;
-            }
-            return `\`/${cmd.displayName}\` · ${cmd.category}`;
-        });
-
-        const columnCount = pageCommands.length > 20 ? 3 : (pageCommands.length > 10 ? 2 : 1);
-        const chunkSize = Math.ceil(commandMentions.length / columnCount);
-
-        for (let i = 0; i < columnCount; i++) {
-            const chunk = commandMentions
-                .slice(i * chunkSize, (i + 1) * chunkSize)
-                .join("\n");
-
-            if (!chunk) continue;
-
-            embed.addFields({
-                name: i === 0 ? `Commands (Page ${page})` : "Commands (cont.)",
-                value: chunk,
-                inline: columnCount > 1,
-            });
-        }
-    }
-
-    const components = [];
-
-    if (totalPages > 1) {
-        const paginationRow = getPaginationRow(
-            PAGINATION_PREFIX,
-            page,
-            totalPages,
-        );
-        components.push(paginationRow);
-    }
-
-    const backButton = createButton(
-        BACK_BUTTON_ID,
-        "Back",
-        "primary",
-        "⬅️",
-        false,
-    );
-
-    const buttonRow = new ActionRowBuilder().addComponents(backButton);
-    components.push(buttonRow);
-
-    return {
-        embeds: [embed],
-        components,
-        currentPage: page,
-        totalPages,
-    };
-}
+import { MessageFlags } from 'discord.js';
 
 export const helpCategorySelectMenu = {
-    name: CATEGORY_SELECT_ID,
+    name: 'help-category-select',
     async execute(interaction, client) {
         try {
             if (!interaction.deferred && !interaction.replied) {
                 await interaction.deferUpdate();
             }
 
+            // 1. Lấy category mà người dùng chọn
             const selectedCategory = interaction.values[0];
-
-            if (selectedCategory === ALL_COMMANDS_ID) {
-                const { embeds, components } = await createAllCommandsMenu(1, client);
-                await interaction.editReply({
-                    embeds,
-                    components,
-                });
-            } else {
-                const { embeds, components } = await createCategoryCommandsMenu(selectedCategory, client);
-                await interaction.editReply({
-                    embeds,
-                    components,
+            
+            // Nếu chọn "All Commands" (ID: help-all-commands) thì xử lý riêng hoặc ignore
+            if (selectedCategory === 'help-all-commands') {
+                return await interaction.editReply({ 
+                    content: 'Coming soon: All commands view! Please use the category view instead.' 
                 });
             }
+
+            // 2. Lấy Embed trang đầu tiên (page 1) của category đó
+            const { embed, totalPages } = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
+            
+            // 3. Tạo nút bấm chuyển trang cho category này
+            const row = createHelpPaginationButtons(1, totalPages, selectedCategory);
+            
+            // 4. Cập nhật tin nhắn
+            await interaction.editReply({
+                embeds: [embed],
+                components: [row]
+            });
         } catch (error) {
+            logger.error('Error in help category select menu handler:', error);
+            
             if (error?.code === 40060 || error?.code === 10062) {
                 logger.warn('Help category select interaction already acknowledged or expired.', {
                     event: 'interaction.help.select.unavailable',
@@ -396,18 +43,13 @@ export const helpCategorySelectMenu = {
                 });
                 return;
             }
-
-            logger.error('Error in help category select menu handler:', error);
+            
             if (!interaction.replied && !interaction.deferred) {
                 await interaction.reply({
-                    content: 'An error occurred while loading help categories.',
+                    content: '❌ An error occurred while loading help categories.',
                     flags: MessageFlags.Ephemeral,
                 });
             }
         }
     },
 };
-
-
-
-

From 23a510d994f27575dc3e49f427fda10695fb8f60 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:20:11 +0700
Subject: [PATCH 82/97] Add command descriptions, All Commands view, and fix
 pagination page calculation

---
 src/utils/helpMenuHelper.js | 108 ++++++++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 6 deletions(-)

diff --git a/src/utils/helpMenuHelper.js b/src/utils/helpMenuHelper.js
index 1fdc7f2e7..69a76ad01 100644
--- a/src/utils/helpMenuHelper.js
+++ b/src/utils/helpMenuHelper.js
@@ -80,12 +80,31 @@ export async function getAllCategories() {
     return categoryDirs;
 }
 
+/**
+ * Lấy description của command từ file
+ * @param {string} filePath - Path đến file command
+ * @returns {Promise<string>}
+ */
+async function getCommandDescription(filePath) {
+    try {
+        const commandModule = await import(`file://${filePath}`);
+        const command = commandModule.default;
+        
+        if (command?.data?.description) {
+            return command.data.description;
+        }
+    } catch (error) {
+        console.error(`Error loading command description from ${filePath}:`, error);
+    }
+    return "No description available";
+}
+
 /**
  * Tạo embed cho một category cụ thể với pagination
  * @param {string} category - Category name
  * @param {number} page - Page number
  * @param {Client} client - Discord bot client
- * @returns {Promise<{embed: EmbedBuilder, totalPages: number}>}
+ * @returns {Promise<{embed: EmbedBuilder, totalPages: number, currentPage: number}>}
  */
 export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
     const commandsPath = path.join(__dirname, "../commands");
@@ -101,7 +120,7 @@ export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
         const pageSize = 5;
         const totalPages = Math.ceil(files.length / pageSize) || 1;
         
-        // Validate page number
+        // Validate page number - FIX: ensure page is within valid range
         const validPage = Math.max(1, Math.min(page, totalPages));
         
         const startIndex = (validPage - 1) * pageSize;
@@ -113,14 +132,18 @@ export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
             color: 'primary'
         });
 
-        paginatedFiles.forEach(file => {
+        // Load descriptions for each command
+        for (const file of paginatedFiles) {
             const commandName = file.replace('.js', '');
+            const filePath = path.join(categoryPath, file);
+            const description = await getCommandDescription(filePath);
+            
             embed.addFields({
                 name: `• ${commandName}`,
-                value: "No description available",
+                value: description,
                 inline: false
             });
-        });
+        }
 
         embed.setFooter({ text: `Starlight Security | Page ${validPage}/${totalPages}` });
         embed.setTimestamp();
@@ -132,12 +155,85 @@ export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
     }
 }
 
+/**
+ * Tạo embed cho "All Commands" view
+ * @param {number} page - Page number
+ * @param {Client} client - Discord bot client
+ * @returns {Promise<{embed: EmbedBuilder, totalPages: number, currentPage: number}>}
+ */
+export async function getAllCommandsEmbedAndPageCount(page = 1, client) {
+    const commandsPath = path.join(__dirname, "../commands");
+    const categoryDirs = (await fs.readdir(commandsPath, { withFileTypes: true }))
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name)
+        .sort();
+
+    try {
+        const allCommands = [];
+
+        // Collect all commands from all categories
+        for (const category of categoryDirs) {
+            const categoryPath = path.join(commandsPath, category);
+            const files = (await fs.readdir(categoryPath))
+                .filter(file => file.endsWith('.js'))
+                .sort();
+
+            for (const file of files) {
+                const commandName = file.replace('.js', '');
+                const filePath = path.join(categoryPath, file);
+                const description = await getCommandDescription(filePath);
+                const categoryName = category.charAt(0).toUpperCase() + category.slice(1).toLowerCase();
+
+                allCommands.push({
+                    name: commandName,
+                    description,
+                    category: categoryName,
+                    icon: CATEGORY_ICONS[categoryName] || "🔍"
+                });
+            }
+        }
+
+        allCommands.sort((a, b) => a.name.localeCompare(b.name));
+
+        const pageSize = 10;
+        const totalPages = Math.ceil(allCommands.length / pageSize) || 1;
+        
+        // Validate page number - FIX: ensure page is within valid range
+        const validPage = Math.max(1, Math.min(page, totalPages));
+        
+        const startIndex = (validPage - 1) * pageSize;
+        const paginatedCommands = allCommands.slice(startIndex, startIndex + pageSize);
+
+        const embed = createEmbed({
+            title: `📋 All Commands`,
+            description: `Page ${validPage} of ${totalPages} (Total: ${allCommands.length} commands)`,
+            color: 'primary'
+        });
+
+        for (const cmd of paginatedCommands) {
+            embed.addFields({
+                name: `${cmd.icon} ${cmd.name}`,
+                value: `${cmd.description}\n*Category: ${cmd.category}*`,
+                inline: false
+            });
+        }
+
+        embed.setFooter({ text: `Starlight Security | Page ${validPage}/${totalPages}` });
+        embed.setTimestamp();
+
+        return { embed, totalPages, currentPage: validPage };
+    } catch (error) {
+        console.error(`Error reading all commands:`, error);
+        throw error;
+    }
+}
+
 /**
  * Tạo pagination buttons cho help menu
  * Format customId: help:action:page:category
  * @param {number} currentPage - Current page number
  * @param {number} totalPages - Total number of pages
- * @param {string} category - Category name
+ * @param {string} category - Category name (or 'all' for all commands)
  * @returns {ActionRowBuilder}
  */
 export function createHelpPaginationButtons(currentPage, totalPages, category = '') {

From 620779e27154217e4fa0583b072d11a2e8778e77 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 13:22:05 +0700
Subject: [PATCH 83/97] Update helpMenuHelper.js


From b169c24b731fc14a8e14b6339e3d2652ae189552 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:03:59 +0700
Subject: [PATCH 84/97] Update messageCreate.js

---
 src/events/messageCreate.js | 61 +++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 5e7ef55c7..6ebb0955c 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -10,43 +10,38 @@ export default {
 
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
-
         const command = client.commands.get(commandName);
 
-        if (command) {
-            // Enhanced fakeInteraction to prevent errors with missing methods
-            const fakeInteraction = {
-                member: message.member,
-                guild: message.guild,
-                channel: message.channel,
-                user: message.author,
-                
-                // Essential Slash Command methods
-                reply: async (content) => message.reply(content),
-                deferReply: async () => {}, // Prevents "deferReply is not a function" error
-                editReply: async (content) => message.channel.send(content),
-                followUp: async (content) => message.channel.send(content),
-                
-                // Properties often checked by commands
-                deferred: false,
-                replied: false,
-                
-                options: {
-                    getMember: (name) => message.mentions.members.first() || message.member,
-                    getString: (name) => args.join(' '),
-                    getUser: (name) => message.mentions.users.first(),
-                    getChannel: (name) => message.mentions.channels.first(),
-                    getInteger: (name) => parseInt(args[0]) || 0
-                }
-            };
+        if (!command) return;
 
-            try {
-                await command.execute(fakeInteraction);
-            } catch (error) {
-                // Log the SPECIFIC error to your terminal
-                logger.error(`Error executing ${commandName}:`, error);
-                message.reply('An error occurred. Check terminal for details.');
+        // Object Context thay thế cho Interaction (rất gọn nhẹ)
+        const context = {
+            member: message.member,
+            guild: message.guild,
+            channel: message.channel,
+            user: message.author,
+            
+            // Các phương thức thay thế cho Slash Command
+            reply: async (options) => message.reply(options),
+            editReply: async (options) => message.channel.send(options),
+            
+            // Xử lý args cho các lệnh cũ
+            options: {
+                getMember: () => message.mentions.members.first() || message.member,
+                getString: (name) => args.join(' '),
+                getUser: () => message.mentions.users.first(),
+                getInteger: () => parseInt(args[0]) || 0
             }
+        };
+
+        try {
+            // Thực thi lệnh. 
+            // Lưu ý: Nếu lệnh trong file command yêu cầu deferReply, 
+            // ta cần một lớp "bọc" hoặc sửa file command đó.
+            await command.execute(context, null, client);
+        } catch (error) {
+            logger.error(`Error executing prefix command ${commandName}:`, error);
+            message.reply('❌ Có lỗi xảy ra khi thực hiện lệnh này.');
         }
     }
 };

From e8d3583cbd4982e9ab6c4258cbf2ba7e358ed5ed Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:22:10 +0700
Subject: [PATCH 85/97] Update lock.js

---
 src/commands/Moderation/lock.js | 37 +++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 4c1cacd4b..11f76d725 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -9,17 +9,21 @@ export default {
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
-        await InteractionHelper.safeDefer(interaction);
+        // KIỂM TRA ĐÂY LÀ PREFIX HAY SLASH
+        // Nếu không có deferReply, nghĩa là đây là lệnh Prefix (nh!lock)
+        const isPrefix = !interaction.deferReply;
+
+        if (!isPrefix) {
+            await InteractionHelper.safeDefer(interaction);
+        }
+
         const channel = interaction.channel;
         const guild = interaction.guild;
 
         try {
             const overwrites = channel.permissionOverwrites.cache;
-            
-            // Tạo danh sách các ID cần xử lý
             const roleIds = [...overwrites.keys(), guild.roles.everyone.id];
             
-            // Xử lý từng role một, dùng try-catch bên trong để tránh làm chết cả lệnh
             for (const id of roleIds) {
                 try {
                     await channel.permissionOverwrites.edit(id, { SendMessages: false });
@@ -28,16 +32,27 @@ export default {
                 }
             }
 
-            await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed("🔒 Channel locked successfully.")],
-                flags: MessageFlags.Ephemeral,
-            });
+            // PHẢN HỒI DỰA VÀO LOẠI LỆNH
+            const embed = successEmbed("🔒 Channel locked successfully.");
+            
+            if (isPrefix) {
+                await channel.send({ embeds: [embed] });
+            } else {
+                await InteractionHelper.safeEditReply(interaction, {
+                    embeds: [embed],
+                    flags: MessageFlags.Ephemeral,
+                });
+            }
 
         } catch (error) {
             console.error("Critical lock error:", error);
-            await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", "Failed to process lock command.")],
-            });
+            const errEmbed = errorEmbed("Error", "Failed to process lock command.");
+            
+            if (isPrefix) {
+                await channel.send({ embeds: [errEmbed] });
+            } else {
+                await InteractionHelper.safeEditReply(interaction, { embeds: [errEmbed] });
+            }
         }
     }
 };

From 3d8e63559fc79419a930872ab55847064383616b Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:47:23 +0700
Subject: [PATCH 86/97] Update purge.js

---
 src/commands/Moderation/purge.js | 50 ++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index faf9eb9da..ebb5064d5 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -14,10 +14,22 @@ export default {
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
 
     async execute(interaction, config, client) {
-        // [WAIT] Initial response to prevent "Interaction Failed"
-        await InteractionHelper.safeDefer(interaction);
+        // 1. Kiểm tra lệnh này là Slash hay Prefix
+        const isPrefix = !interaction.deferReply;
+        
+        if (!isPrefix) {
+            await InteractionHelper.safeDefer(interaction);
+        }
+
+        // 2. Xử lý logic lấy amount (Prefix lấy từ args, Slash lấy từ options)
+        let amount = isPrefix 
+            ? parseInt(interaction.options.getInteger()) // Lấy từ context của prefixHandler
+            : interaction.options.getInteger("amount");
+
+        // 3. CHẶN LỖI 100 TIN NHẮN (Discord API limit)
+        if (amount > 100) amount = 100;
+        if (amount < 1) amount = 1;
 
-        const amount = interaction.options.getInteger("amount");
         const channel = interaction.channel;
 
         try {
@@ -25,14 +37,11 @@ export default {
             const messagesToDelete = Array.from(fetched.values()).slice(1);
 
             if (messagesToDelete.length === 0) {
-                return await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [errorEmbed("No messages found", "There are no messages available to delete.")],
-                });
+                const err = errorEmbed("No messages found", "There are no messages available to delete.");
+                return isPrefix ? await channel.send({ embeds: [err] }) : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
             }
 
             let deletedCount = 0;
-
-            // [WAIT] Bot will pause here until the deletion is fully confirmed by Discord
             if (messagesToDelete.length === 1) {
                 await messagesToDelete[0].delete();
                 deletedCount = 1;
@@ -40,22 +49,21 @@ export default {
                 const deleted = await channel.bulkDelete(messagesToDelete, true);
                 deletedCount = deleted.size;
             }
-            // [AFTER THIS] Only now, the code proceeds to the next line
 
-            // [WAIT] Finally, send the success notification
-            await InteractionHelper.safeEditReply(interaction, {
-                embeds: [successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`)],
-                flags: MessageFlags.Ephemeral,
-            });
-
-            // Auto-delete the success message after 3s
-            setTimeout(() => { interaction.deleteReply().catch(() => {}); }, 3000);
+            const success = successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`);
+            
+            if (isPrefix) {
+                const msg = await channel.send({ embeds: [success] });
+                setTimeout(() => msg.delete().catch(() => {}), 3000);
+            } else {
+                await InteractionHelper.safeEditReply(interaction, { embeds: [success], flags: MessageFlags.Ephemeral });
+                setTimeout(() => interaction.deleteReply().catch(() => {}), 3000);
+            }
 
         } catch (error) {
-            console.error(error);
-            await InteractionHelper.safeEditReply(interaction, {
-                embeds: [errorEmbed("Error", "Failed to delete messages. (They might be older than 14 days or system messages.)")],
-            });
+            console.error("Purge error:", error);
+            const err = errorEmbed("Error", "Failed to delete messages. (Older than 14 days or system messages.)");
+            isPrefix ? await channel.send({ embeds: [err] }) : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
         }
     }
 };

From d5b1c586caae0ace8d73cf566d7b83c6d0309361 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:56:07 +0700
Subject: [PATCH 87/97] Update help-category-select.js

---
 .../selectMenus/help-category-select.js       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/interactions/selectMenus/help-category-select.js b/src/interactions/selectMenus/help-category-select.js
index 559c4f199..018cdefd8 100644
--- a/src/interactions/selectMenus/help-category-select.js
+++ b/src/interactions/selectMenus/help-category-select.js
@@ -1,24 +1,28 @@
-import { getCategoryEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
 
 export default {
     name: 'help-category-select',
     async execute(interaction, client, args) {
         try {
-            // 1. Lấy category mà người dùng chọn
             const selectedCategory = interaction.values[0];
-            
-            // Nếu chọn "All Commands" (ID: help-all-commands) thì xử lý riêng hoặc ignore
+            let embed, totalPages;
+
+            // Xử lý khi chọn "All Commands"
             if (selectedCategory === 'help-all-commands') {
-                return await interaction.editReply({ content: 'Coming soon: All commands view!' });
+                const result = await getAllCommandsEmbedAndPageCount(1, client);
+                embed = result.embed;
+                totalPages = result.totalPages;
+            } else {
+                // Xử lý các category bình thường
+                const result = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
+                embed = result.embed;
+                totalPages = result.totalPages;
             }
-
-            // 2. Lấy Embed trang đầu tiên (page 1) của category đó
-            const { embed, totalPages } = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
             
-            // 3. Tạo nút bấm chuyển trang cho category này
+            // Tạo nút bấm chuyển trang
             const row = createHelpPaginationButtons(1, totalPages, selectedCategory);
             
-            // 4. Cập nhật tin nhắn
+            // Cập nhật tin nhắn
             await interaction.editReply({
                 embeds: [embed],
                 components: [row]

From 42cfcb91d830cef0cbf368eeb7b6a0396b9be224 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:57:37 +0700
Subject: [PATCH 88/97] Update messageCreate.js

---
 src/events/messageCreate.js | 60 ++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 6ebb0955c..f82b76169 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,47 +1,33 @@
-import { Events } from 'discord.js';
-import { logger } from '../utils/logger.js';
+import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
 
 export default {
-    name: Events.MessageCreate,
-    async execute(message, client) {
-        const PREFIX = "nh!";
-
-        if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
-
-        const args = message.content.slice(PREFIX.length).trim().split(/ +/);
-        const commandName = args.shift().toLowerCase();
-        const command = client.commands.get(commandName);
+    name: 'help',
+    async execute(interaction, client, args) {
+        try {
+            // args format: [action, page, category]
+            const action = args[0]; // 'next' or 'back'
+            const currentPage = parseInt(args[1]) || 1;
+            const category = args[2] || 'help-all-commands';
 
-        if (!command) return;
+            const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
 
-        // Object Context thay thế cho Interaction (rất gọn nhẹ)
-        const context = {
-            member: message.member,
-            guild: message.guild,
-            channel: message.channel,
-            user: message.author,
-            
-            // Các phương thức thay thế cho Slash Command
-            reply: async (options) => message.reply(options),
-            editReply: async (options) => message.channel.send(options),
-            
-            // Xử lý args cho các lệnh cũ
-            options: {
-                getMember: () => message.mentions.members.first() || message.member,
-                getString: (name) => args.join(' '),
-                getUser: () => message.mentions.users.first(),
-                getInteger: () => parseInt(args[0]) || 0
+            let result;
+            if (category === 'help-all-commands') {
+                result = await getAllCommandsEmbedAndPageCount(newPage, client);
+            } else {
+                result = await getCategoryEmbedAndPageCount(category, newPage, client);
             }
-        };
 
-        try {
-            // Thực thi lệnh. 
-            // Lưu ý: Nếu lệnh trong file command yêu cầu deferReply, 
-            // ta cần một lớp "bọc" hoặc sửa file command đó.
-            await command.execute(context, null, client);
+            const { embed, totalPages } = result;
+            const row = createHelpPaginationButtons(newPage, totalPages, category);
+
+            await interaction.editReply({
+                embeds: [embed],
+                components: [row]
+            });
         } catch (error) {
-            logger.error(`Error executing prefix command ${commandName}:`, error);
-            message.reply('❌ Có lỗi xảy ra khi thực hiện lệnh này.');
+            console.error('Error in help button handler:', error);
+            await interaction.editReply({ content: '❌ An error occurred while updating the help menu.' });
         }
     }
 };

From c0c9ce957e9d0c3fe5db9435963ae56f34490ebb Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 14:58:21 +0700
Subject: [PATCH 89/97] Update help.js

---
 src/interactions/buttons/help.js | 48 +++++++++-----------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index f890775db..f82b76169 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -1,55 +1,33 @@
-import { getCategoryEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
 
 export default {
     name: 'help',
     async execute(interaction, client, args) {
         try {
-            console.log('🔵 Help button handler triggered');
-            console.log('Button customId:', interaction.customId);
-            console.log('Args received:', args);
-
-            // Parse arguments: action (next/back), page, category
-            const action = args[0]; // 'next' hoặc 'back'
+            // args format: [action, page, category]
+            const action = args[0]; // 'next' or 'back'
             const currentPage = parseInt(args[1]) || 1;
-            const category = args[2] || ''; // Category name (nếu có)
-
-            console.log(`Action: ${action}, Page: ${currentPage}, Category: ${category}`);
-
-            if (!action || !category) {
-                console.error('Missing action or category');
-                await interaction.editReply({
-                    content: '❌ Invalid button interaction. Please use the help command again.',
-                    embeds: [],
-                    components: []
-                });
-                return;
-            }
+            const category = args[2] || 'help-all-commands';
 
-            // Tính trang mới
             const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
-            console.log(`Moving from page ${currentPage} to page ${newPage}`);
 
-            // Lấy Embed và số trang tối đa của category
-            const { embed, totalPages } = await getCategoryEmbedAndPageCount(category, newPage, client);
-            console.log(`Total pages: ${totalPages}, Current page: ${newPage}`);
+            let result;
+            if (category === 'help-all-commands') {
+                result = await getAllCommandsEmbedAndPageCount(newPage, client);
+            } else {
+                result = await getCategoryEmbedAndPageCount(category, newPage, client);
+            }
 
-            // Tạo lại hàng nút bấm với số trang mới
+            const { embed, totalPages } = result;
             const row = createHelpPaginationButtons(newPage, totalPages, category);
 
-            // Cập nhật tin nhắn
             await interaction.editReply({
                 embeds: [embed],
                 components: [row]
             });
-            
-            console.log('✅ Help pagination updated successfully');
         } catch (error) {
-            console.error('❌ Error in help button handler:', error);
-            await interaction.editReply({
-                content: '❌ An error occurred while handling the help menu.',
-                embeds: [],
-                components: []
-            }).catch(() => {});
+            console.error('Error in help button handler:', error);
+            await interaction.editReply({ content: '❌ An error occurred while updating the help menu.' });
         }
     }
 };

From af06c66b986100497485e1de1f351234b471d6bc Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 15:00:42 +0700
Subject: [PATCH 90/97] Update help-category-select.js

---
 .../selectMenus/help-category-select.js       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/interactions/selectMenus/help-category-select.js b/src/interactions/selectMenus/help-category-select.js
index 018cdefd8..114c89c70 100644
--- a/src/interactions/selectMenus/help-category-select.js
+++ b/src/interactions/selectMenus/help-category-select.js
@@ -4,25 +4,21 @@ export default {
     name: 'help-category-select',
     async execute(interaction, client, args) {
         try {
+            await interaction.deferUpdate(); // Quan trọng: Đánh dấu đã nhận tương tác
+            
             const selectedCategory = interaction.values[0];
-            let embed, totalPages;
+            let result;
 
-            // Xử lý khi chọn "All Commands"
+            // Xử lý đúng cho All Commands
             if (selectedCategory === 'help-all-commands') {
-                const result = await getAllCommandsEmbedAndPageCount(1, client);
-                embed = result.embed;
-                totalPages = result.totalPages;
+                result = await getAllCommandsEmbedAndPageCount(1, client);
             } else {
-                // Xử lý các category bình thường
-                const result = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
-                embed = result.embed;
-                totalPages = result.totalPages;
+                result = await getCategoryEmbedAndPageCount(selectedCategory, 1, client);
             }
-            
-            // Tạo nút bấm chuyển trang
+
+            const { embed, totalPages } = result;
             const row = createHelpPaginationButtons(1, totalPages, selectedCategory);
             
-            // Cập nhật tin nhắn
             await interaction.editReply({
                 embeds: [embed],
                 components: [row]

From a7574aff8cb3c5448a0ee24503de40f2cd29e786 Mon Sep 17 00:00:00 2001
From: NH Starlight <pnhathao60@gmail.com>
Date: Tue, 26 May 2026 15:05:17 +0700
Subject: [PATCH 91/97] Update messageCreate.js

---
 src/events/messageCreate.js | 65 ++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index f82b76169..b59e089d7 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -1,33 +1,52 @@
-import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+import { Events } from 'discord.js';
+import { logger } from '../utils/logger.js';
+import { getGuildConfig } from '../services/guildConfig.js';
 
 export default {
-    name: 'help',
-    async execute(interaction, client, args) {
-        try {
-            // args format: [action, page, category]
-            const action = args[0]; // 'next' or 'back'
-            const currentPage = parseInt(args[1]) || 1;
-            const category = args[2] || 'help-all-commands';
+    name: Events.MessageCreate,
+    async execute(message, client) {
+        const PREFIX = "nh!";
+        if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-            const newPage = action === 'next' ? currentPage + 1 : currentPage - 1;
+        const args = message.content.slice(PREFIX.length).trim().split(/ +/);
+        const commandName = args.shift().toLowerCase();
+        const command = client.commands.get(commandName);
 
-            let result;
-            if (category === 'help-all-commands') {
-                result = await getAllCommandsEmbedAndPageCount(newPage, client);
-            } else {
-                result = await getCategoryEmbedAndPageCount(category, newPage, client);
-            }
+        if (!command) return;
 
-            const { embed, totalPages } = result;
-            const row = createHelpPaginationButtons(newPage, totalPages, category);
+        // Tạo 'fakeInteraction' để các lệnh tưởng chúng đang chạy qua Slash Command
+        const fakeInteraction = {
+            member: message.member,
+            guild: message.guild,
+            channel: message.channel,
+            user: message.author,
+            client: client,
+            // Giả lập các phương thức quan trọng
+            deferReply: async () => {}, 
+            reply: async (content) => message.reply(content),
+            editReply: async (content) => message.channel.send(content),
+            followUp: async (content) => message.channel.send(content),
+            deleteReply: async () => {},
+            // Giả lập options để lệnh lấy dữ liệu từ args của Prefix
+            options: {
+                getInteger: (name) => parseInt(args[0]) || 0,
+                getString: (name) => args.join(' '),
+                getUser: (name) => message.mentions.users.first(),
+                getMember: (name) => message.mentions.members.first() || message.member,
+                getChannel: (name) => message.mentions.channels.first() || message.channel,
+                getBoolean: (name) => args.includes('true')
+            }
+        };
 
-            await interaction.editReply({
-                embeds: [embed],
-                components: [row]
-            });
+        try {
+            // Lấy config guild nếu cần thiết
+            const guildConfig = await getGuildConfig(client, message.guild.id);
+            
+            // Thực thi lệnh với fakeInteraction
+            await command.execute(fakeInteraction, guildConfig, client);
         } catch (error) {
-            console.error('Error in help button handler:', error);
-            await interaction.editReply({ content: '❌ An error occurred while updating the help menu.' });
+            logger.error(`Error executing prefix command ${commandName}:`, error);
+            message.channel.send('❌ Lệnh này gặp lỗi khi chạy ở chế độ Prefix. Vui lòng sử dụng Slash Command (/).');
         }
     }
 };

From 2327bfe8844f69494da13a7be1d89361fb8c94ee Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Tue, 26 May 2026 09:38:38 +0000
Subject: [PATCH 92/97] Update database configuration to use environment
 variables

Modify src/config/postgres.js to prioritize environment variables like `DATABASE_URL`, `PGHOST`, `PGPORT`, `PGDATABASE`, `PGUSER`, and `PGPASSWORD` for PostgreSQL connection settings, including SSL configuration when applicable.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: baacfdfe-4384-406d-8932-56f17e67bff4
Replit-Helium-Checkpoint-Created: true
---
 .replit                | 47 ++++++++++++++++++++++++++++++++++++++++++
 package-lock.json      |  8 +++----
 src/config/postgres.js | 14 ++++++-------
 3 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 .replit

diff --git a/.replit b/.replit
new file mode 100644
index 000000000..e3747a246
--- /dev/null
+++ b/.replit
@@ -0,0 +1,47 @@
+modules = ["nodejs-18"]
+[agent]
+expertMode = true
+stack = "BEST_EFFORT_FALLBACK"
+
+[nix]
+channel = "stable-25_05"
+
+[userenv]
+
+[userenv.shared]
+NODE_ENV = "development"
+LOG_LEVEL = "info"
+LOG_TO_FILE = "false"
+PORT = "3000"
+WEB_HOST = "0.0.0.0"
+PORT_RETRY_ATTEMPTS = "5"
+CORS_ORIGIN = "*"
+AUTO_MIGRATE = "true"
+POSTGRES_MIGRATION_TABLE = "schema_migrations"
+SCHEMA_VERSION = "1"
+SCHEMA_VERSION_LABEL = "baseline-v1"
+BACKUP_DIR = "./backups"
+BACKUP_RETENTION_DAYS = "14"
+
+[workflows]
+runButton = "Project"
+
+[[workflows.workflow]]
+name = "Project"
+mode = "parallel"
+author = "agent"
+
+[[workflows.workflow.tasks]]
+task = "workflow.run"
+args = "Start application"
+
+[[workflows.workflow]]
+name = "Start application"
+author = "agent"
+
+[[workflows.workflow.tasks]]
+task = "shell.exec"
+args = "node src/app.js"
+
+[workflows.workflow.metadata]
+outputType = "console"
diff --git a/package-lock.json b/package-lock.json
index 94e61bfc1..70023ff9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "titanbot-custom",
-  "version": "2.0.0",
+  "name": "starlight-security",
+  "version": "1.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "titanbot-custom",
-      "version": "2.0.0",
+      "name": "starlight-security",
+      "version": "1.1.1",
       "dependencies": {
         "@discordjs/rest": "^2.6.1",
         "axios": "^1.15.2",
diff --git a/src/config/postgres.js b/src/config/postgres.js
index b70d1875a..956735fc3 100644
--- a/src/config/postgres.js
+++ b/src/config/postgres.js
@@ -49,16 +49,16 @@ const validatedTables = Object.fromEntries(
 
 
 export const pgConfig = {
-    url: process.env.POSTGRES_URL || 'postgresql://localhost:5432/titanbot',
+    url: process.env.POSTGRES_URL || process.env.DATABASE_URL || 'postgresql://localhost:5432/titanbot',
     
     options: {
         
-        host: process.env.POSTGRES_HOST || 'localhost',
-        port: parseInt(process.env.POSTGRES_PORT) || 5432,
-        database: process.env.POSTGRES_DB || 'titanbot',
-        user: process.env.POSTGRES_USER || 'postgres',
-        password: (process.env.POSTGRES_PASSWORD || '').toString(),
-        ssl: false,
+        host: process.env.POSTGRES_HOST || process.env.PGHOST || 'localhost',
+        port: parseInt(process.env.POSTGRES_PORT || process.env.PGPORT) || 5432,
+        database: process.env.POSTGRES_DB || process.env.PGDATABASE || 'titanbot',
+        user: process.env.POSTGRES_USER || process.env.PGUSER || 'postgres',
+        password: (process.env.POSTGRES_PASSWORD || process.env.PGPASSWORD || '').toString(),
+        ssl: process.env.PGHOST ? { rejectUnauthorized: false } : false,
         
         
         max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS) || 20,

From 932f8a7208a125a7b2a1bcda10a3a34a749cc18e Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Tue, 26 May 2026 09:45:59 +0000
Subject: [PATCH 93/97] Fix numerous bugs and improve logging throughout the
 application

Replace console logs with a structured logger, fix database query issues, handle potential errors in JSON parsing and API responses, update permission flag usage, and ensure commands are properly checked before execution.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: 2b9cf294-4dcd-4ba1-8f05-69b1b8ca8eb1
Replit-Helium-Checkpoint-Created: true
---
 .replit                                        |  4 ++++
 src/commands/Moderation/cases.js               |  1 +
 src/commands/Moderation/lock.js                |  5 +++--
 src/commands/Moderation/purge.js               |  3 ++-
 src/commands/Moderation/quarantine.js          |  9 +++++----
 src/commands/Moderation/quarantinesetup.js     |  5 +++--
 src/commands/Moderation/unlock.js              |  5 +++--
 src/commands/Moderation/unquarantine.js        | 16 +++++++++++-----
 src/commands/Search/movie.js                   |  1 -
 src/commands/Search/urban.js                   |  4 ++--
 src/config/postgres.js                         |  2 +-
 src/events/interactionCreate.js                | 18 ++++++++----------
 src/handlers/countdownButtons.js               |  4 ++--
 src/interactions/buttons/help.js               |  3 ++-
 .../selectMenus/help-category-select.js        |  3 ++-
 src/utils/components.js                        |  6 +++---
 src/utils/embeds.js                            | 10 +++++-----
 src/utils/helpMenuHelper.js                    |  4 +---
 18 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/.replit b/.replit
index e3747a246..45d746fd8 100644
--- a/.replit
+++ b/.replit
@@ -45,3 +45,7 @@ args = "node src/app.js"
 
 [workflows.workflow.metadata]
 outputType = "console"
+
+[[ports]]
+localPort = 3000
+externalPort = 80
diff --git a/src/commands/Moderation/cases.js b/src/commands/Moderation/cases.js
index a89377a76..beadbf126 100644
--- a/src/commands/Moderation/cases.js
+++ b/src/commands/Moderation/cases.js
@@ -178,6 +178,7 @@ export default {
                         components: [disabledRow]
                     });
                 } catch (error) {
+                    logger.debug('Could not disable cases buttons (message may have been deleted):', error.message);
                 }
             });
 
diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 11f76d725..745f176dc 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -1,6 +1,7 @@
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
 import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -28,7 +29,7 @@ export default {
                 try {
                     await channel.permissionOverwrites.edit(id, { SendMessages: false });
                 } catch (e) {
-                    console.log(`Skipping role ${id}:`, e.message);
+                    logger.debug(`Skipping role ${id}: ${e.message}`);
                 }
             }
 
@@ -45,7 +46,7 @@ export default {
             }
 
         } catch (error) {
-            console.error("Critical lock error:", error);
+            logger.error("Critical lock error:", error);
             const errEmbed = errorEmbed("Error", "Failed to process lock command.");
             
             if (isPrefix) {
diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index ebb5064d5..99b4b5d6b 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -1,6 +1,7 @@
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
 import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -61,7 +62,7 @@ export default {
             }
 
         } catch (error) {
-            console.error("Purge error:", error);
+            logger.error("Purge error:", error);
             const err = errorEmbed("Error", "Failed to delete messages. (Older than 14 days or system messages.)");
             isPrefix ? await channel.send({ embeds: [err] }) : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
         }
diff --git a/src/commands/Moderation/quarantine.js b/src/commands/Moderation/quarantine.js
index b51b5994b..2a3a205db 100644
--- a/src/commands/Moderation/quarantine.js
+++ b/src/commands/Moderation/quarantine.js
@@ -1,5 +1,6 @@
 import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
-import { db } from '../../utils/database.js';
+import { pgDb } from '../../utils/database.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -19,7 +20,7 @@ export default {
 
         // Đảm bảo bảng tồn tại
         try {
-            await db.query(`CREATE TABLE IF NOT EXISTS quarantine_data (user_id VARCHAR(20) PRIMARY KEY, roles TEXT NOT NULL)`);
+            await pgDb.pool.query(`CREATE TABLE IF NOT EXISTS quarantine_data (user_id VARCHAR(20) PRIMARY KEY, roles TEXT NOT NULL)`);
         } catch (e) { /* Bỏ qua nếu bảng đã tồn tại */ }
 
         let role = interaction.guild.roles.cache.find(r => r.name === 'Quarantine');
@@ -34,7 +35,7 @@ export default {
         const rolesToSave = member.roles.cache.filter(r => r.id !== interaction.guild.id && r.id !== role.id).map(r => r.id);
         
         try {
-            await db.query(
+            await pgDb.pool.query(
                 'INSERT INTO quarantine_data (user_id, roles) VALUES ($1, $2) ON CONFLICT (user_id) DO UPDATE SET roles = $2',
                 [member.id, JSON.stringify(rolesToSave)]
             );
@@ -42,7 +43,7 @@ export default {
             await member.roles.set([role.id]);
             await interaction.editReply({ content: `Successfully quarantined ${member.user.tag}.` });
         } catch (error) {
-            console.error('Database Error:', error);
+            logger.error('Quarantine database error:', error);
             await interaction.editReply({ content: 'Failed to apply quarantine. Check role hierarchy.' });
         }
     }
diff --git a/src/commands/Moderation/quarantinesetup.js b/src/commands/Moderation/quarantinesetup.js
index 77022d678..aec84e738 100644
--- a/src/commands/Moderation/quarantinesetup.js
+++ b/src/commands/Moderation/quarantinesetup.js
@@ -1,4 +1,5 @@
 import { SlashCommandBuilder, PermissionsBitField, Colors } from 'discord.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -33,13 +34,13 @@ export default {
                 if (channel.permissionOverwrites) {
                     await channel.permissionOverwrites.create(role, { 
                         ViewChannel: false 
-                    }).catch(err => console.error(`Failed to update ${channel.name}:`, err));
+                    }).catch(err => logger.warn(`Failed to update permissions for ${channel.name}: ${err.message}`));
                 }
             }
 
             await interaction.editReply(`Quarantine role created (Red) and channels secured. Role ID: ${role.id}`);
         } catch (error) {
-            console.error(error);
+            logger.error('Quarantine setup error:', error);
             await interaction.editReply('An error occurred while setting up the quarantine system.');
         }
     }
diff --git a/src/commands/Moderation/unlock.js b/src/commands/Moderation/unlock.js
index f7a6c74eb..229ce891b 100644
--- a/src/commands/Moderation/unlock.js
+++ b/src/commands/Moderation/unlock.js
@@ -1,6 +1,7 @@
 import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
 import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -21,7 +22,7 @@ export default {
                 try {
                     await channel.permissionOverwrites.edit(id, { SendMessages: null });
                 } catch (e) {
-                    console.log(`Skipping role ${id}:`, e.message);
+                    logger.debug(`Skipping role ${id}: ${e.message}`);
                 }
             }
 
@@ -31,7 +32,7 @@ export default {
             });
 
         } catch (error) {
-            console.error("Critical unlock error:", error);
+            logger.error("Critical unlock error:", error);
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [errorEmbed("Error", "Failed to process unlock command.")],
             });
diff --git a/src/commands/Moderation/unquarantine.js b/src/commands/Moderation/unquarantine.js
index 9ce1ead85..fd22f88b3 100644
--- a/src/commands/Moderation/unquarantine.js
+++ b/src/commands/Moderation/unquarantine.js
@@ -1,5 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { db } from '../../utils/database.js';
+import { pgDb } from '../../utils/database.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -14,20 +15,25 @@ export default {
         if (!target) return interaction.editReply({ content: 'Member not found.' });
 
         try {
-            const res = await db.query('SELECT roles FROM quarantine_data WHERE user_id = $1', [target.id]);
+            const res = await pgDb.pool.query('SELECT roles FROM quarantine_data WHERE user_id = $1', [target.id]);
             
             if (res.rows.length === 0) {
                 return interaction.editReply({ content: 'This user is not in quarantine database.' });
             }
 
-            const oldRoles = JSON.parse(res.rows[0].roles);
+            let oldRoles;
+            try {
+                oldRoles = JSON.parse(res.rows[0].roles);
+            } catch (parseError) {
+                return interaction.editReply({ content: 'Failed to parse quarantine data. The data may be corrupted.' });
+            }
             
             await target.roles.set(oldRoles);
-            await db.query('DELETE FROM quarantine_data WHERE user_id = $1', [target.id]);
+            await pgDb.pool.query('DELETE FROM quarantine_data WHERE user_id = $1', [target.id]);
 
             await interaction.editReply({ content: `Successfully unquarantined ${target.user.tag}.` });
         } catch (error) {
-            console.error('Database Error:', error);
+            logger.error('Unquarantine database error:', error);
             await interaction.editReply({ content: 'Database error or missing permissions.' });
         }
     }
diff --git a/src/commands/Search/movie.js b/src/commands/Search/movie.js
index a4e72ebc0..dc84a430a 100644
--- a/src/commands/Search/movie.js
+++ b/src/commands/Search/movie.js
@@ -8,7 +8,6 @@ import { getGuildConfig } from '../../services/guildConfig.js';
 import { getColor } from '../../config/bot.js';
 
 const TMDB_API_KEY = process.env.TMDB_API_KEY || '4e44d9029b1270a757cddc766a1bcb63';
-    "4e44d9029b1270a757cddc766a1bcb63";
 const IMAGE_BASE_URL = "https://image.tmdb.org/t/p/w500";
 const MAX_RESULTS = 5;
 
diff --git a/src/commands/Search/urban.js b/src/commands/Search/urban.js
index e2020025b..1a5b2df1c 100644
--- a/src/commands/Search/urban.js
+++ b/src/commands/Search/urban.js
@@ -76,8 +76,8 @@ export default {
             }
             
             const definition = response.data.list[0];
-            const cleanDefinition = definition.definition.replace(/\[|\]/g, '');
-            const cleanExample = definition.example.replace(/\[|\]/g, '');
+            const cleanDefinition = (definition.definition || '').replace(/\[|\]/g, '');
+            const cleanExample = (definition.example || '').replace(/\[|\]/g, '');
             
             const formattedDefinition = cleanDefinition
 .replace(/\n\s*\n/g, '\n\n')
diff --git a/src/config/postgres.js b/src/config/postgres.js
index 956735fc3..2ae95a6b9 100644
--- a/src/config/postgres.js
+++ b/src/config/postgres.js
@@ -58,7 +58,7 @@ export const pgConfig = {
         database: process.env.POSTGRES_DB || process.env.PGDATABASE || 'titanbot',
         user: process.env.POSTGRES_USER || process.env.PGUSER || 'postgres',
         password: (process.env.POSTGRES_PASSWORD || process.env.PGPASSWORD || '').toString(),
-        ssl: process.env.PGHOST ? { rejectUnauthorized: false } : false,
+        ssl: false,
         
         
         max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS) || 20,
diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
index 3a4809bda..02a23cf62 100644
--- a/src/events/interactionCreate.js
+++ b/src/events/interactionCreate.js
@@ -46,31 +46,29 @@ export default {
         }
 
         if (interaction.isChatInputCommand()) {
-          // ... (giữ nguyên logic cũ của bạn) ...
           const command = client.commands.get(interaction.commandName);
+          if (!command) {
+            logger.warn(`Unknown command: ${interaction.commandName}`);
+            return;
+          }
           await command.execute(interaction, await getGuildConfig(client, interaction.guildId), client);
         } 
         else if (interaction.isButton()) {
-          console.log(`🔴 Button pressed! customId: ${interaction.customId}`);
+          logger.debug(`Button pressed: ${interaction.customId}`);
           const [customId, ...args] = interaction.customId.split(':');
-          console.log(`Parsed customId: ${customId}, args: ${args.join(':')}`);
-          console.log(`Looking for button handler with name: "${customId}"`);
-          console.log(`Available buttons:`, Array.from(client.buttons.keys()));
           
           const button = client.buttons.get(customId);
-          console.log(`Button handler found:`, !!button);
           
           if (button) await button.execute(interaction, client, args);
-          else console.log(`❌ No button handler found for: ${customId}`);
+          else logger.warn(`No button handler found for: ${customId}`);
         } 
         else if (interaction.isStringSelectMenu()) {
-          console.log(`🟢 Select menu! customId: ${interaction.customId}`);
+          logger.debug(`Select menu: ${interaction.customId}`);
           const [customId, ...args] = interaction.customId.split(':');
-          console.log(`Parsed customId: ${customId}, args: ${args.join(':')}`);
           
           const selectMenu = client.selectMenus.get(customId);
           if (selectMenu) await selectMenu.execute(interaction, client, args);
-          else console.log(`❌ No select menu handler found for: ${customId}`);
+          else logger.warn(`No select menu handler found for: ${customId}`);
         }
         else if (interaction.isModalSubmit()) {
            // ... (giữ nguyên logic modal cũ) ...
diff --git a/src/handlers/countdownButtons.js b/src/handlers/countdownButtons.js
index 2b5e916dd..c9c0a47df 100644
--- a/src/handlers/countdownButtons.js
+++ b/src/handlers/countdownButtons.js
@@ -1,4 +1,4 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionFlagsBits } from 'discord.js';
 import { successEmbed, errorEmbed } from '../utils/embeds.js';
 import { logger } from '../utils/logger.js';
 
@@ -112,7 +112,7 @@ async function countdownButtonHandler(interaction, client, args) {
             });
         }
 
-        if (!interaction.member.permissions.has("MANAGE_MESSAGES")) {
+        if (!interaction.member.permissions.has(PermissionFlagsBits.ManageMessages)) {
             return await interaction.reply({
                 content: 'You need the "Manage Messages" permission to control countdowns.',
                 flags: ["Ephemeral"],
diff --git a/src/interactions/buttons/help.js b/src/interactions/buttons/help.js
index f82b76169..1bdad99a5 100644
--- a/src/interactions/buttons/help.js
+++ b/src/interactions/buttons/help.js
@@ -1,4 +1,5 @@
 import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     name: 'help',
@@ -26,7 +27,7 @@ export default {
                 components: [row]
             });
         } catch (error) {
-            console.error('Error in help button handler:', error);
+            logger.error('Error in help button handler:', error);
             await interaction.editReply({ content: '❌ An error occurred while updating the help menu.' });
         }
     }
diff --git a/src/interactions/selectMenus/help-category-select.js b/src/interactions/selectMenus/help-category-select.js
index 114c89c70..37d62d3ba 100644
--- a/src/interactions/selectMenus/help-category-select.js
+++ b/src/interactions/selectMenus/help-category-select.js
@@ -1,4 +1,5 @@
 import { getCategoryEmbedAndPageCount, getAllCommandsEmbedAndPageCount, createHelpPaginationButtons } from '../../utils/helpMenuHelper.js';
+import { logger } from '../../utils/logger.js';
 
 export default {
     name: 'help-category-select',
@@ -24,7 +25,7 @@ export default {
                 components: [row]
             });
         } catch (error) {
-            console.error('Error in select menu handler:', error);
+            logger.error('Error in select menu handler:', error);
             await interaction.editReply({ content: '❌ Failed to load category.' });
         }
     }
diff --git a/src/utils/components.js b/src/utils/components.js
index 4babb09f9..cb8619722 100644
--- a/src/utils/components.js
+++ b/src/utils/components.js
@@ -84,7 +84,7 @@ export function createButton(customId, label, style = 'primary', emoji = null, d
         try {
             button.setEmoji(emoji);
         } catch (error) {
-            
+            // Invalid emoji format — skip silently
         }
     }
     
@@ -111,7 +111,7 @@ export function createLinkButton(label, url, emoji = null) {
         try {
             button.setEmoji(emoji);
         } catch (error) {
-            
+            // Invalid emoji format — skip silently
         }
     }
     
@@ -142,7 +142,7 @@ export function createButtonRow(buttons) {
                 ));
             }
         } catch (error) {
-            
+            // Skip invalid button definition
             continue;
         }
     }
diff --git a/src/utils/embeds.js b/src/utils/embeds.js
index b3ca90607..c67ff1139 100644
--- a/src/utils/embeds.js
+++ b/src/utils/embeds.js
@@ -50,7 +50,7 @@ export function createEmbed({
         embed.setAuthor(author);
       }
     } catch (error) {
-      
+      // Invalid author URL or format — skip silently to avoid crashing the embed
     }
   }
 
@@ -63,7 +63,7 @@ export function createEmbed({
         embed.setFooter(footer);
       }
     } catch (error) {
-      
+      // Invalid footer iconURL or format — skip silently to avoid crashing the embed
     }
   }
 
@@ -76,7 +76,7 @@ export function createEmbed({
         embed.setThumbnail(thumbnail.url);
       }
     } catch (error) {
-      
+      // Invalid thumbnail URL — skip silently to avoid crashing the embed
     }
   }
 
@@ -89,7 +89,7 @@ export function createEmbed({
         embed.setImage(image.url);
       }
     } catch (error) {
-      
+      // Invalid image URL — skip silently to avoid crashing the embed
     }
   }
 
@@ -105,7 +105,7 @@ export function createEmbed({
     try {
       embed.setURL(url);
     } catch (error) {
-      
+      // Invalid URL format — skip silently to avoid crashing the embed
     }
   }
 
diff --git a/src/utils/helpMenuHelper.js b/src/utils/helpMenuHelper.js
index 69a76ad01..50d185524 100644
--- a/src/utils/helpMenuHelper.js
+++ b/src/utils/helpMenuHelper.js
@@ -94,7 +94,7 @@ async function getCommandDescription(filePath) {
             return command.data.description;
         }
     } catch (error) {
-        console.error(`Error loading command description from ${filePath}:`, error);
+        // Silently skip — command file may not export a description
     }
     return "No description available";
 }
@@ -150,7 +150,6 @@ export async function getCategoryEmbedAndPageCount(category, page = 1, client) {
 
         return { embed, totalPages, currentPage: validPage };
     } catch (error) {
-        console.error(`Error reading category ${category}:`, error);
         throw error;
     }
 }
@@ -223,7 +222,6 @@ export async function getAllCommandsEmbedAndPageCount(page = 1, client) {
 
         return { embed, totalPages, currentPage: validPage };
     } catch (error) {
-        console.error(`Error reading all commands:`, error);
         throw error;
     }
 }

From 0e86de2c65bc73eb964304f31aa15564e5834b71 Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Tue, 26 May 2026 09:51:08 +0000
Subject: [PATCH 94/97] Improve parallel execution of commands using slash and
 prefix

Implement a robust fake interaction object for prefix commands and correct prefix detection logic in moderation commands.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: f65c0055-07da-4287-983d-c160ceb13506
Replit-Helium-Checkpoint-Created: true
---
 src/commands/Moderation/lock.js  |  4 +-
 src/commands/Moderation/purge.js |  2 +-
 src/events/messageCreate.js      | 92 +++++++++++++++++++++++++-------
 3 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index 745f176dc..7cd0de864 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -10,9 +10,7 @@ export default {
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels),
 
     async execute(interaction, config, client) {
-        // KIỂM TRA ĐÂY LÀ PREFIX HAY SLASH
-        // Nếu không có deferReply, nghĩa là đây là lệnh Prefix (nh!lock)
-        const isPrefix = !interaction.deferReply;
+        const isPrefix = interaction._isPrefix === true;
 
         if (!isPrefix) {
             await InteractionHelper.safeDefer(interaction);
diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 99b4b5d6b..88f2ab708 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -16,7 +16,7 @@ export default {
 
     async execute(interaction, config, client) {
         // 1. Kiểm tra lệnh này là Slash hay Prefix
-        const isPrefix = !interaction.deferReply;
+        const isPrefix = interaction._isPrefix === true;
         
         if (!isPrefix) {
             await InteractionHelper.safeDefer(interaction);
diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index b59e089d7..81a8d547a 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -10,43 +10,95 @@ export default {
 
         const args = message.content.slice(PREFIX.length).trim().split(/ +/);
         const commandName = args.shift().toLowerCase();
-        const command = client.commands.get(commandName);
+        if (!commandName) return;
 
+        const command = client.commands.get(commandName);
         if (!command) return;
 
-        // Tạo 'fakeInteraction' để các lệnh tưởng chúng đang chạy qua Slash Command
+        // Build a fakeInteraction that mimics a real Discord interaction closely enough
+        // so that InteractionHelper and all commands work correctly for prefix commands.
+        let _deferred = false;
+        let _replied = false;
+
+        const stripFlags = (options) => {
+            if (!options || typeof options !== 'object') return options;
+            const { flags, ephemeral, ...safe } = options;
+            return safe;
+        };
+
         const fakeInteraction = {
+            // Marker so commands can detect prefix mode via: interaction._isPrefix === true
+            _isPrefix: true,
+
+            // InteractionHelper.isInteractionValid() requires id to be a string
+            id: `prefix-${message.id}`,
+            createdTimestamp: message.createdTimestamp,
+
+            guildId: message.guild.id,
+            commandName: commandName,
+
             member: message.member,
             guild: message.guild,
             channel: message.channel,
             user: message.author,
             client: client,
-            // Giả lập các phương thức quan trọng
-            deferReply: async () => {}, 
-            reply: async (content) => message.reply(content),
-            editReply: async (content) => message.channel.send(content),
-            followUp: async (content) => message.channel.send(content),
+
+            get deferred() { return _deferred; },
+            get replied() { return _replied; },
+
+            deferReply: async () => {
+                _deferred = true;
+            },
+            reply: async (content) => {
+                const opts = stripFlags(typeof content === 'string' ? { content } : content);
+                const msg = await message.reply(opts);
+                _replied = true;
+                return msg;
+            },
+            editReply: async (content) => {
+                const opts = stripFlags(typeof content === 'string' ? { content } : content);
+                const msg = await message.channel.send(opts);
+                _replied = true;
+                return msg;
+            },
+            followUp: async (content) => {
+                const opts = stripFlags(typeof content === 'string' ? { content } : content);
+                return message.channel.send(opts);
+            },
             deleteReply: async () => {},
-            // Giả lập options để lệnh lấy dữ liệu từ args của Prefix
+
             options: {
-                getInteger: (name) => parseInt(args[0]) || 0,
-                getString: (name) => args.join(' '),
-                getUser: (name) => message.mentions.users.first(),
-                getMember: (name) => message.mentions.members.first() || message.member,
-                getChannel: (name) => message.mentions.channels.first() || message.channel,
-                getBoolean: (name) => args.includes('true')
-            }
+                // For subcommand commands: first arg is the subcommand name
+                getSubcommand: () => args[0] || null,
+
+                // For named options: find first integer among args
+                getInteger: (_name) => {
+                    const num = args.find(a => /^-?\d+$/.test(a));
+                    return num !== undefined ? parseInt(num, 10) : null;
+                },
+                getNumber: (_name) => {
+                    const num = args.find(a => /^-?[\d.]+$/.test(a));
+                    return num !== undefined ? parseFloat(num) : null;
+                },
+                // getString returns args joined (excluding subcommand if present)
+                // Works for both plain "nh!ban @user reason" and subcommand "nh!todo add task"
+                getString: (_name) => args.join(' ') || null,
+
+                getUser: (_name) => message.mentions.users.first() ?? null,
+                getMember: (_name) => message.mentions.members.first() ?? null,
+                getChannel: (_name) => message.mentions.channels.first() ?? message.channel,
+                getRole: (_name) => message.mentions.roles.first() ?? null,
+                getBoolean: (_name) => args.includes('true'),
+                getAttachment: (_name) => message.attachments.first() ?? null,
+            },
         };
 
         try {
-            // Lấy config guild nếu cần thiết
             const guildConfig = await getGuildConfig(client, message.guild.id);
-            
-            // Thực thi lệnh với fakeInteraction
             await command.execute(fakeInteraction, guildConfig, client);
         } catch (error) {
-            logger.error(`Error executing prefix command ${commandName}:`, error);
-            message.channel.send('❌ Lệnh này gặp lỗi khi chạy ở chế độ Prefix. Vui lòng sử dụng Slash Command (/).');
+            logger.error(`Error executing prefix command "${commandName}":`, error);
+            message.channel.send('❌ An error occurred while running this command. Please try the slash command (/) version instead.');
         }
     }
 };

From c1ac6dcfd7d51734ddcfdcb7fcf9aaa9d35d02aa Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Tue, 26 May 2026 09:56:12 +0000
Subject: [PATCH 95/97] Improve command execution by enabling prefix and slash
 commands to work together

Refactor messageCreate.js to create a fake interaction object for prefix commands, and update purge.js to correctly handle integer arguments, ensuring both command types function seamlessly.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: 66d5d1a2-9889-4d6f-9651-a53e69ae39f6
Replit-Helium-Checkpoint-Created: true
---
 src/commands/Moderation/purge.js |  4 +-
 src/events/messageCreate.js      | 83 +++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index 88f2ab708..fb305044d 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -23,9 +23,7 @@ export default {
         }
 
         // 2. Xử lý logic lấy amount (Prefix lấy từ args, Slash lấy từ options)
-        let amount = isPrefix 
-            ? parseInt(interaction.options.getInteger()) // Lấy từ context của prefixHandler
-            : interaction.options.getInteger("amount");
+        let amount = interaction.options.getInteger("amount") ?? 10;
 
         // 3. CHẶN LỖI 100 TIN NHẮN (Discord API limit)
         if (amount > 100) amount = 100;
diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 81a8d547a..b968eb592 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -2,40 +2,58 @@ import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
 import { getGuildConfig } from '../services/guildConfig.js';
 
+// Regex để nhận diện Discord mention syntax: <@123>, <@!123>, <@&123>, <#123>
+const MENTION_REGEX = /^<[@#][!&]?\d+>$/;
+// Regex số nguyên thuần tuý (có thể âm)
+const INTEGER_REGEX = /^-?\d+$/;
+
 export default {
     name: Events.MessageCreate,
     async execute(message, client) {
         const PREFIX = "nh!";
         if (!message.content.startsWith(PREFIX) || message.author.bot || !message.guild) return;
 
-        const args = message.content.slice(PREFIX.length).trim().split(/ +/);
-        const commandName = args.shift().toLowerCase();
+        const rawArgs = message.content.slice(PREFIX.length).trim().split(/ +/);
+        const commandName = rawArgs.shift().toLowerCase();
         if (!commandName) return;
 
         const command = client.commands.get(commandName);
         if (!command) return;
 
-        // Build a fakeInteraction that mimics a real Discord interaction closely enough
-        // so that InteractionHelper and all commands work correctly for prefix commands.
+        // args là bản sao để các option method dùng chung không mutate nhau
+        const args = [...rawArgs];
+
+        // Các arg không phải mention và không phải số nguyên (phần text thuần)
+        const textArgs = args.filter(a => !MENTION_REGEX.test(a) && !INTEGER_REGEX.test(a));
+
+        // Nếu args[0] là subcommand (không phải mention, không phải số), các textArgs
+        // dùng cho getString sẽ bỏ qua nó để tránh subcommand lẫn vào reason/text
+        const firstArgIsSubcommand = args[0] && !MENTION_REGEX.test(args[0]) && !INTEGER_REGEX.test(args[0]);
+        const stringArgs = firstArgIsSubcommand ? textArgs.slice(1) : textArgs;
+
         let _deferred = false;
         let _replied = false;
 
-        const stripFlags = (options) => {
-            if (!options || typeof options !== 'object') return options;
-            const { flags, ephemeral, ...safe } = options;
+        const stripFlags = (opts) => {
+            if (!opts || typeof opts !== 'object') return opts;
+            const { flags, ephemeral, ...safe } = opts;
             return safe;
         };
 
         const fakeInteraction = {
-            // Marker so commands can detect prefix mode via: interaction._isPrefix === true
+            // Marker cho lệnh tự phát hiện chế độ prefix
             _isPrefix: true,
 
-            // InteractionHelper.isInteractionValid() requires id to be a string
+            // InteractionHelper.isInteractionValid() yêu cầu id là string
             id: `prefix-${message.id}`,
             createdTimestamp: message.createdTimestamp,
 
             guildId: message.guild.id,
-            commandName: commandName,
+            channelId: message.channel.id,
+            commandName,
+
+            // type = 0 (không phải APPLICATION_COMMAND) để phân biệt với slash
+            type: 0,
 
             member: message.member,
             guild: message.guild,
@@ -46,43 +64,62 @@ export default {
             get deferred() { return _deferred; },
             get replied() { return _replied; },
 
-            deferReply: async () => {
+            deferReply: async (_opts) => {
                 _deferred = true;
             },
+
             reply: async (content) => {
                 const opts = stripFlags(typeof content === 'string' ? { content } : content);
                 const msg = await message.reply(opts);
                 _replied = true;
                 return msg;
             },
+
             editReply: async (content) => {
                 const opts = stripFlags(typeof content === 'string' ? { content } : content);
                 const msg = await message.channel.send(opts);
                 _replied = true;
                 return msg;
             },
+
             followUp: async (content) => {
                 const opts = stripFlags(typeof content === 'string' ? { content } : content);
                 return message.channel.send(opts);
             },
+
             deleteReply: async () => {},
 
             options: {
-                // For subcommand commands: first arg is the subcommand name
-                getSubcommand: () => args[0] || null,
+                /**
+                 * Trả về args[0] nếu nó là tên subcommand (không phải mention/số).
+                 * Ví dụ: nh!todo add task → "add"
+                 */
+                getSubcommand: () => firstArgIsSubcommand ? args[0] : null,
 
-                // For named options: find first integer among args
+                /**
+                 * Tìm số nguyên đầu tiên trong args.
+                 * Ví dụ: nh!timeout @user 60 reason → 60
+                 */
                 getInteger: (_name) => {
-                    const num = args.find(a => /^-?\d+$/.test(a));
-                    return num !== undefined ? parseInt(num, 10) : null;
+                    const found = args.find(a => INTEGER_REGEX.test(a));
+                    return found !== undefined ? parseInt(found, 10) : null;
                 },
+
+                /**
+                 * Tương tự getInteger nhưng cho số thực.
+                 */
                 getNumber: (_name) => {
-                    const num = args.find(a => /^-?[\d.]+$/.test(a));
-                    return num !== undefined ? parseFloat(num) : null;
+                    const found = args.find(a => /^-?[\d.]+$/.test(a) && !isNaN(parseFloat(a)));
+                    return found !== undefined ? parseFloat(found) : null;
                 },
-                // getString returns args joined (excluding subcommand if present)
-                // Works for both plain "nh!ban @user reason" and subcommand "nh!todo add task"
-                getString: (_name) => args.join(' ') || null,
+
+                /**
+                 * Trả về phần text thuần (bỏ mention và số), bỏ qua subcommand nếu có.
+                 * Ví dụ: nh!ban @user lý do ban → "lý do ban"
+                 * Ví dụ: nh!timeout @user 60 lý do → "lý do"
+                 * Ví dụ: nh!todo add tên công việc → "tên công việc"
+                 */
+                getString: (_name) => stringArgs.join(' ') || null,
 
                 getUser: (_name) => message.mentions.users.first() ?? null,
                 getMember: (_name) => message.mentions.members.first() ?? null,
@@ -97,8 +134,8 @@ export default {
             const guildConfig = await getGuildConfig(client, message.guild.id);
             await command.execute(fakeInteraction, guildConfig, client);
         } catch (error) {
-            logger.error(`Error executing prefix command "${commandName}":`, error);
-            message.channel.send('❌ An error occurred while running this command. Please try the slash command (/) version instead.');
+            logger.error(`Prefix command "${commandName}" failed:`, error);
+            await message.channel.send('❌ Lệnh gặp lỗi. Hãy thử dùng Slash Command (/) để có đầy đủ tính năng.').catch(() => {});
         }
     }
 };

From 9109dc8159e6ebb79f550494e8eace67670c051e Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Wed, 27 May 2026 03:47:40 +0000
Subject: [PATCH 96/97] Improve moderation commands with bug fixes and enhanced
 functionality

Addresses issues in timeout, purge, quarantine setup, warnings, warn, ban, and kick commands. Enhances argument parsing, duration handling, role positioning, error reporting, and message deletion capabilities.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: 774438d8-5dc9-473f-8e54-372a3cb08ed6
Replit-Helium-Checkpoint-Created: true
---
 src/commands/Moderation/ban.js             |   8 +
 src/commands/Moderation/kick.js            |  10 +-
 src/commands/Moderation/purge.js           |  84 ++++++---
 src/commands/Moderation/quarantinesetup.js |  39 +++--
 src/commands/Moderation/timeout.js         | 188 ++++++++++++++-------
 src/commands/Moderation/warn.js            | 147 ++++++++--------
 src/commands/Moderation/warnings.js        |  68 ++++----
 src/events/messageCreate.js                |  61 +++----
 8 files changed, 361 insertions(+), 244 deletions(-)

diff --git a/src/commands/Moderation/ban.js b/src/commands/Moderation/ban.js
index 657359233..fe46d28e8 100644
--- a/src/commands/Moderation/ban.js
+++ b/src/commands/Moderation/ban.js
@@ -26,6 +26,14 @@ export default {
             const user = interaction.options.getUser("target");
             const reason = interaction.options.getString("reason") || "No reason provided";
 
+            // Missing args guard
+            if (!user) {
+                return handleInteractionError(interaction,
+                    Object.assign(new Error("Please mention the user to ban.\nUsage: `nh!ban @user [reason]`"), { userMessage: "Please mention the user to ban.\nUsage: `nh!ban @user [reason]`" }),
+                    { subtype: 'missing_target' }
+                );
+            }
+
             if (user.id === interaction.user.id) {
                 throw new Error("You cannot ban yourself.");
             }
diff --git a/src/commands/Moderation/kick.js b/src/commands/Moderation/kick.js
index d1902f906..4c7f71aae 100644
--- a/src/commands/Moderation/kick.js
+++ b/src/commands/Moderation/kick.js
@@ -36,7 +36,15 @@ export default {
       const member = interaction.options.getMember("target");
       const reason = interaction.options.getString("reason") || "No reason provided";
 
-      
+      // Missing args guard
+      if (!targetUser) {
+        throw new TitanBotError(
+          "Missing target",
+          ErrorTypes.USER_INPUT,
+          "Please mention the user to kick.\nUsage: `nh!kick @user [reason]`"
+        );
+      }
+
       if (targetUser.id === interaction.user.id) {
         throw new TitanBotError(
           "Cannot kick self",
diff --git a/src/commands/Moderation/purge.js b/src/commands/Moderation/purge.js
index fb305044d..07a2f3d28 100644
--- a/src/commands/Moderation/purge.js
+++ b/src/commands/Moderation/purge.js
@@ -3,66 +3,94 @@ import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { logger } from '../../utils/logger.js';
 
+const MAX_AMOUNT = 1000;
+const BATCH_SIZE = 100;  // Discord bulk delete limit
+const MAX_AGE_MS = 14 * 24 * 60 * 60 * 1000; // 14 days — Discord hard limit for bulkDelete
+
 export default {
     data: new SlashCommandBuilder()
         .setName("purge")
-        .setDescription("Delete a specific amount of messages")
-        .addIntegerOption((option) =>
+        .setDescription(`Delete messages in bulk (up to ${MAX_AMOUNT})`)
+        .addIntegerOption(option =>
             option.setName("amount")
-                .setDescription("Number of messages (1-100)")
+                .setDescription(`Number of messages to delete (1–${MAX_AMOUNT})`)
                 .setRequired(true)
+                .setMinValue(1)
+                .setMaxValue(MAX_AMOUNT)
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),
 
     async execute(interaction, config, client) {
-        // 1. Kiểm tra lệnh này là Slash hay Prefix
         const isPrefix = interaction._isPrefix === true;
-        
+
+        // Slash: defer ephemerally so the "thinking…" message doesn't count as a channel message
         if (!isPrefix) {
-            await InteractionHelper.safeDefer(interaction);
+            await InteractionHelper.safeDefer(interaction, { flags: MessageFlags.Ephemeral });
         }
 
-        // 2. Xử lý logic lấy amount (Prefix lấy từ args, Slash lấy từ options)
         let amount = interaction.options.getInteger("amount") ?? 10;
-
-        // 3. CHẶN LỖI 100 TIN NHẮN (Discord API limit)
-        if (amount > 100) amount = 100;
-        if (amount < 1) amount = 1;
+        amount = Math.max(1, Math.min(amount, MAX_AMOUNT));
 
         const channel = interaction.channel;
 
         try {
-            const fetched = await channel.messages.fetch({ limit: amount + 1 });
-            const messagesToDelete = Array.from(fetched.values()).slice(1);
+            let totalDeleted = 0;
+            let remaining = amount;
+
+            while (remaining > 0) {
+                const batchLimit = Math.min(remaining, BATCH_SIZE);
+                const fetched = await channel.messages.fetch({ limit: batchLimit });
+
+                if (fetched.size === 0) break;
+
+                // bulkDelete only works on messages < 14 days old
+                const cutoff = Date.now() - MAX_AGE_MS;
+                const deletable = fetched.filter(msg => msg.createdTimestamp > cutoff);
 
-            if (messagesToDelete.length === 0) {
-                const err = errorEmbed("No messages found", "There are no messages available to delete.");
-                return isPrefix ? await channel.send({ embeds: [err] }) : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
+                if (deletable.size === 0) break;
+
+                let deleted = 0;
+                if (deletable.size === 1) {
+                    await deletable.first().delete();
+                    deleted = 1;
+                } else {
+                    const result = await channel.bulkDelete(deletable, true);
+                    deleted = result.size;
+                }
+
+                totalDeleted += deleted;
+                remaining -= deleted;
+
+                // Fewer messages fetched than requested → no more messages available
+                if (fetched.size < batchLimit) break;
+
+                // Small delay between batches to avoid rate-limits on large purges
+                if (remaining > 0) await new Promise(r => setTimeout(r, 500));
             }
 
-            let deletedCount = 0;
-            if (messagesToDelete.length === 1) {
-                await messagesToDelete[0].delete();
-                deletedCount = 1;
-            } else {
-                const deleted = await channel.bulkDelete(messagesToDelete, true);
-                deletedCount = deleted.size;
+            if (totalDeleted === 0) {
+                const err = errorEmbed("No Messages Deleted", "No eligible messages found (they may be older than 14 days or system messages).");
+                return isPrefix
+                    ? channel.send({ embeds: [err] })
+                    : InteractionHelper.safeEditReply(interaction, { embeds: [err] });
             }
 
-            const success = successEmbed(`🗑️ Successfully deleted ${deletedCount} messages.`);
-            
+            const success = successEmbed(`🗑️ Deleted **${totalDeleted}** message${totalDeleted !== 1 ? 's' : ''}.`);
+
             if (isPrefix) {
                 const msg = await channel.send({ embeds: [success] });
                 setTimeout(() => msg.delete().catch(() => {}), 3000);
             } else {
-                await InteractionHelper.safeEditReply(interaction, { embeds: [success], flags: MessageFlags.Ephemeral });
+                await InteractionHelper.safeEditReply(interaction, { embeds: [success] });
                 setTimeout(() => interaction.deleteReply().catch(() => {}), 3000);
             }
 
         } catch (error) {
             logger.error("Purge error:", error);
-            const err = errorEmbed("Error", "Failed to delete messages. (Older than 14 days or system messages.)");
-            isPrefix ? await channel.send({ embeds: [err] }) : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
+            const err = errorEmbed("Error", "Failed to delete messages. They may be older than 14 days or be system messages.");
+            isPrefix
+                ? await channel.send({ embeds: [err] })
+                : await InteractionHelper.safeEditReply(interaction, { embeds: [err] });
         }
     }
 };
diff --git a/src/commands/Moderation/quarantinesetup.js b/src/commands/Moderation/quarantinesetup.js
index aec84e738..056e63a73 100644
--- a/src/commands/Moderation/quarantinesetup.js
+++ b/src/commands/Moderation/quarantinesetup.js
@@ -5,9 +5,8 @@ export default {
     data: new SlashCommandBuilder()
         .setName('setup-quarantine')
         .setDescription('Create and setup the Quarantine role'),
-    
+
     async execute(interaction) {
-        // Only allow administrators to run this
         if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
             return interaction.reply({ content: 'You need Administrator permissions!', ephemeral: true });
         }
@@ -15,30 +14,44 @@ export default {
         await interaction.deferReply({ ephemeral: true });
 
         try {
-            // Get bot's highest role position
             const botMember = await interaction.guild.members.fetch(interaction.client.user.id);
-            const botTopRolePosition = botMember.roles.highest.position;
+            const botTopPosition = botMember.roles.highest.position;
 
-            // Create the role
+            // Create the role without a position first (goes to bottom by default)
             const role = await interaction.guild.roles.create({
                 name: 'Quarantine',
                 color: Colors.Red,
                 reason: 'Automated setup for Quarantine system',
-                position: botTopRolePosition - 1 // Place it below the bot's top role
             });
 
-            // Iterate through channels and deny viewing permissions
+            // Re-fetch bot member to get accurate position after role creation
+            // (role creation can shift positions)
+            const refreshedBot = await interaction.guild.members.fetch(interaction.client.user.id);
+            const currentBotTop = refreshedBot.roles.highest.position;
+
+            // Place quarantine role exactly 1 below the bot's highest role
+            await role.setPosition(currentBotTop - 1);
+
+            // Lock all channels from Quarantine role
             const channels = interaction.guild.channels.cache;
-            for (const [channelId, channel] of channels) {
-                // Skip category channels if you want, or just apply to all
+            for (const [, channel] of channels) {
                 if (channel.permissionOverwrites) {
-                    await channel.permissionOverwrites.create(role, { 
-                        ViewChannel: false 
-                    }).catch(err => logger.warn(`Failed to update permissions for ${channel.name}: ${err.message}`));
+                    await channel.permissionOverwrites.create(role, {
+                        ViewChannel: false
+                    }).catch(err => logger.warn(`Failed to update ${channel.name}: ${err.message}`));
                 }
             }
 
-            await interaction.editReply(`Quarantine role created (Red) and channels secured. Role ID: ${role.id}`);
+            // Verify the final position
+            const finalRole = await interaction.guild.roles.fetch(role.id);
+            const finalBot  = await interaction.guild.members.fetch(interaction.client.user.id);
+            const gap = finalBot.roles.highest.position - finalRole.position;
+
+            await interaction.editReply(
+                `✅ Quarantine role created (Red) and channels secured.\n` +
+                `**Role ID:** ${role.id}\n` +
+                `**Position:** ${finalRole.position} (${gap} below bot's highest role)`
+            );
         } catch (error) {
             logger.error('Quarantine setup error:', error);
             await interaction.editReply('An error occurred while setting up the quarantine system.');
diff --git a/src/commands/Moderation/timeout.js b/src/commands/Moderation/timeout.js
index 04f205a3f..bd62eed89 100644
--- a/src/commands/Moderation/timeout.js
+++ b/src/commands/Moderation/timeout.js
@@ -1,52 +1,99 @@
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
+import { SlashCommandBuilder, PermissionFlagsBits, MessageFlags } from 'discord.js';
+import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { logModerationAction } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+import { InteractionHelper } from '../../utils/interactionHelper.js';
 
+// Discord maximum timeout is 28 days
+const MAX_TIMEOUT_MINUTES = 28 * 24 * 60; // 40320
 
-import { InteractionHelper } from '../../utils/interactionHelper.js';
-const durationChoices = [
-    { name: "5 minutes", value: 5 },
-    { name: "10 minutes", value: 10 },
-    { name: "30 minutes", value: 30 },
-    { name: "1 hour", value: 60 },
-    { name: "6 hours", value: 360 },
-    { name: "1 day", value: 1440 },
-    { name: "1 week", value: 10080 },
+const DURATION_CHOICES = [
+    { name: "5m  — 5 minutes",        value: "5m"  },
+    { name: "10m — 10 minutes",       value: "10m" },
+    { name: "30m — 30 minutes",       value: "30m" },
+    { name: "1h  — 1 hour",           value: "1h"  },
+    { name: "2h  — 2 hours",          value: "2h"  },
+    { name: "6h  — 6 hours",          value: "6h"  },
+    { name: "12h — 12 hours",         value: "12h" },
+    { name: "1d  — 1 day",            value: "1d"  },
+    { name: "2d  — 2 days",           value: "2d"  },
+    { name: "3d  — 3 days",           value: "3d"  },
+    { name: "5d  — 5 days",           value: "5d"  },
+    { name: "7d  — 1 week",           value: "7d"  },
+    { name: "14d — 2 weeks",          value: "14d" },
+    { name: "21d — 3 weeks",          value: "21d" },
+    { name: "28d — 4 weeks (max)",    value: "28d" },
 ];
+
+/**
+ * Parses a duration string and returns { minutes, rest }.
+ * Handles compact ("2d", "30m", "1h") and spaced ("2 days", "1 hour") forms.
+ * Examples:
+ *   "2d ban evade"      → { minutes: 2880, rest: "ban evade" }
+ *   "2 days ban evade"  → { minutes: 2880, rest: "ban evade" }
+ *   "60"                → { minutes: 60,   rest: "" }
+ *   "1w"                → { minutes: 10080, rest: "" }
+ */
+function parseDurationFromStr(str) {
+    if (!str || !str.trim()) return { minutes: null, rest: '' };
+    str = str.trim();
+
+    const UNIT_MINUTES = { m: 1, h: 60, d: 1440, w: 10080, y: 525600 };
+
+    // Pattern: number (optional space) unit keyword (then rest)
+    const match = str.match(
+        /^(\d+)\s*(m(?:in(?:utes?)?)?|h(?:(?:ou)?rs?)?|d(?:ays?)?|w(?:(?:ee)?ks?)?|y(?:(?:ea)?rs?)?)(?:\s+|$)(.*)/i
+    );
+    if (match) {
+        const num = parseInt(match[1], 10);
+        const unitChar = match[2][0].toLowerCase();
+        const rest = match[3].trim();
+        const multiplier = UNIT_MINUTES[unitChar] ?? 1;
+        return { minutes: Math.min(num * multiplier, MAX_TIMEOUT_MINUTES), rest };
+    }
+
+    // Pure integer fallback → treat as minutes
+    const numMatch = str.match(/^(\d+)(?:\s+|$)(.*)/);
+    if (numMatch) {
+        return { minutes: Math.min(parseInt(numMatch[1], 10), MAX_TIMEOUT_MINUTES), rest: numMatch[2].trim() };
+    }
+
+    return { minutes: null, rest: str };
+}
+
+function formatDuration(minutes) {
+    if (minutes % 10080 === 0) return `${minutes / 10080}w`;
+    if (minutes % 1440  === 0) return `${minutes / 1440}d`;
+    if (minutes % 60    === 0) return `${minutes / 60}h`;
+    return `${minutes}m`;
+}
+
 export default {
     data: new SlashCommandBuilder()
         .setName("timeout")
         .setDescription("Timeout a user for a specific duration.")
-        .addUserOption((option) =>
-            option
-                .setName("target")
+        .addUserOption(option =>
+            option.setName("target")
                 .setDescription("User to timeout")
-                .setRequired(true),
+                .setRequired(true)
         )
-        .addIntegerOption(
-            (option) =>
-                option
-                    .setName("duration")
-                    .setDescription("Duration of the timeout")
-                    .setRequired(true)
-.addChoices(...durationChoices),
+        .addStringOption(option =>
+            option.setName("duration")
+                .setDescription("Duration (e.g. 5m, 1h, 2d, 1w). Prefix: nh!timeout @user 2d reason")
+                .setRequired(true)
+                .addChoices(...DURATION_CHOICES)
         )
-        .addStringOption((option) =>
-            option.setName("reason").setDescription("Reason for the timeout"),
+        .addStringOption(option =>
+            option.setName("reason")
+                .setDescription("Reason for the timeout")
         )
-.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
-    category: "moderation",
+        .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
 
     async execute(interaction, config, client) {
         const deferSuccess = await InteractionHelper.safeDefer(interaction);
         if (!deferSuccess) {
-            logger.warn(`Timeout interaction defer failed`, {
-                userId: interaction.user.id,
-                guildId: interaction.guildId,
-                commandName: 'timeout'
-            });
+            logger.warn('Timeout defer failed', { userId: interaction.user.id });
             return;
         }
 
@@ -60,46 +107,63 @@ export default {
             }
 
             const targetUser = interaction.options.getUser("target");
-            const member = interaction.options.getMember("target");
-            const durationMinutes = interaction.options.getInteger("duration");
-            const reason = interaction.options.getString("reason") || "No reason provided";
 
-            if (targetUser.id === interaction.user.id) {
+            // Missing args guard
+            if (!targetUser) {
                 throw new TitanBotError(
-                    "Cannot timeout self",
-                    ErrorTypes.VALIDATION,
-                    "You cannot timeout yourself."
+                    "Missing target",
+                    ErrorTypes.USER_INPUT,
+                    "Please mention the user to timeout.\nUsage: `nh!timeout @user <duration> [reason]`\nExamples: `nh!timeout @user 2d`, `nh!timeout @user 1h spam`"
                 );
             }
-            if (targetUser.id === client.user.id) {
-                throw new TitanBotError(
-                    "Cannot timeout bot",
-                    ErrorTypes.VALIDATION,
-                    "You cannot timeout the bot."
-                );
+
+            // Duration + reason parsing
+            // For prefix: getString returns "2d reason text" merged → split at first duration token
+            // For slash:  getString("duration") = "2d", getString("reason") = reason separately
+            let durationMinutes, reason;
+            if (interaction._isPrefix) {
+                const rawStr = interaction.options.getString("duration") || "";
+                const { minutes, rest } = parseDurationFromStr(rawStr);
+                durationMinutes = minutes;
+                reason = rest || "No reason provided";
+            } else {
+                const rawDuration = interaction.options.getString("duration");
+                const { minutes } = parseDurationFromStr(rawDuration || "");
+                durationMinutes = minutes;
+                reason = interaction.options.getString("reason") || "No reason provided";
             }
-            if (!member) {
+
+            if (!durationMinutes || durationMinutes < 1) {
                 throw new TitanBotError(
-                    "Target not found",
+                    "Invalid duration",
                     ErrorTypes.USER_INPUT,
-                    "The target user is not currently in this server."
+                    "Invalid duration. Use formats like `5m`, `1h`, `2d`, `1w`.\nMax duration: 28 days."
                 );
             }
 
+            const member = interaction.options.getMember("target");
+
+            if (targetUser.id === interaction.user.id) {
+                throw new TitanBotError("Cannot timeout self", ErrorTypes.VALIDATION, "You cannot timeout yourself.");
+            }
+            if (targetUser.id === client.user.id) {
+                throw new TitanBotError("Cannot timeout bot", ErrorTypes.VALIDATION, "You cannot timeout the bot.");
+            }
+            if (!member) {
+                throw new TitanBotError("Target not found", ErrorTypes.USER_INPUT, "That user is not in this server.");
+            }
             if (!member.moderatable) {
                 throw new TitanBotError(
                     "Cannot timeout member",
                     ErrorTypes.PERMISSION,
-                    "I cannot timeout this user. They might have a higher role than me or you."
+                    "I cannot timeout this user — they may have a higher role than me."
                 );
             }
 
             const durationMs = durationMinutes * 60 * 1000;
             await member.timeout(durationMs, reason);
 
-            const durationDisplay =
-                durationChoices.find((c) => c.value === durationMinutes)
-                    ?.name || `${durationMinutes} minutes`;
+            const display = formatDuration(durationMinutes);
 
             const caseId = await logModerationAction({
                 client,
@@ -108,8 +172,8 @@ export default {
                     action: "Member Timed Out",
                     target: `${targetUser.tag} (${targetUser.id})`,
                     executor: `${interaction.user.tag} (${interaction.user.id})`,
-                    reason: `${reason}\nDuration: ${durationDisplay}`,
-                    duration: durationDisplay,
+                    reason: `${reason}\nDuration: ${display}`,
+                    duration: display,
                     metadata: {
                         userId: targetUser.id,
                         moderatorId: interaction.user.id,
@@ -122,23 +186,17 @@ export default {
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [
                     successEmbed(
-                        `⏳ **Timed out** ${targetUser.tag} for ${durationDisplay}.`,
-                        `**Reason:** ${reason}\n**Case ID:** #${caseId}`,
-                    ),
-                ],
+                        `⏳ **Timed out** ${targetUser.tag} for **${display}**`,
+                        `**Reason:** ${reason}\n**Case ID:** #${caseId}`
+                    )
+                ]
             });
+
         } catch (error) {
             logger.error('Timeout command error:', error);
             await InteractionHelper.safeEditReply(interaction, {
-                embeds: [
-                    errorEmbed(
-                        error.userMessage || "An unexpected error occurred during the timeout action. Please check my role permissions.",
-                    ),
-                ],
+                embeds: [errorEmbed(error.userMessage || "An unexpected error occurred. Please check my role permissions.")]
             });
         }
     }
 };
-
-
-
diff --git a/src/commands/Moderation/warn.js b/src/commands/Moderation/warn.js
index 571214ece..516b58386 100644
--- a/src/commands/Moderation/warn.js
+++ b/src/commands/Moderation/warn.js
@@ -1,25 +1,20 @@
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType, MessageFlags } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
+import { SlashCommandBuilder, PermissionFlagsBits } from 'discord.js';
+import { errorEmbed, successEmbed } from '../../utils/embeds.js';
 import { logModerationAction } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { WarningService } from '../../services/warningService.js';
-import { handleInteractionError } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+
 export default {
     data: new SlashCommandBuilder()
         .setName("warn")
         .setDescription("Warn a user")
-        .addUserOption((o) =>
-            o
-                .setName("target")
-                .setRequired(true)
-                .setDescription("User to warn"),
+        .addUserOption(o =>
+            o.setName("target").setRequired(true).setDescription("User to warn")
         )
-        .addStringOption((o) =>
-            o
-                .setName("reason")
-                .setRequired(true)
-                .setDescription("Reason for the warning"),
+        .addStringOption(o =>
+            o.setName("reason").setRequired(false).setDescription("Reason for the warning")
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
     category: "moderation",
@@ -27,76 +22,90 @@ export default {
     async execute(interaction, config, client) {
         const deferSuccess = await InteractionHelper.safeDefer(interaction);
         if (!deferSuccess) {
-            logger.warn(`Warn interaction defer failed`, {
-                userId: interaction.user.id,
-                guildId: interaction.guildId,
-                commandName: 'warn'
-            });
+            logger.warn('Warn defer failed', { userId: interaction.user.id });
             return;
         }
 
         try {
-                if (!interaction.member.permissions.has(PermissionFlagsBits.ModerateMembers)) {
-                    throw new Error("You need the `Moderate Members` permission to issue warnings.");
-                }
+            if (!interaction.member.permissions.has(PermissionFlagsBits.ModerateMembers)) {
+                throw new TitanBotError(
+                    "User lacks permission",
+                    ErrorTypes.PERMISSION,
+                    "You need the `Moderate Members` permission to issue warnings."
+                );
+            }
 
-                const target = interaction.options.getUser("target");
-                const member = interaction.options.getMember("target");
-                const reason = interaction.options.getString("reason");
-                const moderator = interaction.user;
-                const guildId = interaction.guildId;
+            const target = interaction.options.getUser("target");
 
-                if (!member) {
-                    throw new Error("The target user is not currently in this server.");
-                }
+            // Missing args guard
+            if (!target) {
+                throw new TitanBotError(
+                    "Missing target",
+                    ErrorTypes.USER_INPUT,
+                    "Please mention the user to warn.\nUsage: `nh!warn @user [reason]`"
+                );
+            }
 
-                
-                const result = await WarningService.addWarning({
-                    guildId,
-                    userId: target.id,
-                    moderatorId: moderator.id,
-                    reason,
-                    timestamp: Date.now()
-                });
+            const member = interaction.options.getMember("target");
+            // Default reason instead of null
+            const reason = interaction.options.getString("reason") || "No reason provided";
+            const moderator = interaction.user;
+            const guildId = interaction.guildId;
 
-                if (!result.success) {
-                    throw new Error("Failed to store warning in database");
-                }
+            if (!member) {
+                throw new TitanBotError(
+                    "Target not found",
+                    ErrorTypes.USER_INPUT,
+                    "That user is not currently in this server."
+                );
+            }
+
+            const result = await WarningService.addWarning({
+                guildId,
+                userId: target.id,
+                moderatorId: moderator.id,
+                reason,
+                timestamp: Date.now()
+            });
+
+            if (!result.success) {
+                throw new Error("Failed to store warning in database");
+            }
 
-                const totalWarns = result.totalCount;
+            const totalWarns = result.totalCount;
 
-                await logModerationAction({
-                    client,
-                    guild: interaction.guild,
-                    event: {
-                        action: "User Warned",
-                        target: `${target.tag} (${target.id})`,
-                        executor: `${moderator.tag} (${moderator.id})`,
-                        reason,
-                        metadata: {
-                            userId: target.id,
-                            moderatorId: moderator.id,
-                            totalWarns,
-                            warningNumber: totalWarns,
-                            warningId: result.id
-                        }
+            await logModerationAction({
+                client,
+                guild: interaction.guild,
+                event: {
+                    action: "User Warned",
+                    target: `${target.tag} (${target.id})`,
+                    executor: `${moderator.tag} (${moderator.id})`,
+                    reason,
+                    metadata: {
+                        userId: target.id,
+                        moderatorId: moderator.id,
+                        totalWarns,
+                        warningNumber: totalWarns,
+                        warningId: result.id
                     }
-                });
+                }
+            });
+
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [
+                    successEmbed(
+                        `⚠️ **Warned** ${target.tag}`,
+                        `**Reason:** ${reason}\n**Total Warns:** ${totalWarns}`
+                    )
+                ]
+            });
 
-                await InteractionHelper.safeEditReply(interaction, {
-                    embeds: [
-                        successEmbed(
-                            `⚠️ **Warned** ${target.tag}`,
-                            `**Reason:** ${reason}\n**Total Warns:** ${totalWarns}`,
-                        ),
-                    ],
-                });
         } catch (error) {
             logger.error('Warn command error:', error);
-            await handleInteractionError(interaction, error, { subtype: 'warn_failed' });
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [errorEmbed(error.userMessage || "An unexpected error occurred.")]
+            });
         }
     }
 };
-
-
-
diff --git a/src/commands/Moderation/warnings.js b/src/commands/Moderation/warnings.js
index 834bdd1da..b4d7d3783 100644
--- a/src/commands/Moderation/warnings.js
+++ b/src/commands/Moderation/warnings.js
@@ -1,20 +1,20 @@
 import { getColor } from '../../config/bot.js';
-import { SlashCommandBuilder, PermissionFlagsBits, PermissionsBitField, ChannelType } from 'discord.js';
-import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
+import { SlashCommandBuilder, PermissionFlagsBits } from 'discord.js';
+import { createEmbed, errorEmbed } from '../../utils/embeds.js';
 import { logEvent } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { WarningService } from '../../services/warningService.js';
-import { handleInteractionError } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+
 export default {
     data: new SlashCommandBuilder()
         .setName("warnings")
         .setDescription("View all warnings for a user")
-        .addUserOption((o) =>
-            o
-                .setName("target")
+        .addUserOption(o =>
+            o.setName("target")
                 .setRequired(true)
-                .setDescription("User to check warnings for"),
+                .setDescription("User to check warnings for")
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
     category: "moderation",
@@ -22,44 +22,50 @@ export default {
     async execute(interaction, config, client) {
         const deferSuccess = await InteractionHelper.safeDefer(interaction);
         if (!deferSuccess) {
-            logger.warn(`Warnings interaction defer failed`, {
-                userId: interaction.user.id,
-                guildId: interaction.guildId,
-                commandName: 'warnings'
-            });
+            logger.warn('Warnings defer failed', { userId: interaction.user.id });
             return;
         }
 
         try {
             const target = interaction.options.getUser("target");
-            const guildId = interaction.guildId;
 
-            
+            // Missing args guard
+            if (!target) {
+                throw new TitanBotError(
+                    "Missing target",
+                    ErrorTypes.USER_INPUT,
+                    "Please mention the user to check.\nUsage: `nh!warnings @user`"
+                );
+            }
+
+            const guildId = interaction.guildId;
             const validWarnings = await WarningService.getWarnings(guildId, target.id);
             const totalWarns = validWarnings.length;
 
             if (totalWarns === 0) {
                 await InteractionHelper.safeEditReply(interaction, {
                     embeds: [
-                        createEmbed({ 
-                            title: `Warnings: ${target.tag}`, 
-                            description: "✅ This user has no recorded warnings." 
-                        }).setColor(getColor('success')),
-                    ],
+                        createEmbed({
+                            title: `Warnings: ${target.tag}`,
+                            description: "✅ This user has no recorded warnings."
+                        }).setColor(getColor('success'))
+                    ]
                 });
                 return;
             }
 
-            const embed = createEmbed({ 
-                title: `Warnings: ${target.tag}`, 
-                description: `Total Warnings: **${totalWarns}**` 
+            const embed = createEmbed({
+                title: `Warnings: ${target.tag}`,
+                description: `Total Warnings: **${totalWarns}**`
             }).setColor(getColor('warning'));
 
             const warningFields = validWarnings
                 .map((w, i) => {
-                    const discordTimestamp = Math.floor(w.timestamp / 1000);
+                    const discordTimestamp = Math.floor((w.timestamp || Date.now()) / 1000);
+                    // Guard against null/undefined reason
+                    const reason = (w.reason || 'No reason provided').substring(0, 100);
                     return {
-                        name: `[#${i + 1}] Reason: ${w.reason.substring(0, 100)}`,
+                        name: `[#${i + 1}] ${reason}`,
                         value: `**Moderator:** <@${w.moderatorId}>\n**Date:** <t:${discordTimestamp}:F> (<t:${discordTimestamp}:R>)`,
                         inline: false,
                     };
@@ -76,21 +82,17 @@ export default {
                     target: `${target.tag} (${target.id})`,
                     executor: `${interaction.user.tag} (${interaction.user.id})`,
                     reason: `Viewed ${totalWarns} warnings`,
-                    metadata: {
-                        userId: target.id,
-                        moderatorId: interaction.user.id,
-                        totalWarnings: totalWarns
-                    }
+                    metadata: { userId: target.id, moderatorId: interaction.user.id, totalWarnings: totalWarns }
                 }
             });
 
             await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
+
         } catch (error) {
             logger.error('Warnings command error:', error);
-            await handleInteractionError(interaction, error, { subtype: 'warnings_view_failed' });
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [errorEmbed(error.userMessage || "Failed to retrieve warnings. Please try again.")]
+            });
         }
     }
 };
-
-
-
diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index b968eb592..9ee2f0da3 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -2,9 +2,9 @@ import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
 import { getGuildConfig } from '../services/guildConfig.js';
 
-// Regex để nhận diện Discord mention syntax: <@123>, <@!123>, <@&123>, <#123>
+// Discord mention syntax: <@123>, <@!123>, <@&123>, <#123>
 const MENTION_REGEX = /^<[@#][!&]?\d+>$/;
-// Regex số nguyên thuần tuý (có thể âm)
+// Pure integer (for subcommand detection only — NOT filtered from getString)
 const INTEGER_REGEX = /^-?\d+$/;
 
 export default {
@@ -20,16 +20,19 @@ export default {
         const command = client.commands.get(commandName);
         if (!command) return;
 
-        // args là bản sao để các option method dùng chung không mutate nhau
         const args = [...rawArgs];
 
-        // Các arg không phải mention và không phải số nguyên (phần text thuần)
-        const textArgs = args.filter(a => !MENTION_REGEX.test(a) && !INTEGER_REGEX.test(a));
+        // Non-mention args — keep integers so "2 days", "2d", "60" all pass through getString intact
+        const nonMentionArgs = args.filter(a => !MENTION_REGEX.test(a));
 
-        // Nếu args[0] là subcommand (không phải mention, không phải số), các textArgs
-        // dùng cho getString sẽ bỏ qua nó để tránh subcommand lẫn vào reason/text
-        const firstArgIsSubcommand = args[0] && !MENTION_REGEX.test(args[0]) && !INTEGER_REGEX.test(args[0]);
-        const stringArgs = firstArgIsSubcommand ? textArgs.slice(1) : textArgs;
+        // Subcommand detection: args[0] is text (not a mention, not a pure integer)
+        // e.g.  nh!todo add task  → args[0]="add"  → isSubcommand = true
+        //       nh!ban @user reason → args[0]="<@123>" → isSubcommand = false
+        //       nh!purge 10        → args[0]="10"   → isSubcommand = false
+        const firstArgIsSubcommand = !!args[0] && !MENTION_REGEX.test(args[0]) && !INTEGER_REGEX.test(args[0]);
+
+        // stringArgs: everything that is not a mention, skip subcommand token if present
+        const stringArgs = firstArgIsSubcommand ? nonMentionArgs.slice(1) : nonMentionArgs;
 
         let _deferred = false;
         let _replied = false;
@@ -41,18 +44,12 @@ export default {
         };
 
         const fakeInteraction = {
-            // Marker cho lệnh tự phát hiện chế độ prefix
             _isPrefix: true,
-
-            // InteractionHelper.isInteractionValid() yêu cầu id là string
             id: `prefix-${message.id}`,
             createdTimestamp: message.createdTimestamp,
-
             guildId: message.guild.id,
             channelId: message.channel.id,
             commandName,
-
-            // type = 0 (không phải APPLICATION_COMMAND) để phân biệt với slash
             type: 0,
 
             member: message.member,
@@ -60,13 +57,13 @@ export default {
             channel: message.channel,
             user: message.author,
             client: client,
+            // memberPermissions for commands that check interaction.memberPermissions
+            memberPermissions: message.member.permissions,
 
             get deferred() { return _deferred; },
             get replied() { return _replied; },
 
-            deferReply: async (_opts) => {
-                _deferred = true;
-            },
+            deferReply: async (_opts) => { _deferred = true; },
 
             reply: async (content) => {
                 const opts = stripFlags(typeof content === 'string' ? { content } : content);
@@ -89,36 +86,30 @@ export default {
 
             deleteReply: async () => {},
 
+            // showModal cannot work in prefix mode — inform user to use slash command
+            showModal: async (_modal) => {
+                await message.reply('❌ This feature requires the slash command (`/`). Please use `/` version instead.');
+            },
+
+            // fetchReply returns the channel message (best approximation)
+            fetchReply: async () => message,
+
             options: {
-                /**
-                 * Trả về args[0] nếu nó là tên subcommand (không phải mention/số).
-                 * Ví dụ: nh!todo add task → "add"
-                 */
                 getSubcommand: () => firstArgIsSubcommand ? args[0] : null,
 
-                /**
-                 * Tìm số nguyên đầu tiên trong args.
-                 * Ví dụ: nh!timeout @user 60 reason → 60
-                 */
+                // Finds the first pure integer in args
                 getInteger: (_name) => {
                     const found = args.find(a => INTEGER_REGEX.test(a));
                     return found !== undefined ? parseInt(found, 10) : null;
                 },
 
-                /**
-                 * Tương tự getInteger nhưng cho số thực.
-                 */
+                // Finds the first float in args
                 getNumber: (_name) => {
                     const found = args.find(a => /^-?[\d.]+$/.test(a) && !isNaN(parseFloat(a)));
                     return found !== undefined ? parseFloat(found) : null;
                 },
 
-                /**
-                 * Trả về phần text thuần (bỏ mention và số), bỏ qua subcommand nếu có.
-                 * Ví dụ: nh!ban @user lý do ban → "lý do ban"
-                 * Ví dụ: nh!timeout @user 60 lý do → "lý do"
-                 * Ví dụ: nh!todo add tên công việc → "tên công việc"
-                 */
+                // Returns non-mention args as a string (integers included so "2 days", "30m" etc. survive)
                 getString: (_name) => stringArgs.join(' ') || null,
 
                 getUser: (_name) => message.mentions.users.first() ?? null,

From 046e080e851c215cc648ebb5750ce3c244b59033 Mon Sep 17 00:00:00 2001
From: pnhathao60 <57155941-pnhathao60@users.noreply.replit.com>
Date: Wed, 27 May 2026 03:54:45 +0000
Subject: [PATCH 97/97] Implement comprehensive moderation punishment tracking
 and evasion prevention

Integrate a new PostgreSQL table and service for logging all moderation actions (bans, kicks, timeouts, warns), add a command to view user history, and implement evasion detection in the guild member add event to automatically re-apply timeouts and alert moderators about returning users.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: d4f2b168-e09e-43fc-a7b4-00bc519a6768
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Event-Id: bf0c35d4-e7da-48ff-9702-26152e4f8658
Replit-Helium-Checkpoint-Created: true
---
 src/commands/Moderation/ban.js       |  10 ++
 src/commands/Moderation/history.js   | 172 +++++++++++++++++++++++++++
 src/commands/Moderation/kick.js      |  10 ++
 src/commands/Moderation/timeout.js   |  11 ++
 src/commands/Moderation/unban.js     |   4 +
 src/commands/Moderation/untimeout.js |   4 +
 src/commands/Moderation/warn.js      |  10 ++
 src/config/postgres.js               |   2 +
 src/events/guildMemberAdd.js         | 108 ++++++++++++++++-
 src/services/punishmentService.js    | 161 +++++++++++++++++++++++++
 src/utils/postgresDatabase.js        |  19 +++
 11 files changed, 510 insertions(+), 1 deletion(-)
 create mode 100644 src/commands/Moderation/history.js
 create mode 100644 src/services/punishmentService.js

diff --git a/src/commands/Moderation/ban.js b/src/commands/Moderation/ban.js
index fe46d28e8..d62e9f062 100644
--- a/src/commands/Moderation/ban.js
+++ b/src/commands/Moderation/ban.js
@@ -5,6 +5,7 @@ import { logger } from '../../utils/logger.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { ModerationService } from '../../services/moderationService.js';
 import { handleInteractionError } from '../../utils/errorHandler.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("ban")
@@ -49,6 +50,15 @@ export default {
                 reason
             });
 
+            PunishmentService.record({
+                guildId: interaction.guildId,
+                userId: user.id,
+                moderatorId: interaction.user.id,
+                action: 'BAN',
+                reason,
+                caseId: result.caseId
+            }).catch(e => logger.warn('Failed to record ban punishment:', e.message));
+
             await InteractionHelper.universalReply(interaction, {
                 embeds: [
                     successEmbed(
diff --git a/src/commands/Moderation/history.js b/src/commands/Moderation/history.js
new file mode 100644
index 000000000..54ef7eafb
--- /dev/null
+++ b/src/commands/Moderation/history.js
@@ -0,0 +1,172 @@
+import { SlashCommandBuilder, PermissionFlagsBits, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, MessageFlags } from 'discord.js';
+import { createEmbed, errorEmbed } from '../../utils/embeds.js';
+import { getColor } from '../../config/bot.js';
+import { PunishmentService } from '../../services/punishmentService.js';
+import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { logger } from '../../utils/logger.js';
+import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+
+const ACTION_EMOJI = {
+    BAN:     '🔨',
+    KICK:    '👢',
+    TIMEOUT: '⏳',
+    WARN:    '⚠️',
+};
+
+const ACTION_COLOR = {
+    BAN:     0xe74c3c,
+    KICK:    0xe67e22,
+    TIMEOUT: 0xf39c12,
+    WARN:    0xf1c40f,
+};
+
+export default {
+    data: new SlashCommandBuilder()
+        .setName('history')
+        .setDescription('View full punishment history for a user')
+        .addUserOption(o =>
+            o.setName('target').setRequired(true).setDescription('User to look up')
+        )
+        .addStringOption(o =>
+            o.setName('filter')
+                .setDescription('Filter by punishment type')
+                .addChoices(
+                    { name: 'All',     value: 'ALL'     },
+                    { name: 'Bans',    value: 'BAN'     },
+                    { name: 'Kicks',   value: 'KICK'    },
+                    { name: 'Timeouts', value: 'TIMEOUT' },
+                    { name: 'Warns',   value: 'WARN'    },
+                )
+        )
+        .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
+    category: 'moderation',
+
+    async execute(interaction, config, client) {
+        const deferSuccess = await InteractionHelper.safeDefer(interaction);
+        if (!deferSuccess) return;
+
+        try {
+            const target = interaction.options.getUser('target');
+            if (!target) {
+                throw new TitanBotError('Missing target', ErrorTypes.USER_INPUT,
+                    'Please mention the user to look up.\nUsage: `nh!history @user`');
+            }
+
+            const filter = interaction.options.getString('filter') || 'ALL';
+            const guildId = interaction.guildId;
+
+            let history = await PunishmentService.getUserHistory(guildId, target.id, 100);
+
+            if (filter !== 'ALL') {
+                history = history.filter(p => p.action === filter);
+            }
+
+            const counts = await PunishmentService.countByAction(guildId, target.id);
+
+            if (history.length === 0) {
+                const embed = createEmbed({
+                    title: `📋 History: ${target.tag}`,
+                    description: filter === 'ALL'
+                        ? '✅ This user has no punishment records.'
+                        : `✅ No **${filter}** records found for this user.`
+                }).setColor(getColor('success'))
+                  .setThumbnail(target.displayAvatarURL({ dynamic: true }));
+
+                return InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
+            }
+
+            const PER_PAGE = 5;
+            const totalPages = Math.ceil(history.length / PER_PAGE);
+            let page = 1;
+
+            const buildEmbed = (p) => {
+                const start = (p - 1) * PER_PAGE;
+                const slice = history.slice(start, start + PER_PAGE);
+
+                const embed = createEmbed({
+                    title: `📋 Punishment History: ${target.tag}`,
+                    description: [
+                        `🔨 Bans: **${counts.BAN}** | 👢 Kicks: **${counts.KICK}** | ⏳ Timeouts: **${counts.TIMEOUT}** | ⚠️ Warns: **${counts.WARN}**`,
+                        `Total records: **${history.length}**${filter !== 'ALL' ? ` (filtered: ${filter})` : ''}`,
+                    ].join('\n')
+                })
+                .setColor(0xe74c3c)
+                .setThumbnail(target.displayAvatarURL({ dynamic: true }))
+                .setFooter({ text: `Page ${p}/${totalPages} • ${target.id}` });
+
+                for (const record of slice) {
+                    const ts = Math.floor(
+                        new Date(record.created_at || record.createdAt || Date.now()).getTime() / 1000
+                    );
+                    const emoji = ACTION_EMOJI[record.action] ?? '📌';
+                    const modId = record.moderator_id || record.moderatorId;
+                    const statusTag = record.active === false ? ' ~~revoked~~' : '';
+                    const durationStr = record.duration_minutes
+                        ? ` | Duration: **${formatDuration(record.duration_minutes)}**`
+                        : '';
+
+                    embed.addFields({
+                        name: `${emoji} ${record.action}${statusTag} — <t:${ts}:d>`,
+                        value: [
+                            `**Reason:** ${record.reason || 'No reason provided'}`,
+                            `**Moderator:** <@${modId}> | <t:${ts}:R>${durationStr}`,
+                            record.case_id || record.caseId ? `**Case:** #${record.case_id || record.caseId}` : ''
+                        ].filter(Boolean).join('\n'),
+                        inline: false
+                    });
+                }
+
+                return embed;
+            };
+
+            const buildRow = (p) => {
+                const row = new ActionRowBuilder();
+                row.addComponents(
+                    new ButtonBuilder().setCustomId('hist_prev').setLabel('⬅ Prev').setStyle(ButtonStyle.Secondary).setDisabled(p <= 1),
+                    new ButtonBuilder().setCustomId('hist_page').setLabel(`${p}/${totalPages}`).setStyle(ButtonStyle.Primary).setDisabled(true),
+                    new ButtonBuilder().setCustomId('hist_next').setLabel('Next ➡').setStyle(ButtonStyle.Secondary).setDisabled(p >= totalPages),
+                );
+                return row;
+            };
+
+            const msg = await interaction.editReply({
+                embeds: [buildEmbed(page)],
+                components: totalPages > 1 ? [buildRow(page)] : []
+            });
+
+            if (totalPages <= 1) return;
+
+            const collector = msg.createMessageComponentCollector({
+                componentType: ComponentType.Button,
+                time: 120_000,
+                filter: btn => btn.user.id === interaction.user.id
+            });
+
+            collector.on('collect', async btn => {
+                await btn.deferUpdate();
+                if (btn.customId === 'hist_prev' && page > 1) page--;
+                else if (btn.customId === 'hist_next' && page < totalPages) page++;
+                await btn.editReply({ embeds: [buildEmbed(page)], components: [buildRow(page)] });
+            });
+
+            collector.on('end', async () => {
+                const disabledRow = buildRow(page);
+                disabledRow.components.forEach(b => b.setDisabled(true));
+                msg.edit({ components: [disabledRow] }).catch(() => {});
+            });
+
+        } catch (error) {
+            logger.error('History command error:', error);
+            await InteractionHelper.safeEditReply(interaction, {
+                embeds: [errorEmbed(error.userMessage || 'Failed to retrieve punishment history.')]
+            });
+        }
+    }
+};
+
+function formatDuration(minutes) {
+    if (minutes % 10080 === 0) return `${minutes / 10080}w`;
+    if (minutes % 1440  === 0) return `${minutes / 1440}d`;
+    if (minutes % 60    === 0) return `${minutes / 60}h`;
+    return `${minutes}m`;
+}
diff --git a/src/commands/Moderation/kick.js b/src/commands/Moderation/kick.js
index 4c7f71aae..c4116137c 100644
--- a/src/commands/Moderation/kick.js
+++ b/src/commands/Moderation/kick.js
@@ -4,6 +4,7 @@ import { logModerationAction } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -110,6 +111,15 @@ export default {
       });
 
       
+      PunishmentService.record({
+        guildId: interaction.guildId,
+        userId: targetUser.id,
+        moderatorId: interaction.user.id,
+        action: 'KICK',
+        reason,
+        caseId
+      }).catch(e => logger.warn('Failed to record kick punishment:', e.message));
+
       await InteractionHelper.universalReply(interaction, {
         embeds: [
           successEmbed(
diff --git a/src/commands/Moderation/timeout.js b/src/commands/Moderation/timeout.js
index bd62eed89..5523b16ac 100644
--- a/src/commands/Moderation/timeout.js
+++ b/src/commands/Moderation/timeout.js
@@ -4,6 +4,7 @@ import { logModerationAction } from '../../utils/moderation.js';
 import { logger } from '../../utils/logger.js';
 import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 
 // Discord maximum timeout is 28 days
 const MAX_TIMEOUT_MINUTES = 28 * 24 * 60; // 40320
@@ -183,6 +184,16 @@ export default {
                 }
             });
 
+            PunishmentService.record({
+                guildId: interaction.guildId,
+                userId: targetUser.id,
+                moderatorId: interaction.user.id,
+                action: 'TIMEOUT',
+                reason,
+                durationMinutes,
+                caseId
+            }).catch(e => logger.warn('Failed to record timeout punishment:', e.message));
+
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [
                     successEmbed(
diff --git a/src/commands/Moderation/unban.js b/src/commands/Moderation/unban.js
index d32196945..7e3740e17 100644
--- a/src/commands/Moderation/unban.js
+++ b/src/commands/Moderation/unban.js
@@ -5,6 +5,7 @@ import { logger } from '../../utils/logger.js';
 import { ModerationService } from '../../services/moderationService.js';
 import { handleInteractionError } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("unban")
@@ -46,6 +47,9 @@ export default {
                     reason
                 });
 
+                PunishmentService.deactivate(interaction.guildId, targetUser.id, 'BAN')
+                    .catch(e => logger.warn('Failed to deactivate ban punishment:', e.message));
+
                 await InteractionHelper.safeEditReply(interaction, {
                     embeds: [
                         successEmbed(
diff --git a/src/commands/Moderation/untimeout.js b/src/commands/Moderation/untimeout.js
index a55882953..103c561aa 100644
--- a/src/commands/Moderation/untimeout.js
+++ b/src/commands/Moderation/untimeout.js
@@ -5,6 +5,7 @@ import { logger } from '../../utils/logger.js';
 import { ModerationService } from '../../services/moderationService.js';
 import { handleInteractionError } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 export default {
     data: new SlashCommandBuilder()
         .setName("untimeout")
@@ -40,6 +41,9 @@ export default {
                     moderator: interaction.member
                 });
 
+                PunishmentService.deactivate(interaction.guildId, targetUser.id, 'TIMEOUT')
+                    .catch(e => logger.warn('Failed to deactivate timeout punishment:', e.message));
+
                 await InteractionHelper.safeEditReply(interaction, {
                     embeds: [
                         successEmbed(
diff --git a/src/commands/Moderation/warn.js b/src/commands/Moderation/warn.js
index 516b58386..33f960896 100644
--- a/src/commands/Moderation/warn.js
+++ b/src/commands/Moderation/warn.js
@@ -5,6 +5,7 @@ import { logger } from '../../utils/logger.js';
 import { WarningService } from '../../services/warningService.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { TitanBotError, ErrorTypes } from '../../utils/errorHandler.js';
+import { PunishmentService } from '../../services/punishmentService.js';
 
 export default {
     data: new SlashCommandBuilder()
@@ -92,6 +93,15 @@ export default {
                 }
             });
 
+            PunishmentService.record({
+                guildId,
+                userId: target.id,
+                moderatorId: moderator.id,
+                action: 'WARN',
+                reason,
+                caseId: result.id
+            }).catch(e => logger.warn('Failed to record warn punishment:', e.message));
+
             await InteractionHelper.safeEditReply(interaction, {
                 embeds: [
                     successEmbed(
diff --git a/src/config/postgres.js b/src/config/postgres.js
index 2ae95a6b9..d990c9d9d 100644
--- a/src/config/postgres.js
+++ b/src/config/postgres.js
@@ -18,6 +18,7 @@ const configuredTables = {
     verification_audit: 'verification_audit',
     temp_data: 'temp_data',
     cache_data: 'cache_data',
+    moderation_punishments: 'moderation_punishments',
 };
 
 const allowedTableIdentifiers = new Set([
@@ -37,6 +38,7 @@ const allowedTableIdentifiers = new Set([
     'verification_audit',
     'temp_data',
     'cache_data',
+    'moderation_punishments',
 ]);
 
 const validatedTables = Object.fromEntries(
diff --git a/src/events/guildMemberAdd.js b/src/events/guildMemberAdd.js
index 42c2d8450..7f7216956 100644
--- a/src/events/guildMemberAdd.js
+++ b/src/events/guildMemberAdd.js
@@ -4,10 +4,14 @@ import { getGuildConfig } from '../services/guildConfig.js';
 import { getWelcomeConfig } from '../utils/database.js';
 import { formatWelcomeMessage } from '../utils/welcome.js';
 import { logEvent, EVENT_TYPES } from '../services/loggingService.js';
+import { logEvent as logModEvent } from '../utils/moderation.js';
 import { getServerCounters, updateCounter } from '../services/serverstatsService.js';
 import { setBirthday as dbSetBirthday } from '../utils/database.js';
+import { PunishmentService } from '../services/punishmentService.js';
 import { logger } from '../utils/logger.js';
 
+const MAX_TIMEOUT_MS = 28 * 24 * 60 * 60 * 1000; // 28 days — Discord max
+
 export default {
   name: Events.GuildMemberAdd,
   once: false,
@@ -164,13 +168,115 @@ export default {
         } catch (error) {
             logger.debug('Error restoring birthday on member join:', error);
         }
-        
+
+        // Punishment evasion detection
+        checkPunishmentEvasion(member, guild).catch(err =>
+            logger.debug('Evasion check error:', err.message)
+        );
+
     } catch (error) {
         logger.error('Error in guildMemberAdd event:', error);
     }
   }
 };
 
+/**
+ * Check for punishment evasion when a member joins.
+ * - Re-applies active timeouts (user left during timeout).
+ * - Alerts moderators when previously banned/kicked users rejoin.
+ * - Flags accounts less than 7 days old.
+ */
+async function checkPunishmentEvasion(member, guild) {
+    const { user } = member;
+
+    // 1. Re-apply active timeouts
+    try {
+        const active = await PunishmentService.getActive(guild.id, user.id);
+        const activeTimeout = active.find(p => p.action === 'TIMEOUT');
+
+        if (activeTimeout && member.moderatable) {
+            const expiresAt = new Date(activeTimeout.expires_at || activeTimeout.expiresAt);
+            const remaining = expiresAt.getTime() - Date.now();
+
+            if (remaining > 0) {
+                const applyMs = Math.min(remaining, MAX_TIMEOUT_MS);
+                await member.timeout(applyMs, 'Auto-reapplied: timeout evasion prevention');
+                logger.info(`Timeout re-applied for ${user.tag} in ${guild.name} (evasion prevention)`);
+
+                await logModEvent({
+                    client: member.client,
+                    guild,
+                    event: {
+                        action: '⚠️ Timeout Evasion',
+                        target: `${user.tag} (${user.id})`,
+                        executor: 'TitanBot (Auto)',
+                        reason: `User rejoined during active timeout. Auto-reapplied.\nOriginal reason: ${activeTimeout.reason || 'No reason provided'}`,
+                        duration: `Expires <t:${Math.floor(expiresAt.getTime() / 1000)}:R>`,
+                        color: 0xff6b00,
+                    }
+                });
+            }
+        }
+    } catch (err) {
+        logger.debug('Timeout evasion check failed:', err.message);
+    }
+
+    // 2. Alert mods when a previously banned/kicked user rejoins
+    try {
+        const history = await PunishmentService.getUserHistory(guild.id, user.id, 10);
+        const severe = history.filter(p => p.action === 'BAN' || p.action === 'KICK');
+
+        if (severe.length > 0) {
+            const latest = severe[0];
+            const ts = Math.floor(
+                new Date(latest.created_at || latest.createdAt || Date.now()).getTime() / 1000
+            );
+
+            await logModEvent({
+                client: member.client,
+                guild,
+                event: {
+                    action: '⚠️ Previously Punished User Rejoined',
+                    target: `${user.tag} (${user.id})`,
+                    executor: 'TitanBot (Auto)',
+                    reason: `User has **${severe.length}** prior ban/kick record(s).\nMost recent: **${latest.action}** — <t:${ts}:R>\nReason: ${latest.reason || 'No reason provided'}`,
+                    color: 0xff0000,
+                    metadata: {
+                        totalRecords: `${severe.length} ban/kick(s)`,
+                        'Run /history': `Use \`/history @${user.username}\` to review their full history`,
+                    }
+                }
+            });
+        }
+    } catch (err) {
+        logger.debug('Punishment history check failed:', err.message);
+    }
+
+    // 3. Flag new accounts (less than 7 days old)
+    try {
+        const accountAgeDays = (Date.now() - user.createdTimestamp) / (1000 * 60 * 60 * 24);
+        if (accountAgeDays < 7) {
+            await logModEvent({
+                client: member.client,
+                guild,
+                event: {
+                    action: '🆕 New Account Alert',
+                    target: `${user.tag} (${user.id})`,
+                    executor: 'TitanBot (Auto)',
+                    reason: `Account is only **${accountAgeDays.toFixed(1)} days** old (under 7 days).`,
+                    color: 0xffcc00,
+                    metadata: {
+                        'Account Age': `${accountAgeDays.toFixed(1)} days`,
+                        'Created': `<t:${Math.floor(user.createdTimestamp / 1000)}:F>`,
+                    }
+                }
+            });
+        }
+    } catch (err) {
+        logger.debug('New account check failed:', err.message);
+    }
+}
+
 async function handleVerification(member, guild, verificationConfig, client) {
     const { autoVerifyOnJoin } = await import('../services/verificationService.js');
     
diff --git a/src/services/punishmentService.js b/src/services/punishmentService.js
new file mode 100644
index 000000000..e68665bb2
--- /dev/null
+++ b/src/services/punishmentService.js
@@ -0,0 +1,161 @@
+import { pgDb } from '../utils/postgresDatabase.js';
+import { getFromDb, setInDb } from '../utils/database.js';
+import { logger } from '../utils/logger.js';
+
+const TABLE = 'moderation_punishments';
+
+/**
+ * PunishmentService — persistent record of all moderation actions.
+ * Writes to PostgreSQL when available, falls back to key-value store.
+ * Used to detect & prevent punishment evasion when users rejoin.
+ */
+export class PunishmentService {
+
+    /**
+     * Record a new punishment.
+     * @param {object} opts
+     * @param {string} opts.guildId
+     * @param {string} opts.userId
+     * @param {string} opts.moderatorId
+     * @param {'BAN'|'KICK'|'TIMEOUT'|'WARN'} opts.action
+     * @param {string}  [opts.reason]
+     * @param {number|null} [opts.durationMinutes] — null = no expiry (ban/kick/warn)
+     * @param {number|null} [opts.caseId]
+     */
+    static async record({ guildId, userId, moderatorId, action, reason = 'No reason provided', durationMinutes = null, caseId = null }) {
+        const expiresAt = durationMinutes
+            ? new Date(Date.now() + durationMinutes * 60 * 1000)
+            : null;
+
+        try {
+            if (pgDb.isAvailable()) {
+                const result = await pgDb.pool.query(
+                    `INSERT INTO ${TABLE}
+                        (guild_id, user_id, moderator_id, action, reason, duration_minutes, expires_at, active, case_id)
+                     VALUES ($1,$2,$3,$4,$5,$6,$7,TRUE,$8)
+                     RETURNING id`,
+                    [guildId, userId, moderatorId, action, reason, durationMinutes, expiresAt, caseId]
+                );
+                logger.debug(`Punishment recorded [${action}] for ${userId} in ${guildId} (id=${result.rows[0]?.id})`);
+                return { success: true, id: result.rows[0]?.id };
+            }
+        } catch (err) {
+            logger.warn(`PunishmentService.record PG failed, falling back to KV:`, err.message);
+        }
+
+        // KV fallback
+        const key = `punishments:${guildId}:${userId}`;
+        const list = await getFromDb(key, []);
+        const entry = {
+            id: Date.now(),
+            guildId, userId, moderatorId, action, reason,
+            durationMinutes,
+            expiresAt: expiresAt?.toISOString() ?? null,
+            active: true,
+            caseId,
+            createdAt: new Date().toISOString(),
+        };
+        list.push(entry);
+        if (list.length > 200) list.splice(0, list.length - 200);
+        await setInDb(key, list);
+        return { success: true, id: entry.id };
+    }
+
+    /**
+     * Return active (non-expired, non-revoked) punishments for a user.
+     */
+    static async getActive(guildId, userId) {
+        try {
+            if (pgDb.isAvailable()) {
+                const result = await pgDb.pool.query(
+                    `SELECT * FROM ${TABLE}
+                     WHERE guild_id = $1
+                       AND user_id  = $2
+                       AND active   = TRUE
+                       AND (expires_at IS NULL OR expires_at > NOW())
+                     ORDER BY created_at DESC`,
+                    [guildId, userId]
+                );
+                return result.rows;
+            }
+        } catch (err) {
+            logger.warn('PunishmentService.getActive PG failed:', err.message);
+        }
+
+        const key = `punishments:${guildId}:${userId}`;
+        const list = await getFromDb(key, []);
+        const now = Date.now();
+        return list.filter(p =>
+            p.active && (!p.expiresAt || new Date(p.expiresAt).getTime() > now)
+        );
+    }
+
+    /**
+     * Return the full punishment history for a user (newest first).
+     */
+    static async getUserHistory(guildId, userId, limit = 25) {
+        try {
+            if (pgDb.isAvailable()) {
+                const result = await pgDb.pool.query(
+                    `SELECT * FROM ${TABLE}
+                     WHERE guild_id = $1 AND user_id = $2
+                     ORDER BY created_at DESC
+                     LIMIT $3`,
+                    [guildId, userId, limit]
+                );
+                return result.rows;
+            }
+        } catch (err) {
+            logger.warn('PunishmentService.getUserHistory PG failed:', err.message);
+        }
+
+        const key = `punishments:${guildId}:${userId}`;
+        const list = await getFromDb(key, []);
+        return [...list]
+            .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
+            .slice(0, limit);
+    }
+
+    /**
+     * Deactivate all active punishments of a given action type for a user.
+     * Called on unban / untimeout.
+     */
+    static async deactivate(guildId, userId, action) {
+        try {
+            if (pgDb.isAvailable()) {
+                await pgDb.pool.query(
+                    `UPDATE ${TABLE}
+                     SET active = FALSE, updated_at = NOW()
+                     WHERE guild_id = $1 AND user_id = $2 AND action = $3 AND active = TRUE`,
+                    [guildId, userId, action]
+                );
+                return true;
+            }
+        } catch (err) {
+            logger.warn('PunishmentService.deactivate PG failed:', err.message);
+        }
+
+        // KV fallback
+        const key = `punishments:${guildId}:${userId}`;
+        const list = await getFromDb(key, []);
+        let changed = false;
+        for (const p of list) {
+            if (p.action === action && p.active) { p.active = false; changed = true; }
+        }
+        if (changed) await setInDb(key, list);
+        return true;
+    }
+
+    /**
+     * Count total punishments by type for a user.
+     */
+    static async countByAction(guildId, userId) {
+        const history = await this.getUserHistory(guildId, userId, 1000);
+        const counts = { BAN: 0, KICK: 0, TIMEOUT: 0, WARN: 0 };
+        for (const p of history) {
+            if (counts[p.action] !== undefined) counts[p.action]++;
+        }
+        counts.total = history.length;
+        return counts;
+    }
+}
diff --git a/src/utils/postgresDatabase.js b/src/utils/postgresDatabase.js
index 7e8d76d90..037a0d94c 100644
--- a/src/utils/postgresDatabase.js
+++ b/src/utils/postgresDatabase.js
@@ -405,6 +405,21 @@ class PostgreSQLDatabase {
                 value JSONB NOT NULL,
                 expires_at TIMESTAMP,
                 created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+            )`,
+
+            `CREATE TABLE IF NOT EXISTS ${pgConfig.tables.moderation_punishments} (
+                id SERIAL PRIMARY KEY,
+                guild_id VARCHAR(20) NOT NULL,
+                user_id VARCHAR(20) NOT NULL,
+                moderator_id VARCHAR(20) NOT NULL,
+                action VARCHAR(20) NOT NULL,
+                reason TEXT DEFAULT 'No reason provided',
+                duration_minutes INTEGER,
+                expires_at TIMESTAMP,
+                active BOOLEAN DEFAULT TRUE,
+                case_id INTEGER,
+                created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+                updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
             )`
         ];
 
@@ -442,6 +457,10 @@ class PostgreSQLDatabase {
             `CREATE INDEX IF NOT EXISTS idx_economy_guild_id ON ${pgConfig.tables.economy}(guild_id)`,
             `CREATE INDEX IF NOT EXISTS idx_verification_audit_guild_id ON ${pgConfig.tables.verification_audit}(guild_id)`,
             `CREATE INDEX IF NOT EXISTS idx_verification_audit_user_id ON ${pgConfig.tables.verification_audit}(user_id)`,
+            `CREATE INDEX IF NOT EXISTS idx_punishments_guild_user ON ${pgConfig.tables.moderation_punishments}(guild_id, user_id)`,
+            `CREATE INDEX IF NOT EXISTS idx_punishments_active ON ${pgConfig.tables.moderation_punishments}(guild_id, user_id, active)`,
+            `CREATE INDEX IF NOT EXISTS idx_punishments_expires_at ON ${pgConfig.tables.moderation_punishments}(expires_at)`,
+            `CREATE INDEX IF NOT EXISTS idx_punishments_guild_action ON ${pgConfig.tables.moderation_punishments}(guild_id, action)`,
             `CREATE INDEX IF NOT EXISTS idx_verification_audit_created_at ON ${pgConfig.tables.verification_audit}(created_at)`,
             `CREATE INDEX IF NOT EXISTS idx_temp_data_expires_at ON ${pgConfig.tables.temp_data}(expires_at)`,
             `CREATE INDEX IF NOT EXISTS idx_cache_data_expires_at ON ${pgConfig.tables.cache_data}(expires_at)`