koishi-plugin-ccb-plus 0.2.6 → 0.2.8-beta.1

package/lib/index.js

@@ -42,10 +42,10 @@ var path = __toESM(require("path"));
 var name = "ccb-plus";
 var inject = ["database"];
 var Config = import_koishi.Schema.object({
-  ywWindow: import_koishi.Schema.number().default(60).description("全局触发赛博阳痿的窗口时间（秒）"),
+  ywWindow: import_koishi.Schema.number().default(60).description("全局触发冷却的窗口时间（秒）"),
   ywThreshold: import_koishi.Schema.number().default(5).description("全局窗口时间内最大ccb数"),
-  ywBanDuration: import_koishi.Schema.number().default(900).description("全局养胃时长（秒）"),
-  ywProbability: import_koishi.Schema.number().default(0.1).min(0).max(1).description("全局随机养胃概率"),
+  ywBanDuration: import_koishi.Schema.number().default(900).description("全局冷却时长（秒）"),
+  ywProbability: import_koishi.Schema.number().default(0.1).min(0).max(1).description("全局随机冷却概率"),
   whiteList: import_koishi.Schema.array(String).default([]).description("全局配置的黑名单"),
   selfCcb: import_koishi.Schema.boolean().default(false).description("是否允许对自己ccb"),
   critProb: import_koishi.Schema.number().default(0.2).min(0).max(1).description("全局暴击概率"),
@@ -54,9 +54,9 @@ var Config = import_koishi.Schema.object({
     userId: import_koishi.Schema.string().required().description("用户ID"),
     ywWindow: import_koishi.Schema.number().default(10).description("特权窗口时间（秒）"),
     ywThreshold: import_koishi.Schema.number().default(999).description("特权窗口内最大次数"),
-    ywProbability: import_koishi.Schema.number().default(0).min(0).max(1).description("特权养胃概率"),
+    ywProbability: import_koishi.Schema.number().default(0).min(0).max(1).description("特权冷却概率"),
     critProb: import_koishi.Schema.number().default(0.8).min(0).max(1).description("特权暴击概率"),
-    ywBanDuration: import_koishi.Schema.number().default(60).description("特权养胃时长（秒）")
+    ywBanDuration: import_koishi.Schema.number().default(60).description("特权冷却时长（秒）")
   })).role("table").description("开挂名单（优先级高于全局设置）")
 });
 function apply(ctx, config) {
@@ -82,6 +82,7 @@ function apply(ctx, config) {
   const actionTimes = {};
   const banList = {};
   const nicknameCache = /* @__PURE__ */ new Map();
+  const MAX_CACHE_SIZE = 2e3;
   const CACHE_DURATION = 5 * 60 * 1e3;
   ctx.on("ready", async () => {
     const DATA_FILE = path.join(ctx.baseDir, "data", "ccb.json");
@@ -118,6 +119,27 @@ function apply(ctx, config) {
       }
     }
   });
+  const CLEANUP_INTERVAL = 10 * 60 * 1e3;
+  const cleanupTimer = setInterval(() => {
+    const now = Date.now() / 1e3;
+    for (const userId in banList) {
+      if (banList[userId] < now) delete banList[userId];
+    }
+    for (const userId in actionTimes) {
+      if (!actionTimes[userId] || actionTimes[userId].length === 0) {
+        delete actionTimes[userId];
+      }
+    }
+    const cacheNow = Date.now();
+    for (const [key, value] of nicknameCache) {
+      if (cacheNow - value.timestamp > CACHE_DURATION) {
+        nicknameCache.delete(key);
+      }
+    }
+  }, CLEANUP_INTERVAL);
+  ctx.on("dispose", () => {
+    clearInterval(cleanupTimer);
+  });
   function getAvatar(userId) {
     return `https://q4.qlogo.cn/headimg_dl?dst_uin=${userId}&spec=640`;
   }
@@ -133,6 +155,10 @@ function apply(ctx, config) {
       if (name2 && name2 !== userId) {
         const actualName = name2.trim();
         if (actualName) {
+          if (nicknameCache.size >= MAX_CACHE_SIZE) {
+            const oldestKey = nicknameCache.keys().next().value;
+            if (oldestKey) nicknameCache.delete(oldestKey);
+          }
           nicknameCache.set(cacheKey, { name: actualName, timestamp: now });
           return actualName;
         }
@@ -150,7 +176,7 @@ function apply(ctx, config) {
     }
     try {
       const userInfo = await session.bot.getUser(userId);
-      const displayName = userInfo?.name || userInfo?.nick || userInfo?.nickname;
+      const displayName = userInfo?.name || userInfo?.nick;
       const result = setAndReturnName(displayName);
       if (result) return result;
     } catch (e) {
@@ -174,39 +200,62 @@ function apply(ctx, config) {
     return null;
   }
   __name(checkGroupCommand, "checkGroupCommand");
+  async function findTargetUser(session, input) {
+    if (!input) return null;
+    const atMatch = input.match(/<at\s[^>]*id="([^"]+)"/);
+    if (atMatch) return atMatch[1];
+    const unionMatch = input.match(/^[^:]+:(.+)$/);
+    if (unionMatch) {
+      return unionMatch[1];
+    }
+    if (/^\d+$/.test(input)) {
+      return input;
+    }
+    try {
+      const list = await session.bot.getGuildMemberList(session.guildId);
+      const members = list?.data || [];
+      const clean = /* @__PURE__ */ __name((s) => s.replace(/\s/g, "").toLowerCase(), "clean");
+      const targetName = clean(input);
+      let found = members.find((m) => {
+        const nick = m.nick || m.user?.name || m.name || "";
+        return clean(nick) === targetName;
+      });
+      if (!found) {
+        found = members.find((m) => {
+          const nick = m.nick || m.user?.name || m.name || "";
+          return clean(nick).includes(targetName);
+        });
+      }
+      if (found) return found.user?.id;
+    } catch (e) {
+    }
+    return null;
+  }
+  __name(findTargetUser, "findTargetUser");
   async function validateTargetUser(session, target) {
-    let targetUserId = session.userId;
     if (target) {
-      const match = target.match(/^[^:]+:(.+)$/);
-      if (match) {
-        targetUserId = match[1];
+      const foundId = await findTargetUser(session, target);
+      if (foundId) {
         try {
-          const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserId);
-          if (!memberInfo) {
-            return "无法找到指定用户，请检查输入是否正确。";
-          }
-        } catch (error) {
+          const member = await session.bot.getGuildMember(session.guildId, foundId);
+          if (!member) return "无法找到指定用户，请检查输入是否正确。";
+        } catch {
           return "无法找到指定用户，请检查输入是否正确。";
         }
+        return foundId;
       }
-    } else if (session.quote?.user?.id) {
-      targetUserId = session.quote.user.id;
-      try {
-        const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserId);
-        if (!memberInfo) {
-          return "无法找到指定用户，请检查输入是否正确。";
-        }
-      } catch (error) {
-        return "无法找到指定用户，请检查输入是否正确。";
-      }
+      return "无法找到指定用户，请检查输入是否正确。";
+    }
+    if (session.quote?.user?.id) {
+      return session.quote.user.id;
     }
-    return targetUserId;
+    return session.userId;
   }
   __name(validateTargetUser, "validateTargetUser");
   async function updateCCBRecord(session, groupId, targetUserId, duration, V, nickname, crit, pic) {
     const [record] = await ctx.database.get("ccb_record", { groupId, userId: targetUserId });
     if (!record) {
-      return await createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, pic);
+      return await createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, crit, pic);
     }
     const senderId = session.userId;
     const newNum = (record.num || 0) + 1;
@@ -234,12 +283,6 @@ function apply(ctx, config) {
         if (ccb_by[k]) ccb_by[k].max = false;
       }
       if (ccb_by[senderId]) ccb_by[senderId].max = true;
-    } else {
-      for (const k in ccb_by) {
-        if (ccb_by[k] && !ccb_by[k].max) {
-          ccb_by[k].max = false;
-        }
-      }
     }
     await ctx.database.set("ccb_record", { groupId, userId: targetUserId }, {
       num: newNum,
@@ -256,7 +299,7 @@ function apply(ctx, config) {
     return message;
   }
   __name(updateCCBRecord, "updateCCBRecord");
-  async function createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, pic) {
+  async function createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, crit, pic) {
     const newRecord = {
       groupId,
       userId: targetUserId,
@@ -266,7 +309,7 @@ function apply(ctx, config) {
       ccb_by: { [session.userId]: { count: 1, first: true, max: true } }
     };
     await ctx.database.upsert("ccb_record", [newRecord]);
-    const resultMessage = `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
+    const resultMessage = crit ? `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了 💥 暴击！${V.toFixed(2)}ml的生命因子` : `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
     const message = [
       resultMessage,
       import_koishi.segment.image(pic),
@@ -279,6 +322,17 @@ function apply(ctx, config) {
     const checkResult = checkGroupCommand(session);
     if (checkResult) return checkResult;
     const senderId = session.userId;
+    const checkCooldown = /* @__PURE__ */ __name((lastToggle) => {
+      const now2 = Date.now();
+      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}秒 后再试。`;
+      }
+      return null;
+    }, "checkCooldown");
     const hasOff = "off" in options;
     const hasOn = "on" in options;
     if (hasOff || hasOn) {
@@ -286,13 +340,7 @@ function apply(ctx, config) {
       const optionVal = isOff ? options.off : options.on;
       let targetUserStr = null;
       if (typeof optionVal === "string" && optionVal.trim()) {
-        const val = optionVal.trim();
-        const atIdMatch = val.match(/<at\s[^>]*id="([^"]+)"/);
-        if (atIdMatch) {
-          targetUserStr = atIdMatch[1];
-        } else {
-          targetUserStr = val;
-        }
+        targetUserStr = await findTargetUser(session, optionVal.trim());
       }
       if (!targetUserStr) {
         const atEl = session.elements?.find((el) => el.type === "at");
@@ -301,16 +349,14 @@ function apply(ctx, config) {
         }
       }
       if (!targetUserStr) {
+        if (typeof optionVal === "string" && optionVal.trim()) {
+          return `无法找到用户「${optionVal}」，请检查输入是否正确。`;
+        }
         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 cooldownResult = checkCooldown(lastToggle);
+        if (cooldownResult) return cooldownResult;
         const newOptOut = !!isOff;
         await ctx.database.upsert("ccb_setting", [{
           userId: senderId,
@@ -320,30 +366,27 @@ function apply(ctx, config) {
         }]);
         return newOptOut ? "已开启全局保护模式，阻止你被ccb。" : "已关闭全局保护模式，允许你被ccb。";
       } else {
-        let targetId = targetUserStr;
-        const match = targetUserStr.match(/^[^:]+:(.+)$/);
-        if (match) targetId = match[1];
         try {
-          const memberInfo = await session.bot.getGuildMember(session.guildId, targetId);
+          const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserStr);
           if (!memberInfo) {
             return "无法找到指定用户，请检查输入是否正确。";
           }
         } catch (error) {
           return "无法找到指定用户，请检查输入是否正确。";
         }
+        const targetId = targetUserStr;
+        const now2 = Date.now();
         const [userSetting] = await ctx.database.get("ccb_setting", { userId: senderId });
+        const lastToggle = userSetting?.lastToggleTime || 0;
+        const cooldownResult = checkCooldown(lastToggle);
+        if (cooldownResult) return cooldownResult;
         const overrides = userSetting?.overrides || {};
-        if (isOff) {
-          overrides[targetId] = false;
-        } else {
-          overrides[targetId] = true;
-        }
+        overrides[targetId] = !isOff;
         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 +432,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 || {};
@@ -402,7 +449,7 @@ function apply(ctx, config) {
       }
     }
     if (targetUserId === actorId && !config.selfCcb) {
-      return "怎么还能捅到自己的啊（恼）";
+      return "怎么还能对自己下手啊（恼）";
     }
     const duration = parseFloat((Math.random() * 59 + 1).toFixed(2));
     let V = parseFloat((Math.random() * 99 + 1).toFixed(2));
@@ -413,18 +460,10 @@ function apply(ctx, config) {
       crit = true;
     }
     const pic = getAvatar(targetUserId);
-    const exists = await ctx.database.get("ccb_record", {
-      groupId: session.guildId,
-      userId: targetUserId
-    });
     let message;
     try {
       const nickname = await getUserNickname(session, targetUserId);
-      if (exists.length > 0) {
-        message = await updateCCBRecord(session, session.guildId, targetUserId, duration, V, nickname, crit, pic);
-      } else {
-        message = await createNewCCBRecord(session, session.guildId, targetUserId, duration, V, nickname, pic);
-      }
+      message = await updateCCBRecord(session, session.guildId, targetUserId, duration, V, nickname, crit, pic);
     } catch (e) {
       console.error(`报错: ${e}`);
       return "对方拒绝了和你ccb";
@@ -432,26 +471,37 @@ function apply(ctx, config) {
     if (Math.random() < currentConfig.ywProbability) {
       banList[actorId] = now + currentConfig.ywBanDuration;
       await session.send(message);
-      return "💥你炸膛了！再也不能ccb了（悲）";
+      return "💥你炸膛了！不能ccb了（悲）";
     }
     return message;
   });
+  async function buildRanking(session, title, data, formatLine) {
+    const nicknameMap = /* @__PURE__ */ new Map();
+    await Promise.all(data.map(async (r) => {
+      nicknameMap.set(r.userId, await getUserNickname(session, r.userId));
+    }));
+    let msg = `${title}
+`;
+    for (let i = 0; i < data.length; i++) {
+      const nick = nicknameMap.get(data[i].userId) || data[i].userId;
+      msg += formatLine(data[i], nick, i);
+    }
+    return msg.trim();
+  }
+  __name(buildRanking, "buildRanking");
   ctx.command("ccbtop", "按次数排行").action(async ({ session }) => {
     const checkResult = checkGroupCommand(session);
     if (checkResult) return checkResult;
     const groupData = await ctx.database.get("ccb_record", { groupId: session.guildId });
     if (!groupData.length) return "当前群暂无ccb记录。";
     const top5 = groupData.sort((a, b) => b.num - a.num).slice(0, 5);
-    const nicknamePromises = top5.map((r) => getUserNickname(session, r.userId));
-    const nicknames = await Promise.all(nicknamePromises);
-    let msg = "被ccb排行榜 TOP5：\n";
-    for (let i = 0; i < top5.length; i++) {
-      const r = top5[i];
-      const nick = nicknames[i] || r.userId;
-      msg += `${i + 1}. ${nick} - 次数：${r.num}
-`;
-    }
-    return msg.trim();
+    return buildRanking(
+      session,
+      "被ccb排行榜 TOP5：",
+      top5,
+      (r, nick, i) => `${i + 1}. ${nick} - 次数：${r.num}
+`
+    );
   });
   ctx.command("ccbvol", "按注入量排行").action(async ({ session }) => {
     const checkResult = checkGroupCommand(session);
@@ -459,16 +509,13 @@ function apply(ctx, config) {
     const groupData = await ctx.database.get("ccb_record", { groupId: session.guildId });
     if (!groupData.length) return "当前群暂无ccb记录。";
     const top5 = groupData.sort((a, b) => b.vol - a.vol).slice(0, 5);
-    const nicknamePromises = top5.map((r) => getUserNickname(session, r.userId));
-    const nicknames = await Promise.all(nicknamePromises);
-    let msg = "被注入量排行榜 TOP5：\n";
-    for (let i = 0; i < top5.length; i++) {
-      const r = top5[i];
-      const nick = nicknames[i] || r.userId;
-      msg += `${i + 1}. ${nick} - 累计注入：${r.vol.toFixed(2)}ml
-`;
-    }
-    return msg.trim();
+    return buildRanking(
+      session,
+      "被注入量排行榜 TOP5：",
+      top5,
+      (r, nick, i) => `${i + 1}. ${nick} - 累计注入：${r.vol.toFixed(2)}ml
+`
+    );
   });
   ctx.command("ccbmax", "按max值排行并输出产生者").action(async ({ session }) => {
     const checkResult = checkGroupCommand(session);
@@ -527,16 +574,15 @@ function apply(ctx, config) {
   ctx.command("ccbinfo [target:user]", "查询某人ccb信息").action(async ({ session }, target) => {
     const checkResult = checkGroupCommand(session);
     if (checkResult) return checkResult;
-    let targetUserId = session.userId;
-    if (target) {
-      const match = target.match(/^[^:]+:(.+)$/);
-      if (match) targetUserId = match[1];
+    let targetUserId = await validateTargetUser(session, target);
+    if (targetUserId.startsWith("无法找到")) {
+      return targetUserId;
     }
     const [record] = await ctx.database.get("ccb_record", { groupId: session.guildId, userId: targetUserId });
     if (!record) return "该用户暂无ccb记录。";
     const total_num = record.num;
     const total_vol = record.vol;
-    let max_val = record.max || (total_num > 0 ? total_vol / total_num : 0);
+    const max_val = record.max || (total_num > 0 ? total_vol / total_num : 0);
     const groupData = await ctx.database.get("ccb_record", { groupId: session.guildId });
     let cb_total = 0;
     for (const r of groupData) {
@@ -564,15 +610,15 @@ function apply(ctx, config) {
     const first_nick = first_actor ? await getUserNickname(session, first_actor) : "未知";
     const msg = [
       `【${target_nick} 】`,
-      `• 破壁人：${first_nick}`,
-      `• 北朝：${total_num}`,
-      `• 朝壁：${cb_total}`,
-      `• 诗经：${total_vol.toFixed(2)}ml`,
-      `• 马克思：${max_val.toFixed(2)}ml`
+      `• 开拓者：${first_nick}`,
+      `• 被注入次数：${total_num}`,
+      `• 主动出击：${cb_total}`,
+      `• 累计容量：${total_vol.toFixed(2)}ml`,
+      `• 单次最高：${max_val.toFixed(2)}ml`
     ].join("\n");
     return msg;
   });
-  ctx.command("xnn", "XNN榜 - 计算群中最xnn特质的群友").action(async ({ session }) => {
+  ctx.command("ccbcharm", "魅力榜 - 计算群中最受欢迎的群友").action(async ({ session }) => {
     const checkResult = checkGroupCommand(session);
     if (checkResult) return checkResult;
     const w_num = 1;
@@ -596,11 +642,11 @@ function apply(ctx, config) {
     await Promise.all(ranking.map(async (r) => {
       nicknameMap.set(r.userId, await getUserNickname(session, r.userId));
     }));
-    let msg = "💎 XNN TOP5 💎\n";
+    let msg = "💎 魅力榜 TOP5 💎\n";
     for (let i = 0; i < ranking.length; i++) {
       const { userId, val } = ranking[i];
       const nick = nicknameMap.get(userId) || userId;
-      msg += `${i + 1}. ${nick} - XNN值：${val.toFixed(2)}
+      msg += `${i + 1}. ${nick} - 魅力值：${val.toFixed(2)}
 `;
     }
     return msg.trim();

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.8-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [