refactor: consolidate modal routing and use LabelBuilder for modal components

Merges modalInteractionCreate into interactionCreate, and replaces
ActionRowBuilder with LabelBuilder for the announcement modal components.

bot/commandJson.js

@@ -6,6 +6,12 @@ const about = new SlashCommandBuilder()
   .setContexts([InteractionContextType.Guild, InteractionContextType.BotDM, InteractionContextType.PrivateChannel])
   .setIntegrationTypes([ApplicationIntegrationType.UserInstall, ApplicationIntegrationType.GuildInstall]);
 
+const announcement = new SlashCommandBuilder()
+  .setName("announcement")
+  .setDescription("Create a cross-platform announcement. (Owner only)")
+  .setContexts([InteractionContextType.BotDM, InteractionContextType.PrivateChannel])
+  .setIntegrationTypes([ApplicationIntegrationType.UserInstall]);
+
 const dm  = new SlashCommandBuilder()
   .setName("dm")
   .setDescription("Trigger a DM response so you can find your DM channel.")
@@ -14,5 +20,6 @@ const dm  = new SlashCommandBuilder()
 
 console.log(JSON.stringify([
     about.toJSON(),
+    announcement.toJSON(),
     dm.toJSON()
 ]))

bot/package.json

@@ -18,7 +18,7 @@
     "@anthropic-ai/sdk": "0.56.0",
     "@nhcarrigan/discord-analytics": "0.0.6",
     "@nhcarrigan/logger": "1.1.1",
-    "discord.js": "14.21.0",
+    "discord.js": "14.25.1",
     "fastify": "5.4.0"
   },
   "devDependencies": {

bot/prod.env

@@ -1,3 +1,4 @@
 LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth"
 DISCORD_TOKEN="op://Environment Variables - Naomi/Hikari/discord_token"
 ANTHROPIC_KEY="op://Environment Variables - Naomi/Hikari/anthropic_key"
+ANNOUNCEMENT_TOKEN="op://Environment Variables - Naomi/Hikari/announcement_token"

bot/src/commands/announcement.ts

@@ -0,0 +1,75 @@
+/**
+ * @copyright nhcarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import {
+  LabelBuilder,
+  ModalBuilder,
+  StringSelectMenuBuilder,
+  TextInputBuilder,
+  TextInputStyle,
+} from "discord.js";
+import { entitledUsers } from "../config/entitlements.js";
+import { errorHandler } from "../utils/errorHandler.js";
+import type { Command } from "../interfaces/command.js";
+
+/**
+ * Handles the `/announcement` command interaction.
+ * Owner-only command that opens a modal for creating cross-platform announcements.
+ * @param _hikari - Hikari's Discord instance (unused).
+ * @param interaction - The command interaction payload from Discord.
+ */
+export const announcement: Command = async(_hikari, interaction) => {
+  try {
+    if (!entitledUsers.includes(interaction.user.id)) {
+      await interaction.reply({
+        content:   "This command is restricted to the owner.",
+        ephemeral: true,
+      });
+      return;
+    }
+
+    const modal = new ModalBuilder().
+      setCustomId("announcement_modal").
+      setTitle("Create Announcement");
+
+    const contentInput = new TextInputBuilder().
+      setCustomId("content").
+      setStyle(TextInputStyle.Paragraph).
+      setMaxLength(4000).
+      setRequired(true);
+
+    const categorySelect = new StringSelectMenuBuilder().
+      setCustomId("category").
+      setPlaceholder("Select a category").
+      addOptions([
+        { label: "Products", value: "products" },
+        { label: "Community", value: "community" },
+        { label: "Company", value: "company" },
+      ]);
+
+    const contentLabel = new LabelBuilder().setLabel("Announcement Copy").
+      setDescription(
+        "Your version of the announcement, to send to the AI for processing.",
+      ).
+      setTextInputComponent(contentInput);
+    const categoryLabel = new LabelBuilder().setLabel("Announcement Category").
+      setDescription("The category of the announcement.").
+      setStringSelectMenuComponent(categorySelect);
+
+    modal.addLabelComponents(
+      contentLabel,
+      categoryLabel,
+    );
+
+    await interaction.showModal(modal);
+  } catch (error) {
+    const id = await errorHandler(error, "announcement command");
+    await interaction.reply({
+      content:   `An error occurred whilst processing your request. Error ID: \`${id}\``,
+      ephemeral: true,
+    });
+  }
+};

bot/src/events/interactionCreate.ts

@@ -4,10 +4,16 @@
  * @author Naomi Carrigan
  */
 import { about } from "../commands/about.js";
+import { announcement } from "../commands/announcement.js";
 import { dm } from "../commands/dm.js";
+import { handleAnnouncementModal } from "../modules/handleAnnouncementModal.js";
 import { logger } from "../utils/logger.js";
 import type { Command } from "../interfaces/command.js";
-import type { ChatInputCommandInteraction, Client } from "discord.js";
+import type {
+  ModalSubmitInteraction,
+  ChatInputCommandInteraction,
+  Client,
+} from "discord.js";
 
 const handlers: { _default: Command } & Record<string, Command> = {
   _default: async(_, interaction): Promise<void> => {
@@ -16,8 +22,9 @@ const handlers: { _default: Command } & Record<string, Command> = {
       ephemeral: true,
     });
   },
-  about: about,
+  about:        about,
-  dm:    dm,
+  announcement: announcement,
+  dm:           dm,
 };
 
 /**
@@ -39,4 +46,18 @@ const chatInputInteractionCreate = async(
   });
 };
 
-export { chatInputInteractionCreate };
+/**
+ * Routes a modal submit interaction to the appropriate handler.
+ * @param _hikari - Hikari's Discord instance (unused).
+ * @param interaction - The modal submit interaction payload from Discord.
+ */
+const modalSubmitInteractionCreate = async(
+  _hikari: Client,
+  interaction: ModalSubmitInteraction,
+): Promise<void> => {
+  if (interaction.customId === "announcement_modal") {
+    await handleAnnouncementModal(interaction);
+  }
+};
+
+export { chatInputInteractionCreate, modalSubmitInteractionCreate };

bot/src/index.ts

@@ -6,7 +6,10 @@
 
 import { DiscordAnalytics } from "@nhcarrigan/discord-analytics";
 import { Client, Events, GatewayIntentBits, Partials } from "discord.js";
-import { chatInputInteractionCreate } from "./events/interactionCreate.js";
+import {
+  chatInputInteractionCreate,
+  modalSubmitInteractionCreate,
+} from "./events/interactionCreate.js";
 import { logger } from "./utils/logger.js";
 
 /*
@@ -51,6 +54,10 @@ hikari.once(Events.ClientReady, () => {
 hikari.on(Events.InteractionCreate, (interaction) => {
   if (interaction.isChatInputCommand()) {
     void chatInputInteractionCreate(hikari, interaction);
+    return;
+  }
+  if (interaction.isModalSubmit()) {
+    void modalSubmitInteractionCreate(hikari, interaction);
   }
 });
 

bot/src/modules/handleAnnouncementModal.ts

@@ -0,0 +1,142 @@
+/**
+ * @copyright nhcarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { AttachmentBuilder, type ModalSubmitInteraction } from "discord.js";
+import { errorHandler } from "../utils/errorHandler.js";
+
+interface RawMarkdown {
+  content: string;
+  title:   string;
+}
+
+interface RawPost {
+  markdown:  RawMarkdown;
+  plaintext: string;
+  threaded:  Array<string>;
+}
+
+interface AnnouncementApiResponse {
+  alert:   string;
+  cost:    unknown;
+  message: string;
+  rawPost: RawPost;
+}
+
+const isRawMarkdown = (value: unknown): value is RawMarkdown => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Necessary narrowing in type guard
+  const cast = value as Record<string, unknown>;
+  return typeof cast.title === "string" && typeof cast.content === "string";
+};
+
+const isRawPost = (value: unknown): value is RawPost => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Necessary narrowing in type guard
+  const cast = value as Record<string, unknown>;
+  return (
+    isRawMarkdown(cast.markdown)
+    && typeof cast.plaintext === "string"
+    && Array.isArray(cast.threaded)
+  );
+};
+
+const isAnnouncementApiResponse = (
+  value: unknown,
+): value is AnnouncementApiResponse => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Necessary narrowing in type guard
+  const cast = value as Record<string, unknown>;
+  return (
+    typeof cast.message === "string"
+    && typeof cast.alert === "string"
+    && isRawPost(cast.rawPost)
+  );
+};
+
+const buildAnnouncementFiles = (rawPost: RawPost): Array<AttachmentBuilder> => {
+  const markdownFileContent = `# ${rawPost.markdown.title}\n\n${rawPost.markdown.content}`;
+  const threadedFileContent = rawPost.threaded.join("\n\n---\n\n");
+  return [
+    new AttachmentBuilder(
+      Buffer.from(markdownFileContent),
+      { name: "markdown.md" },
+    ),
+    new AttachmentBuilder(
+      Buffer.from(rawPost.plaintext),
+      { name: "plaintext.txt" },
+    ),
+    new AttachmentBuilder(
+      Buffer.from(threadedFileContent),
+      { name: "threaded.md" },
+    ),
+  ];
+};
+
+/**
+ * Handles the announcement modal submission.
+ * Calls the announcement API, sends the generated copy as file attachments
+ * to the owner's DMs, and replies ephemerally with the platform recap.
+ * @param interaction - The modal submit interaction payload from Discord.
+ */
+export const handleAnnouncementModal = async(
+  interaction: ModalSubmitInteraction,
+): Promise<void> => {
+  try {
+    await interaction.deferReply({ ephemeral: true });
+
+    const content = interaction.fields.getTextInputValue("content");
+    const categoryValues = interaction.fields.getStringSelectValues("category");
+    const type = categoryValues[0] ?? "company";
+
+    const response = await fetch("https://hikari.nhcarrigan.com/announcement", {
+      body:    JSON.stringify({ content, type }),
+      headers: {
+        // eslint-disable-next-line @typescript-eslint/naming-convention -- HTTP header capitalisation convention
+        "Authorization": process.env.ANNOUNCEMENT_TOKEN ?? "",
+        // eslint-disable-next-line @typescript-eslint/naming-convention -- HTTP header naming convention
+        "Content-Type":  "application/json",
+      },
+      method: "POST",
+    });
+
+    if (!response.ok) {
+      await interaction.editReply({
+        content: `The announcement server returned HTTP ${String(response.status)}.`,
+      });
+      return;
+    }
+
+    const body: unknown = await response.json();
+
+    if (!isAnnouncementApiResponse(body)) {
+      await interaction.editReply({
+        // eslint-disable-next-line stylistic/max-len -- Error message needs sufficient context
+        content: "Received an unexpected response from the announcement server.",
+      });
+      return;
+    }
+
+    await interaction.user.send({
+      content: "Here are the generated announcement files~",
+      files:   buildAnnouncementFiles(body.rawPost),
+    });
+
+    await interaction.editReply({
+      content: `**Announcement Recap**\n${body.message}\n\n⚠️ ${body.alert}`,
+    });
+  } catch (error) {
+    const id = await errorHandler(error, "announcement modal");
+    await interaction.editReply({
+      content: `An error occurred whilst processing the announcement. Error ID: \`${id}\``,
+    });
+  }
+};

package.json

@@ -18,7 +18,7 @@
     "@nhcarrigan/eslint-config": "5.2.0",
     "@nhcarrigan/typescript-config": "4.0.0",
     "eslint": "9.30.1",
-    "turbo": "2.8.10",
+    "turbo": "2.8.11",
     "typescript": "5.8.3"
   }
 }

pnpm-lock.yaml

@@ -18,8 +18,8 @@ importers:
         specifier: 9.30.1
         version: 9.30.1(jiti@2.4.2)
       turbo:
-        specifier: 2.8.10
+        specifier: 2.8.11
-        version: 2.8.10
+        version: 2.8.11
       typescript:
         specifier: 5.8.3
         version: 5.8.3
@@ -31,13 +31,13 @@ importers:
         version: 0.56.0
       '@nhcarrigan/discord-analytics':
         specifier: 0.0.6
-        version: 0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.21.0)
+        version: 0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.25.1)
       '@nhcarrigan/logger':
         specifier: 1.1.1
         version: 1.1.1
       discord.js:
-        specifier: 14.21.0
+        specifier: 14.25.1
-        version: 14.21.0
+        version: 14.25.1
       fastify:
         specifier: 5.4.0
         version: 5.4.0
@@ -2497,8 +2497,8 @@ packages:
   discord-api-types@0.38.40:
     resolution: {integrity: sha512-P/His8cotqZgQqrt+hzrocp9L8RhQQz1GkrCnC9TMJ8Uw2q0tg8YyqJyGULxhXn/8kxHETN4IppmOv+P2m82lQ==}
 
-  discord.js@14.21.0:
+  discord.js@14.25.1:
-    resolution: {integrity: sha512-U5w41cEmcnSfwKYlLv5RJjB8Joa+QJyRwIJz5i/eg+v2Qvv6EYpCRhN9I2Rlf0900LuqSDg8edakUATrDZQncQ==}
+    resolution: {integrity: sha512-2l0gsPOLPs5t6GFZfQZKnL1OJNYFcuC/ETWsW4VtKVD/tg4ICa9x+jb9bkPffkMdRpRpuUaO/fKkHCBeiCKh8g==}
     engines: {node: '>=18'}
 
   doctrine@2.1.0:
@@ -4618,38 +4618,38 @@ packages:
     resolution: {integrity: sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==}
     engines: {node: ^18.17.0 || >=20.5.0}
 
-  turbo-darwin-64@2.8.10:
+  turbo-darwin-64@2.8.11:
-    resolution: {integrity: sha512-A03fXh+B7S8mL3PbdhTd+0UsaGrhfyPkODvzBDpKRY7bbeac4MDFpJ7I+Slf2oSkCEeSvHKR7Z4U71uKRUfX7g==}
+    resolution: {integrity: sha512-XKaCWaz4OCt77oYYvGCIRpvYD4c/aNaKjRkUpv+e8rN3RZb+5Xsyew4yRO+gaHdMIUhQznXNXfHlhs+/p7lIhA==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@2.8.10:
+  turbo-darwin-arm64@2.8.11:
-    resolution: {integrity: sha512-sidzowgWL3s5xCHLeqwC9M3s9M0i16W1nuQF3Mc7fPHpZ+YPohvcbVFBB2uoRRHYZg6yBnwD4gyUHKTeXfwtXA==}
+    resolution: {integrity: sha512-VvynLHGUNvQ9k7GZjRPSsRcK4VkioTfFb7O7liAk4nHKjEcMdls7GqxzjVWgJiKz3hWmQGaP9hRa9UUnhVWCxA==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@2.8.10:
+  turbo-linux-64@2.8.11:
-    resolution: {integrity: sha512-YK9vcpL3TVtqonB021XwgaQhY9hJJbKKUhLv16osxV0HkcQASQWUqR56yMge7puh6nxU67rQlTq1b7ksR1T3KA==}
+    resolution: {integrity: sha512-cbSn37dcm+EmkQ7DD0euy7xV7o2el4GAOr1XujvkAyKjjNvQ+6QIUeDgQcwAx3D17zPpDvfDMJY2dLQadWnkmQ==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@2.8.10:
+  turbo-linux-arm64@2.8.11:
-    resolution: {integrity: sha512-3+j2tL0sG95iBJTm+6J8/45JsETQABPqtFyYjVjBbi6eVGdtNTiBmHNKrbvXRlQ3ZbUG75bKLaSSDHSEEN+btQ==}
+    resolution: {integrity: sha512-+trymp2s2aBrhS04l6qFxcExzZ8ffndevuUB9c5RCeqsVpZeiWuGQlWNm5XjOmzoMayxRARZ5ma7yiWbGMiLqQ==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@2.8.10:
+  turbo-windows-64@2.8.11:
-    resolution: {integrity: sha512-hdeF5qmVY/NFgiucf8FW0CWJWtyT2QPm5mIsX0W1DXAVzqKVXGq+Zf+dg4EUngAFKjDzoBeN6ec2Fhajwfztkw==}
+    resolution: {integrity: sha512-3kJjFSM4yw1n9Uzmi+XkAUgCae19l/bH6RJ442xo7mnZm0tpOjo33F+FYHoSVpIWVMd0HG0LDccyafPSdylQbA==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@2.8.10:
+  turbo-windows-arm64@2.8.11:
-    resolution: {integrity: sha512-QGdr/Q8LWmj+ITMkSvfiz2glf0d7JG0oXVzGL3jxkGqiBI1zXFj20oqVY0qWi+112LO9SVrYdpHS0E/oGFrMbQ==}
+    resolution: {integrity: sha512-JOM4uF2vuLsJUvibdR6X9QqdZr6BhC6Nhlrw4LKFPsXZZI/9HHLoqAiYRpE4MuzIwldCH/jVySnWXrI1SKto0g==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@2.8.10:
+  turbo@2.8.11:
-    resolution: {integrity: sha512-OxbzDES66+x7nnKGg2MwBA1ypVsZoDTLHpeaP4giyiHSixbsiTaMyeJqbEyvBdp5Cm28fc+8GG6RdQtic0ijwQ==}
+    resolution: {integrity: sha512-H+rwSHHPLoyPOSoHdmI1zY0zy0GGj1Dmr7SeJW+nZiWLz2nex8EJ+fkdVabxXFMNEux+aywI4Sae8EqhmnOv4A==}
     hasBin: true
 
   twitter-api-v2@1.28.0:
@@ -6029,10 +6029,10 @@ snapshots:
       '@napi-rs/nice-win32-x64-msvc': 1.1.1
     optional: true
 
-  '@nhcarrigan/discord-analytics@0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.21.0)':
+  '@nhcarrigan/discord-analytics@0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.25.1)':
     dependencies:
       '@nhcarrigan/logger': 1.1.1
-      discord.js: 14.21.0
+      discord.js: 14.25.1
       node-schedule: 2.1.1
 
   '@nhcarrigan/eslint-config@5.2.0(@typescript-eslint/utils@8.35.1(eslint@9.30.1(jiti@2.4.2))(typescript@5.8.3))(eslint@9.30.1(jiti@2.4.2))(playwright@1.53.2)(react@19.1.0)(typescript@5.8.3)(vitest@3.2.4(@types/node@24.0.10)(jiti@2.4.2)(less@4.3.0)(sass@1.88.0)(terser@5.39.1)(tsx@4.20.3))':
@@ -7603,7 +7603,7 @@ snapshots:
 
   discord-api-types@0.38.40: {}
 
-  discord.js@14.21.0:
+  discord.js@14.25.1:
     dependencies:
       '@discordjs/builders': 1.13.1
       '@discordjs/collection': 1.5.3
@@ -10192,32 +10192,32 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  turbo-darwin-64@2.8.10:
+  turbo-darwin-64@2.8.11:
     optional: true
 
-  turbo-darwin-arm64@2.8.10:
+  turbo-darwin-arm64@2.8.11:
     optional: true
 
-  turbo-linux-64@2.8.10:
+  turbo-linux-64@2.8.11:
     optional: true
 
-  turbo-linux-arm64@2.8.10:
+  turbo-linux-arm64@2.8.11:
     optional: true
 
-  turbo-windows-64@2.8.10:
+  turbo-windows-64@2.8.11:
     optional: true
 
-  turbo-windows-arm64@2.8.10:
+  turbo-windows-arm64@2.8.11:
     optional: true
 
-  turbo@2.8.10:
+  turbo@2.8.11:
     optionalDependencies:
-      turbo-darwin-64: 2.8.10
+      turbo-darwin-64: 2.8.11
-      turbo-darwin-arm64: 2.8.10
+      turbo-darwin-arm64: 2.8.11
-      turbo-linux-64: 2.8.10
+      turbo-linux-64: 2.8.11
-      turbo-linux-arm64: 2.8.10
+      turbo-linux-arm64: 2.8.11
-      turbo-windows-64: 2.8.10
+      turbo-windows-64: 2.8.11
-      turbo-windows-arm64: 2.8.10
+      turbo-windows-arm64: 2.8.11
 
   twitter-api-v2@1.28.0: {}