2 Commits

Author SHA1 Message Date
hikari e2167b117a deps: update discord.js to 14.25.1
Node.js CI / CI (push) Successful in 42s
Security Scan and Upload / Security & DefectDojo Upload (push) Successful in 1m2s
Enables typed getStringSelectValues() for modal select menus,
removing the need for type assertion workarounds.
2026-03-12 23:01:22 -07:00
hikari 2991a56147 feat: add /announcement owner-only slash command
Triggers a modal with a content text input and category select menu,
calls the announcement API, DMs generated copy as file attachments,
and replies ephemerally with the platform recap.
2026-03-12 23:01:19 -07:00
9 changed files with 267 additions and 12 deletions
+7
View File
@@ -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()
]))
+1 -1
View File
@@ -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": {
+2 -1
View File
@@ -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"
ANTHROPIC_KEY="op://Environment Variables - Naomi/Hikari/anthropic_key"
ANNOUNCEMENT_TOKEN="op://Environment Variables - Naomi/Hikari/announcement_token"
+72
View File
@@ -0,0 +1,72 @@
/**
* @copyright nhcarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import {
ActionRowBuilder,
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").
// eslint-disable-next-line deprecation/deprecation -- No V2 equivalent exists for modal text input labels
setLabel("Announcement Copy").
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" },
]);
// eslint-disable-next-line deprecation/deprecation -- No V2 equivalent exists for modal component rows
modal.addComponents(
new ActionRowBuilder<TextInputBuilder>().addComponents(contentInput),
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- discord.js types don't yet reflect select menus in modals, but they're supported at the API level
new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(
categorySelect,
) as unknown as ActionRowBuilder<TextInputBuilder>,
);
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,
});
}
};
+4 -2
View File
@@ -4,6 +4,7 @@
* @author Naomi Carrigan
*/
import { about } from "../commands/about.js";
import { announcement } from "../commands/announcement.js";
import { dm } from "../commands/dm.js";
import { logger } from "../utils/logger.js";
import type { Command } from "../interfaces/command.js";
@@ -16,8 +17,9 @@ const handlers: { _default: Command } & Record<string, Command> = {
ephemeral: true,
});
},
about: about,
dm: dm,
about: about,
announcement: announcement,
dm: dm,
};
/**
+24
View File
@@ -0,0 +1,24 @@
/**
* @copyright nhcarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { handleAnnouncementModal } from "../modules/handleAnnouncementModal.js";
import type { Client, ModalSubmitInteraction } from "discord.js";
/**
* 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 { modalSubmitInteractionCreate };
+7
View File
@@ -7,6 +7,9 @@
import { DiscordAnalytics } from "@nhcarrigan/discord-analytics";
import { Client, Events, GatewayIntentBits, Partials } from "discord.js";
import { chatInputInteractionCreate } from "./events/interactionCreate.js";
import {
modalSubmitInteractionCreate,
} from "./events/modalInteractionCreate.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);
}
});
+142
View File
@@ -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}\``,
});
}
};
+8 -8
View File
@@ -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
version: 14.21.0
specifier: 14.25.1
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:
resolution: {integrity: sha512-U5w41cEmcnSfwKYlLv5RJjB8Joa+QJyRwIJz5i/eg+v2Qvv6EYpCRhN9I2Rlf0900LuqSDg8edakUATrDZQncQ==}
discord.js@14.25.1:
resolution: {integrity: sha512-2l0gsPOLPs5t6GFZfQZKnL1OJNYFcuC/ETWsW4VtKVD/tg4ICa9x+jb9bkPffkMdRpRpuUaO/fKkHCBeiCKh8g==}
engines: {node: '>=18'}
doctrine@2.1.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