feat(blacklist): add lodestone-id field

src/blacklist/blacklist.utils.ts

@@ -33,11 +33,15 @@
   characterName,
   discordId,
   reason,
+  lodestoneId,
 }: BlacklistDocument): APIEmbedField[] {
   const displayName = getDisplayName({ characterName, discordId });
+
   return [
     { name: 'Player', value: displayName, inline: true },
     { name: 'Reason', value: reason, inline: true },
-    { name: '\u200b', value: '\u200b', inline: true },
+    lodestoneId
+      ? { name: 'Lodestone ID', value: String(lodestoneId), inline: true }
+      : { name: '\u200b', value: '\u200b', inline: true },
   ];
 }

src/blacklist/events/handlers/blacklist-updated.event-handler.ts

@@ -1,6 +1,7 @@
 import { EventsHandler, type IEventHandler } from '@nestjs/cqrs';
 import { type APIEmbedField, EmbedBuilder } from 'discord.js';
 import { titleCase } from 'title-case';
+import { createFields } from '../../../common/embed-helpers.js';
 import { DiscordService } from '../../../discord/discord.service.js';
 import { SettingsCollection } from '../../../firebase/collections/settings-collection.js';
 import { getDisplayName } from '../../blacklist.utils.js';
@@ -28,13 +29,18 @@
 
     const toFrom = type === 'added' ? 'to' : 'from';
 
-    const fields: APIEmbedField[] = [
+    const fields = createFields([
       {
         name: 'User',
         value: titleCase(getDisplayName(entry)),
         inline: true,
       },
-    ];
+      {
+        name: 'Lodestone ID',
+        value: entry.lodestoneId?.toString(),
+        inline: true,
+      },
+    ]);
 
     if (type === 'added') {
       fields.push({ name: 'Reason', value: entry.reason, inline: true });

src/blacklist/subcommands/add/blacklist-add.command-handler.ts

@@ -20,12 +20,14 @@
 
     const discordId = getDiscordId(interaction);
     const characterName = interaction.options.getString('character');
+    const lodestoneId = interaction.options.getInteger('lodestone-id');
     const reason = interaction.options.getString('reason', true);
 
     const props: BlacklistDocument = {
       discordId,
       characterName: characterName?.toLowerCase() ?? null,
       reason,
+      lodestoneId,
     };
 
     const entry = await this.blacklistCollection.upsert(guildId, props);

src/blacklist/subcommands/remove/blacklist-remove.command-handler.ts

@@ -19,10 +19,12 @@
 
     const discordId = getDiscordId(interaction);
     const characterName = interaction.options.getString('character');
+    const lodestoneId = interaction.options.getInteger('lodestone-id');
 
     const entry = await this.blacklistCollection.remove(guildId, {
       discordId,
       characterName: characterName?.toLowerCase() ?? null,
+      lodestoneId,
     });
 
     await interaction.editReply('Success!');

src/firebase/collections/blacklist-collection.ts

@@ -69,7 +69,10 @@
    */
   public remove(
     guildId: string,
-    props: BlacklistDocumentKeys,
+    props: ExactType<
+      BlacklistDocument,
+      'discordId' | 'characterName' | 'lodestoneId'
+    >,
   ): Promise<BlacklistDocument | undefined> {
     const pipeline$ = this.query$(guildId, props).pipe(
       mergeMap(async (result) => {

src/firebase/models/blacklist.model.ts

@@ -2,4 +2,5 @@ export interface BlacklistDocument {
   characterName: string | null;
   discordId: string | null;
   reason: string;
+  lodestoneId: number | null;
 }

src/slash-commands/commands/blacklist.ts

@@ -1,6 +1,7 @@
 import {
   PermissionFlagsBits,
   SlashCommandBuilder,
+  type SlashCommandIntegerOption,
   type SlashCommandStringOption,
   SlashCommandSubcommandBuilder,
   type SlashCommandUserOption,
@@ -26,6 +27,11 @@ const characterOption = (option: SlashCommandStringOption) =>
     .setName('character')
     .setDescription('The character name incase no discord id is known');
 
+const lodestoneIdOption = (option: SlashCommandIntegerOption) =>
+  option
+    .setName('lodestone-id')
+    .setDescription('The Lodestone ID of the character');
+
 const BlacklistAddSubCommand = new SlashCommandSubcommandBuilder()
   .setName('add')
   .setDescription('A list of players to keep an eye on')
@@ -37,14 +43,16 @@ const BlacklistAddSubCommand = new SlashCommandSubcommandBuilder()
   )
   .addUserOption(userOption)
   .addStringOption(discordIdOption)
-  .addStringOption(characterOption);
+  .addStringOption(characterOption)
+  .addIntegerOption(lodestoneIdOption);
 
 const BlacklistRemoveSubCommand = new SlashCommandSubcommandBuilder()
   .setName('remove')
   .setDescription('Remove a user from the blacklist')
   .addUserOption(userOption)
   .addStringOption(discordIdOption)
-  .addStringOption(characterOption);
+  .addStringOption(characterOption)
+  .addIntegerOption(lodestoneIdOption);
 
 const BlacklistDisplayCommand = new SlashCommandSubcommandBuilder()
   .setName('display')