feat: return-based interaction reply edits

src/commands/verify.ts

@@ -1,11 +1,12 @@
-import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import cmdName from '../core/interaction/cmdName.js';
+import negativeEmbed from '../core/interaction/negativeEmbed.js';
+import positiveEmbed from '../core/interaction/positiveEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
@@ -14,7 +15,7 @@ import { PlayerClanData } from '../types/playerClanData.js';
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -33,84 +34,49 @@ export default {
     );
     const clan = clanData[id]?.clan;
     const clanTag = clan ? ` [${clan!.tag}]` : '';
+    const member =
+      interaction.member &&
+      interaction.guild?.members.cache.get(interaction.member?.user.id);
 
     if (!interaction.guild?.members.me?.permissions.has('ManageNicknames')) {
-      interaction.editReply({
-        embeds: [
-          new EmbedBuilder()
-            .setColor(NEGATIVE_COLOR)
-            .setTitle(
-              `${markdownEscape(interaction.user.username)} failed to verify`,
-            )
-            .setDescription(
-              "I don't have the permission to change your nickname.",
-            ),
-        ],
-      });
-
-      return;
+      return negativeEmbed(
+        `${markdownEscape(interaction.user.username)} failed to verify`,
+        "I don't have the permission to change your nickname.",
+      );
+    }
+    if (!interaction.member || !member) {
+      return negativeEmbed(
+        `${interaction.user.username} is not in this server`,
+        "I couldn't find this person in this server. Did they leave?",
+      );
     }
 
-    if (interaction.member) {
-      const member = interaction.guild?.members.cache.get(
-        interaction.member?.user.id,
-      );
+    try {
+      await member.setNickname(`${accountInfo[id].nickname}${clanTag}`);
 
-      if (member) {
-        try {
-          await member.setNickname(`${accountInfo[id].nickname}${clanTag}`);
-
-          if (interaction.guildId === discord.sklld_guild_id) {
-            if (
-              !interaction.guild?.members.me?.permissions.has('ManageRoles')
-            ) {
-              await interaction.editReply({
-                embeds: [
-                  new EmbedBuilder()
-                    .setColor(NEGATIVE_COLOR)
-                    .setTitle(
-                      `${markdownEscape(
-                        interaction.user.username,
-                      )} failed to verify`,
-                    )
-                    .setDescription(
-                      "I don't have the permission to change your manage roles.",
-                    ),
-                ],
-              });
-
-              return;
-            }
-
-            await member.roles.remove(discord.sklld_verify_role);
-            await member.roles.add(discord.sklld_peasant_role);
-          }
-
-          await interaction.editReply({
-            embeds: [
-              new EmbedBuilder()
-                .setColor(POSITIVE_COLOR)
-                .setTitle(`${interaction.user.username} is verified`)
-                .setDescription(
-                  `The user is now verified as ${markdownEscape(
-                    accountInfo[id].nickname,
-                  )}${markdownEscape(clanTag)}`,
-                ),
-            ],
-          });
-        } catch (error) {
-          await interaction.editReply({
-            embeds: [
-              new EmbedBuilder()
-                .setColor(NEGATIVE_COLOR)
-                .setTitle(`${interaction.user.username} failed to verify`)
-                .setDescription(
-                  "I can't change your nickname because you have higher permissions than me. Try setting your nickname to your Blitz username manually.",
-                ),
-            ],
-          });
+      if (interaction.guildId === discord.sklld_guild_id) {
+        if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
+          return negativeEmbed(
+            `${markdownEscape(interaction.user.username)} failed to verify`,
+            "I don't have the permission to change your manage roles.",
+          );
         }
+
+        await member.roles.remove(discord.sklld_verify_role);
+        await member.roles.add(discord.sklld_peasant_role);
       }
+
+      return positiveEmbed(
+        `${interaction.user.username} is verified`,
+        `The user is now verified as ${markdownEscape(
+          accountInfo[id].nickname,
+        )}${markdownEscape(clanTag)}`,
+      );
+    } catch (error) {
+      return negativeEmbed(
+        `${interaction.user.username} failed to verify`,
+        "I can't change your nickname because you have higher permissions than me. Try setting your nickname to your Blitz username manually.",
+      );
     }
   },