koishi-plugin-cat-raising 0.0.10 → 0.1.1

package/lib/index.js

@@ -73,19 +73,20 @@ function extractDateTime(line) {
 __name(extractDateTime, "extractDateTime");
 function extractRewards(line) {
   const rewards = [];
-  const regex = /(?:(\d{1,2})\s*级(?:灯牌)?\s*)?(?:发\s*)?(\d+\.?\d*w?\+?)(?:神金|钻石|猫猫钻)?/gi;
+  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) {
-    if (line.includes("签到") && !line.match(/发|神金|猫猫钻/)) continue;
     const condition = match[1] ? `${match[1]}级灯牌` : "无限制";
-    let amountStr = match[2].toLowerCase();
+    let amountStr = (match[2] || "").toLowerCase();
     let amount = 0;
     if (amountStr.includes("w")) {
       amount = parseFloat(amountStr.replace("w", "")) * 1e4;
     } else {
       amount = parseFloat(amountStr);
     }
-    rewards.push({ amount, condition });
+    if (!isNaN(amount) && amount > 0) {
+      rewards.push({ amount, condition });
+    }
   }
   return rewards;
 }
@@ -112,13 +113,17 @@ __name(parseEvents, "parseEvents");
 function apply(ctx, config) {
   const forwardedHistory = [];
   const HISTORY_SIZE = 30;
-  const REJECTION_KEYWORDS = ["签到"];
-  const OVERRIDE_KEYWORDS = ["神金", "发"];
+  const REJECTION_KEYWORDS = ["签到", "打卡"];
+  const OVERRIDE_KEYWORDS = ["神金", "发", "掉落", "猫猫钻"];
   ctx.on("message", async (session) => {
     if (session.channelId !== config.monitorGroup) return;
     const originalMessageContent = session.content;
     const messageForChecks = session.stripped.content;
     const messageId = session.messageId;
+    const triggerRegex = /神金|发|掉落|猫猫钻|w|\b\d{3,5}\b/i;
+    if (!triggerRegex.test(messageForChecks)) {
+      return;
+    }
     const hasRejectionKeyword = REJECTION_KEYWORDS.some((keyword) => messageForChecks.includes(keyword));
     if (hasRejectionKeyword) {
       const hasOverrideKeyword = OVERRIDE_KEYWORDS.some((keyword) => messageForChecks.includes(keyword));
@@ -129,19 +134,22 @@ function apply(ctx, config) {
     }
     const roomIds = extractAllRoomIds(messageForChecks);
     if (roomIds.length > 1) {
-      session.send(`检测到多个直播间号 (${roomIds.join(", ")})，为避免信息混淆，已停止处理。`);
       return;
     }
     const roomId = roomIds.length === 1 ? roomIds[0] : null;
     const parsedEvents = parseEvents(messageForChecks);
     if (!parsedEvents || !roomId) {
-      if (messageForChecks.match(/神金|w|发|掉落|\d{4,}/)) {
-        ctx.logger.info(`消息可能为神金信息但无法完整解析(缺少房间号或事件)，已忽略: ${messageForChecks.substring(0, 50)}...`);
-      }
+      return;
+    }
+    const strongContextRegex = /神金|发|掉落|猫猫钻|w/i;
+    const hasStrongContext = strongContextRegex.test(messageForChecks);
+    const hasTime = parsedEvents.some((event) => event.dateTime !== "时间未知");
+    if (!hasStrongContext && !hasTime) {
+      ctx.logger.info(`纯数字信息缺少时间，已忽略: ${messageForChecks.replace(/\s+/g, " ").substring(0, 50)}...`);
       return;
     }
     if (forwardedHistory.some((entry) => entry.originalContent === originalMessageContent)) {
-      session.send("这个消息刚刚已经发过啦~");
+      session.send("看到啦看到啦，不要发那么多次嘛~");
       return;
     }
     let biliInfo = "";
@@ -166,6 +174,7 @@ function apply(ctx, config) {
       }
     } catch (error) {
       ctx.logger.warn(`获取直播间 ${roomId} 的B站信息失败: ${error.message}`);
+      return;
     }
     const forwardMessage = originalMessageContent + biliInfo;
     try {

package/package.json

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