Add deleteButton

BenjammingKirby · BenjammingKirby · commit 47f6d3070855 · 2022-01-16T10:44:57.000-07:00
diff --git a/src/bot.ts b/src/bot.ts
@@ -1,7 +1,7 @@
 import "dotenv/config";
 import { Client, Collection, LimitedCollection } from "discord.js";
 import { MyContext } from "./interfaces";
-import { loadCommands, commandHandler } from "./handlers/CommandHandler";
+import { loadCommands, interactionCreateHandler } from "./handlers/CommandHandler";
 import { messageHandler } from "./handlers/MessageHandler";
 
 (async function () {
@@ -42,7 +42,7 @@ import { messageHandler } from "./handlers/MessageHandler";
     });
 
     docsBot.on("messageCreate", messageHandler);
-    docsBot.on("interactionCreate", commandHandler.bind(null, context));
+    docsBot.on("interactionCreate", interactionCreateHandler.bind(null, context));
 
     docsBot.login(process.env.TOKEN);
 })();
diff --git a/src/commands/docs/djs.ts b/src/commands/docs/djs.ts
@@ -2,6 +2,8 @@ import { Command } from "../../interfaces";
 import { SlashCommandBuilder } from "@discordjs/builders";
 import Doc, { sources } from "discord.js-docs";
 import { checkEmbedLimits } from "../../utils/EmbedUtils";
+import { deleteButton } from "../../utils/CommandUtils";
+import { MessageActionRow } from "discord.js";
 
 const supportedBranches = Object.keys(sources).map((branch) => [capitalize(branch), branch] as [string, string]);
 
@@ -29,6 +31,7 @@ const command: Command = {
                 .setRequired(false),
         ),
     async execute(interaction) {
+        const deleteButtonRow = new MessageActionRow().addComponents([deleteButton]);
         const query = interaction.options.getString("query");
         // The Default source should be stable
         const source: keyof typeof sources =
@@ -47,7 +50,7 @@ const command: Command = {
             // Satisfies the method's MessageEmbedOption type
             const embedObj = { ...notFoundEmbed, timestamp: timeStampDate };
 
-            interaction.editReply({ embeds: [embedObj] }).catch(console.error);
+            interaction.editReply({ embeds: [embedObj], components: [deleteButtonRow] }).catch(console.error);
             return;
         }
 
@@ -60,7 +63,7 @@ const command: Command = {
             // The final field should be the View Source button
             embedObj.fields = [embedObj.fields?.at(-1)];
         }
-        interaction.editReply({ embeds: [embedObj] }).catch(console.error);
+        interaction.editReply({ embeds: [embedObj], components: [deleteButtonRow] }).catch(console.error);
         return;
     },
 };
diff --git a/src/commands/docs/mdn.ts b/src/commands/docs/mdn.ts
@@ -1,5 +1,6 @@
 import { SlashCommandBuilder } from "@discordjs/builders";
-import { MessageEmbed } from "discord.js";
+import { deleteButton } from "../../utils/CommandUtils";
+import { MessageActionRow, MessageEmbed } from "discord.js";
 import { gunzipSync } from "zlib";
 import { XMLParser } from "fast-xml-parser";
 import { Command } from "../../interfaces";
@@ -20,7 +21,7 @@ let sources = {
 
 const MDN_BASE_URL = "https://developer.mozilla.org/en-US/docs/" as const;
 const MDN_ICON_URL = "https://i.imgur.com/1P4wotC.png" as const;
-const MDN_BLUE_COLOR = 0x83BFFF as const;
+const MDN_BLUE_COLOR = 0x83bfff as const;
 
 const command: Command = {
     data: new SlashCommandBuilder()
@@ -33,36 +34,37 @@ const command: Command = {
                 .setRequired(true),
         ),
     async execute(interaction) {
+        const deleteButtonRow = new MessageActionRow().addComponents([deleteButton]);
         const query = interaction.options.getString("query");
         const { index, sitemap } = await getSources();
         const search: string[] = index.search(query, { limit: 10 }).map((id) => sitemap[<number>id].loc);
         const embed = new MessageEmbed()
             .setColor(MDN_BLUE_COLOR)
-            .setAuthor("MDN Documentation", MDN_ICON_URL)
+            .setAuthor({ name: "MDN Documentation", iconURL: MDN_ICON_URL })
             .setTitle(`Search for: ${query}`);
 
         if (!search.length) {
-            embed.setColor(0xFF0000).setDescription("No results found...");
-            interaction.editReply({ embeds: [embed] });
+            embed.setColor(0xff0000).setDescription("No results found...");
+            interaction.editReply({ embeds: [embed], components: [deleteButtonRow] });
             return;
         }
 
         if (search.length === 1) {
             const res = await fetch(`${MDN_BASE_URL + search[0]}/index.json`);
             const doc: MdnDoc = (await res.json()).doc;
             const docEmbed = embed
-                .setColor(0xFFFFFF)
+                .setColor(0xffffff)
                 .setTitle(doc.pageTitle)
                 .setURL(`https://developer.mozilla.org/${doc.mdn_url}`)
                 .setThumbnail(this.MDN_ICON_URL)
                 .setDescription(doc.summary);
-            interaction.editReply({ embeds: [docEmbed] });
+            interaction.editReply({ embeds: [docEmbed], components: [deleteButtonRow] });
             return;
         }
 
         const results = search.map((path) => `**• [${path.replace(/_|-/g, " ")}](${MDN_BASE_URL}${path})**`);
         embed.setDescription(results.join("\n"));
-        interaction.editReply({ embeds: [embed] });
+        interaction.editReply({ embeds: [embed], components: [deleteButtonRow] });
         return;
     },
 };
diff --git a/src/handlers/CommandHandler.ts b/src/handlers/CommandHandler.ts
@@ -1,12 +1,10 @@
 import glob from "glob";
 import type { Command, MyContext } from "../interfaces";
-import type { CommandInteraction, Interaction } from "discord.js";
-import { Permissions, Formatters } from "discord.js";
+import type { CommandInteraction, Interaction, Message } from "discord.js";
+import { Permissions, Formatters, MessageActionRow } from "discord.js";
+import { deleteButton } from "../utils/CommandUtils";
 
-export async function commandHandler(
-    context: MyContext,
-    interaction: Interaction
-) {
+export async function interactionCreateHandler(context: MyContext, interaction: Interaction) {
     if (interaction.isCommand()) {
         await interaction.deferReply();
         const command = context.commands.get(interaction.commandName);
@@ -19,7 +17,27 @@ export async function commandHandler(
         } catch (e) {
             console.error(e);
             const errorMessage = "An error has occurred";
-            interaction.editReply(errorMessage).catch(console.error);
+            interaction
+                .editReply({
+                    content: errorMessage,
+                    components: [new MessageActionRow().addComponents([deleteButton])],
+                })
+                .catch(console.error);
+        }
+    }
+    if (interaction.isButton()) {
+        // The delete button
+        if (interaction.customId === "deletebtn") {
+            // If the button clicker is the command initiator
+            if (interaction.user.id === interaction.message.interaction.user.id) {
+                (interaction.message as Message).delete().catch(console.error);
+            } else
+                interaction
+                    .reply({
+                        content: "Only the command initiator is allowed to delete this message",
+                        ephemeral: true,
+                    })
+                    .catch(console.error);
         }
     }
 }
@@ -31,20 +49,18 @@ export async function commandHandler(
 export function loadCommands(context: MyContext) {
     // Promisifies the process of glob
     return new Promise((resolve) => {
-    // Find all js files
+        // Find all js files
         glob(`${__dirname}/../commands/**/*.js`, async (err, files) => {
             await Promise.all(
                 files.map(async (file) => {
-                    const { default: myCommandFile }: { default: Command } = await import(
-                        file
-                    ).catch((err) => {
+                    const { default: myCommandFile }: { default: Command } = await import(file).catch((err) => {
                         console.error(err);
                         // Since the return value gets destructured, an empty object is returned
                         return {};
                     });
                     if (!myCommandFile) return;
                     context.commands.set(myCommandFile.data.name, myCommandFile);
-                })
+                }),
             );
             resolve(undefined);
         });
@@ -56,21 +72,14 @@ export function loadCommands(context: MyContext) {
  * @param command
  * @returns Whether to cancel the command
  */
-// * Note that as of writing, slash commands can override permissions 
-function commandPermissionCheck(
-    interaction: CommandInteraction,
-    command: Command
-): boolean {
+// * Note that as of writing, slash commands can override permissions
+function commandPermissionCheck(interaction: CommandInteraction, command: Command): boolean {
     const { client, user, channel } = interaction;
     // If the channel is a dm
     // if it's a partial, channel.type wouldn't exist
     if (channel.type === "DM" || !channel) {
         if (command.guildOnly) {
-            interaction
-                .editReply(
-                    "This is a guild exclusive command, not to be executed in a dm"
-                )
-                .catch(console.error);
+            interaction.editReply("This is a guild exclusive command, not to be executed in a dm").catch(console.error);
             // For guild only commands that were executed in a dm, cancel the command
             return true;
         }
@@ -80,15 +89,13 @@ function commandPermissionCheck(
     if (command.botPermissions) {
         const botPermissions = new Permissions(command.botPermissions);
         // The required permissions for the bot to run the command, missing in the channel.
-        const missingPermissions = channel
-            .permissionsFor(client.user)
-            .missing(botPermissions);
+        const missingPermissions = channel.permissionsFor(client.user).missing(botPermissions);
         if (missingPermissions.length > 0) {
             interaction
                 .editReply(
                     `In order to run this command, I need the following permissions: ${missingPermissions
                         .map((perm) => `\`${perm}\``)
-                        .join(", ")}`
+                        .join(", ")}`,
                 )
                 .catch(console.error);
             return true;
@@ -97,15 +104,13 @@ function commandPermissionCheck(
     if (command.authorPermissions) {
         const authorPermissions = new Permissions(command.authorPermissions);
         // The required permissions for the user to run the command, missing in the channel.
-        const missingPermissions = channel
-            .permissionsFor(user.id)
-            .missing(authorPermissions);
+        const missingPermissions = channel.permissionsFor(user.id).missing(authorPermissions);
         if (missingPermissions.length > 0) {
             interaction
                 .editReply(
                     `In order to run this command, you need: ${missingPermissions
                         .map((perm) => `\`${perm}\``)
-                        .join(", ")}`
+                        .join(", ")}`,
                 )
                 .catch(console.error);
             return true;
@@ -114,11 +119,7 @@ function commandPermissionCheck(
     // By default, allow execution;
     return false;
 }
-function commandCooldownCheck(
-    interaction: CommandInteraction,
-    command: Command,
-    context: MyContext
-): boolean {
+function commandCooldownCheck(interaction: CommandInteraction, command: Command, context: MyContext): boolean {
     const { user } = interaction;
     if (command.cooldown) {
         const id = user.id + "/" + interaction.commandName;
@@ -131,18 +132,12 @@ function commandCooldownCheck(
             interaction
                 .editReply(
                     //TODO revert to using custom logic to send remaining time as the discord timestamp formatting isn't very descriptive
-                    `Please wait ${Formatters.time(
-                        existingCooldown,
-                        "R"
-                    )} before using the command again`
+                    `Please wait ${Formatters.time(existingCooldown, "R")} before using the command again`,
                 )
                 .catch(console.error);
             return true;
         }
-        context.cooldownCounter.set(
-            user.id + "/" + interaction.commandName,
-            Date.now() + command.cooldown
-        );
+        context.cooldownCounter.set(user.id + "/" + interaction.commandName, Date.now() + command.cooldown);
     }
     return false;
 }
diff --git a/src/utils/CommandUtils.ts b/src/utils/CommandUtils.ts
@@ -0,0 +1,3 @@
+import { MessageButton } from "discord.js";
+
+export const deleteButton = new MessageButton().setCustomId("deletebtn").setEmoji("🗑").setStyle("SECONDARY");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { MessageButton } from "discord.js";`
	`2`	`+`
	`3`	`+export const deleteButton = new MessageButton().setCustomId("deletebtn").setEmoji("🗑").setStyle("SECONDARY");`