8 Commits

Author SHA1 Message Date
hikari 1fa793935f chore: disable message create event handler 2026-03-11 08:55:27 -07:00
hikari f3197245db fix: safely extract first chunk to satisfy noUncheckedIndexedAccess
Node.js CI / CI (pull_request) Successful in 48s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 1m14s
2026-03-03 18:03:53 -08:00
hikari 2ebeddd890 fix: remove stale eslint-disable directive in announcement route
Node.js CI / CI (pull_request) Failing after 1m12s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 1m37s
2026-03-03 17:59:00 -08:00
hikari c6de6c9591 fix: resolve lint errors across bot, client, and server packages
Node.js CI / CI (pull_request) Failing after 50s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 1m42s
2026-03-03 17:56:42 -08:00
hikari d6ad6375b2 chore: add workspace packages to pnpm-workspace.yaml
Node.js CI / CI (pull_request) Failing after 31s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 57s
2026-03-03 17:39:16 -08:00
hikari 10a2f3dcd5 fix: make announcement route resilient to platform failures
Node.js CI / CI (pull_request) Failing after 32s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 1m53s
✨ This commit was made with love from Hikari~ 🌸
2026-03-03 17:03:49 -08:00
hikari f25163096b feat: chunk long announcements for Discord, Reddit, and Discourse
✨ This commit was made with love from Hikari~ 🌸
2026-03-03 16:56:15 -08:00
hikari 4437047543 feat: announce on discourse support forum
✨ This commit was made with love from Hikari~ 🌸
2026-03-03 16:44:13 -08:00
26 changed files with 257 additions and 467 deletions
-7
View File
@@ -6,12 +6,6 @@ const about = new SlashCommandBuilder()
.setContexts([InteractionContextType.Guild, InteractionContextType.BotDM, InteractionContextType.PrivateChannel]) .setContexts([InteractionContextType.Guild, InteractionContextType.BotDM, InteractionContextType.PrivateChannel])
.setIntegrationTypes([ApplicationIntegrationType.UserInstall, ApplicationIntegrationType.GuildInstall]); .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() const dm = new SlashCommandBuilder()
.setName("dm") .setName("dm")
.setDescription("Trigger a DM response so you can find your DM channel.") .setDescription("Trigger a DM response so you can find your DM channel.")
@@ -20,6 +14,5 @@ const dm = new SlashCommandBuilder()
console.log(JSON.stringify([ console.log(JSON.stringify([
about.toJSON(), about.toJSON(),
announcement.toJSON(),
dm.toJSON() dm.toJSON()
])) ]))
+1 -1
View File
@@ -18,7 +18,7 @@
"@anthropic-ai/sdk": "0.56.0", "@anthropic-ai/sdk": "0.56.0",
"@nhcarrigan/discord-analytics": "0.0.6", "@nhcarrigan/discord-analytics": "0.0.6",
"@nhcarrigan/logger": "1.1.1", "@nhcarrigan/logger": "1.1.1",
"discord.js": "14.25.1", "discord.js": "14.21.0",
"fastify": "5.4.0" "fastify": "5.4.0"
}, },
"devDependencies": { "devDependencies": {
-1
View File
@@ -1,4 +1,3 @@
LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth" LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth"
DISCORD_TOKEN="op://Environment Variables - Naomi/Hikari/discord_token" 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"
-109
View File
@@ -1,109 +0,0 @@
/**
* @copyright nhcarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import {
LabelBuilder,
ModalBuilder,
StringSelectMenuBuilder,
TextInputBuilder,
TextInputStyle,
} from "discord.js";
import { naomiId } 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.
*/
// eslint-disable-next-line max-lines-per-function -- Modal requires many input components
export const announcement: Command = async(_hikari, interaction) => {
try {
if (interaction.user.id !== naomiId) {
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 contentInput2 = new TextInputBuilder().
setCustomId("content_2").
setStyle(TextInputStyle.Paragraph).
setMaxLength(4000).
setRequired(false);
const contentInput3 = new TextInputBuilder().
setCustomId("content_3").
setStyle(TextInputStyle.Paragraph).
setMaxLength(4000).
setRequired(false);
const contentInput4 = new TextInputBuilder().
setCustomId("content_4").
setStyle(TextInputStyle.Paragraph).
setMaxLength(4000).
setRequired(false);
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);
// eslint-disable-next-line stylistic/max-len -- Label chain exceeds line length limit
const contentLabel2 = new LabelBuilder().setLabel("Additional Copy (Part 2)").
setDescription("Optional continuation of your announcement copy.").
setTextInputComponent(contentInput2);
// eslint-disable-next-line stylistic/max-len -- Label chain exceeds line length limit
const contentLabel3 = new LabelBuilder().setLabel("Additional Copy (Part 3)").
setDescription("Optional continuation of your announcement copy.").
setTextInputComponent(contentInput3);
// eslint-disable-next-line stylistic/max-len -- Label chain exceeds line length limit
const contentLabel4 = new LabelBuilder().setLabel("Additional Copy (Part 4)").
setDescription("Optional continuation of your announcement copy.").
setTextInputComponent(contentInput4);
const categoryLabel = new LabelBuilder().setLabel("Announcement Category").
setDescription("The category of the announcement.").
setStringSelectMenuComponent(categorySelect);
modal.addLabelComponents(
contentLabel,
contentLabel2,
contentLabel3,
contentLabel4,
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,
});
}
};
+4 -4
View File
@@ -3,12 +3,12 @@
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
const naomiId = "465650873650118659";
const entitledGuilds = [ const entitledGuilds = [
"1354624415861833870", "1354624415861833870",
]; ];
const entitledUsers = [ naomiId ]; const entitledUsers = [
"465650873650118659",
];
export { entitledGuilds, entitledUsers, naomiId }; export { entitledGuilds, entitledUsers };
+2 -23
View File
@@ -4,16 +4,10 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { about } from "../commands/about.js"; import { about } from "../commands/about.js";
import { announcement } from "../commands/announcement.js";
import { dm } from "../commands/dm.js"; import { dm } from "../commands/dm.js";
import { handleAnnouncementModal } from "../modules/handleAnnouncementModal.js";
import { logger } from "../utils/logger.js"; import { logger } from "../utils/logger.js";
import type { Command } from "../interfaces/command.js"; import type { Command } from "../interfaces/command.js";
import type { import type { ChatInputCommandInteraction, Client } from "discord.js";
ModalSubmitInteraction,
ChatInputCommandInteraction,
Client,
} from "discord.js";
const handlers: { _default: Command } & Record<string, Command> = { const handlers: { _default: Command } & Record<string, Command> = {
_default: async(_, interaction): Promise<void> => { _default: async(_, interaction): Promise<void> => {
@@ -23,7 +17,6 @@ const handlers: { _default: Command } & Record<string, Command> = {
}); });
}, },
about: about, about: about,
announcement: announcement,
dm: dm, dm: dm,
}; };
@@ -46,18 +39,4 @@ 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 };
+1 -8
View File
@@ -6,10 +6,7 @@
import { DiscordAnalytics } from "@nhcarrigan/discord-analytics"; import { DiscordAnalytics } from "@nhcarrigan/discord-analytics";
import { Client, Events, GatewayIntentBits, Partials } from "discord.js"; import { Client, Events, GatewayIntentBits, Partials } from "discord.js";
import { import { chatInputInteractionCreate } from "./events/interactionCreate.js";
chatInputInteractionCreate,
modalSubmitInteractionCreate,
} from "./events/interactionCreate.js";
import { logger } from "./utils/logger.js"; import { logger } from "./utils/logger.js";
/* /*
@@ -54,10 +51,6 @@ hikari.once(Events.ClientReady, () => {
hikari.on(Events.InteractionCreate, (interaction) => { hikari.on(Events.InteractionCreate, (interaction) => {
if (interaction.isChatInputCommand()) { if (interaction.isChatInputCommand()) {
void chatInputInteractionCreate(hikari, interaction); void chatInputInteractionCreate(hikari, interaction);
return;
}
if (interaction.isModalSubmit()) {
void modalSubmitInteractionCreate(hikari, interaction);
} }
}); });
-153
View File
@@ -1,153 +0,0 @@
/**
* @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.
*/
// eslint-disable-next-line max-lines-per-function -- This is a big function.
export const handleAnnouncementModal = async(
interaction: ModalSubmitInteraction,
): Promise<void> => {
try {
await interaction.deferReply({ ephemeral: true });
const content = [
interaction.fields.getTextInputValue("content"),
interaction.fields.getTextInputValue("content_2"),
interaction.fields.getTextInputValue("content_3"),
interaction.fields.getTextInputValue("content_4"),
].filter((part) => {
return part.length > 0;
}).join("\n\n");
const categoryValues = interaction.fields.getStringSelectValues("category");
const type = categoryValues[0] ?? "company";
const response = await fetch(
"https://hikari.nhcarrigan.com/api/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}\``,
});
}
};
+2 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { entitledGuilds, naomiId } from "../config/entitlements.js"; import { entitledGuilds, entitledUsers } from "../config/entitlements.js";
import type { Client, Guild, User } from "discord.js"; import type { Client, Guild, User } from "discord.js";
/** /**
@@ -17,7 +17,7 @@ const checkUserEntitlement = async(
hikari: Client, hikari: Client,
user: User, user: User,
): Promise<boolean> => { ): Promise<boolean> => {
if (user.id === naomiId) { if (entitledUsers.includes(user.id)) {
return true; return true;
} }
const entitlements = await hikari.application?.entitlements.fetch({ const entitlements = await hikari.application?.entitlements.fetch({
@@ -1,11 +1,11 @@
hr { hr {
width: 100%; width: 100%;
border: none; border: none;
border-top: 1px solid var(--border); border-top: 1px solid var(--foreground);
margin: 0; margin: 0;
} }
:host ::ng-deep ul { :host ::ng-deep ul{
list-style-type: disc; list-style-type: disc;
list-style-position: inside; list-style-position: inside;
} }
@@ -15,7 +15,6 @@ hr {
margin-bottom: 1em; margin-bottom: 1em;
width: 90%; width: 90%;
} }
.tag { .tag {
display: inline-block; display: inline-block;
padding: 0 0.5em; padding: 0 0.5em;
@@ -24,13 +23,13 @@ hr {
} }
.products { .products {
background-color: var(--witch-plum); background-color: #e0f7fa;
color: var(--witch-moon); color: #006064;
} }
.community { .community {
background-color: var(--witch-rose); background-color: #e8f5e9;
color: var(--witch-moon); color: #1b5e20;
} }
.date { .date {
+10 -7
View File
@@ -4,7 +4,7 @@ ul {
margin: 0; margin: 0;
} }
::ng-deep main { ::ng-deep main{
overflow: hidden !important; overflow: hidden !important;
max-width: 100%; max-width: 100%;
} }
@@ -53,22 +53,20 @@ ul {
justify-content: space-evenly; justify-content: space-evenly;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
gap: 10px;
margin-top: 1em;
} }
.btn { .btn {
display: inline-block; display: inline-block;
padding: 10px 20px; padding: 10px 20px;
background-color: var(--accent); background-color: var(--foreground);
color: var(--witch-moon); color: var(--background);
text-decoration: none; text-decoration: none;
border-radius: 50px; border-radius: 50px;
border: 2px solid var(--border); border: 2px solid white;
} }
.btn:hover { .btn:hover {
background-color: var(--highlight); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
transition: background-color 0.3s, color 0.3s; transition: background-color 0.3s, color 0.3s;
} }
@@ -93,6 +91,11 @@ ul {
100% { opacity: 1; } 100% { opacity: 1; }
} }
@keyframes background-color {
0% { background-color: var(--foreground); }
100% { background-color: var(--background); }
}
@media screen and (prefers-reduced-motion: reduce) { @media screen and (prefers-reduced-motion: reduce) {
* { * {
animation: none !important; animation: none !important;
+1 -2
View File
@@ -1,9 +1,8 @@
<h1>Hi there, I'm Hikari~!</h1> <h1>Hi there, I'm Hikari~!</h1>
<img <img
src="https://cdn.nhcarrigan.com/hikari.png" src="https://cdn.nhcarrigan.com/new-avatars/hikari-full.png"
alt="Hikari" alt="Hikari"
height="250" height="250"
style="display: block; margin: auto;"
/> />
<p id="one">How may I help you today?</p> <p id="one">How may I help you today?</p>
<p id="two">I can assist you with:</p> <p id="two">I can assist you with:</p>
+3 -4
View File
@@ -6,13 +6,11 @@ nav {
height: 40px; height: 40px;
color: var(--foreground); color: var(--foreground);
background-color: var(--background); background-color: var(--background);
border-bottom: 1px solid var(--border);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
z-index: 100;
} }
nav a:not(#logo) { nav a:not(#logo) {
@@ -36,7 +34,7 @@ img {
hr { hr {
width: 100%; width: 100%;
border: none; border: none;
border-top: 1px solid var(--border); border-top: 1px solid var(--foreground);
margin: 0; margin: 0;
} }
@@ -52,7 +50,7 @@ hr {
top: 40px; top: 40px;
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
border: 1px solid var(--border); border: 1px solid var(--foreground);
border-radius: 5px; border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
} }
@@ -61,6 +59,7 @@ hr {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: url('https://cdn.nhcarrigan.com/cursors/pointer.cur'), pointer;
text-decoration: none; text-decoration: none;
font-size: 2rem; font-size: 2rem;
} }
+1 -3
View File
@@ -15,9 +15,7 @@
<hr /> <hr />
<a routerLink="/settings" class="nav-link">Settings</a> <a routerLink="/settings" class="nav-link">Settings</a>
<hr /> <hr />
<a href="https://chat.nhcarrigan.com" target="_blank" class="nav-link">Chat</a> <a routerLink="/chat" class="nav-link">Chat</a>
<hr />
<a href="https://support.nhcarrigan.com" target="_blank" class="nav-link">Support</a>
<hr /> <hr />
</div> </div>
<i class="fa-solid fa-bars" *ngIf="!navOpen" (click)="toggleNav()"></i> <i class="fa-solid fa-bars" *ngIf="!navOpen" (click)="toggleNav()"></i>
+12 -20
View File
@@ -3,33 +3,33 @@ a.product {
} }
a.product:hover { a.product:hover {
background-color: var(--highlight); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
} }
.product:not(a) { .product:not(a) {
cursor: default; cursor: default;
border: 2px dashed var(--witch-silver); border: 2px dashed grey;
} }
.btn { .btn {
display: inline-block; display: inline-block;
padding: 10px 20px; padding: 10px 20px;
background-color: var(--accent); background-color: var(--foreground);
color: var(--witch-moon); color: var(--background);
text-decoration: none; text-decoration: none;
border-radius: 50px; border-radius: 50px;
border: 2px solid var(--border); border: 2px solid white;
font-family: 'OpenDyslexic', monospace;
} }
.btn:disabled { .btn:disabled {
background-color: var(--witch-plum); background-color: var(--background);
color: var(--witch-moon); color: var(--foreground);
opacity: 0.6;
} }
.btn:hover { .btn:hover {
background-color: var(--highlight); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
transition: background-color 0.3s, color 0.3s; transition: background-color 0.3s, color 0.3s;
} }
@@ -38,9 +38,9 @@ a.product:hover {
display: grid; display: grid;
grid-template-areas: "logo title icon" "logo description icon"; grid-template-areas: "logo title icon" "logo description icon";
grid-template-columns: 100px 1fr auto; grid-template-columns: 100px 1fr auto;
background-color: var(--witch-plum); background-color: var(--foreground);
color: var(--witch-moon); color: var(--background);
border: 2px solid var(--border); border: 2px solid white;
border-radius: 50px; border-radius: 50px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
@@ -49,14 +49,6 @@ a.product:hover {
align-items: center; align-items: center;
} }
.title {
color: var(--witch-moon);
}
.description {
color: var(--witch-moon);
}
.icons { .icons {
grid-area: icon; grid-area: icon;
font-size: 2rem; font-size: 2rem;
+1 -2
View File
@@ -1,9 +1,8 @@
<h1>Products</h1> <h1>Products</h1>
<img <img
src="https://cdn.nhcarrigan.com/hikari.png" src="https://cdn.nhcarrigan.com/new-avatars/hikari-thinking-full.png"
alt="Hikari" alt="Hikari"
height="250" height="250"
style="display: block; margin: auto;"
/> />
<p>Excellent! What sort of product are you looking for?</p> <p>Excellent! What sort of product are you looking for?</p>
<div class="row"> <div class="row">
+4 -5
View File
@@ -1,11 +1,11 @@
hr { hr {
width: 100%; width: 100%;
border: none; border: none;
border-top: 1px solid var(--border); border-top: 1px solid var(--foreground);
margin: 0; margin: 0;
} }
:host ::ng-deep ul { :host ::ng-deep ul{
list-style-type: disc; list-style-type: disc;
list-style-position: inside; list-style-position: inside;
} }
@@ -15,14 +15,13 @@ hr {
margin-bottom: 1em; margin-bottom: 1em;
width: 90%; width: 90%;
} }
.tag { .tag {
display: inline-block; display: inline-block;
padding: 0 0.5em; padding: 0 0.5em;
border-radius: 50px; border-radius: 50px;
font-size: 0.8em; font-size: 0.8em;
background-color: var(--witch-plum); background-color: #e0f7fa;
color: var(--witch-moon); color: #006064;
} }
.date { .date {
+3 -1
View File
@@ -32,7 +32,9 @@ export class Sanctions {
private async loadSanctions(): Promise<void> { private async loadSanctions(): Promise<void> {
const sanctions = await this.sanctionsService.getSanctions(); const sanctions = await this.sanctionsService.getSanctions();
this.sanctions = sanctions.sort((a, b) => { this.sanctions = sanctions.sort((a, b) => {
return b.number - a.number; return b.createdAt > a.createdAt
? 1
: -1;
}); });
} }
} }
+4 -4
View File
@@ -1,15 +1,15 @@
.btn { .btn {
display: inline-block; display: inline-block;
padding: 10px 20px; padding: 10px 20px;
background-color: var(--accent); background-color: var(--foreground);
color: var(--witch-moon); color: var(--background);
text-decoration: none; text-decoration: none;
border-radius: 50px; border-radius: 50px;
border: 2px solid var(--border); border: 2px solid white;
} }
.btn:hover { .btn:hover {
background-color: var(--highlight); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
transition: background-color 0.3s, color 0.3s; transition: background-color 0.3s, color 0.3s;
} }
+1 -2
View File
@@ -1,9 +1,8 @@
<h1>Oh dear~!</h1> <h1>Oh dear~!</h1>
<img <img
src="https://cdn.nhcarrigan.com/hikari.png" src="https://cdn.nhcarrigan.com/new-avatars/hikari-cry-full.png"
alt="Hikari" alt="Hikari"
height="250" height="250"
style="display: block; margin: auto;"
/> />
<p>You appear to have become lost!</p> <p>You appear to have become lost!</p>
<p> <p>
+6
View File
@@ -15,4 +15,10 @@
<app-root></app-root> <app-root></app-root>
</body> </body>
<script src="https://cdn.nhcarrigan.com/headers/index.js"></script> <script src="https://cdn.nhcarrigan.com/headers/index.js"></script>
<script>
const styleElement = document.getElementById("nhcarrigan-global-styles");
if (styleElement) {
styleElement.remove();
}
</script>
</html> </html>
+95 -5
View File
@@ -1,12 +1,102 @@
/* Account for the fixed navigation bar */ @font-face {
main { font-family: 'Vampyr';
margin-top: 50px; src: url('https://cdn.nhcarrigan.com/fonts/vampyr.ttf') format('truetype');
min-height: calc(100vh - 50px - 85px);
} }
:root {
--foreground: #8F2447;
--background: #E1F6F9DC;
}
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
html {
font-family: 'Vampyr', monospace;
cursor: url('https://cdn.nhcarrigan.com/cursors/cursor.cur'), auto;
min-height: 100vh;
min-width: 100vw;
}
body::before {
background: url(https://cdn.nhcarrigan.com/background.png);
background-size: cover;
background-position: center;
width: 100%;
height: 100%;
z-index: -1;
content: "";
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
opacity: 1;
pointer-events: none;
}
main {
color: var(--foreground);
background-color: var(--background);
text-align: center;
border-radius: 10px;
width: 100vw;
margin-bottom: 85px;
margin-top: 50px;
min-height: calc(100vh - 85px - 50px);
}
footer {
width: 100%;
color: var(--foreground);
background-color: var(--background);
position: fixed;
bottom: 0;
height: 75px;
padding: 0 10px;
}
#footer-inner-container {
display: flex;
align-items: center;
justify-content: space-between;
height: 75px;
}
#footer-badge-container {
display: grid;
grid-template-columns: repeat(8, 1fr);
align-items: center;
justify-content: space-around;
}
#audio-theme-button, #theme-select-button {
background: none;
border: none;
cursor: url('https://cdn.nhcarrigan.com/cursors/pointer.cur'), pointer;
color: var(--foreground);
}
a {
color: unset;
cursor: url('https://cdn.nhcarrigan.com/cursors/pointer.cur'), pointer;
}
.btn:not(:disabled) {
cursor: url('https://cdn.nhcarrigan.com/cursors/pointer.cur'), pointer;
}
#tree-nation-offset-website {
display: flex;
align-items: center;
}
.is-dark {
--foreground: #E1F6F9;
--background: #8F2447bb;
}
@media screen and (max-width: 625px) { @media screen and (max-width: 625px) {
#tree-nation-offset-website {
display: none;
}
footer, #footer-inner-container {
height: 50px;
justify-content: space-around;
}
main { main {
margin-bottom: 60px; margin-bottom: 60px;
min-height: calc(100vh - 50px - 60px);
} }
} }
+1 -1
View File
@@ -18,7 +18,7 @@
"@nhcarrigan/eslint-config": "5.2.0", "@nhcarrigan/eslint-config": "5.2.0",
"@nhcarrigan/typescript-config": "4.0.0", "@nhcarrigan/typescript-config": "4.0.0",
"eslint": "9.30.1", "eslint": "9.30.1",
"turbo": "2.8.12", "turbo": "2.8.10",
"typescript": "5.8.3" "typescript": "5.8.3"
} }
} }
+37 -37
View File
@@ -18,8 +18,8 @@ importers:
specifier: 9.30.1 specifier: 9.30.1
version: 9.30.1(jiti@2.4.2) version: 9.30.1(jiti@2.4.2)
turbo: turbo:
specifier: 2.8.12 specifier: 2.8.10
version: 2.8.12 version: 2.8.10
typescript: typescript:
specifier: 5.8.3 specifier: 5.8.3
version: 5.8.3 version: 5.8.3
@@ -31,13 +31,13 @@ importers:
version: 0.56.0 version: 0.56.0
'@nhcarrigan/discord-analytics': '@nhcarrigan/discord-analytics':
specifier: 0.0.6 specifier: 0.0.6
version: 0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.25.1) version: 0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.21.0)
'@nhcarrigan/logger': '@nhcarrigan/logger':
specifier: 1.1.1 specifier: 1.1.1
version: 1.1.1 version: 1.1.1
discord.js: discord.js:
specifier: 14.25.1 specifier: 14.21.0
version: 14.25.1 version: 14.21.0
fastify: fastify:
specifier: 5.4.0 specifier: 5.4.0
version: 5.4.0 version: 5.4.0
@@ -2497,8 +2497,8 @@ packages:
discord-api-types@0.38.40: discord-api-types@0.38.40:
resolution: {integrity: sha512-P/His8cotqZgQqrt+hzrocp9L8RhQQz1GkrCnC9TMJ8Uw2q0tg8YyqJyGULxhXn/8kxHETN4IppmOv+P2m82lQ==} resolution: {integrity: sha512-P/His8cotqZgQqrt+hzrocp9L8RhQQz1GkrCnC9TMJ8Uw2q0tg8YyqJyGULxhXn/8kxHETN4IppmOv+P2m82lQ==}
discord.js@14.25.1: discord.js@14.21.0:
resolution: {integrity: sha512-2l0gsPOLPs5t6GFZfQZKnL1OJNYFcuC/ETWsW4VtKVD/tg4ICa9x+jb9bkPffkMdRpRpuUaO/fKkHCBeiCKh8g==} resolution: {integrity: sha512-U5w41cEmcnSfwKYlLv5RJjB8Joa+QJyRwIJz5i/eg+v2Qvv6EYpCRhN9I2Rlf0900LuqSDg8edakUATrDZQncQ==}
engines: {node: '>=18'} engines: {node: '>=18'}
doctrine@2.1.0: doctrine@2.1.0:
@@ -4618,38 +4618,38 @@ packages:
resolution: {integrity: sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==} resolution: {integrity: sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==}
engines: {node: ^18.17.0 || >=20.5.0} engines: {node: ^18.17.0 || >=20.5.0}
turbo-darwin-64@2.8.12: turbo-darwin-64@2.8.10:
resolution: {integrity: sha512-EiHJmW2MeQQx+21x8hjMHw/uPhXt9PIxvDrxzOtyVwrXzL0tQmsxtO4qHf2l7uA+K6PUJ4+TjY1MHZDuCvWXrw==} resolution: {integrity: sha512-A03fXh+B7S8mL3PbdhTd+0UsaGrhfyPkODvzBDpKRY7bbeac4MDFpJ7I+Slf2oSkCEeSvHKR7Z4U71uKRUfX7g==}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
turbo-darwin-arm64@2.8.12: turbo-darwin-arm64@2.8.10:
resolution: {integrity: sha512-cbqqGN0vd7ly2TeuaM8k9AK9u1CABO4kBA5KPSqovTiLL3sORccn/mZzJSbvQf0EsYRfU34MgW5FotfwW3kx8Q==} resolution: {integrity: sha512-sidzowgWL3s5xCHLeqwC9M3s9M0i16W1nuQF3Mc7fPHpZ+YPohvcbVFBB2uoRRHYZg6yBnwD4gyUHKTeXfwtXA==}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
turbo-linux-64@2.8.12: turbo-linux-64@2.8.10:
resolution: {integrity: sha512-jXKw9j4r4q6s0goSXuKI3aKbQK2qiNeP25lGGEnq018TM6SWRW1CCpPMxyG91aCKrub7wDm/K45sGNT4ZFBcFQ==} resolution: {integrity: sha512-YK9vcpL3TVtqonB021XwgaQhY9hJJbKKUhLv16osxV0HkcQASQWUqR56yMge7puh6nxU67rQlTq1b7ksR1T3KA==}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
turbo-linux-arm64@2.8.12: turbo-linux-arm64@2.8.10:
resolution: {integrity: sha512-BRJCMdyXjyBoL0GYpvj9d2WNfMHwc3tKmJG5ATn2Efvil9LsiOsd/93/NxDqW0jACtHFNVOPnd/CBwXRPiRbwA==} resolution: {integrity: sha512-3+j2tL0sG95iBJTm+6J8/45JsETQABPqtFyYjVjBbi6eVGdtNTiBmHNKrbvXRlQ3ZbUG75bKLaSSDHSEEN+btQ==}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
turbo-windows-64@2.8.12: turbo-windows-64@2.8.10:
resolution: {integrity: sha512-vyFOlpFFzQFkikvSVhVkESEfzIopgs2J7J1rYvtSwSHQ4zmHxkC95Q8Kjkus8gg+8X2mZyP1GS5jirmaypGiPw==} resolution: {integrity: sha512-hdeF5qmVY/NFgiucf8FW0CWJWtyT2QPm5mIsX0W1DXAVzqKVXGq+Zf+dg4EUngAFKjDzoBeN6ec2Fhajwfztkw==}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
turbo-windows-arm64@2.8.12: turbo-windows-arm64@2.8.10:
resolution: {integrity: sha512-9nRnlw5DF0LkJClkIws1evaIF36dmmMEO84J5Uj4oQ8C0QTHwlH7DNe5Kq2Jdmu8GXESCNDNuUYG8Cx6W/vm3g==} resolution: {integrity: sha512-QGdr/Q8LWmj+ITMkSvfiz2glf0d7JG0oXVzGL3jxkGqiBI1zXFj20oqVY0qWi+112LO9SVrYdpHS0E/oGFrMbQ==}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
turbo@2.8.12: turbo@2.8.10:
resolution: {integrity: sha512-auUAMLmi0eJhxDhQrxzvuhfEbICnVt0CTiYQYY8WyRJ5nwCDZxD0JG8bCSxT4nusI2CwJzmZAay5BfF6LmK7Hw==} resolution: {integrity: sha512-OxbzDES66+x7nnKGg2MwBA1ypVsZoDTLHpeaP4giyiHSixbsiTaMyeJqbEyvBdp5Cm28fc+8GG6RdQtic0ijwQ==}
hasBin: true hasBin: true
twitter-api-v2@1.28.0: twitter-api-v2@1.28.0:
@@ -6029,10 +6029,10 @@ snapshots:
'@napi-rs/nice-win32-x64-msvc': 1.1.1 '@napi-rs/nice-win32-x64-msvc': 1.1.1
optional: true optional: true
'@nhcarrigan/discord-analytics@0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.25.1)': '@nhcarrigan/discord-analytics@0.0.6(@nhcarrigan/logger@1.1.1)(discord.js@14.21.0)':
dependencies: dependencies:
'@nhcarrigan/logger': 1.1.1 '@nhcarrigan/logger': 1.1.1
discord.js: 14.25.1 discord.js: 14.21.0
node-schedule: 2.1.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))': '@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-api-types@0.38.40: {}
discord.js@14.25.1: discord.js@14.21.0:
dependencies: dependencies:
'@discordjs/builders': 1.13.1 '@discordjs/builders': 1.13.1
'@discordjs/collection': 1.5.3 '@discordjs/collection': 1.5.3
@@ -10192,32 +10192,32 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
turbo-darwin-64@2.8.12: turbo-darwin-64@2.8.10:
optional: true optional: true
turbo-darwin-arm64@2.8.12: turbo-darwin-arm64@2.8.10:
optional: true optional: true
turbo-linux-64@2.8.12: turbo-linux-64@2.8.10:
optional: true optional: true
turbo-linux-arm64@2.8.12: turbo-linux-arm64@2.8.10:
optional: true optional: true
turbo-windows-64@2.8.12: turbo-windows-64@2.8.10:
optional: true optional: true
turbo-windows-arm64@2.8.12: turbo-windows-arm64@2.8.10:
optional: true optional: true
turbo@2.8.12: turbo@2.8.10:
optionalDependencies: optionalDependencies:
turbo-darwin-64: 2.8.12 turbo-darwin-64: 2.8.10
turbo-darwin-arm64: 2.8.12 turbo-darwin-arm64: 2.8.10
turbo-linux-64: 2.8.12 turbo-linux-64: 2.8.10
turbo-linux-arm64: 2.8.12 turbo-linux-arm64: 2.8.10
turbo-windows-64: 2.8.12 turbo-windows-64: 2.8.10
turbo-windows-arm64: 2.8.12 turbo-windows-arm64: 2.8.10
twitter-api-v2@1.28.0: {} twitter-api-v2@1.28.0: {}
+6 -6
View File
@@ -24,7 +24,7 @@ Platform-specific requirements:
- Include clear calls to action - Include clear calls to action
- The same content will be used for Discord, Reddit, Ko-fi, and Patreon, so make it work well for all these platforms - The same content will be used for Discord, Reddit, Ko-fi, and Patreon, so make it work well for all these platforms
**Threaded (for Twitter, Bluesky, and Mastodon):** **Threaded (for Threads, Twitter, Bluesky, and Mastodon):**
- Break content into a thread of individual posts - Break content into a thread of individual posts
- Each post should be under 280 characters (to work for Twitter's limit, which is the most restrictive) - Each post should be under 280 characters (to work for Twitter's limit, which is the most restrictive)
- Posts should flow naturally from one to the next - Posts should flow naturally from one to the next
@@ -32,14 +32,14 @@ Platform-specific requirements:
- Make the first post compelling to encourage thread reading - Make the first post compelling to encourage thread reading
- Do NOT include post numbers or thread indicators (e.g., "1/5" or "đź§µ") - Do NOT include post numbers or thread indicators (e.g., "1/5" or "đź§µ")
- Plain text format (no markdown) - Plain text format (no markdown)
- The same thread will be used for Twitter, Bluesky, and Mastodon - The same thread will be used for Threads, Twitter, Bluesky, and Mastodon
**Plaintext (for LinkedIn and Facebook):** **Plaintext (for LinkedIn, Facebook, and Peerlist):**
- Plain text format (no markdown) - Plain text format (no markdown)
- Professional yet friendly tone, conversational style suitable for a broader audience - Professional yet friendly tone, conversational style suitable for a broader audience
- Include 3-5 relevant hashtags - Include 3-5 relevant hashtags
- Keep it concise but informative - Keep it concise but informative
- The same content will be used for LinkedIn and Facebook - The same content will be used for LinkedIn, Facebook, and Peerlist
**Universal requirements:** **Universal requirements:**
- All announcements must include a call to action to donate (https://donate.nhcarrigan.com) - All announcements must include a call to action to donate (https://donate.nhcarrigan.com)
@@ -71,13 +71,13 @@ const announcementJsonSchema = {
type: "object", type: "object",
}, },
plaintext: { plaintext: {
description: "Plain text announcement for LinkedIn and Facebook (shared content). Should be professional yet friendly, conversational style suitable for a broader audience. Include 3-5 relevant hashtags and calls to action for donating and joining Discord.", description: "Plain text announcement for LinkedIn, Facebook, and Peerlist (shared content). Should be professional yet friendly, conversational style suitable for a broader audience. Include 3-5 relevant hashtags and calls to action for donating and joining Discord.",
maxLength: 1900, maxLength: 1900,
minLength: 100, minLength: 100,
type: "string", type: "string",
}, },
threaded: { threaded: {
description: "Array of individual posts that form a thread. Will be used for Twitter, Bluesky, and Mastodon. Each post should be under 280 characters (Twitter's limit) and flow naturally from one to the next.", description: "Array of individual posts that form a thread. Will be used for Threads, Twitter, Bluesky, and Mastodon. Each post should be under 280 characters (Twitter's limit) and flow naturally from one to the next.",
items: { items: {
description: "A single post in the thread (max 280 characters, no post numbers or thread indicators)", description: "A single post in the thread (max 280 characters, no post numbers or thread indicators)",
maxLength: 280, maxLength: 280,
+5 -2
View File
@@ -12,6 +12,7 @@ import { announceOnDiscourse } from "../modules/announceOnDiscourse.js";
import { announceOnFacebook } from "../modules/announceOnFacebook.js"; import { announceOnFacebook } from "../modules/announceOnFacebook.js";
import { announceOnMastodon } from "../modules/announceOnMastodon.js"; import { announceOnMastodon } from "../modules/announceOnMastodon.js";
import { announceOnReddit } from "../modules/announceOnReddit.js"; import { announceOnReddit } from "../modules/announceOnReddit.js";
import { announceOnThreads } from "../modules/announceOnThreads.js";
import { announceOnTwitter } from "../modules/announceOnTwitter.js"; import { announceOnTwitter } from "../modules/announceOnTwitter.js";
import { generateAnnouncements } from "../modules/generateAnnouncements.js"; import { generateAnnouncements } from "../modules/generateAnnouncements.js";
import { getIpFromRequest } from "../modules/getIpFromRequest.js"; import { getIpFromRequest } from "../modules/getIpFromRequest.js";
@@ -115,6 +116,7 @@ export const announcementRoutes: FastifyPluginAsync = async(server) => {
blueskyResult, blueskyResult,
twitterResult, twitterResult,
facebookResult, facebookResult,
threadsResult,
mastodonResult, mastodonResult,
discourseResult, discourseResult,
] = await Promise.allSettled([ ] = await Promise.allSettled([
@@ -123,14 +125,15 @@ export const announcementRoutes: FastifyPluginAsync = async(server) => {
announceOnBluesky(threaded), announceOnBluesky(threaded),
announceOnTwitter(threaded), announceOnTwitter(threaded),
announceOnFacebook(plaintext), announceOnFacebook(plaintext),
announceOnThreads(threaded),
announceOnMastodon(threaded), announceOnMastodon(threaded),
announceOnDiscourse(markdownTitle, markdownContent, type), announceOnDiscourse(markdownTitle, markdownContent, type),
]); ]);
return await reply.status(201).send({ return await reply.status(201).send({
alert: `Please remember to manually post to: LinkedIn, Ko-fi, and Patreon.`, alert: `Please remember to manually post to: LinkedIn, Peerlist, Ko-fi, and Patreon.`,
cost: announcement.cost, cost: announcement.cost,
message: `Announcement processed. Discord: ${getPlatformResult(discordResult)}, Reddit: ${getPlatformResult(redditResult)}, Bluesky: ${getPlatformResult(blueskyResult)}, Twitter: ${getPlatformResult(twitterResult)}, Facebook: ${getPlatformResult(facebookResult)}, Mastodon: ${getPlatformResult(mastodonResult)}, Discourse: ${getPlatformResult(discourseResult)}`, message: `Announcement processed. Discord: ${getPlatformResult(discordResult)}, Reddit: ${getPlatformResult(redditResult)}, Bluesky: ${getPlatformResult(blueskyResult)}, Twitter: ${getPlatformResult(twitterResult)}, Facebook: ${getPlatformResult(facebookResult)}, Threads: ${getPlatformResult(threadsResult)}, Mastodon: ${getPlatformResult(mastodonResult)}, Discourse: ${getPlatformResult(discourseResult)}`,
rawPost: announcement.response, rawPost: announcement.response,
}); });
}, },