koishi-plugin-cat-raising 1.1.0 → 1.2.0

package/lib/index.js

@@ -46,60 +46,62 @@ var Config = 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),
+  historySize: import_koishi.Schema.number().description("用于防复读的历史记录大小").default(30).min(5).max(100),
   biliAccessKeys: import_koishi.Schema.array(import_koishi.Schema.object({
     key: import_koishi.Schema.string().description("Bilibili access_key").required(),
-    remark: import_koishi.Schema.string().description("对此 access_key 的备注，例如所属账号")
-  })).description("用于发送B站弹幕的 access_key 列表。插件会为列表中的每个 key 发送弹幕。如果留空，则不执行发送弹幕功能。").default([])
+    remark: import_koishi.Schema.string().description("对此 access_key 的备注")
+  })).description("用于发送B站弹幕的 access_key 列表").default([])
 });
 function preprocessChineseNumerals(text) {
   const numMap = { "零": 0, "一": 1, "二": 2, "两": 2, "三": 3, "四": 4, "五": 5, "六": 6, "七": 7, "八": 8, "九": 9 };
-  const unitMap = {
-    "十": { value: 10, isSection: false },
-    "百": { value: 100, isSection: false },
-    "千": { value: 1e3, isSection: false },
-    "万": { value: 1e4, isSection: true },
-    "亿": { value: 1e8, isSection: true }
-  };
+  const unitMap = { "十": 10, "百": 100, "千": 1e3, "万": 1e4, "亿": 1e8 };
   const chineseNumRegex = /([一二三四五六七八九十百千万亿两零]+)/g;
   return text.replace(chineseNumRegex, (match) => {
-    if (match.length === 1 && !numMap[match] && !unitMap[match]) return match;
-    let total = 0;
-    let sectionTotal = 0;
-    let currentNum = 0;
-    for (const char of match) {
+    let total = 0, tempVal = 0, sectionVal = 0;
+    for (let i = 0; i < match.length; i++) {
+      const char = match[i];
       if (numMap[char] !== void 0) {
-        currentNum = numMap[char];
+        tempVal = numMap[char];
       } else if (unitMap[char]) {
-        const { value, isSection } = unitMap[char];
-        if (value === 10 && currentNum === 0) currentNum = 1;
-        sectionTotal += currentNum * value;
-        currentNum = 0;
-        if (isSection) {
-          total += sectionTotal;
-          sectionTotal = 0;
+        const unit = unitMap[char];
+        if (unit >= 1e4) {
+          sectionVal += tempVal;
+          total += sectionVal * unit;
+          sectionVal = 0;
+        } else {
+          sectionVal += (tempVal || 1) * unit;
         }
+        tempVal = 0;
       }
     }
-    total += sectionTotal + currentNum;
+    total += sectionVal + tempVal;
     return String(total);
   });
 }
 __name(preprocessChineseNumerals, "preprocessChineseNumerals");
 function extractAllRoomIds(text) {
   const sanitizedText = text.replace(/<[^>]+>/g, "");
-  const patterns = [
-    /(?:播间号|房间号|直播间)[:：\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 sanitizedText.matchAll(pattern)) {
-      if (match[1]) foundIds.add(match[1]);
-    }
+  const explicitPattern = /(?:播间号|房间号|直播间)[:：\s]*(\d{3,15})/gi;
+  const explicitIds = /* @__PURE__ */ new Set();
+  for (const match of sanitizedText.matchAll(explicitPattern)) {
+    if (match[1]) explicitIds.add(match[1]);
+  }
+  if (explicitIds.size > 0) return Array.from(explicitIds);
+  const genericPattern = /\b(\d{3,15})\b/g;
+  const allNumericCandidates = /* @__PURE__ */ new Set();
+  for (const match of sanitizedText.matchAll(genericPattern)) {
+    if (match[1]) allNumericCandidates.add(match[1]);
   }
-  return Array.from(foundIds);
+  if (allNumericCandidates.size <= 1) return Array.from(allNumericCandidates);
+  const preprocessedText = preprocessChineseNumerals(sanitizedText);
+  const rewards = extractRewards(preprocessedText);
+  const rewardAmounts = new Set(rewards.map((r) => String(r.amount)));
+  let filteredIds = Array.from(allNumericCandidates).filter((id) => !rewardAmounts.has(id));
+  if (filteredIds.length > 1) {
+    filteredIds.sort((a, b) => b.length - a.length);
+    return [filteredIds[0]];
+  }
+  return filteredIds;
 }
 __name(extractAllRoomIds, "extractAllRoomIds");
 function extractDateTime(line) {
@@ -122,14 +124,31 @@ function extractDateTime(line) {
 __name(extractDateTime, "extractDateTime");
 function extractRewards(line) {
   const rewards = [];
-  const regex = /(?:(\d{1,2})\s*级(?:灯牌)?\s*)?(?:发\s*)?(\d+\.?\d*w\+?|\b\d{3,5}\b)(?:神金|钻石|猫猫钻)?/gi;
-  let match;
-  while ((match = regex.exec(line)) !== null) {
+  const foundAmounts = /* @__PURE__ */ new Set();
+  const addReward = /* @__PURE__ */ __name((amount, condition) => {
+    if (!isNaN(amount) && amount > 0 && !foundAmounts.has(amount)) {
+      rewards.push({ amount, condition });
+      foundAmounts.add(amount);
+    }
+  }, "addReward");
+  const strongRegex = /(?:(\d{1,2})\s*级(?:灯牌)?\s*)?(?:(发|掉落)\s*)?(?:(神金|钻石|猫猫钻)\s*(\d+\.?\d*w?|\b\d{3,5}\b)|(\d+\.?\d*w|\b\d{3,5}\b)\s*(?:神金|钻石|猫猫钻|w))/gi;
+  for (const match of line.matchAll(strongRegex)) {
     const condition = match[1] ? `${match[1]}级灯牌` : "无限制";
-    const amountStr = (match[2] || "").toLowerCase();
+    const amountStr = (match[4] || match[5] || "").toLowerCase();
     const amount = amountStr.includes("w") ? parseFloat(amountStr.replace("w", "")) * 1e4 : parseFloat(amountStr);
-    if (!isNaN(amount) && amount > 0) {
-      rewards.push({ amount, condition });
+    addReward(amount, condition);
+  }
+  if (rewards.length === 0) {
+    const conditionMatch = line.match(/(\d{1,2})\s*级(?:灯牌)?/);
+    if (conditionMatch) {
+      const condition = conditionMatch[0];
+      const conditionLevel = conditionMatch[1];
+      for (const numMatch of line.matchAll(/\b(\d{3,5})\b/g)) {
+        if (numMatch[1] !== conditionLevel) {
+          const amount = parseFloat(numMatch[1]);
+          addReward(amount, condition);
+        }
+      }
     }
   }
   return rewards;
@@ -159,51 +178,25 @@ var BILI_APPSECRET = "59b43e04ad6965f34319062b478f83dd";
 function signBilibiliParams(params, appSecret) {
   const sortedKeys = Object.keys(params).sort();
   const queryString = sortedKeys.map((key) => `${key}=${params[key]}`).join("&");
-  const sign = crypto.createHash("md5").update(queryString + appSecret).digest("hex");
-  return sign;
+  return crypto.createHash("md5").update(queryString + appSecret).digest("hex");
 }
 __name(signBilibiliParams, "signBilibiliParams");
 async function sendBilibiliDanmaku(ctx, keyConfig, roomId, message) {
-  const MAX_RETRIES = 4;
-  const RETRY_DELAY_MS = 3e3;
-  const FREQUENCY_LIMIT_KEYWORD = "频率过快";
+  const MAX_RETRIES = 4, RETRY_DELAY_MS = 3e3, FREQUENCY_LIMIT_KEYWORD = "频率过快";
   const url = "https://api.live.bilibili.com/xlive/app-room/v1/dM/sendmsg";
   const logIdentifier = keyConfig.remark || keyConfig.key.slice(0, 8);
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    if (attempt > 0) {
-      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
-    }
+    if (attempt > 0) await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
     const ts = Math.floor(Date.now() / 1e3);
-    const baseParams = {
-      access_key: keyConfig.key,
-      actionKey: "appkey",
-      appkey: BILI_APPKEY,
-      cid: roomId,
-      msg: message,
-      rnd: ts,
-      color: "16777215",
-      // 白色
-      fontsize: "25",
-      mode: "1",
-      // 滚动弹幕
-      ts
-    };
+    const baseParams = { access_key: keyConfig.key, actionKey: "appkey", appkey: BILI_APPKEY, cid: roomId, msg: message, rnd: ts, color: "16777215", fontsize: "25", mode: "1", ts };
     const sign = signBilibiliParams(baseParams, BILI_APPSECRET);
     const params = { ...baseParams, sign };
     const formData = new import_url.URLSearchParams();
-    for (const key in params) {
-      formData.append(key, params[key]);
-    }
+    for (const key in params) formData.append(key, params[key]);
     try {
-      const response = await ctx.http.post(url, formData, {
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          "User-Agent": "Mozilla/5.0 BiliDroid/6.73.1 (bbcallen@gmail.com) os/android model/Mi 10 Pro mobi_app/android build/6731100 channel/xiaomi innerVer/6731110 osVer/12 network/2"
-        }
-      });
+      const response = await ctx.http.post(url, formData, { headers: { "Content-Type": "application/x-www-form-urlencoded", "User-Agent": "Mozilla/5.0 BiliDroid/6.73.1" } });
       if (response.code === 0) {
-        const successMessage = attempt > 0 ? `[弹幕] [${logIdentifier}] 成功向直播间 ${roomId} 发送弹幕 (重试 ${attempt} 次后)` : `[弹幕] [${logIdentifier}] 成功向直播间 ${roomId} 发送弹幕: "${message}"`;
-        ctx.logger.info(successMessage);
+        ctx.logger.info(`[弹幕] [${logIdentifier}] 成功向直播间 ${roomId} 发送弹幕${attempt > 0 ? ` (重试 ${attempt} 次后)` : `: "${message}"`}`);
         return;
       }
       if (response.message?.includes(FREQUENCY_LIMIT_KEYWORD)) {
@@ -241,32 +234,25 @@ async function fetchBilibiliInfo(ctx, roomId) {
 __name(fetchBilibiliInfo, "fetchBilibiliInfo");
 function apply(ctx, config) {
   const forwardedHistory = [];
-  const warningMessageMap = /* @__PURE__ */ new Map();
   ctx.on("message", async (session) => {
     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 (CHECK_IN_REJECTION_REGEX.test(strippedContent)) {
-      ctx.logger.info(`[忽略] 消息包含签到模式 (如 110+)，判定为非奖励信息。内容: "${strippedContent.replace(/\n/g, " ")}"`);
-      return;
-    }
+    if (CHECK_IN_REJECTION_REGEX.test(strippedContent)) 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(", ")}`);
+      if (roomIds.length > 1) ctx.logger.info(`[忽略] 消息包含多个可能的房间号: ${roomIds.join(", ")}`);
       return;
     }
     const roomId = roomIds[0];
     const preprocessedMessage = preprocessChineseNumerals(strippedContent);
-    const hasRejectionKeyword = REJECTION_KEYWORDS.some((keyword) => preprocessedMessage.includes(keyword));
-    if (hasRejectionKeyword && !OVERRIDE_KEYWORDS.some((keyword) => preprocessedMessage.includes(keyword))) return;
+    if (REJECTION_KEYWORDS.some((k) => preprocessedMessage.includes(k)) && !OVERRIDE_KEYWORDS.some((k) => preprocessedMessage.includes(k))) return;
     const parsedEvent = parseEventFromText(preprocessedMessage);
     if (!parsedEvent) return;
-    const hasStrongContext = /神金|发|w/i.test(preprocessedMessage);
-    const hasTime = parsedEvent.dateTime !== "时间未知";
-    if (!hasStrongContext && !hasTime) return;
+    if (!/神金|发|w/i.test(preprocessedMessage) && parsedEvent.dateTime === "时间未知") return;
     const biliInfo = await fetchBilibiliInfo(ctx, roomId);
     if (!biliInfo) return;
     let helperMessageId;
@@ -289,20 +275,11 @@ function apply(ctx, config) {
 ---
 投稿数: ${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,
-        // 存储辅助消息ID用于撤回联动
-        roomId,
-        dateTime
-      });
+      forwardedHistory.push({ originalMessageId: session.messageId, forwardedMessageId, helperMessageId, roomId, dateTime });
       if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
-      if (config.biliAccessKeys && config.biliAccessKeys.length > 0) {
+      if (config.biliAccessKeys?.length > 0) {
         ctx.logger.info(`[弹幕] 准备为 ${config.biliAccessKeys.length} 个账号发送弹幕到直播间 ${roomId}...`);
-        const danmakuPromises = config.biliAccessKeys.map(
-          (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
-        );
+        const danmakuPromises = config.biliAccessKeys.map((keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵"));
         Promise.allSettled(danmakuPromises);
       }
     } catch (error) {
@@ -311,8 +288,7 @@ function apply(ctx, config) {
     }
   });
   ctx.on("message-deleted", async (session) => {
-    const isMonitored = config.monitorGroups.some((g) => g.groupId === session.channelId);
-    if (!isMonitored) return;
+    if (!config.monitorGroups.some((g) => g.groupId === session.channelId)) return;
     const originalMessageId = session.messageId;
     const entryIndex = forwardedHistory.findIndex((entry) => entry.originalMessageId === originalMessageId);
     if (entryIndex !== -1) {
@@ -334,17 +310,6 @@ function apply(ctx, config) {
         ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} 相关的转发。`);
       }
     }
-    if (warningMessageMap.has(originalMessageId)) {
-      const warningMessageId = warningMessageMap.get(originalMessageId);
-      try {
-        await session.bot.deleteMessage(session.channelId, warningMessageId);
-      } catch (e) {
-        ctx.logger.warn(`[撤回] 警告消息 (ID: ${warningMessageId}) 失败:`, e);
-      } finally {
-        warningMessageMap.delete(originalMessageId);
-        ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} 相关的警告。`);
-      }
-    }
   });
 }
 __name(apply, "apply");

package/package.json

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