Refactor el comando de eliminación de bloques para mejorar la legibilidad y la gestión de interacciones, permitiendo la selección múltiple de bloques y simplificando la lógica de confirmación.

This commit is contained in:
Shni
2025-10-14 11:40:22 -05:00
parent deb08a3413
commit eb957df1e6

View File

@@ -5,7 +5,7 @@ import {
MessageComponentInteraction, MessageComponentInteraction,
ComponentType, ComponentType,
ButtonStyle, ButtonStyle,
APIEmbed APIEmbed,
} from "discord.js"; } from "discord.js";
import { CommandMessage } from "../../../core/types/commands"; import { CommandMessage } from "../../../core/types/commands";
import type Amayo from "../../../core/client"; import type Amayo from "../../../core/client";
@@ -30,77 +30,30 @@ export const command: CommandMessage = {
description: "Elimina bloques DisplayComponents del servidor", description: "Elimina bloques DisplayComponents del servidor",
category: "Creacion", category: "Creacion",
usage: "eliminar-bloque [nombre_bloque]", usage: "eliminar-bloque [nombre_bloque]",
run: async (message: Message, args: string[], client: Amayo): Promise<void> => { run: async (
const allowed = await hasManageGuildOrStaff(message.member, message.guildId!, client.prisma); message: Message,
args: string[],
client: Amayo
): Promise<void> => {
const allowed = await hasManageGuildOrStaff(
message.member,
message.guildId!,
client.prisma
);
if (!allowed) { if (!allowed) {
await message.reply("❌ No tienes permisos de ManageGuild ni rol de staff."); await message.reply(
"❌ No tienes permisos de ManageGuild ni rol de staff."
);
return; return;
} }
// If specific block name provided, handle direct deletion
if (args.length > 0) {
const blockName = args.join(" ").trim();
await handleDirectDeletion(message, client, blockName);
return;
}
// Otherwise, show interactive panel
await showDeletionPanel(message, client); await showDeletionPanel(message, client);
}, },
}; };
async function handleDirectDeletion( async function showDeletionPanel(
message: Message, message: Message,
client: Amayo, client: Amayo
blockName: string
): Promise<void> { ): Promise<void> {
const block = await client.prisma.blockV2Config.findFirst({
where: {
guildId: message.guildId!,
name: blockName
}
});
if (!block) {
await message.reply(`❌ No se encontró un bloque llamado \`${blockName}\`.`);
return;
}
// Show confirmation for direct deletion
const confirmEmbed: APIEmbed = {
color: 0xff6b35,
title: "⚠️ Confirmar Eliminación",
description: `¿Estás seguro de que quieres eliminar el bloque \`${blockName}\`?\n\n**Esta acción es irreversible.**`,
footer: { text: "Confirma la eliminación usando los botones" }
};
const confirmRow: ActionRowBuilder = {
type: ComponentType.ActionRow,
components: [
{
type: ComponentType.Button,
style: ButtonStyle.Danger,
label: "🗑️ Confirmar Eliminación",
custom_id: `confirm_delete_${block.id}`
},
{
type: ComponentType.Button,
style: ButtonStyle.Secondary,
label: "❌ Cancelar",
custom_id: "cancel_delete"
}
]
};
const confirmMessage = await message.reply({
embeds: [confirmEmbed],
components: [confirmRow]
});
await handleConfirmationInteraction(confirmMessage, message, client, block);
}
async function showDeletionPanel(message: Message, client: Amayo): Promise<void> {
const blocks = await fetchBlocks(client, message.guildId!); const blocks = await fetchBlocks(client, message.guildId!);
if (blocks.length === 0) { if (blocks.length === 0) {
@@ -114,17 +67,20 @@ async function showDeletionPanel(message: Message, client: Amayo): Promise<void>
const panelMessage = await message.reply({ const panelMessage = await message.reply({
embeds: [deleteEmbed], embeds: [deleteEmbed],
components: [actionRow, cancelRow] components: [actionRow, cancelRow],
}); });
await handlePanelInteractions(panelMessage, message, client, blocks); await handlePanelInteractions(panelMessage, message, client, blocks);
} }
async function fetchBlocks(client: Amayo, guildId: string): Promise<BlockItem[]> { async function fetchBlocks(
client: Amayo,
guildId: string
): Promise<BlockItem[]> {
return await client.prisma.blockV2Config.findMany({ return await client.prisma.blockV2Config.findMany({
where: { guildId }, where: { guildId },
select: { name: true, id: true }, select: { name: true, id: true },
orderBy: { name: 'asc' } orderBy: { name: "asc" },
}); });
} }
@@ -132,12 +88,13 @@ async function handleNoBlocks(message: Message): Promise<void> {
const noBlocksEmbed: APIEmbed = { const noBlocksEmbed: APIEmbed = {
color: 0xf04747, color: 0xf04747,
title: "🗂️ Panel de Eliminación de Bloques", title: "🗂️ Panel de Eliminación de Bloques",
description: "📭 **No hay bloques disponibles**\n\nNo se encontraron bloques para eliminar en este servidor.\n\nPuedes crear nuevos bloques usando `!crear-embed`.", description:
footer: { text: "Sistema de gestión de bloques • Amayo Bot" } "📭 **No hay bloques disponibles**\n\nNo se encontraron bloques para eliminar en este servidor.\n\nPuedes crear nuevos bloques usando `!crear-embed`.",
footer: { text: "Sistema de gestión de bloques • Amayo Bot" },
}; };
await message.reply({ await message.reply({
embeds: [noBlocksEmbed] embeds: [noBlocksEmbed],
}); });
} }
@@ -146,7 +103,7 @@ function createDeletionEmbed(blocks: BlockItem[]): APIEmbed {
color: 0xff6b35, color: 0xff6b35,
title: "🗑️ Panel de Eliminación de Bloques", title: "🗑️ Panel de Eliminación de Bloques",
description: `📊 **${blocks.length} bloque(s) encontrado(s)**\n\n⚠ **ADVERTENCIA:** La eliminación es permanente e irreversible.\n\nSelecciona el bloque que deseas eliminar del menú de abajo:`, description: `📊 **${blocks.length} bloque(s) encontrado(s)**\n\n⚠ **ADVERTENCIA:** La eliminación es permanente e irreversible.\n\nSelecciona el bloque que deseas eliminar del menú de abajo:`,
footer: { text: "Selecciona un bloque para eliminar • Timeout: 5 minutos" } footer: { text: "Selecciona un bloque para eliminar • Timeout: 5 minutos" },
}; };
} }
@@ -155,7 +112,7 @@ function createBlockSelectRow(blocks: BlockItem[]): ActionRowBuilder {
label: block.name, label: block.name,
value: block.id, // Use ID instead of name for better uniqueness value: block.id, // Use ID instead of name for better uniqueness
description: `ID: ${block.id.slice(-8)}`, description: `ID: ${block.id.slice(-8)}`,
emoji: index < 10 ? { name: `${index + 1}️⃣` } : { name: "📄" } emoji: index < 10 ? { name: `${index + 1}️⃣` } : { name: "📄" },
})); }));
return { return {
@@ -164,12 +121,13 @@ function createBlockSelectRow(blocks: BlockItem[]): ActionRowBuilder {
{ {
type: ComponentType.StringSelect, type: ComponentType.StringSelect,
custom_id: "delete_block_select", custom_id: "delete_block_select",
placeholder: "🗑️ Selecciona un bloque para eliminar...", placeholder: "🗑️ Selecciona uno o varios bloques para eliminar...",
min_values: 1, min_values: 1,
max_values: 1, // Allow multi-select up to how many options we provided (max 25)
options: selectOptions max_values: Math.min(25, blocks.length),
} options: selectOptions,
] },
],
}; };
} }
@@ -181,9 +139,9 @@ function createCancelRow(): ActionRowBuilder {
type: ComponentType.Button, type: ComponentType.Button,
style: ButtonStyle.Danger, style: ButtonStyle.Danger,
label: "❌ Cancelar", label: "❌ Cancelar",
custom_id: "cancel_delete" custom_id: "cancel_delete",
} },
] ],
}; };
} }
@@ -195,7 +153,8 @@ async function handlePanelInteractions(
): Promise<void> { ): Promise<void> {
const collector = panelMessage.createMessageComponentCollector({ const collector = panelMessage.createMessageComponentCollector({
time: 300000, // 5 minutes time: 300000, // 5 minutes
filter: (interaction: MessageComponentInteraction) => interaction.user.id === originalMessage.author.id filter: (interaction: MessageComponentInteraction) =>
interaction.user.id === originalMessage.author.id,
}); });
collector.on("collect", async (interaction: MessageComponentInteraction) => { collector.on("collect", async (interaction: MessageComponentInteraction) => {
@@ -203,12 +162,23 @@ async function handlePanelInteractions(
if (interaction.isButton() && interaction.customId === "cancel_delete") { if (interaction.isButton() && interaction.customId === "cancel_delete") {
await handleCancellation(interaction); await handleCancellation(interaction);
collector.stop(); collector.stop();
} else if (interaction.isStringSelectMenu() && interaction.customId === "delete_block_select") { } else if (
const selectedBlockId = interaction.values[0]; interaction.isStringSelectMenu() &&
const selectedBlock = blocks.find(b => b.id === selectedBlockId); interaction.customId === "delete_block_select"
) {
const selectedIds = interaction.values;
const selectedBlocks = blocks.filter((b) => selectedIds.includes(b.id));
if (selectedBlock) { if (selectedBlocks.length === 1) {
await handleBlockSelection(interaction, client, selectedBlock); await handleBlockSelection(interaction, client, selectedBlocks[0]);
collector.stop();
} else if (selectedBlocks.length > 1) {
// Confirm batch deletion
await handleMultipleBlockSelection(
interaction,
client,
selectedBlocks
);
collector.stop(); collector.stop();
} }
} }
@@ -217,7 +187,7 @@ async function handlePanelInteractions(
if (!interaction.replied && !interaction.deferred) { if (!interaction.replied && !interaction.deferred) {
await interaction.reply({ await interaction.reply({
content: "❌ Ocurrió un error al procesar la interacción.", content: "❌ Ocurrió un error al procesar la interacción.",
flags: 64 // Use flags instead of ephemeral flags: 64, // Use flags instead of ephemeral
}); });
} }
} }
@@ -230,17 +200,20 @@ async function handlePanelInteractions(
}); });
} }
async function handleCancellation(interaction: ButtonInteraction): Promise<void> { async function handleCancellation(
interaction: ButtonInteraction
): Promise<void> {
const canceledEmbed: APIEmbed = { const canceledEmbed: APIEmbed = {
color: 0x36393f, color: 0x36393f,
title: "❌ Operación Cancelada", title: "❌ Operación Cancelada",
description: "La eliminación de bloques ha sido cancelada.\nNingún bloque fue eliminado.", description:
footer: { text: "Operación cancelada por el usuario" } "La eliminación de bloques ha sido cancelada.\nNingún bloque fue eliminado.",
footer: { text: "Operación cancelada por el usuario" },
}; };
await interaction.update({ await interaction.update({
embeds: [canceledEmbed], embeds: [canceledEmbed],
components: [] components: [],
}); });
} }
@@ -253,7 +226,7 @@ async function handleBlockSelection(
color: 0xff4444, color: 0xff4444,
title: "⚠️ Confirmar Eliminación", title: "⚠️ Confirmar Eliminación",
description: `¿Estás seguro de que quieres **eliminar permanentemente** el bloque?\n\n📄 **Nombre:** \`${selectedBlock.name}\`\n🔑 **ID:** \`${selectedBlock.id}\`\n\n❗ **Esta acción NO se puede deshacer.**`, description: `¿Estás seguro de que quieres **eliminar permanentemente** el bloque?\n\n📄 **Nombre:** \`${selectedBlock.name}\`\n🔑 **ID:** \`${selectedBlock.id}\`\n\n❗ **Esta acción NO se puede deshacer.**`,
footer: { text: "Confirma tu decisión usando los botones" } footer: { text: "Confirma tu decisión usando los botones" },
}; };
const confirmRow: ActionRowBuilder = { const confirmRow: ActionRowBuilder = {
@@ -263,34 +236,39 @@ async function handleBlockSelection(
type: ComponentType.Button, type: ComponentType.Button,
style: ButtonStyle.Danger, style: ButtonStyle.Danger,
label: "🗑️ SÍ, ELIMINAR", label: "🗑️ SÍ, ELIMINAR",
custom_id: `confirm_delete_${selectedBlock.id}` custom_id: `confirm_delete_${selectedBlock.id}`,
}, },
{ {
type: ComponentType.Button, type: ComponentType.Button,
style: ButtonStyle.Secondary, style: ButtonStyle.Secondary,
label: "❌ Cancelar", label: "❌ Cancelar",
custom_id: "cancel_delete_final" custom_id: "cancel_delete_final",
} },
] ],
}; };
await interaction.update({ await interaction.update({
embeds: [confirmEmbed], embeds: [confirmEmbed],
components: [confirmRow] components: [confirmRow],
}); });
// Handle final confirmation // Handle final confirmation
const finalCollector = interaction.message.createMessageComponentCollector({ const finalCollector = interaction.message.createMessageComponentCollector({
time: 60000, // 1 minute for final confirmation time: 60000, // 1 minute for final confirmation
filter: (i: MessageComponentInteraction) => i.user.id === interaction.user.id filter: (i: MessageComponentInteraction) =>
i.user.id === interaction.user.id,
}); });
finalCollector.on("collect", async (finalInteraction: MessageComponentInteraction) => { finalCollector.on(
"collect",
async (finalInteraction: MessageComponentInteraction) => {
try { try {
if (finalInteraction.isButton()) { if (finalInteraction.isButton()) {
if (finalInteraction.customId === "cancel_delete_final") { if (finalInteraction.customId === "cancel_delete_final") {
await handleCancellation(finalInteraction); await handleCancellation(finalInteraction);
} else if (finalInteraction.customId === `confirm_delete_${selectedBlock.id}`) { } else if (
finalInteraction.customId === `confirm_delete_${selectedBlock.id}`
) {
await executeBlockDeletion(finalInteraction, client, selectedBlock); await executeBlockDeletion(finalInteraction, client, selectedBlock);
} }
} }
@@ -298,7 +276,8 @@ async function handleBlockSelection(
} catch (error) { } catch (error) {
console.error("Error in final confirmation:", error); console.error("Error in final confirmation:", error);
} }
}); }
);
finalCollector.on("end", async (collected, reason) => { finalCollector.on("end", async (collected, reason) => {
if (reason === "time") { if (reason === "time") {
@@ -307,6 +286,117 @@ async function handleBlockSelection(
}); });
} }
async function handleMultipleBlockSelection(
interaction: StringSelectMenuInteraction,
client: Amayo,
selectedBlocks: BlockItem[]
): Promise<void> {
const namesList = selectedBlocks
.map(
(b) => `${b.name} (
ID: ${b.id.slice(-8)})`
)
.join("\n");
const confirmEmbed: APIEmbed = {
color: 0xff4444,
title: `⚠️ Confirmar Eliminación de ${selectedBlocks.length} bloques`,
description: `¿Estás seguro de que quieres **eliminar permanentemente** los siguientes bloques?\n\n${namesList}\n\n❗ **Esta acción NO se puede deshacer.**`,
footer: { text: "Confirma la eliminación usando los botones" },
};
const confirmRow: ActionRowBuilder = {
type: ComponentType.ActionRow,
components: [
{
type: ComponentType.Button,
style: ButtonStyle.Danger,
label: `🗑️ ELIMINAR ${selectedBlocks.length}`,
custom_id: `confirm_batch_delete_${selectedBlocks
.map((b) => b.id)
.join("_")}`,
},
{
type: ComponentType.Button,
style: ButtonStyle.Secondary,
label: "❌ Cancelar",
custom_id: "cancel_delete_final",
},
],
};
await interaction.update({
embeds: [confirmEmbed],
components: [confirmRow],
});
const finalCollector = interaction.message.createMessageComponentCollector({
time: 60000,
filter: (i: MessageComponentInteraction) =>
i.user.id === interaction.user.id,
});
finalCollector.on(
"collect",
async (finalInteraction: MessageComponentInteraction) => {
try {
if (!finalInteraction.isButton()) return;
if (finalInteraction.customId === "cancel_delete_final") {
await handleCancellation(finalInteraction);
} else if (
finalInteraction.customId.startsWith("confirm_batch_delete_")
) {
await executeBlocksDeletion(finalInteraction, client, selectedBlocks);
}
finalCollector.stop();
} catch (err) {
console.error("Error in batch final confirmation:", err);
}
}
);
finalCollector.on("end", async (_collected, reason) => {
if (reason === "time") {
await handleConfirmationTimeout(interaction.message);
}
});
}
async function executeBlocksDeletion(
interaction: ButtonInteraction,
client: Amayo,
blocks: BlockItem[]
): Promise<void> {
try {
// Delete many by IDs inside a transaction
const ids = blocks.map((b) => b.id);
await client.prisma.blockV2Config.deleteMany({
where: { id: { in: ids } },
});
const successEmbed: APIEmbed = {
color: 0x57f287,
title: "✅ Bloques Eliminados",
description: `Se eliminaron ${blocks.length} bloque(s) correctamente.`,
footer: { text: "Operación completada" },
};
await interaction.update({ embeds: [successEmbed], components: [] });
} catch (error) {
console.error("Error deleting blocks batch:", error);
const errorEmbed: APIEmbed = {
color: 0xf04747,
title: "❌ Error al eliminar bloques",
description:
"Ocurrió un error al eliminar los bloques seleccionados. Intenta de nuevo más tarde.",
footer: { text: "Error en la eliminación" },
};
try {
await interaction.update({ embeds: [errorEmbed], components: [] });
} catch {}
}
}
async function handleConfirmationInteraction( async function handleConfirmationInteraction(
confirmMessage: Message, confirmMessage: Message,
originalMessage: Message, originalMessage: Message,
@@ -315,7 +405,8 @@ async function handleConfirmationInteraction(
): Promise<void> { ): Promise<void> {
const collector = confirmMessage.createMessageComponentCollector({ const collector = confirmMessage.createMessageComponentCollector({
time: 60000, // 1 minute time: 60000, // 1 minute
filter: (interaction: MessageComponentInteraction) => interaction.user.id === originalMessage.author.id filter: (interaction: MessageComponentInteraction) =>
interaction.user.id === originalMessage.author.id,
}); });
collector.on("collect", async (interaction: MessageComponentInteraction) => { collector.on("collect", async (interaction: MessageComponentInteraction) => {
@@ -324,7 +415,10 @@ async function handleConfirmationInteraction(
if (interaction.customId === "cancel_delete") { if (interaction.customId === "cancel_delete") {
await handleCancellation(interaction); await handleCancellation(interaction);
} else if (interaction.customId === `confirm_delete_${block.id}`) { } else if (interaction.customId === `confirm_delete_${block.id}`) {
await executeBlockDeletion(interaction, client, { name: block.name, id: block.id }); await executeBlockDeletion(interaction, client, {
name: block.name,
id: block.id,
});
} }
} }
collector.stop(); collector.stop();
@@ -348,21 +442,20 @@ async function executeBlockDeletion(
try { try {
// Delete the block from database // Delete the block from database
await client.prisma.blockV2Config.delete({ await client.prisma.blockV2Config.delete({
where: { id: block.id } where: { id: block.id },
}); });
const successEmbed: APIEmbed = { const successEmbed: APIEmbed = {
color: 0x57f287, color: 0x57f287,
title: "✅ Bloque Eliminado", title: "✅ Bloque Eliminado",
description: `El bloque \`${block.name}\` ha sido eliminado exitosamente.\n\n🗑 **Operación completada**\n📄 **Bloque:** \`${block.name}\`\n🔑 **ID:** \`${block.id}\``, description: `El bloque \`${block.name}\` ha sido eliminado exitosamente.\n\n🗑 **Operación completada**\n📄 **Bloque:** \`${block.name}\`\n🔑 **ID:** \`${block.id}\``,
footer: { text: "Bloque eliminado permanentemente" } footer: { text: "Bloque eliminado permanentemente" },
}; };
await interaction.update({ await interaction.update({
embeds: [successEmbed], embeds: [successEmbed],
components: [] components: [],
}); });
} catch (error) { } catch (error) {
console.error("Error deleting block:", error); console.error("Error deleting block:", error);
@@ -370,12 +463,12 @@ async function executeBlockDeletion(
color: 0xf04747, color: 0xf04747,
title: "❌ Error al Eliminar", title: "❌ Error al Eliminar",
description: `No se pudo eliminar el bloque \`${block.name}\`.\n\nPor favor, inténtalo de nuevo más tarde.`, description: `No se pudo eliminar el bloque \`${block.name}\`.\n\nPor favor, inténtalo de nuevo más tarde.`,
footer: { text: "Error en la eliminación" } footer: { text: "Error en la eliminación" },
}; };
await interaction.update({ await interaction.update({
embeds: [errorEmbed], embeds: [errorEmbed],
components: [] components: [],
}); });
} }
} }
@@ -384,32 +477,36 @@ async function handlePanelTimeout(panelMessage: Message): Promise<void> {
const timeoutEmbed: APIEmbed = { const timeoutEmbed: APIEmbed = {
color: 0x36393f, color: 0x36393f,
title: "⏰ Panel Expirado", title: "⏰ Panel Expirado",
description: "El panel de eliminación ha expirado por inactividad.\n\nUsa `!eliminar-embed` para abrir un nuevo panel.", description:
footer: { text: "Panel expirado por inactividad" } "El panel de eliminación ha expirado por inactividad.\n\nUsa `!eliminar-embed` para abrir un nuevo panel.",
footer: { text: "Panel expirado por inactividad" },
}; };
try { try {
await panelMessage.edit({ await panelMessage.edit({
embeds: [timeoutEmbed], embeds: [timeoutEmbed],
components: [] components: [],
}); });
} catch (error) { } catch (error) {
console.log("Could not edit message on timeout, likely deleted"); console.log("Could not edit message on timeout, likely deleted");
} }
} }
async function handleConfirmationTimeout(confirmMessage: Message): Promise<void> { async function handleConfirmationTimeout(
confirmMessage: Message
): Promise<void> {
const timeoutEmbed: APIEmbed = { const timeoutEmbed: APIEmbed = {
color: 0x36393f, color: 0x36393f,
title: "⏰ Confirmación Expirada", title: "⏰ Confirmación Expirada",
description: "La confirmación ha expirado por inactividad.\nLa eliminación ha sido cancelada.", description:
footer: { text: "Confirmación expirada" } "La confirmación ha expirado por inactividad.\nLa eliminación ha sido cancelada.",
footer: { text: "Confirmación expirada" },
}; };
try { try {
await confirmMessage.edit({ await confirmMessage.edit({
embeds: [timeoutEmbed], embeds: [timeoutEmbed],
components: [] components: [],
}); });
} catch (error) { } catch (error) {
console.log("Could not edit confirmation message on timeout"); console.log("Could not edit confirmation message on timeout");