koishi-plugin-ccb-plus 1.0.0-alpha.0 → 1.0.1

package/lib/index.js

@@ -77,8 +77,9 @@ function applyDatabase(ctx) {
   ctx.model.extend("ccb_setting", {
     userId: "string",
     optOut: "boolean",
-    lastToggleTime: "unsigned",
-    overrides: "json"
+    lastToggleTime: "double",
+    overrides: "json",
+    lastToggleTimes: "json"
   }, {
     primary: "userId"
   });
@@ -224,8 +225,14 @@ var CcbState = class _CcbState {
         return String(atEl.attrs.id);
       }
     } catch (e) {
-      const atMatch = input.match(/<at\s+(?:.*?\s+)?id=(["'])(.*?)\1/i);
-      if (atMatch) return atMatch[2];
+    }
+    const atMatch = input.match(/<at\s+[^<]*?id=(["'])(.*?)\1/i);
+    if (atMatch) return atMatch[2];
+    if (/<at\b/i.test(input)) {
+      const atEl = session.elements?.find((el) => el.type === "at");
+      if (atEl?.attrs?.id) {
+        return String(atEl.attrs.id);
+      }
     }
     const colonIndex = input.indexOf(":");
     if (colonIndex > 0 && colonIndex < input.length - 1) {
@@ -393,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/lib/model.d.ts

@@ -18,6 +18,7 @@ export interface CCBUserSetting {
     optOut: boolean;
     lastToggleTime: number;
     overrides: Record<string, boolean>;
+    lastToggleTimes?: Record<string, number>;
 }
 declare module 'koishi' {
     interface Tables {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ccb-plus",
   "description": "Koishi 插件，与群友发生 ccb 行为。(移植自 astrbot_plugin_ccb_plus )",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -18,6 +18,6 @@
     "group"
   ],
   "peerDependencies": {
-    "koishi": "^4.18.7"
+    "koishi": "^4.18.10"
   }
 }