koishi-plugin-cat-raising 0.2.1 → 0.3.1

package/lib/index.d.ts

@@ -2,13 +2,19 @@
  * @name cat-raising
  * @description 一个用于监控QQ群内B站直播间奖励信息，并自动转发到指定目标的Koishi插件。
  * 它能智能解析非结构化的文本，提取关键信息（直播间号、时间、奖励），并进行去重和信息补全。
+ * @version 2.1.0
+ * @author YourName
  */
 import { Context, Schema } from 'koishi';
 export declare const name = "cat-raising";
+export interface MonitorGroupConfig {
+    groupId: string;
+    sendHelperMessages: boolean;
+}
 export interface Config {
     targetQQ: string;
     isGroup: boolean;
-    monitorGroups: string[];
+    monitorGroups: MonitorGroupConfig[];
     historySize: number;
 }
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -30,23 +30,15 @@ var name = "cat-raising";
 var Config = import_koishi.Schema.object({
   targetQQ: import_koishi.Schema.string().description("目标QQ号或QQ群号").required(),
   isGroup: import_koishi.Schema.boolean().description("是否为QQ群").default(false),
-  monitorGroups: import_koishi.Schema.array(import_koishi.Schema.string()).description("监听的群号列表 (插件只会处理这些群里的消息)").required(),
+  // 【改动 3】修改 Schema 定义，使其成为一个对象数组
+  monitorGroups: import_koishi.Schema.array(import_koishi.Schema.object({
+    groupId: import_koishi.Schema.string().description("要监听的 QQ 群号").required(),
+    sendHelperMessages: import_koishi.Schema.boolean().description("是否在此群内发送“看到啦”之类的辅助/警告消息").default(true)
+  })).description("监听的群组列表及其配置").required(),
   historySize: import_koishi.Schema.number().description("用于防复读的历史记录大小，防止短期内对同一活动重复转发").default(30).min(5).max(100)
 });
 function preprocessChineseNumerals(text) {
-  const numMap = {
-    "零": 0,
-    "一": 1,
-    "二": 2,
-    "两": 2,
-    "三": 3,
-    "四": 4,
-    "五": 5,
-    "六": 6,
-    "七": 7,
-    "八": 8,
-    "九": 9
-  };
+  const numMap = { "零": 0, "一": 1, "二": 2, "两": 2, "三": 3, "四": 4, "五": 5, "六": 6, "七": 7, "八": 8, "九": 9 };
   const unitMap = {
     "十": { value: 10, isSection: false },
     "百": { value: 100, isSection: false },
@@ -56,21 +48,16 @@ function preprocessChineseNumerals(text) {
   };
   const chineseNumRegex = /([一二三四五六七八九十百千万亿两零]+)/g;
   return text.replace(chineseNumRegex, (match) => {
-    if (match.length === 1 && numMap[match] === void 0 && unitMap[match] === void 0) {
-      return match;
-    }
+    if (match.length === 1 && !numMap[match] && !unitMap[match]) return match;
     let total = 0;
     let sectionTotal = 0;
     let currentNum = 0;
-    for (let i = 0; i < match.length; i++) {
-      const char = match[i];
+    for (const char of match) {
       if (numMap[char] !== void 0) {
         currentNum = numMap[char];
       } else if (unitMap[char]) {
         const { value, isSection } = unitMap[char];
-        if (value === 10 && currentNum === 0) {
-          currentNum = 1;
-        }
+        if (value === 10 && currentNum === 0) currentNum = 1;
         sectionTotal += currentNum * value;
         currentNum = 0;
         if (isSection) {
@@ -85,13 +72,15 @@ function preprocessChineseNumerals(text) {
 }
 __name(preprocessChineseNumerals, "preprocessChineseNumerals");
 function extractAllRoomIds(text) {
+  const sanitizedText = text.replace(/<[^>]+>/g, "");
   const patterns = [
-    /(?:播间号|房间号|直播间)[:：\s]*(\d{6,15})/g,
+    /(?:播间号|房间号|直播间)[:：\s]*(\d{3,15})/g,
     /\b(\d{6,15})\b/g
+    // 使用单词边界确保匹配的是独立数字
   ];
   const foundIds = /* @__PURE__ */ new Set();
   for (const pattern of patterns) {
-    for (const match of text.matchAll(pattern)) {
+    for (const match of sanitizedText.matchAll(pattern)) {
       if (match[1]) foundIds.add(match[1]);
     }
   }
@@ -101,7 +90,7 @@ __name(extractAllRoomIds, "extractAllRoomIds");
 function extractDateTime(line) {
   let match;
   if (match = line.match(/(\d{1,2})\s*[月.]\s*(\d{1,2})\s*日?/)) return `${match[1]}月${match[2]}日`;
-  if (match = line.match(/每晚\s*(\d{1,2})\s*点/)) return `每晚 ${match[1].padStart(2, "0")}:00`;
+  if (match = line.match(/每晚\s*(\d{1,2})\s*[点时]/)) return `每晚 ${match[1].padStart(2, "0")}:00`;
   if (match = line.match(/(\d{1,2}\s*月\s*(?:上|中|下)旬)/)) return match[1];
   if (match = line.match(/(\d{1,2})[:：.点时]\s*(\d{1,2})/)) return `${match[1].padStart(2, "0")}:${match[2].padStart(2, "0")}`;
   if (match = line.match(/(\d{1,2})\s*点\s*半/)) return `${match[1].padStart(2, "0")}:30`;
@@ -109,7 +98,7 @@ function extractDateTime(line) {
   if (match = line.match(/(\d{1,2})\s*分/)) {
     const now = /* @__PURE__ */ new Date();
     const minuteVal = parseInt(match[1]);
-    let hourVal = now.getMinutes() > minuteVal ? now.getHours() + 1 : now.getHours();
+    const hourVal = now.getMinutes() > minuteVal ? now.getHours() + 1 : now.getHours();
     return `${(hourVal % 24).toString().padStart(2, "0")}:${match[1].padStart(2, "0")}`;
   }
   if (match = line.match(/.*?(?:生日|周年|新衣|活动).*/)) return match[0].trim();
@@ -122,8 +111,8 @@ function extractRewards(line) {
   let match;
   while ((match = regex.exec(line)) !== null) {
     const condition = match[1] ? `${match[1]}级灯牌` : "无限制";
-    let amountStr = (match[2] || "").toLowerCase();
-    let amount = amountStr.includes("w") ? parseFloat(amountStr.replace("w", "")) * 1e4 : parseFloat(amountStr);
+    const amountStr = (match[2] || "").toLowerCase();
+    const amount = amountStr.includes("w") ? parseFloat(amountStr.replace("w", "")) * 1e4 : parseFloat(amountStr);
     if (!isNaN(amount) && amount > 0) {
       rewards.push({ amount, condition });
     }
@@ -131,7 +120,7 @@ function extractRewards(line) {
   return rewards;
 }
 __name(extractRewards, "extractRewards");
-function parseEvents(text) {
+function parseEventFromText(text) {
   const lines = text.split("\n").filter((line) => line.trim());
   let globalDateTime = null;
   for (const line of lines) {
@@ -142,90 +131,97 @@ function parseEvents(text) {
     }
   }
   const allRewards = lines.flatMap((line) => extractRewards(line));
-  return allRewards.length > 0 ? [{ dateTime: globalDateTime || "时间未知", rewards: allRewards }] : null;
+  return allRewards.length > 0 ? { dateTime: globalDateTime || "时间未知", rewards: allRewards } : null;
+}
+__name(parseEventFromText, "parseEventFromText");
+var HARD_REJECTION_KEYWORDS = ["发言榜单"];
+var REJECTION_KEYWORDS = ["签到", "打卡"];
+var OVERRIDE_KEYWORDS = ["神金", "发"];
+var TRIGGER_REGEX = /神金|发|掉落|猫猫钻|w|\b\d{3,5}\b|一千|一百|十|九|八|七|六|五|四|三|两|二|一/i;
+async function fetchBilibiliInfo(ctx, roomId) {
+  try {
+    const roomInfo = await ctx.http.get(`https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`);
+    const uid = roomInfo?.data?.uid;
+    if (!uid) throw new Error("无法从房间信息中获取UID");
+    const statsInfo = await ctx.http.get(`https://api.bilibili.com/x/space/navnum?mid=${uid}`);
+    const videoCount = statsInfo?.data?.video;
+    if (videoCount === void 0) throw new Error("无法从空间信息中获取投稿数");
+    return { videoCount };
+  } catch (error) {
+    ctx.logger.warn(`[API] 获取直播间 ${roomId} 的B站信息失败: ${error.message}`);
+    return null;
+  }
 }
-__name(parseEvents, "parseEvents");
+__name(fetchBilibiliInfo, "fetchBilibiliInfo");
 function apply(ctx, config) {
   const forwardedHistory = [];
   const warningMessageMap = /* @__PURE__ */ new Map();
-  const HARD_REJECTION_KEYWORDS = ["发言榜单"];
-  const REJECTION_KEYWORDS = ["签到", "打卡"];
-  const OVERRIDE_KEYWORDS = ["神金", "发"];
   ctx.on("message", async (session) => {
-    const messageForChecks = session.stripped.content;
-    const isPureText = session.elements.every((element) => element.type === "text");
-    if (!config.monitorGroups.includes(session.channelId)) return;
-    if (!isPureText || !messageForChecks.trim()) return;
-    if (HARD_REJECTION_KEYWORDS.some((keyword) => messageForChecks.includes(keyword))) {
-      ctx.logger.info(`消息包含硬性拒绝关键词，已忽略: ${messageForChecks.substring(0, 30)}...`);
+    const groupConfig = config.monitorGroups.find((g) => g.groupId === session.channelId);
+    if (!groupConfig) return;
+    const strippedContent = session.stripped.content;
+    if (!strippedContent.trim()) return;
+    if (HARD_REJECTION_KEYWORDS.some((keyword) => strippedContent.includes(keyword))) return;
+    if (!TRIGGER_REGEX.test(strippedContent)) return;
+    const roomIds = extractAllRoomIds(session.content);
+    if (roomIds.length !== 1) {
+      if (roomIds.length > 1) ctx.logger.info(`[忽略] 消息包含多个房间号: ${roomIds.join(", ")}`);
       return;
     }
-    const triggerRegex = /神金|发|掉落|猫猫钻|w|\b\d{3,5}\b|一千|一百|十|九|八|七|六|五|四|三|两|二|一/i;
-    if (!triggerRegex.test(messageForChecks)) return;
-    const roomIds = extractAllRoomIds(messageForChecks);
-    if (roomIds.length !== 1) return;
     const roomId = roomIds[0];
-    const preprocessedMessage = preprocessChineseNumerals(messageForChecks);
+    const preprocessedMessage = preprocessChineseNumerals(strippedContent);
     const hasRejectionKeyword = REJECTION_KEYWORDS.some((keyword) => preprocessedMessage.includes(keyword));
-    if (hasRejectionKeyword && !OVERRIDE_KEYWORDS.some((keyword) => preprocessedMessage.includes(keyword))) {
-      ctx.logger.info(`消息包含软性拒绝关键词且无覆盖词，已忽略: ${messageForChecks.substring(0, 30)}...`);
-      return;
-    }
-    const parsedEvents = parseEvents(preprocessedMessage);
-    if (!parsedEvents) return;
+    if (hasRejectionKeyword && !OVERRIDE_KEYWORDS.some((keyword) => preprocessedMessage.includes(keyword))) return;
+    const parsedEvent = parseEventFromText(preprocessedMessage);
+    if (!parsedEvent) return;
     const hasStrongContext = /神金|发|w/i.test(preprocessedMessage);
-    const hasTime = parsedEvents.some((event) => event.dateTime !== "时间未知");
-    if (!hasStrongContext && !hasTime) {
-      ctx.logger.info(`纯数字信息缺少时间或强上下文，已忽略: ${messageForChecks.substring(0, 30)}...`);
+    const hasTime = parsedEvent.dateTime !== "时间未知";
+    if (!hasStrongContext && !hasTime) return;
+    const { dateTime } = parsedEvent;
+    if (forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === dateTime)) {
+      ctx.logger.info(`[防复读] 检测到重复活动: 房间=${roomId}, 时间=${dateTime}`);
+      if (groupConfig.sendHelperMessages) {
+        try {
+          const [warningId] = await session.send(`看到啦看到啦，不要发那么多次嘛~`);
+          if (warningId) warningMessageMap.set(session.messageId, warningId);
+        } catch (e) {
+          ctx.logger.warn("[消息] 发送重复警告失败:", e);
+        }
+      }
       return;
     }
-    const currentDateTime = parsedEvents[0].dateTime;
-    if (forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === currentDateTime)) {
-      try {
-        const [warningId] = await session.send(`看到啦看到啦，不要发那么多次嘛~`);
-        if (warningId) warningMessageMap.set(session.messageId, warningId);
-      } catch (e) {
-        ctx.logger.warn("发送重复警告消息失败:", e);
-      }
+    const biliInfo = await fetchBilibiliInfo(ctx, roomId);
+    if (!biliInfo) {
       return;
     }
-    let biliInfo = "";
-    let helperMessageId = void 0;
+    let helperMessageId;
+    if (groupConfig.sendHelperMessages) {
+      [helperMessageId] = await session.send(`直播间: ${roomId}
+投稿数: ${biliInfo.videoCount}`);
+    }
     try {
-      const roomInfo = await ctx.http.get(`https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`);
-      if (roomInfo?.data?.uid === void 0) throw new Error("无法获取UID");
-      const statsInfo = await ctx.http.get(`https://api.bilibili.com/x/space/navnum?mid=${roomInfo.data.uid}`);
-      if (statsInfo?.data?.video === void 0) throw new Error("无法获取投稿数");
-      const videoCount = statsInfo.data.video;
-      biliInfo = `
+      const forwardMessage = `${session.content}
 
 ---
-用户投稿数: ${videoCount}`;
-      const [sentId] = await session.send(`直播间: ${roomId}
-用户投稿数: ${videoCount}`);
-      helperMessageId = sentId;
-    } catch (error) {
-      ctx.logger.warn(`获取直播间 ${roomId} 的B站信息失败: ${error.message}`);
-      return;
-    }
-    try {
-      const forwardMessage = session.content + biliInfo;
+投稿数: ${biliInfo.videoCount}`;
       const [forwardedMessageId] = config.isGroup ? await session.bot.sendMessage(config.targetQQ, forwardMessage) : await session.bot.sendPrivateMessage(config.targetQQ, forwardMessage);
       forwardedHistory.push({
         originalMessageId: session.messageId,
         forwardedMessageId,
         helperMessageId,
+        // helperMessageId 可能是 undefined，这没有问题
         roomId,
-        dateTime: currentDateTime
+        dateTime
       });
       if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
     } catch (error) {
-      session.send("🐱 - 转发失败，请检查配置");
-      ctx.logger.error("转发失败:", error);
+      session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");
+      ctx.logger.error("[转发] 失败:", error);
     }
   });
   ctx.on("message-deleted", async (session) => {
-    if (!config.monitorGroups.includes(session.channelId)) return;
+    const isMonitored = config.monitorGroups.some((g) => g.groupId === session.channelId);
+    if (!isMonitored) return;
     const originalMessageId = session.messageId;
     const entryIndex = forwardedHistory.findIndex((entry) => entry.originalMessageId === originalMessageId);
     if (entryIndex !== -1) {
@@ -234,15 +230,16 @@ function apply(ctx, config) {
         try {
           await session.bot.deleteMessage(session.channelId, entry.helperMessageId);
         } catch (e) {
-          ctx.logger.error(`撤回助手消息 (ID: ${entry.helperMessageId}) 失败:`, e);
+          ctx.logger.warn(`[撤回] 助手消息 (ID: ${entry.helperMessageId}) 失败:`, e);
         }
       }
       try {
         await session.bot.deleteMessage(config.targetQQ, entry.forwardedMessageId);
       } catch (e) {
-        ctx.logger.error(`撤回转发消息 (ID: ${entry.forwardedMessageId}) 失败:`, e);
+        ctx.logger.warn(`[撤回] 转发消息 (ID: ${entry.forwardedMessageId}) 失败:`, e);
       } finally {
         forwardedHistory.splice(entryIndex, 1);
+        ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} 相关的转发。`);
       }
     }
     if (warningMessageMap.has(originalMessageId)) {
@@ -250,9 +247,10 @@ function apply(ctx, config) {
       try {
         await session.bot.deleteMessage(session.channelId, warningMessageId);
       } catch (e) {
-        ctx.logger.error(`撤回警告消息 (ID: ${warningMessageId}) 失败:`, e);
+        ctx.logger.warn(`[撤回] 警告消息 (ID: ${warningMessageId}) 失败:`, e);
       } finally {
         warningMessageMap.delete(originalMessageId);
+        ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} 相关的警告。`);
       }
     }
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cat-raising",
   "description": "",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [