koishi-plugin-ccb-plus 0.2.6 → 0.2.7

package/lib/index.js

@@ -180,6 +180,10 @@ function apply(ctx, config) {
       const match = target.match(/^[^:]+:(.+)$/);
       if (match) {
         targetUserId = match[1];
+      } else if (/^\d+$/.test(target)) {
+        targetUserId = target;
+      }
+      if (targetUserId !== session.userId) {
         try {
           const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserId);
           if (!memberInfo) {
@@ -290,8 +294,24 @@ function apply(ctx, config) {
         const atIdMatch = val.match(/<at\s[^>]*id="([^"]+)"/);
         if (atIdMatch) {
           targetUserStr = atIdMatch[1];
-        } else {
+        } else if (/^\d+$/.test(val) || /^[^:]+:.+$/.test(val)) {
           targetUserStr = val;
+        } else {
+          try {
+            const memberList = await session.bot.getGuildMemberList(session.guildId);
+            const members = memberList?.data || [];
+            const found = members.find((m) => {
+              const nick = m.nick || m.user?.name || m.name || "";
+              return nick.trim() === val || nick === val;
+            });
+            if (found) {
+              targetUserStr = found.user?.id;
+            } else {
+              return `无法通过昵称「${val}」找到群成员，请尝试使用QQ号。`;
+            }
+          } catch (e) {
+            return `无法搜索群成员，请尝试使用QQ号。`;
+          }
         }
       }
       if (!targetUserStr) {
@@ -331,7 +351,16 @@ function apply(ctx, config) {
         } catch (error) {
           return "无法找到指定用户，请检查输入是否正确。";
         }
+        const now2 = Date.now();
         const [userSetting] = await ctx.database.get("ccb_setting", { userId: senderId });
+        const lastToggle = userSetting?.lastToggleTime || 0;
+        const cooldownMs = config.toggleCooldown * 1e3;
+        if (now2 - lastToggle < cooldownMs) {
+          const remain = Math.ceil((cooldownMs - (now2 - lastToggle)) / 1e3);
+          const m = Math.floor(remain / 60);
+          const s = remain % 60;
+          return `操作太频繁了，请等待 ${m}分${s}秒 后再试。`;
+        }
         const overrides = userSetting?.overrides || {};
         if (isOff) {
           overrides[targetId] = false;
@@ -341,9 +370,8 @@ function apply(ctx, config) {
         await ctx.database.upsert("ccb_setting", [{
           userId: senderId,
           overrides,
-          // 保持其他字段默认值或原值
           optOut: userSetting?.optOut ?? false,
-          lastToggleTime: userSetting?.lastToggleTime ?? 0
+          lastToggleTime: now2
         }]);
         const targetNick = await getUserNickname(session, targetId).catch(() => targetId) || targetId;
         return isOff ? `已禁止用户 ${targetNick} 对你ccb。` : `已允许用户 ${targetNick} 对你ccb。`;
@@ -389,6 +417,10 @@ function apply(ctx, config) {
       const nickname = await getUserNickname(session, targetUserId) || targetUserId;
       return `${nickname} 拒绝了和你ccb。`;
     }
+    if (senderSetting?.overrides?.[targetUserId] === false) {
+      const nickname = await getUserNickname(session, targetUserId) || targetUserId;
+      return `你已禁止与 ${nickname} 进行ccb。`;
+    }
     const [targetSetting] = await ctx.database.get("ccb_setting", { userId: targetUserId });
     if (targetSetting) {
       const overrides = targetSetting.overrides || {};

package/package.json

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