Update honeypotService.js

Author: TuBeo5866

src/services/honeypotService.js

@@ -9,10 +9,10 @@ const HONEYPOT_IMAGE = 'https://honeypot.riskymh.dev/honeypot.png';
 export async function getHoneypotConfig(guildId) {
     try {
         const data = await getFromDb(getHoneypotKey(guildId), null);
-        return data || { channelId: null, enabled: false, banCount: 0 };
+        return data || { channelId: null, enabled: false, banCount: 0, method: 'ban' };
     } catch (err) {
         logger.error(`Failed to get honeypot config for ${guildId}:`, err);
-        return { channelId: null, enabled: false, banCount: 0 };
+        return { channelId: null, enabled: false, banCount: 0, method: 'ban' };
     }
 }
 
@@ -26,24 +26,25 @@ export async function setHoneypotConfig(guildId, config) {
     }
 }
 
-export function buildHoneypotWarningEmbed(banCount = 0) {
+export function buildHoneypotWarningEmbed(method = 'ban') {
     return new EmbedBuilder()
         .setColor(0xFF0000)
         .setTitle('DO NOT SEND MESSAGES IN THIS CHANNEL')
         .setDescription(
             'This channel is used to catch spam bots and scammers.\n' +
-            'Any messages sent here will result in a **ban**.',
+            `Any messages sent here will result in a **${method}**.`,
         )
         .setThumbnail(HONEYPOT_IMAGE);
 }
 
-export function buildHoneypotComponents(banCount = 0) {
+export function buildHoneypotComponents(banCount = 0, method = 'ban') {
+    const label = method === 'kick' ? `🍯 Kicks: ${banCount}` : `🍯 Bans: ${banCount}`;
     return new ActionRowBuilder().addComponents(
         new ButtonBuilder()
-            .setCustomId('honeypot_ban_count')
-            .setLabel(`🍯 Kicks: ${banCount}`)
+            .setCustomId('honeypot_action_count')
+            .setLabel(label)
             .setStyle(ButtonStyle.Danger)
-            .setDisabled(true), 
+            .setDisabled(true),
     );
 }
 
@@ -59,35 +60,50 @@ export async function refreshHoneypotMessage(client, guildId) {
         if (!msg) return;
 
         await msg.edit({
-            embeds: [buildHoneypotWarningEmbed(config.banCount)],
-            components: [buildHoneypotComponents(config.banCount)],
+            embeds: [buildHoneypotWarningEmbed(config.method || 'ban')],
+            components: [buildHoneypotComponents(config.banCount, config.method || 'ban')],
         });
     } catch (err) {
         logger.error(`Honeypot: failed to refresh warning message in guild ${guildId}:`, err);
     }
 }
 
-
 export async function handleHoneypotMessage(message, client) {
     const { guild, author } = message;
+
     await message.delete().catch(() => null);
+
     const botMember = guild.members.me;
+    const config = await getHoneypotConfig(guild.id);
+    const method = config.method || 'ban';
 
     try {
-        await ModerationService.banUser({
-            guild,
-            user: author,
-            moderator: botMember,
-            reason: 'Honeypot triggered — sent a message in a protected channel.',
-            deleteDays: 1,
-        });
+        if (method === 'kick') {
+            const member = await guild.members.fetch(author.id).catch(() => null);
+            if (member) {
+                await ModerationService.kickUser({
+                    guild,
+                    member,
+                    moderator: botMember,
+                    reason: 'Honeypot triggered — sent a message in a protected channel.',
+                });
+            }
+            logger.info(`Honeypot: kicked ${author.tag} (${author.id}) in guild ${guild.id}`);
+        } else {
+            await ModerationService.banUser({
+                guild,
+                user: author,
+                moderator: botMember,
+                reason: 'Honeypot triggered — sent a message in a protected channel.',
+                deleteDays: 1,
+            });
+            logger.info(`Honeypot: banned ${author.tag} (${author.id}) in guild ${guild.id}`);
+        }
 
-        logger.info(`Honeypot: banned ${author.tag} (${author.id}) in guild ${guild.id}`);
-        const config = await getHoneypotConfig(guild.id);
         const newCount = (config.banCount || 0) + 1;
         await setHoneypotConfig(guild.id, { ...config, banCount: newCount });
         await refreshHoneypotMessage(client, guild.id);
     } catch (err) {
-        logger.error(`Honeypot: failed to ban ${author.tag} in guild ${guild.id}:`, err);
+        logger.error(`Honeypot: failed to ${method} ${author.tag} in guild ${guild.id}:`, err);
     }
 }