@soimy/dingtalk 3.6.10 → 3.7.0

package/src/{message-utils.ts → messaging/message-utils.ts}

@@ -4,7 +4,7 @@ import type {
   MessageContent,
   QuotedInfo,
   SendMessageOptions,
-} from "./types";
+} from "../platform/types";
 
 interface DingTalkDocMeta {
   spaceId: string;
@@ -106,6 +106,35 @@ function extractRichTextQuoteParts(
   };
 }
 
+function extractCardContentText(cardContent: unknown): string | undefined {
+  if (!Array.isArray(cardContent)) {
+    return undefined;
+  }
+  const collected: string[] = [];
+  const walk = (nodes: unknown): void => {
+    if (!Array.isArray(nodes)) {
+      return;
+    }
+    for (const node of nodes) {
+      if (node === null || typeof node !== "object" || Array.isArray(node)) {
+        continue;
+      }
+      const element = node as { elementType?: unknown; value?: unknown; children?: unknown };
+      if (element.elementType === "TEXT" && typeof element.value === "string") {
+        collected.push(element.value);
+      }
+      walk(element.children);
+    }
+  };
+  walk(cardContent);
+  const text = collected
+    .map((segment) => segment.trim())
+    .filter(Boolean)
+    .join("\n")
+    .trim();
+  return text.length > 0 ? text : undefined;
+}
+
 function extractAtMentionsFromText(text: string): AtMention[] {
   const mentions: AtMention[] = [];
   const matches = text.matchAll(/(?<!\w)@([^\s@.]+)(?!\.\w)/g);
@@ -321,7 +350,9 @@ function buildRepliedMessagePreview(params: {
         cardCreatedAt: repliedMsg.createdAt,
         processQueryKey: trimString(data.originalProcessQueryKey),
         previewText:
-          trimString(content?.text) || buildQuotedMessageTypePlaceholder("interactiveCard"),
+          trimString(content?.text) ||
+          extractCardContentText(content?.cardContent) ||
+          buildQuotedMessageTypePlaceholder("interactiveCard"),
         previewMessageType: "interactiveCard",
         previewSenderId: trimString(repliedMsg.senderId),
       };
@@ -332,6 +363,7 @@ function buildRepliedMessagePreview(params: {
       fileCreatedAt: repliedMsg.createdAt,
       previewText:
         trimString(content?.text) ||
+        extractCardContentText(content?.cardContent) ||
         buildQuotedMessageTypePlaceholder(docMeta ? "interactiveCardFile" : "interactiveCard"),
       previewMessageType: docMeta ? "interactiveCardFile" : "interactiveCard",
       previewSenderId: trimString(repliedMsg.senderId),
@@ -351,6 +383,7 @@ function buildRepliedMessagePreview(params: {
 
   const textPreview =
     trimString(content?.text) ||
+    trimString(content?.content) ||
     trimString(richTextQuote?.summary) ||
     buildQuotedMessageTypePlaceholder(repliedMsgType, fileName);
 
@@ -459,7 +492,11 @@ function buildSeparatorRow(alignments: ("left" | "center" | "right")[]): string
  * Render markdown table rows preserving original alignment.
  * Extracts alignment from the separator row and applies it to output.
  */
-function renderMarkdownTable(headerLine: string, separatorLine: string, dataLines: string[]): string {
+function renderMarkdownTable(
+  headerLine: string,
+  separatorLine: string,
+  dataLines: string[],
+): string {
   const headerCells = parseMarkdownTableRow(headerLine);
   const separatorCells = parseMarkdownTableRow(separatorLine);
   const dataRows = dataLines.map(parseMarkdownTableRow).filter((cells) => cells.length > 0);
@@ -484,13 +521,11 @@ function renderMarkdownTable(headerLine: string, separatorLine: string, dataLine
   const separator = buildSeparatorRow(alignments);
 
   const allRows = [headerCells, ...dataRows];
-  const rendered = allRows
-    .map((cells) => {
-      const padded = cells.length < colCount
-        ? [...cells, ...Array(colCount - cells.length).fill("")]
-        : cells;
-      return "|" + padded.join("|") + "|";
-    });
+  const rendered = allRows.map((cells) => {
+    const padded =
+      cells.length < colCount ? [...cells, ...Array(colCount - cells.length).fill("")] : cells;
+    return "|" + padded.join("|") + "|";
+  });
 
   // Insert separator after header row (works for header-only tables too)
   rendered.splice(1, 0, separator);
@@ -636,7 +671,7 @@ export function extractMessageContent(data: DingTalkInboundMessage): MessageCont
       }
 
       // No msgType — backward compat: extract text or richText from content.
-      if (content?.text?.trim()) {
+      if (trimString(content?.text) || trimString(content?.content)) {
         return repliedMsgId ? { msgId: repliedMsgId, ...repliedPreview } : null;
       }
 

package/src/messaging/quoted-context.ts

@@ -1,5 +1,5 @@
-import type { MessageRecord } from "../message-context-store";
-import type { Logger, QuotedRef } from "../types";
+import type { Logger, QuotedRef } from "../platform/types";
+import type { MessageRecord } from "./message-context-store";
 import { resolveQuotedRecord } from "./quoted-ref";
 
 const DEFAULT_MAX_DEPTH = 3;