fix(bot): update embeds after flag edits

apps/bot/src/commands/embed.ts

@@ -71,7 +71,7 @@ export class EmbedCommand extends Command {
     await handleUrls(
       extractURLs(msg.content).map(({ url }) => ({ url })),
       interaction,
-      "context_menu",
+      { source: "context_menu" },
     );
   }
 
@@ -88,7 +88,7 @@ export class EmbedCommand extends Command {
         force: interaction.options.getBoolean("force") ?? false,
       })),
       interaction,
-      "command",
+      { source: "command" },
     );
   }
 }

apps/bot/src/lib/handleUrls.ts

@@ -25,6 +25,7 @@ import {
   recordError,
   span,
 } from "./observability";
+import { extractURLs } from "./utils";
 
 type EmbedSource = "message" | "command" | "context_menu";
 type EmbedInteraction = Command.ChatInputCommandInteraction | Command.ContextMenuCommandInteraction;
@@ -56,6 +57,51 @@ export interface EmbedURLRequest {
   force?: boolean;
 }
 
+interface HandleUrlsOptions {
+  source?: EmbedSource;
+  updateTargets?: ReadonlyMap<number, string>;
+}
+
+export function parseMessageURLs(content: string) {
+  const urls: EmbedURLRequest[] = [];
+  let suppressNativeEmbeds = true;
+
+  for (const match of extractURLs(content)) {
+    const before = content.slice(0, match.index);
+    const after = content.slice(match.endIndex);
+
+    if (before.endsWith("<") && after.startsWith(">")) continue;
+
+    if (before.endsWith("~")) {
+      suppressNativeEmbeds = false;
+      continue;
+    }
+
+    const flags: Partial<EmbedFlags> = {
+      Spoiler: before.split("||").length % 2 === 0,
+    };
+    let force = false;
+
+    if (before.endsWith("?@")) {
+      flags.SourceOnly = true;
+      force = true;
+    } else if (before.endsWith("?!")) {
+      flags.MediaOnly = true;
+      force = true;
+    } else if (before.endsWith("@")) {
+      flags.SourceOnly = true;
+    } else if (before.endsWith("!")) {
+      flags.MediaOnly = true;
+    } else if (before.endsWith("?")) {
+      force = true;
+    }
+
+    urls.push({ url: match.url, flags, force });
+  }
+
+  return { urls, suppressNativeEmbeds };
+}
+
 function canReactToMessage(msg: Message) {
   if (!msg.channel) return false;
   if (!msg.inGuild()) return true;
@@ -69,7 +115,7 @@ function canReactToMessage(msg: Message) {
 export async function handleUrls(
   urls: EmbedURLRequest[],
   interactionOrMessage: EmbedInteraction | Message,
-  source?: EmbedSource,
+  options: HandleUrlsOptions = {},
 ) {
   let msg: Message | null = null;
   let interaction: EmbedInteraction | null = null;
@@ -80,7 +126,7 @@ export async function handleUrls(
     interaction = interactionOrMessage;
   }
 
-  const embedSource = source ?? (msg ? "message" : "command");
+  const embedSource = options.source ?? (msg ? "message" : "command");
   let sentEmbed = false;
   let sentFailureReaction = false;
   const reactToFailure = async () => {
@@ -142,15 +188,16 @@ export async function handleUrls(
       };
   const matches = (
     await Promise.all(
-      urls.map(async (request, index) => {
+      urls.map(async (request, requestIndex) => {
+        if (options.updateTargets && !options.updateTargets.has(requestIndex)) return null;
         try {
           const match = await matchURL(request.url);
-          return match ? { ...request, ...match } : null;
+          return match ? { ...request, ...match, requestIndex } : null;
         } catch (error) {
           matchFailures++;
           const requestId = msg
-            ? `message:${msg.id}:match:${index}`
-            : `${embedSource}:${interaction!.id}:match:${index}`;
+            ? `message:${msg.id}:match:${requestIndex}`
+            : `${embedSource}:${interaction!.id}:match:${requestIndex}`;
           container.logger.warn(
             formatLog("warn", EmbedlyErrors.ApiUnexpectedResponse, {
               request_id: requestId,
@@ -164,7 +211,11 @@ export async function handleUrls(
         }
       }),
     )
-  ).filter((m) => m !== null);
+  ).filter((match) => match !== null);
+
+  if (msg && options.updateTargets && matches.length !== options.updateTargets.size) {
+    await reactToFailure();
+  }
 
   if (interaction && matches.length === 0) {
     const requestId = `${embedSource}:${interaction.id}`;
@@ -186,15 +237,19 @@ export async function handleUrls(
     return sentEmbed;
   }
 
-  for (const [i, { platform, id, flags, force }] of matches.entries()) {
+  for (const [i, { platform, id, flags, force, requestIndex }] of matches.entries()) {
     const startedAt = Date.now();
-    const requestId = msg ? `message:${msg.id}:${i}` : `${embedSource}:${interaction!.id}:${i}`;
+    const requestId = msg
+      ? `message:${msg.id}:${requestIndex}`
+      : `${embedSource}:${interaction!.id}:${requestIndex}`;
+    const targetBotMessageId = options.updateTargets?.get(requestIndex);
     const logContext: EmbedLogContext = {
       request_id: requestId,
       source: embedSource,
       platform,
       post_id: id,
       force: force ?? false,
+      operation: targetBotMessageId ? "update" : "create",
       outcome: "success",
       status_code: 200,
       ...(msg
@@ -353,20 +408,28 @@ export async function handleUrls(
           let botMessage: Message;
           try {
             botMessage = await span(
-              "discord.send",
+              targetBotMessageId ? "discord.edit" : "discord.send",
               {
                 ...spanAttributes,
                 "discord.guild_id": String(logContext.guild_id),
                 "discord.channel_id": String(logContext.channel_id),
               },
               async (sendSpan) => {
-                const message = msg
-                  ? i > 0 && msg.channel.isSendable()
-                    ? await msg.channel.send(response)
-                    : await msg.reply(response)
-                  : i === 0
-                    ? await interaction!.editReply(response)
-                    : await interaction!.followUp(response);
+                let message: Message;
+                if (msg && targetBotMessageId) {
+                  message = await msg.channel.messages.fetch(targetBotMessageId);
+                  await message.edit(response);
+                } else if (msg) {
+                  message =
+                    i > 0 && msg.channel.isSendable()
+                      ? await msg.channel.send(response)
+                      : await msg.reply(response);
+                } else {
+                  message =
+                    i === 0
+                      ? await interaction!.editReply(response)
+                      : await interaction!.followUp(response);
+                }
                 sendSpan.setAttribute("discord.bot_message_id", message.id);
                 return message;
               },
@@ -392,10 +455,10 @@ export async function handleUrls(
           }
 
           logContext.bot_message_id = botMessage.id;
-          botEmbedsCreated.add(1, metricContext);
+          if (!targetBotMessageId) botEmbedsCreated.add(1, metricContext);
           sentEmbed = true;
 
-          if (msg) {
+          if (msg && !targetBotMessageId) {
             try {
               await span(
                 "message_cache.save",
@@ -405,7 +468,12 @@ export async function handleUrls(
                   "discord.bot_message_id": botMessage.id,
                 },
                 async () => {
-                  await container.messageCache.save(msg.id, botMessage.id, msg.author.id);
+                  await container.messageCache.save(
+                    msg.id,
+                    botMessage.id,
+                    msg.author.id,
+                    requestIndex,
+                  );
                 },
               );
             } catch (error) {

apps/bot/src/lib/messageCache.ts

@@ -6,6 +6,7 @@ const CACHE_URL = process.env.CACHE_URL ?? "redis://localhost:6379";
 
 interface SourceMessageCache {
   botMessageIds: string[];
+  botMessageIndexes?: Record<string, number | undefined>;
 }
 
 export class MessageCache {
@@ -24,20 +25,29 @@ export class MessageCache {
     return new MessageCache(client);
   }
 
-  public async save(sourceMessageId: string, botMessageId: string, authorId: string) {
+  public async save(
+    sourceMessageId: string,
+    botMessageId: string,
+    authorId: string,
+    requestIndex: number,
+  ) {
     const messageKey = this.getSourceMessageKey(sourceMessageId);
     const authorKey = this.getBotMessageAuthorKey(botMessageId);
     const sourceKey = this.getBotMessageSourceKey(botMessageId);
     const existing = await this.getSourceMessage(sourceMessageId);
     const botMessageIds = existing?.botMessageIds ?? [];
+    const botMessageIndexes = existing?.botMessageIndexes ?? {};
 
     if (!botMessageIds.includes(botMessageId)) {
       botMessageIds.push(botMessageId);
     }
+    botMessageIndexes[botMessageId] = requestIndex;
 
     await this.client
       .multi()
-      .set(messageKey, JSON.stringify({ botMessageIds }), { EX: MESSAGE_CACHE_TTL_SECONDS })
+      .set(messageKey, JSON.stringify({ botMessageIds, botMessageIndexes }), {
+        EX: MESSAGE_CACHE_TTL_SECONDS,
+      })
       .set(authorKey, authorId, { EX: MESSAGE_CACHE_TTL_SECONDS })
       .set(sourceKey, sourceMessageId, { EX: MESSAGE_CACHE_TTL_SECONDS })
       .exec();
@@ -61,14 +71,16 @@ export class MessageCache {
 
     const sourceMessage = await this.getSourceMessage(sourceMessageId);
     const botMessageIds = sourceMessage?.botMessageIds.filter((id) => id !== botMessageId) ?? [];
+    const botMessageIndexes = sourceMessage?.botMessageIndexes ?? {};
+    delete botMessageIndexes[botMessageId];
     const transaction = this.client.multi().del(keys);
 
     if (botMessageIds.length === 0) {
       transaction.del(this.getSourceMessageKey(sourceMessageId));
     } else {
       transaction.set(
         this.getSourceMessageKey(sourceMessageId),
-        JSON.stringify({ botMessageIds }),
+        JSON.stringify({ botMessageIds, botMessageIndexes }),
         {
           EX: MESSAGE_CACHE_TTL_SECONDS,
         },
@@ -83,6 +95,27 @@ export class MessageCache {
     return sourceMessage?.botMessageIds ?? [];
   }
 
+  public async getBotMessages(sourceMessageId: string) {
+    const sourceMessage = await this.getSourceMessage(sourceMessageId);
+    if (!sourceMessage) return [];
+
+    return sourceMessage.botMessageIds.map((id) => ({
+      id,
+      requestIndex: sourceMessage.botMessageIndexes?.[id],
+    }));
+  }
+
+  public async clearBotMessageIndexes(sourceMessageId: string) {
+    const sourceMessage = await this.getSourceMessage(sourceMessageId);
+    if (!sourceMessage) return;
+
+    await this.client.set(
+      this.getSourceMessageKey(sourceMessageId),
+      JSON.stringify({ botMessageIds: sourceMessage.botMessageIds }),
+      { KEEPTTL: true, XX: true },
+    );
+  }
+
   public async close() {
     await this.client.close();
   }
@@ -101,8 +134,24 @@ export class MessageCache {
     ) {
       throw new Error("Invalid source message cache entry");
     }
+    const botMessageIndexes: SourceMessageCache["botMessageIndexes"] = {};
+    if ("botMessageIndexes" in parsed && parsed.botMessageIndexes !== undefined) {
+      if (
+        !parsed.botMessageIndexes ||
+        typeof parsed.botMessageIndexes !== "object" ||
+        Array.isArray(parsed.botMessageIndexes)
+      ) {
+        throw new Error("Invalid bot message indexes");
+      }
+      for (const [id, index] of Object.entries(parsed.botMessageIndexes)) {
+        if (typeof index !== "number" || !Number.isSafeInteger(index) || index < 0) {
+          throw new Error("Invalid bot message index");
+        }
+        botMessageIndexes[id] = index;
+      }
+    }
     /* oxlint-enable anti-slop/no-runtime-typeof */
-    return { botMessageIds: parsed.botMessageIds };
+    return { botMessageIds: parsed.botMessageIds, botMessageIndexes };
   }
 
   private getSourceMessageKey(messageId: string) {

apps/bot/src/lib/utils.ts

@@ -10,10 +10,11 @@ export interface URLMatch {
 export function extractURLs(content: string): URLMatch[] {
   return [...content.matchAll(URL_RE)].map((match) => {
     const index = match.index ?? 0;
+    const url = match[0].endsWith("||") ? match[0].slice(0, -2) : match[0];
     return {
-      url: match[0],
+      url,
       index,
-      endIndex: index + match[0].length,
+      endIndex: index + url.length,
     };
   });
 }

apps/bot/src/listeners/messageCreate.ts

@@ -1,49 +1,7 @@
 import { Events, Listener } from "@sapphire/framework";
 import { MessageFlags, type Message } from "discord.js";
 
-import type { EmbedFlags } from "../lib/builder";
-import { handleUrls, type EmbedURLRequest } from "../lib/handleUrls";
-import { extractURLs } from "../lib/utils";
-
-function parseMessageURLs(content: string) {
-  const urls: EmbedURLRequest[] = [];
-  let suppressNativeEmbeds = true;
-
-  for (const match of extractURLs(content)) {
-    const before = content.slice(0, match.index);
-    const after = content.slice(match.endIndex);
-
-    if (before.endsWith("<") && after.startsWith(">")) continue;
-
-    if (before.endsWith("~")) {
-      suppressNativeEmbeds = false;
-      continue;
-    }
-
-    const flags: Partial<EmbedFlags> = {
-      Spoiler: content.slice(0, match.index).split("||").length % 2 === 0,
-    };
-    let force = false;
-
-    if (before.endsWith("?@")) {
-      flags.SourceOnly = true;
-      force = true;
-    } else if (before.endsWith("?!")) {
-      flags.MediaOnly = true;
-      force = true;
-    } else if (before.endsWith("@")) {
-      flags.SourceOnly = true;
-    } else if (before.endsWith("!")) {
-      flags.MediaOnly = true;
-    } else if (before.endsWith("?")) {
-      force = true;
-    }
-
-    urls.push({ url: match.url, flags, force });
-  }
-
-  return { urls, suppressNativeEmbeds };
-}
+import { handleUrls, parseMessageURLs } from "../lib/handleUrls";
 
 export class MessageCreateListener extends Listener<typeof Events.MessageCreate> {
   public constructor(context: Listener.LoaderContext, options: Listener.Options) {