koishi-plugin-ccb-plus 0.2.10 → 0.2.11

package/lib/index.js

@@ -78,7 +78,8 @@ function applyDatabase(ctx) {
     userId: "string",
     optOut: "boolean",
     lastToggleTime: "unsigned",
-    overrides: "json"
+    overrides: "json",
+    lastToggleTimes: "json"
   }, {
     primary: "userId"
   });
@@ -399,28 +400,38 @@ function applyCcbCommand(ctx, config, state) {
         }
       }
       const [userSetting] = await ctx.database.get("ccb_setting", { userId: senderId });
-      const lastToggle = userSetting?.lastToggleTime || 0;
+      const targetKey = targetUserStr || "__global__";
+      const lastToggleTimes = { ...userSetting?.lastToggleTimes || {} };
+      let lastToggle = lastToggleTimes[targetKey] || 0;
+      if (targetKey === "__global__" && !lastToggle) {
+        lastToggle = userSetting?.lastToggleTime || 0;
+      }
       const cooldownResult = checkCooldown(lastToggle);
       if (cooldownResult) return cooldownResult;
       const nowMs = Date.now();
+      lastToggleTimes[targetKey] = nowMs;
       if (!targetUserStr) {
         const newOptOut = !!isOff;
         await ctx.database.upsert("ccb_setting", [{
           userId: senderId,
           optOut: newOptOut,
           lastToggleTime: nowMs,
-          overrides: userSetting?.overrides || {}
+          // 保持更新以供兼容
+          lastToggleTimes,
+          overrides: { ...userSetting?.overrides || {} }
         }]);
         return newOptOut ? "已开启全局保护模式，阻止你被ccb。" : "已关闭全局保护模式，允许你被ccb。";
       } else {
         const targetId = targetUserStr;
-        const overrides = userSetting?.overrides || {};
+        const overrides = { ...userSetting?.overrides || {} };
         overrides[targetId] = !isOff;
         await ctx.database.upsert("ccb_setting", [{
           userId: senderId,
           overrides,
           optOut: userSetting?.optOut ?? false,
-          lastToggleTime: nowMs
+          lastToggleTime: userSetting?.lastToggleTime || 0,
+          // 不改变全局旧字段
+          lastToggleTimes
         }]);
         const targetNick = await state.getUserNickname(session, targetId).catch(() => targetId) || targetId;
         return isOff ? `已禁止用户 ${targetNick} 对你ccb。` : `已允许用户 ${targetNick} 对你ccb。`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ccb-plus",
   "description": "Koishi 插件，与群友发生 ccb 行为。(移植自 astrbot_plugin_ccb_plus )",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [