koishi-plugin-cat-raising 1.3.7 → 1.3.9

package/lib/index.d.ts

@@ -28,6 +28,8 @@ export interface Config {
     biliAccessKeys: BiliAccessKeyConfig[];
     /** 硬拒绝关键词列表 */
     hardRejectionKeywords: string[];
+    /** 仅弹幕模式关键词（包含任一关键词则只发弹幕不转发） */
+    danmakuOnlyKeywords: string[];
     /** 发送弹幕的延迟下限（秒） */
     danmakuDelayMinSeconds?: number;
     /** 发送弹幕的延迟上限（秒） */

package/lib/index.js

@@ -60,7 +60,8 @@ var Config = import_koishi.Schema.intersect([
     danmakuDelayMaxSeconds: import_koishi.Schema.number().description("弹幕延迟上限（秒）").role("slider", { min: 0, max: 60, step: 1 }).default(10)
   }).description("弹幕设置"),
   import_koishi.Schema.object({
-    hardRejectionKeywords: import_koishi.Schema.array(import_koishi.Schema.string()).description("命中则忽略的关键词（硬拒绝）").default(["发言榜单", "投稿数:", "预告"])
+    hardRejectionKeywords: import_koishi.Schema.array(import_koishi.Schema.string()).description("命中则忽略的关键词（硬拒绝）").default(["发言榜单", "投稿数:", "预告"]),
+    danmakuOnlyKeywords: import_koishi.Schema.array(import_koishi.Schema.string()).description("仅弹幕模式关键词（包含任一关键词则只发弹幕不转发）").default(["闪击"])
   }).description("过滤规则")
 ]);
 function preprocessChineseNumerals(text) {
@@ -315,6 +316,9 @@ __name(fetchBilibiliInfo, "fetchBilibiliInfo");
 function apply(ctx, config) {
   const forwardedHistory = [];
   const warningMessageMap = /* @__PURE__ */ new Map();
+  const pendingDanmakuTimersByMessage = /* @__PURE__ */ new Map();
+  const pendingDanmakuTimersByRoom = /* @__PURE__ */ new Map();
+  const pendingDanmakuRoomMap = /* @__PURE__ */ new Map();
   ctx.on("message", async (session) => {
     const groupConfig = config.monitorGroups.find((g) => g.groupId === session.channelId);
     if (!groupConfig) return;
@@ -342,8 +346,10 @@ function apply(ctx, config) {
     if (!hasStrongContext && !hasTime) return;
     const biliInfo = await fetchBilibiliInfo(ctx, roomId);
     if (!biliInfo) return;
+    const danmakuOnlyKeywords = config.danmakuOnlyKeywords || ["闪击"];
+    const isDanmakuOnly = danmakuOnlyKeywords.some((keyword) => preprocessedMessage.includes(keyword));
     let helperMessageId;
-    if (groupConfig.sendHelperMessages) {
+    if (!isDanmakuOnly && groupConfig.sendHelperMessages) {
       try {
         const displayAnchor = biliInfo.anchorName;
         [helperMessageId] = await session.send(`直播间: ${roomId}
@@ -354,51 +360,92 @@ function apply(ctx, config) {
       }
     }
     const { dateTime } = parsedEvent;
-    if (forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === dateTime)) {
+    if (!isDanmakuOnly && forwardedHistory.some((entry) => entry.roomId === roomId && entry.dateTime === dateTime)) {
       ctx.logger.info(`[防复读] 检测到重复活动，已发送辅助信息，跳过转发: 房间=${roomId}, 时间=${dateTime}`);
       return;
     }
-    try {
-      const displayAnchor = biliInfo.anchorName;
-      const forwardMessage = `${session.content}
+    if (!isDanmakuOnly) {
+      try {
+        const displayAnchor = biliInfo.anchorName;
+        const forwardMessage = `${session.content}
 
 ---
 主播: ${displayAnchor}
 投稿数: ${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
-      });
-      if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
-      if (config.biliAccessKeys && config.biliAccessKeys.length > 0) {
-        const min = Math.max(0, config.danmakuDelayMinSeconds ?? 8);
-        const max = Math.max(min, config.danmakuDelayMaxSeconds ?? 10);
-        const delayMs = (Math.floor(Math.random() * (max - min + 1)) + min) * 1e3;
-        ctx.logger.info(`[弹幕] ${config.biliAccessKeys.length} 个账号将于 ${Math.round(delayMs / 1e3)} 秒后发送弹幕到直播间 ${roomId}。`);
-        setTimeout(() => {
-          const danmakuPromises = config.biliAccessKeys.map(
-            (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
-          );
-          Promise.allSettled(danmakuPromises);
-        }, delayMs);
+        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
+        });
+        if (forwardedHistory.length > config.historySize) forwardedHistory.shift();
+      } catch (error) {
+        session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");
+        ctx.logger.error("[转发] 失败:", error);
       }
-    } catch (error) {
-      session.send("🐱 - 转发失败，请检查目标QQ/群号配置是否正确");
-      ctx.logger.error("[转发] 失败:", error);
+    }
+    if (config.biliAccessKeys && config.biliAccessKeys.length > 0) {
+      const min = Math.max(0, config.danmakuDelayMinSeconds ?? 8);
+      const max = Math.max(min, config.danmakuDelayMaxSeconds ?? 10);
+      const delayMs = (Math.floor(Math.random() * (max - min + 1)) + min) * 1e3;
+      ctx.logger.info(`[弹幕] ${config.biliAccessKeys.length} 个账号将于 ${Math.round(delayMs / 1e3)} 秒后发送弹幕到直播间 ${roomId}。`);
+      const timer = setTimeout(() => {
+        const list1 = pendingDanmakuTimersByMessage.get(session.messageId);
+        if (list1) {
+          const newList = list1.filter((t) => t !== timer);
+          if (newList.length === 0) {
+            pendingDanmakuTimersByMessage.delete(session.messageId);
+            pendingDanmakuRoomMap.delete(session.messageId);
+          } else {
+            pendingDanmakuTimersByMessage.set(session.messageId, newList);
+          }
+        }
+        const list2 = pendingDanmakuTimersByRoom.get(roomId);
+        if (list2) {
+          const newList = list2.filter((t) => t !== timer);
+          if (newList.length === 0) {
+            pendingDanmakuTimersByRoom.delete(roomId);
+          } else {
+            pendingDanmakuTimersByRoom.set(roomId, newList);
+          }
+        }
+        const danmakuPromises = config.biliAccessKeys.map(
+          (keyConfig) => sendBilibiliDanmaku(ctx, keyConfig, roomId, "喵喵喵")
+        );
+        Promise.allSettled(danmakuPromises);
+      }, delayMs);
+      const byMsg = pendingDanmakuTimersByMessage.get(session.messageId) || [];
+      byMsg.push(timer);
+      pendingDanmakuTimersByMessage.set(session.messageId, byMsg);
+      pendingDanmakuRoomMap.set(session.messageId, roomId);
+      const byRoom = pendingDanmakuTimersByRoom.get(roomId) || [];
+      byRoom.push(timer);
+      pendingDanmakuTimersByRoom.set(roomId, byRoom);
     }
   });
   ctx.on("message-deleted", async (session) => {
     const isMonitored = config.monitorGroups.some((g) => g.groupId === session.channelId);
     if (!isMonitored) return;
     const originalMessageId = session.messageId;
+    const timersByMsg = pendingDanmakuTimersByMessage.get(originalMessageId);
+    if (timersByMsg) {
+      for (const t of timersByMsg) clearTimeout(t);
+      pendingDanmakuTimersByMessage.delete(originalMessageId);
+      const roomId = pendingDanmakuRoomMap.get(originalMessageId);
+      pendingDanmakuRoomMap.delete(originalMessageId);
+      ctx.logger.info(`[撤回] 已取消源消息 ${originalMessageId}${roomId ? ` (直播间: ${roomId})` : ""} 的延迟弹幕。`);
+    }
     const entryIndex = forwardedHistory.findIndex((entry) => entry.originalMessageId === originalMessageId);
     if (entryIndex !== -1) {
       const entry = forwardedHistory[entryIndex];
+      const timersByRoom = pendingDanmakuTimersByRoom.get(entry.roomId);
+      if (timersByRoom) {
+        for (const t of timersByRoom) clearTimeout(t);
+        pendingDanmakuTimersByRoom.delete(entry.roomId);
+      }
       if (entry.helperMessageId) {
         try {
           await session.bot.deleteMessage(session.channelId, entry.helperMessageId);
@@ -413,7 +460,7 @@ function apply(ctx, config) {
         ctx.logger.warn(`[撤回] 转发消息 (ID: ${entry.forwardedMessageId}) 失败:`, e);
       } finally {
         forwardedHistory.splice(entryIndex, 1);
-        ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} 相关的转发。`);
+        ctx.logger.info(`[撤回] 已联动撤回与源消息 ${originalMessageId} (直播间: ${entry.roomId}) 相关的转发。`);
       }
     }
     if (warningMessageMap.has(originalMessageId)) {

package/package.json

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