refactor: improvement

discordx-ts · Jun 4, 2024 · 5cd7014 · 5cd7014
1 parent ff1cc8e
commit 5cd7014
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/1-starter/src/commands/simple command.ts b/1-starter/src/commands/simple command.ts
@@ -12,7 +12,12 @@ import {
 export class Example {
   @SimpleCommand({ aliases: ["hi"] })
   async hello(command: SimpleCommandMessage): Promise<void> {
-    await command.message.reply(`👋 ${command.message.member?.toString()}`);
+    const member = command.message.member;
+    if (member) {
+      await command.message.reply(`👋 ${member.toString()}`);
+    } else {
+      await command.message.reply("👋 hello");
+    }
   }
 
   @SimpleCommand({ argSplitter: "+" })
@@ -28,7 +33,7 @@ export class Example {
       return;
     }
 
-    await command.message.reply(`total = ${num1 + num2}`);
+    await command.message.reply(`total = ${String(num1 + num2)}`);
   }
 
   // make single handler for simple and slash command

diff --git a/1-starter/src/commands/slash + button.ts b/1-starter/src/commands/slash + button.ts
@@ -1,7 +1,6 @@
 import type {
   ButtonInteraction,
   CommandInteraction,
-  GuildMember,
   MessageActionRowComponentBuilder,
   User,
 } from "discord.js";
@@ -10,6 +9,7 @@ import {
   ApplicationCommandOptionType,
   ButtonBuilder,
   ButtonStyle,
+  GuildMember,
 } from "discord.js";
 import { ButtonComponent, Discord, Slash, SlashOption } from "discordx";
 
@@ -26,6 +26,10 @@ export class Example {
     user: User | GuildMember | undefined,
     interaction: CommandInteraction,
   ): Promise<void> {
+    if (!user) {
+      return;
+    }
+
     await interaction.deferReply();
 
     const helloBtn = new ButtonBuilder()
@@ -41,12 +45,16 @@ export class Example {
 
     await interaction.editReply({
       components: [row],
-      content: `${user?.toString()}, Say hello to bot`,
+      content: `${user.toString()}, Say hello to bot`,
     });
   }
 
   @ButtonComponent({ id: "hello-btn" })
   async helloBtn(interaction: ButtonInteraction): Promise<void> {
-    await interaction.reply(`👋 ${interaction.member?.toString()}`);
+    if (!(interaction.member instanceof GuildMember)) {
+      return;
+    }
+
+    await interaction.reply(`👋 ${interaction.member.toString()}`);
   }
 }
diff --git a/1-starter/src/commands/slashes.ts b/1-starter/src/commands/slashes.ts
@@ -17,16 +17,14 @@ export class SlashExample {
 
     const pages = commands.map((cmd, i) => {
       const embed = new EmbedBuilder()
-        .setFooter({ text: `Page ${i + 1} of ${commands.length}` })
+        .setFooter({
+          text: `Page ${String(i + 1)} of ${String(commands.length)}`,
+        })
         .setTitle("**Slash command info**")
         .addFields({ name: "Name", value: cmd.name })
         .addFields({
           name: "Description",
-          value: `${
-            cmd.description.length > 0
-              ? cmd.description
-              : "Description unavailable"
-          }`,
+          value: cmd.description,
         });
 
       return { embeds: [embed] };

diff --git a/3-hot-module-reload/src/dev.ts b/3-hot-module-reload/src/dev.ts
@@ -22,7 +22,7 @@ const importPattern = `${dirname(
 export async function LoadFiles(src: string): Promise<void> {
   const files = await resolve(src);
   await Promise.all(
-    files.map((file) => import(`${file}?version=${Date.now()}`)),
+    files.map((file) => import(`${file}?version=${Date.now().toString()}`)),
   );
 }