fix(msteams): connect DM quotes and mention order

giodl73-repo · giodl73-repo · commit 88316f50861e · 2026-07-25T16:54:40.000-07:00
diff --git a/extensions/msteams/src/inbound.test.ts b/extensions/msteams/src/inbound.test.ts
@@ -112,7 +112,7 @@ describe("msteams inbound", () => {
     it("matches duplicate rendered mention tags by entity occurrence", () => {
       expect(
         buildMSTeamsNormalizedText({
-          text: "<at>Bot</at> <at>Bot</at> please check this",
+          text: '<at id="0">Bot</at> <at>Bot</at> please check this',
           botId: "bot-id",
           botName: "Bot",
           entities: [
diff --git a/extensions/msteams/src/inbound.ts b/extensions/msteams/src/inbound.ts
@@ -194,7 +194,7 @@ function normalizeMSTeamsMentionTags(
   botId?: string | null,
   botName?: string | null,
 ): string {
-  const mentionsByTag = new Map<string, Array<{ id?: string; name: string }>>();
+  const mentions: Array<{ id?: string; name: string }> = [];
   const botMentionNames = new Set<string>();
   for (const entity of entities) {
     if (
@@ -208,15 +208,13 @@ function normalizeMSTeamsMentionTags(
     if (mentionedId && botId && mentionedId === botId) {
       botMentionNames.add(entity.mentioned.name.trim());
     }
-    const mentions = mentionsByTag.get(entity.text) ?? [];
     mentions.push({
       id: mentionedId,
       name: entity.mentioned.name,
     });
-    mentionsByTag.set(entity.text, mentions);
   }
   return text.replace(/<at\b[^>]*>.*?<\/at>/gis, (tag) => {
-    const mention = mentionsByTag.get(tag)?.shift();
+    const mention = mentions.shift();
     if (mention?.id && botId && mention.id === botId) {
       return "";
     }
diff --git a/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts b/extensions/msteams/src/monitor-handler/message-handler.authz.test.ts
@@ -1543,7 +1543,7 @@ describe("msteams monitor handler authz", () => {
         id: "dm-quote-1",
         text: "what about this?",
         from: { id: "user-id", aadObjectId: "user-aad", name: "User" },
-        conversation: { id: "19:dm@thread.v2", conversationType: "personal" },
+        conversation: { id: "a:dm-conversation", conversationType: "personal" },
         attachments: [
           {
             contentType: "text/html",
@@ -1559,7 +1559,7 @@ describe("msteams monitor handler authz", () => {
     expect(deps.tokenProvider.getAccessToken).toHaveBeenCalledWith("https://graph.microsoft.com");
     expect(graphThreadMockState.fetchChatMessageText).toHaveBeenCalledWith(
       "token",
-      "19:dm@thread.v2",
+      "19:user-aad_test-app@unq.gbl.spaces",
       "message-1",
       expect.objectContaining({
         label: "MS Teams inbound preprocessing",
diff --git a/extensions/msteams/src/monitor-handler/message-handler.ts b/extensions/msteams/src/monitor-handler/message-handler.ts
@@ -48,6 +48,7 @@ import {
   extractMSTeamsQuoteInfo,
   normalizeMSTeamsConversationId,
   parseMSTeamsActivityTimestamp,
+  translateMSTeamsDmConversationIdForGraph,
   wasMSTeamsBotMentioned,
 } from "../inbound.js";
 import { createMSTeamsInboundDeadline, withMSTeamsRequestDeadline } from "../request-timeout.js";
@@ -663,7 +664,13 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
     // and channel quotes retain their visibility-filtered preview.
     let quoteBodyFull: string | undefined;
     const quoteMessageId = quoteInfo?.id;
-    if (quoteMessageId && isDirectMessage && conversationId.startsWith("19:")) {
+    const graphConversationId = translateMSTeamsDmConversationIdForGraph({
+      isDirectMessage,
+      conversationId,
+      aadObjectId,
+      appId,
+    });
+    if (quoteMessageId && isDirectMessage && graphConversationId.startsWith("19:")) {
       try {
         const graphToken = await withMSTeamsRequestDeadline({
           deadline: preprocessingDeadline,
@@ -674,7 +681,12 @@ export function createMSTeamsMessageHandler(deps: MSTeamsMessageHandlerDeps) {
           deadline: preprocessingDeadline,
           label: "MS Teams quote lookup",
           work: () =>
-            fetchChatMessageText(graphToken, conversationId, quoteMessageId, preprocessingDeadline),
+            fetchChatMessageText(
+              graphToken,
+              graphConversationId,
+              quoteMessageId,
+              preprocessingDeadline,
+            ),
         });
       } catch (err) {
         log.debug?.("failed to fetch full quoted message text", {
