mioku-plugin-chat 2.10.1 → 3.0.1

package/utils/message.ts

@@ -1,5 +1,6 @@
-import { logger, MiokiContext } from "mioki";
-import type { AIInstance } from "mioku";
+import { HistoryMessage, logger, type MiokuContext } from "mioku";
+import type { AIInstance, Bot } from "mioku";
+
 import type {
   ChatConfig,
   ChatMessage,
@@ -22,13 +23,15 @@ export function shouldTrigger(
   e: any,
   text: string,
   cfg: ChatConfig,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
 ): boolean {
   if (e.message_type === "private") return false;
 
-  // Only check if message @s the bot (seg format: {type: "at", qq: "123456"})
   const atSeg = e.message?.find((seg: any) => seg.type === "at");
-  return !!(atSeg && String(atSeg.qq) === String(e.self_id));
+  if (!atSeg) return false;
+  const data = (atSeg.data ?? {}) as { qq?: unknown; target?: unknown };
+  const qq = data.qq ?? data.target;
+  return String(qq ?? "") === String(e.self_id ?? "");
 }
 
 /**
@@ -37,15 +40,15 @@ export function shouldTrigger(
  */
 export async function isQuotingBot(
   e: any,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
 ): Promise<{ quoted: true; messageId: string; content: string } | null> {
   if (e.quote_id) {
     try {
-      const quoteMsg = await ctx.getQuoteMsg(e);
-      if (quoteMsg && String(quoteMsg.sender.user_id) === String(e.self_id)) {
+      const quoteMsg = await fetchQuotedMessage(e, ctx);
+      if (quoteMsg && String(quoteMsg.sender?.user_id) === String(e.self_id)) {
         const quotedText = quoteMsg.message
           ?.filter((s: any) => s.type === "text")
-          .map((s: any) => s.text)
+          .map((s: any) => String(s.data?.text ?? s.text ?? ""))
           .join("");
         if (quotedText) {
           return { quoted: true, messageId: e.quote_id, content: quotedText };
@@ -53,7 +56,7 @@ export async function isQuotingBot(
         return null;
       }
     } catch (err) {
-      logger.error(err);
+      ctx.logger.error(err);
     }
   }
   return null;
@@ -65,7 +68,7 @@ export async function isQuotingBot(
  */
 export async function getQuotedContent(
   e: any,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
 ): Promise<
   | {
       messageId: string;
@@ -78,13 +81,13 @@ export async function getQuotedContent(
 > {
   if (e.quote_id) {
     try {
-      const quotedMsg = await ctx.getQuoteMsg(e);
+      const quotedMsg = await fetchQuotedMessage(e, ctx);
       if (quotedMsg && quotedMsg.message) {
-        const senderName = quotedMsg.sender.nickname;
+        const senderName = quotedMsg.sender?.nickname || "";
         // 提取文本内容
         const textContent = quotedMsg.message
           .filter((s: any) => s.type === "text")
-          .map((s: any) => s.text || "")
+          .map((s: any) => String(s.data?.text ?? s.text ?? ""))
           .join("");
 
         // 检测是否有图片
@@ -120,7 +123,7 @@ export function isGroupAllowed(groupId: number, cfg: ChatConfig): boolean {
 export function extractContent(
   e: any,
   cfg: ChatConfig,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
 ): { text: string; multimodal: any[] | null } {
   let text = "";
   try {
@@ -129,9 +132,12 @@ export function extractContent(
 
   // If text is empty but user @'d the bot, describe the action
   if (!text.trim() && e.message) {
-    const hasAt = e.message.some(
-      (seg: any) => seg.type === "at" && String(seg.qq) === String(e.self_id),
-    );
+    const hasAt = e.message.some((seg: any) => {
+      if (seg.type !== "at") return false;
+      const data = (seg.data ?? {}) as { qq?: unknown; target?: unknown };
+      const qq = data.qq ?? data.target;
+      return String(qq ?? "") === String(e.self_id ?? "");
+    });
     if (hasAt) {
       text = "[@you with no text]";
     }
@@ -190,14 +196,14 @@ async function mapWithConcurrency<T, R>(
 
 export async function getBotRole(
   groupId: number,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   selfId: number,
 ): Promise<"owner" | "admin" | "member"> {
   try {
-    const memberInfo = await ctx
-      .pickBot(selfId)
-      .getGroupMemberInfo(groupId, selfId);
-    return (memberInfo.role as "owner" | "admin" | "member") || "member";
+    const bot = ctx.pickBot(selfId);
+    if (!bot) return "member";
+    const memberInfo = await bot.getMemberInfo(groupId, selfId);
+    return (memberInfo?.role as "owner" | "admin" | "member") || "member";
   } catch {
     return "member";
   }
@@ -208,7 +214,7 @@ interface FormattedHistoryMessage {
   userName: string;
   userRole: string;
   content: string;
-  messageId: number;
+  messageId: string;
   timestamp: number;
   role: "user" | "assistant";
 }
@@ -223,6 +229,8 @@ interface HistoryFormatContext {
     | undefined;
   historyMediaOptions: HistoryMediaProcessingOptions;
   botUin: number;
+  /** 本运行时全部已连接 bot 的 id：这些账号的消息一律不作为用户历史（防 bot 互触循环） */
+  botIds: Set<string>;
   memberNameCache: Map<string, string>;
   hashLookupCache: Map<string, string | null>;
 }
@@ -237,11 +245,11 @@ async function resolveMemberName(
   }
   ctx.memberNameCache.set(key, key);
   try {
-    const bot = ctx.historyMediaOptions.bot as any;
-    if (!bot || typeof bot.getGroupMemberInfo !== "function") return key;
-    const info = await bot.getGroupMemberInfo(
-      ctx.historyMediaOptions.groupId,
-      Number(userId),
+    const bot = ctx.historyMediaOptions.bot as Bot | undefined;
+    if (!bot) return key;
+    const info = await bot.getMemberInfo(
+      ctx.historyMediaOptions.groupId!,
+      userId,
     );
     const name = info?.card || info?.nickname || key;
     ctx.memberNameCache.set(key, name);
@@ -252,6 +260,8 @@ async function resolveMemberName(
 }
 
 function extractQuotedText(messageSegs: any): string {
+  // icqq 的 source.message 是 brief 字符串；onebot 是 segment 数组
+  if (typeof messageSegs === "string") return messageSegs.trim();
   if (!Array.isArray(messageSegs) || messageSegs.length === 0) return "";
   const parts: string[] = [];
   for (const seg of messageSegs) {
@@ -278,7 +288,10 @@ function extractQuotedText(messageSegs: any): string {
   return parts.join(" ").trim();
 }
 
-function buildReplyAnnotation(source: any, ctx: HistoryFormatContext): string | null {
+function buildReplyAnnotation(
+  source: any,
+  ctx: HistoryFormatContext,
+): string | null {
   if (!source || typeof source !== "object") return null;
   const sourceId = source.id ?? source.message_id ?? source.message_seq;
   const sourceUserId = source.user_id;
@@ -291,7 +304,8 @@ function buildReplyAnnotation(source: any, ctx: HistoryFormatContext): string |
   const idStr = sourceId != null ? String(sourceId) : "?";
   let displayName: string | undefined;
   if (sourceUserId != null) {
-    displayName = ctx.memberNameCache.get(String(sourceUserId)) || String(sourceUserId);
+    displayName =
+      ctx.memberNameCache.get(String(sourceUserId)) || String(sourceUserId);
   }
   if (!displayName) displayName = sourceNickname || "unknown";
 
@@ -334,10 +348,13 @@ async function getImageTagWithHashCache(
 }
 
 async function formatHistoryMessage(
-  msg: any,
+  msg: HistoryMessage,
   ctx: HistoryFormatContext,
 ): Promise<FormattedHistoryMessage | null> {
+  // 自己或本运行时其它 bot 的消息不作为用户历史，
+  // 否则多 bot 同群时会把彼此的消息当作用户接话，形成循环触发
   if (String(msg.user_id) === String(ctx.botUin)) return null;
+  if (ctx.botIds.has(String(msg.user_id))) return null;
 
   let content = "";
   try {
@@ -350,12 +367,15 @@ async function formatHistoryMessage(
   if (!content.trim()) return null;
 
   return {
-    userId: msg.user_id,
-    userName: msg.sender?.card || msg.sender?.nickname || String(msg.user_id),
-    userRole: msg.sender?.role || "member",
+    userId: Number(msg.user_id || 0),
+    userName: msg.nickname || String(msg.user_id || "unknown"),
+    userRole: "member",
     content,
-    messageId: msg.message_id,
-    timestamp: msg.time ? msg.time * 1000 : Date.now(),
+    messageId:
+      msg.message_id != null && msg.message_id !== ""
+        ? String(msg.message_id)
+        : "",
+    timestamp: msg.time ?? Date.now(),
     role: "user",
   };
 }
@@ -427,17 +447,24 @@ async function buildMessageContent(
   )) {
     const videoSources = getSegmentSourceCandidates(videoSeg);
     if (videoSources.length > 0) {
-      parts.push(await getCachedHistoryVideoTag(videoSources, historyMediaOptions));
+      parts.push(
+        await getCachedHistoryVideoTag(videoSources, historyMediaOptions),
+      );
     } else {
       parts.push("[video]");
     }
   }
 
-  for (const forwardSeg of msg.message.filter((seg: any) => seg.type === "forward")) {
+  for (const forwardSeg of msg.message.filter(
+    (seg: any) => seg.type === "forward",
+  )) {
     const forwardId = forwardSeg.id || forwardSeg.data?.id;
     if (forwardId) {
       parts.push(
-        await getCachedHistoryForwardTag(String(forwardId), historyMediaOptions),
+        await getCachedHistoryForwardTag(
+          String(forwardId),
+          historyMediaOptions,
+        ),
       );
     } else {
       parts.push("[forward]");
@@ -448,7 +475,11 @@ async function buildMessageContent(
     ["xml", "json", "lightapp", "ark"].includes(seg.type),
   )) {
     const cardData =
-      cardSeg.data?.data || cardSeg.data?.xml || cardSeg.data || cardSeg.xml || "";
+      cardSeg.data?.data ||
+      cardSeg.data?.xml ||
+      cardSeg.data ||
+      cardSeg.xml ||
+      "";
     if (cardData) {
       parts.push(
         getCachedHistoryCardTag(
@@ -464,7 +495,9 @@ async function buildMessageContent(
   if (parts.length > 0) return parts.join(" ");
 
   const segTypes = msg.message.map((seg: any) => seg.type);
-  const nonTextTypes = segTypes.filter((t: string) => t !== "text" && t !== "at");
+  const nonTextTypes = segTypes.filter(
+    (t: string) => t !== "text" && t !== "at",
+  );
   return nonTextTypes.length > 0 ? `[${nonTextTypes.join(", ")}]` : "";
 }
 
@@ -474,7 +507,7 @@ async function buildMessageContent(
  */
 export async function getGroupHistory(
   groupId: number,
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   count: number = 100,
   selfId: number,
   db?: {
@@ -501,7 +534,7 @@ export async function getGroupHistory(
     userName: string;
     userRole: string;
     content: string;
-    messageId: number;
+    messageId: string;
     timestamp: number;
     role: "user" | "assistant";
   }>
@@ -512,7 +545,7 @@ export async function getGroupHistory(
     userName: string;
     userRole: string;
     content: string;
-    messageId: number;
+    messageId: string;
     timestamp: number;
     role: "user" | "assistant";
   }> = [];
@@ -525,7 +558,7 @@ export async function getGroupHistory(
         userName: msg.userName || "Miku",
         userRole: msg.userRole || "member",
         content: msg.content,
-        messageId: msg.messageId ?? 0,
+        messageId: msg.messageId ?? "",
         timestamp: msg.timestamp,
         role: "assistant",
       });
@@ -539,7 +572,7 @@ export async function getGroupHistory(
         userName: msg.userName || String(msg.userId || "unknown"),
         userRole: msg.userRole || "member",
         content: msg.content,
-        messageId: msg.messageId ?? 0,
+        messageId: msg.messageId ?? "",
         timestamp: msg.timestamp,
         role: "user",
       });
@@ -547,8 +580,9 @@ export async function getGroupHistory(
   }
 
   try {
-    const bot = ctx.pickBot(selfId) as any;
+    const bot = ctx.pickBot(selfId);
     const historyMediaOptions: HistoryMediaProcessingOptions = {
+      bot,
       ai: mediaOptions?.ai,
       workingModel: mediaOptions?.workingModel,
       multimodalWorkingModel: mediaOptions?.multimodalWorkingModel,
@@ -561,32 +595,25 @@ export async function getGroupHistory(
               saveMediaSummarySource: db.saveMediaSummarySource?.bind(db),
             }
           : undefined,
-      bot,
       groupId,
     };
-    // 调用 OneBot API 获取群聊历史
-    const result = await bot.api("get_group_msg_history", {
-      group_id: String(groupId),
-      message_seq: "0",
-      count: Math.min(count, 200), // 最多获取200条
-      reverse_order: false,
-      disable_get_url: false,
-      parse_mult_msg: true,
-      quick_reply: false,
-    });
-    const messages = result?.messages || result?.data?.messages || [];
-    if (!Array.isArray(messages)) {
-      logger.warn("[getGroupHistory] API 返回格式异常:", result);
-      return botMessages;
-    }
+    const messages = bot
+      ? await bot.getHistory(
+          { type: "group", group_id: groupId },
+          undefined,
+          Math.min(count, 200),
+        )
+      : [];
 
     const botUin = selfId;
+    const botIds = new Set<string>(ctx.bots.map((b) => String(b.bot_id)));
+    botIds.add(String(botUin));
     const memberNameCache = new Map<string, string>();
     const hashLookupCache = new Map<string, string | null>();
 
     for (const m of messages) {
-      const uid = m?.user_id;
-      const senderName = m?.sender?.card || m?.sender?.nickname;
+      const uid = m.user_id;
+      const senderName = m.nickname;
       if (uid != null && senderName && !memberNameCache.has(String(uid))) {
         memberNameCache.set(String(uid), String(senderName));
       }
@@ -596,6 +623,7 @@ export async function getGroupHistory(
       db,
       historyMediaOptions,
       botUin,
+      botIds,
       memberNameCache,
       hashLookupCache,
     };
@@ -657,3 +685,20 @@ export function normalizeIdList(input: unknown): number[] {
     ),
   );
 }
+
+async function fetchQuotedMessage(
+  e: any,
+  ctx: MiokuContext,
+): Promise<{
+  message: any[];
+  sender?: { user_id?: string; nickname?: string };
+} | null> {
+  const bot = e?.bot ?? ctx.pickBot(e?.self_id ?? "");
+  if (!bot || !e?.quote_id) return null;
+  try {
+    const result = await bot.getMessage(e.quote_id);
+    return result ?? null;
+  } catch {
+    return null;
+  }
+}

package/utils/queue.ts

@@ -100,7 +100,7 @@ export class MessageQueueManager {
  * 例如 "[reply:1]文字A[reply:2]文字B" → ["[reply:1]文字A", "[reply:2]文字B"]
  */
 export function splitByReplyMarkers(line: string): string[] {
-  const parts = line.split(/(?=\[reply:-?\d+\])/);
+  const parts = line.split(/(?=\[reply:[^\]\n]+\])/);
   return parts.filter((p) => p.trim());
 }
 
@@ -116,12 +116,12 @@ export function parseLineMarkers(
   cleanText: string;
   atUsers: number[];
   pokeUsers: number[];
-  quoteId?: number;
+  quoteId?: string;
   audioText?: string;
 } {
   const atUsers: number[] = [];
   const pokeUsers: number[] = [];
-  let quoteId: number | undefined;
+  let quoteId: string | undefined;
   let audioText: string | undefined;
 
   // 提取 AT 标记
@@ -146,12 +146,13 @@ export function parseLineMarkers(
 
   // 提取引用标记（仅在允许时）
   if (quoteMode !== "skip") {
-    const replyPatterns = [/\[reply:(-?\d+)\]/g];
+    const replyPatterns = [/\[reply:([^\]\n]+)\]/g];
     for (const pattern of replyPatterns) {
       const matches = [...line.matchAll(pattern)];
       for (const match of matches) {
         if (quoteId === undefined) {
-          quoteId = parseInt(match[1], 10);
+          const value = match[1].trim();
+          if (value) quoteId = value;
         }
       }
     }
@@ -170,7 +171,7 @@ export function parseLineMarkers(
   let cleanText = line
     .replace(/\[at:\d+\]/g, "")
     .replace(/\[poke:\d+\]/g, "")
-    .replace(/\[reply:-?\d+\]/g, "")
+    .replace(/\[reply:[^\]\n]+\]/g, "")
     .replace(/\[audio:[^\]]+\]/gi, "")
     .trim();