koishi-plugin-ccb-plus 0.2.7 → 0.2.8-beta.2

package/lib/commands/ccb.d.ts

@@ -0,0 +1,4 @@
+import { Context } from 'koishi';
+import { CCBConfig } from '../config';
+import { CcbState } from '../utils';
+export declare function applyCcbCommand(ctx: Context, config: CCBConfig, state: CcbState): void;

package/lib/commands/charm.d.ts

@@ -0,0 +1,3 @@
+import { Context } from 'koishi';
+import { CcbState } from '../utils';
+export declare function applyCharmCommand(ctx: Context, state: CcbState): void;

package/lib/commands/index.d.ts

@@ -0,0 +1,4 @@
+import { Context } from 'koishi';
+import { CCBConfig } from '../config';
+import { CcbState } from '../utils';
+export declare function applyCommands(ctx: Context, config: CCBConfig, state: CcbState): void;

package/lib/commands/info.d.ts

@@ -0,0 +1,3 @@
+import { Context } from 'koishi';
+import { CcbState } from '../utils';
+export declare function applyInfoCommand(ctx: Context, state: CcbState): void;

package/lib/commands/rank.d.ts

@@ -0,0 +1,3 @@
+import { Context } from 'koishi';
+import { CcbState } from '../utils';
+export declare function applyRankCommands(ctx: Context, state: CcbState): void;

package/lib/config.d.ts

@@ -0,0 +1,21 @@
+import { Schema } from 'koishi';
+export interface CheatConfig {
+    userId: string;
+    ywWindow: number;
+    ywThreshold: number;
+    ywProbability: number;
+    critProb: number;
+    ywBanDuration: number;
+}
+export interface CCBConfig {
+    ywWindow: number;
+    ywThreshold: number;
+    ywBanDuration: number;
+    ywProbability: number;
+    whiteList: string[];
+    selfCcb: boolean;
+    critProb: number;
+    toggleCooldown: number;
+    cheatList: CheatConfig[];
+}
+export declare const Config: Schema<CCBConfig>;

package/lib/core.d.ts

@@ -0,0 +1,3 @@
+import { Context, Session } from 'koishi';
+export declare function createNewCCBRecord(ctx: Context, session: Session, groupId: string, targetUserId: string, duration: number, V: number, nickname: string, crit: boolean, pic: string): Promise<string>;
+export declare function updateCCBRecord(ctx: Context, session: Session, groupId: string, targetUserId: string, duration: number, V: number, nickname: string, crit: boolean, pic: string): Promise<string>;

package/lib/index.d.ts

@@ -1,50 +1,8 @@
-import { Context, Schema } from 'koishi';
+import { Context } from 'koishi';
+import { Config, CCBConfig } from './config';
 export declare const name = "ccb-plus";
 export declare const inject: string[];
-export interface CheatConfig {
-    userId: string;
-    ywWindow: number;
-    ywThreshold: number;
-    ywProbability: number;
-    critProb: number;
-    ywBanDuration: number;
-}
-export interface CCBConfig {
-    ywWindow: number;
-    ywThreshold: number;
-    ywBanDuration: number;
-    ywProbability: number;
-    whiteList: string[];
-    selfCcb: boolean;
-    critProb: number;
-    toggleCooldown: number;
-    cheatList: CheatConfig[];
-}
-export interface CCBRecord {
-    groupId: string;
-    userId: string;
-    num: number;
-    vol: number;
-    max: number;
-    ccb_by: {
-        [actorId: string]: {
-            count: number;
-            first: boolean;
-            max: boolean;
-        };
-    };
-}
-export interface CCBUserSetting {
-    userId: string;
-    optOut: boolean;
-    lastToggleTime: number;
-    overrides: Record<string, boolean>;
-}
-declare module 'koishi' {
-    interface Tables {
-        ccb_record: CCBRecord;
-        ccb_setting: CCBUserSetting;
-    }
-}
-export declare const Config: Schema<CCBConfig>;
+export { Config };
+export * from './config';
+export * from './model';
 export declare function apply(ctx: Context, config: CCBConfig): void;

package/lib/index.js

@@ -32,20 +32,19 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  applyDatabase: () => applyDatabase,
   inject: () => inject,
   name: () => name
 });
 module.exports = __toCommonJS(src_exports);
+
+// src/config.ts
 var import_koishi = require("koishi");
-var import_fs = require("fs");
-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,12 +53,16 @@ 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) {
+
+// src/model.ts
+var import_fs = require("fs");
+var path = __toESM(require("path"));
+function applyDatabase(ctx) {
   ctx.model.extend("ccb_record", {
     groupId: "string",
     userId: "string",
@@ -79,10 +82,6 @@ function apply(ctx, config) {
   }, {
     primary: "userId"
   });
-  const actionTimes = {};
-  const banList = {};
-  const nicknameCache = /* @__PURE__ */ new Map();
-  const CACHE_DURATION = 5 * 60 * 1e3;
   ctx.on("ready", async () => {
     const DATA_FILE = path.join(ctx.baseDir, "data", "ccb.json");
     try {
@@ -118,22 +117,66 @@ function apply(ctx, config) {
       }
     }
   });
-  function getAvatar(userId) {
+}
+__name(applyDatabase, "applyDatabase");
+
+// src/utils.ts
+var import_koishi2 = require("koishi");
+var CcbState = class _CcbState {
+  static {
+    __name(this, "CcbState");
+  }
+  actionTimes = {};
+  banList = {};
+  nicknameCache = /* @__PURE__ */ new Map();
+  static MAX_CACHE_SIZE = 2e3;
+  static CACHE_DURATION = 5 * 60 * 1e3;
+  cleanupTimer;
+  constructor(ctx) {
+    const CLEANUP_INTERVAL = 10 * 60 * 1e3;
+    this.cleanupTimer = setInterval(() => this.cleanup(), CLEANUP_INTERVAL);
+    ctx.on("dispose", () => {
+      clearInterval(this.cleanupTimer);
+    });
+  }
+  cleanup() {
+    const nowMs = Date.now();
+    const nowSec = nowMs / 1e3;
+    for (const userId in this.banList) {
+      if (this.banList[userId] < nowSec) {
+        delete this.banList[userId];
+      }
+    }
+    for (const userId in this.actionTimes) {
+      if (!this.actionTimes[userId]?.length) {
+        delete this.actionTimes[userId];
+      }
+    }
+    for (const [key, value] of this.nicknameCache) {
+      if (nowMs - value.timestamp > _CcbState.CACHE_DURATION) {
+        this.nicknameCache.delete(key);
+      }
+    }
+  }
+  getAvatar(userId) {
     return `https://q4.qlogo.cn/headimg_dl?dst_uin=${userId}&spec=640`;
   }
-  __name(getAvatar, "getAvatar");
-  async function getUserNickname(session, userId) {
+  async getUserNickname(session, userId) {
     const cacheKey = `${session.guildId}:${userId}`;
-    const cached = nicknameCache.get(cacheKey);
+    const cached = this.nicknameCache.get(cacheKey);
     const now = Date.now();
-    if (cached && now - cached.timestamp < CACHE_DURATION) {
+    if (cached && now - cached.timestamp < _CcbState.CACHE_DURATION) {
       return cached.name;
     }
     const setAndReturnName = /* @__PURE__ */ __name((name2) => {
       if (name2 && name2 !== userId) {
         const actualName = name2.trim();
         if (actualName) {
-          nicknameCache.set(cacheKey, { name: actualName, timestamp: now });
+          if (this.nicknameCache.size >= _CcbState.MAX_CACHE_SIZE) {
+            const oldestKey = this.nicknameCache.keys().next().value;
+            if (oldestKey) this.nicknameCache.delete(oldestKey);
+          }
+          this.nicknameCache.set(cacheKey, { name: actualName, timestamp: now });
           return actualName;
         }
       }
@@ -150,7 +193,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) {
@@ -163,126 +206,166 @@ function apply(ctx, config) {
     } catch (nestedError) {
     }
     const friendlyName = `用户${userId}`;
-    nicknameCache.set(cacheKey, { name: friendlyName, timestamp: now });
+    this.nicknameCache.set(cacheKey, { name: friendlyName, timestamp: now });
     return friendlyName;
   }
-  __name(getUserNickname, "getUserNickname");
-  function checkGroupCommand(session) {
+  checkGroupCommand(session) {
     if (!session.guildId) {
       return "此命令只能在群聊中使用。";
     }
     return null;
   }
-  __name(checkGroupCommand, "checkGroupCommand");
-  async function validateTargetUser(session, target) {
-    let targetUserId = session.userId;
-    if (target) {
-      const match = target.match(/^[^:]+:(.+)$/);
-      if (match) {
-        targetUserId = match[1];
-      } else if (/^\d+$/.test(target)) {
-        targetUserId = target;
+  async findTargetUser(session, input) {
+    if (!input) return null;
+    try {
+      const elements = import_koishi2.h.parse(input);
+      const atEl = elements.find((el) => el.type === "at");
+      if (atEl?.attrs?.id) {
+        return String(atEl.attrs.id);
       }
-      if (targetUserId !== session.userId) {
-        try {
-          const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserId);
-          if (!memberInfo) {
-            return "无法找到指定用户，请检查输入是否正确。";
-          }
-        } catch (error) {
-          return "无法找到指定用户，请检查输入是否正确。";
+    } catch (e) {
+      const atMatch = input.match(/<at\s+(?:.*?\s+)?id=(["'])(.*?)\1/i);
+      if (atMatch) return atMatch[2];
+    }
+    const colonIndex = input.indexOf(":");
+    if (colonIndex > 0 && colonIndex < input.length - 1) {
+      return input.slice(colonIndex + 1);
+    }
+    if (/^\d+$/.test(input)) {
+      return input;
+    }
+    try {
+      const list = await session.bot.getGuildMemberList(session.guildId);
+      const members = list?.data;
+      if (!members?.length) return null;
+      const targetName = input.replace(/\s/g, "").toLowerCase();
+      let exactMatchId;
+      let partialMatchId;
+      for (const m of members) {
+        const nick = m.nick || m.user?.name || m.name || "";
+        if (!nick) continue;
+        const cleanNick = nick.replace(/\s/g, "").toLowerCase();
+        if (cleanNick === targetName) {
+          exactMatchId = m.user?.id;
+          break;
         }
-      }
-    } else if (session.quote?.user?.id) {
-      targetUserId = session.quote.user.id;
-      try {
-        const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserId);
-        if (!memberInfo) {
-          return "无法找到指定用户，请检查输入是否正确。";
+        if (!partialMatchId && cleanNick.includes(targetName)) {
+          partialMatchId = m.user?.id;
         }
-      } catch (error) {
-        return "无法找到指定用户，请检查输入是否正确。";
       }
+      const finalMatch = exactMatchId || partialMatchId;
+      if (finalMatch) return finalMatch;
+    } catch (e) {
     }
-    return targetUserId;
+    return null;
   }
-  __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);
-    }
-    const senderId = session.userId;
-    const newNum = (record.num || 0) + 1;
-    const newVol = parseFloat(((record.vol || 0) + V).toFixed(2));
-    let ccb_by = record.ccb_by || {};
-    ccb_by = JSON.parse(JSON.stringify(ccb_by));
-    if (senderId in ccb_by) {
-      const current = ccb_by[senderId];
-      ccb_by[senderId] = {
-        count: (current?.count || 0) + 1,
-        first: current?.first || false,
-        max: current?.max || false
-      };
-    } else {
-      ccb_by[senderId] = { count: 1, first: false, max: false };
-    }
-    let prev_max = record.max || 0;
-    if (prev_max === 0 && (record.num || 0) > 0) {
-      prev_max = parseFloat(((record.vol || 0) / (record.num || 0)).toFixed(2));
-    }
-    let newMax = prev_max;
-    if (V > prev_max) {
-      newMax = V;
-      for (const k in ccb_by) {
-        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;
+  async validateTargetUser(session, target) {
+    if (target) {
+      const foundId = await this.findTargetUser(session, target);
+      if (foundId) {
+        try {
+          const member = await session.bot.getGuildMember(session.guildId, foundId);
+          if (!member) return "无法找到指定用户，请检查输入是否正确。";
+        } catch {
+          return "无法找到指定用户，请检查输入是否正确。";
         }
+        return foundId;
       }
+      return "无法找到指定用户，请检查输入是否正确。";
     }
-    await ctx.database.set("ccb_record", { groupId, userId: targetUserId }, {
-      num: newNum,
-      vol: newVol,
-      max: newMax,
-      ccb_by
-    });
-    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),
-      `这是ta的第${newNum}次。`
-    ].join("\n");
-    return message;
+    if (session.quote?.user?.id) {
+      return session.quote.user.id;
+    }
+    return session.userId;
   }
-  __name(updateCCBRecord, "updateCCBRecord");
-  async function createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, pic) {
-    const newRecord = {
-      groupId,
-      userId: targetUserId,
-      num: 1,
-      vol: V,
-      max: V,
-      ccb_by: { [session.userId]: { count: 1, first: true, max: true } }
+};
+
+// src/core.ts
+var import_koishi3 = require("koishi");
+async function createNewCCBRecord(ctx, session, groupId, targetUserId, duration, V, nickname, crit, pic) {
+  const newRecord = {
+    groupId,
+    userId: targetUserId,
+    num: 1,
+    vol: V,
+    max: V,
+    ccb_by: { [session.userId]: { count: 1, first: true, max: true } }
+  };
+  await ctx.database.upsert("ccb_record", [newRecord]);
+  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_koishi3.segment.image(pic),
+    "这是ta的初体验。"
+  ].join("\n");
+  return message;
+}
+__name(createNewCCBRecord, "createNewCCBRecord");
+async function updateCCBRecord(ctx, session, groupId, targetUserId, duration, V, nickname, crit, pic) {
+  const [record] = await ctx.database.get("ccb_record", { groupId, userId: targetUserId });
+  if (!record) {
+    return await createNewCCBRecord(ctx, session, groupId, targetUserId, duration, V, nickname, crit, pic);
+  }
+  const senderId = session.userId;
+  const newNum = (record.num || 0) + 1;
+  const newVol = parseFloat(((record.vol || 0) + V).toFixed(2));
+  let ccb_by = record.ccb_by || {};
+  ccb_by = JSON.parse(JSON.stringify(ccb_by));
+  if (senderId in ccb_by) {
+    const current = ccb_by[senderId];
+    ccb_by[senderId] = {
+      count: (current?.count || 0) + 1,
+      first: current?.first || false,
+      max: current?.max || false
     };
-    await ctx.database.upsert("ccb_record", [newRecord]);
-    const resultMessage = `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
-    const message = [
-      resultMessage,
-      import_koishi.segment.image(pic),
-      "这是ta的初体验。"
-    ].join("\n");
-    return message;
+  } else {
+    ccb_by[senderId] = { count: 1, first: false, max: false };
   }
-  __name(createNewCCBRecord, "createNewCCBRecord");
+  let prev_max = record.max || 0;
+  if (prev_max === 0 && (record.num || 0) > 0) {
+    prev_max = parseFloat(((record.vol || 0) / (record.num || 0)).toFixed(2));
+  }
+  let newMax = prev_max;
+  if (V > prev_max) {
+    newMax = V;
+    for (const k in ccb_by) {
+      if (ccb_by[k]) ccb_by[k].max = false;
+    }
+    if (ccb_by[senderId]) ccb_by[senderId].max = true;
+  }
+  await ctx.database.set("ccb_record", { groupId, userId: targetUserId }, {
+    num: newNum,
+    vol: newVol,
+    max: newMax,
+    ccb_by
+  });
+  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_koishi3.segment.image(pic),
+    `这是ta的第${newNum}次。`
+  ].join("\n");
+  return message;
+}
+__name(updateCCBRecord, "updateCCBRecord");
+
+// src/commands/ccb.ts
+function applyCcbCommand(ctx, config, state) {
   ctx.command("ccb [target:user]", "给群友注入生命因子").option("off", "--off [user:string] 将自己加入白名单（禁止被人ccb），可指定用户").option("on", "--on [user:string] 将自己移出白名单（允许被人ccb），可指定用户").action(async ({ session, options }, target) => {
-    const checkResult = checkGroupCommand(session);
+    const checkResult = state.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) {
@@ -290,29 +373,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 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号。`;
-          }
-        }
+        targetUserStr = await state.findTargetUser(session, optionVal.trim());
       }
       if (!targetUserStr) {
         const atEl = session.elements?.find((el) => el.type === "at");
@@ -320,60 +381,42 @@ function apply(ctx, config) {
           targetUserStr = String(atEl.attrs.id);
         }
       }
-      if (!targetUserStr) {
-        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}秒 后再试。`;
+      if (!targetUserStr && typeof optionVal === "string" && optionVal.trim()) {
+        return `无法找到用户「${optionVal}」，请检查输入是否正确。`;
+      }
+      if (targetUserStr) {
+        try {
+          const memberInfo = await session.bot.getGuildMember(session.guildId, targetUserStr);
+          if (!memberInfo) return "无法找到指定用户，请检查输入是否正确。";
+        } catch (error) {
+          return "无法找到指定用户，请检查输入是否正确。";
         }
+      }
+      const [userSetting] = await ctx.database.get("ccb_setting", { userId: senderId });
+      const lastToggle = userSetting?.lastToggleTime || 0;
+      const cooldownResult = checkCooldown(lastToggle);
+      if (cooldownResult) return cooldownResult;
+      const nowMs = Date.now();
+      if (!targetUserStr) {
         const newOptOut = !!isOff;
         await ctx.database.upsert("ccb_setting", [{
           userId: senderId,
           optOut: newOptOut,
-          lastToggleTime: now2,
+          lastToggleTime: nowMs,
           overrides: userSetting?.overrides || {}
         }]);
         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);
-          if (!memberInfo) {
-            return "无法找到指定用户，请检查输入是否正确。";
-          }
-        } 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 targetId = targetUserStr;
         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: now2
+          lastToggleTime: nowMs
         }]);
-        const targetNick = await getUserNickname(session, targetId).catch(() => targetId) || targetId;
+        const targetNick = await state.getUserNickname(session, targetId).catch(() => targetId) || targetId;
         return isOff ? `已禁止用户 ${targetNick} 对你ccb。` : `已允许用户 ${targetNick} 对你ccb。`;
       }
     }
@@ -391,50 +434,50 @@ function apply(ctx, config) {
       ywProbability: cheatSetting ? cheatSetting.ywProbability : config.ywProbability,
       critProb: cheatSetting ? cheatSetting.critProb : config.critProb
     };
-    const banEnd = banList[actorId] || 0;
+    const banEnd = state.banList[actorId] || 0;
     if (now < banEnd) {
       const remain = Math.floor(banEnd - now);
       const m = Math.floor(remain / 60);
       const s = remain % 60;
       return `嘻嘻，你已经一滴不剩了，填充还剩 ${m}分${s}秒`;
     }
-    const times = actionTimes[actorId] = actionTimes[actorId] || [];
+    const times = state.actionTimes[actorId] = state.actionTimes[actorId] || [];
     const cutoff = now - currentConfig.ywWindow;
     while (times.length > 0 && times[0] < cutoff) {
       times.shift();
     }
     times.push(now);
     if (times.length > currentConfig.ywThreshold) {
-      banList[actorId] = now + currentConfig.ywBanDuration;
-      actionTimes[actorId] = [];
+      state.banList[actorId] = now + currentConfig.ywBanDuration;
+      state.actionTimes[actorId] = [];
       return "冲得出来吗你就冲，再冲就给你折了";
     }
-    let targetUserId = await validateTargetUser(session, target);
+    let targetUserId = await state.validateTargetUser(session, target);
     if (targetUserId.startsWith("无法找到")) {
       return targetUserId;
     }
     if (config.whiteList.includes(targetUserId)) {
-      const nickname = await getUserNickname(session, targetUserId) || targetUserId;
+      const nickname = await state.getUserNickname(session, targetUserId) || targetUserId;
       return `${nickname} 拒绝了和你ccb。`;
     }
     if (senderSetting?.overrides?.[targetUserId] === false) {
-      const nickname = await getUserNickname(session, targetUserId) || targetUserId;
+      const nickname = await state.getUserNickname(session, targetUserId) || targetUserId;
       return `你已禁止与 ${nickname} 进行ccb。`;
     }
     const [targetSetting] = await ctx.database.get("ccb_setting", { userId: targetUserId });
     if (targetSetting) {
       const overrides = targetSetting.overrides || {};
       if (overrides[actorId] === false) {
-        const nickname = await getUserNickname(session, targetUserId) || targetUserId;
+        const nickname = await state.getUserNickname(session, targetUserId) || targetUserId;
         return `${nickname} 拒绝了和你ccb`;
       }
       if (overrides[actorId] !== true && targetSetting.optOut) {
-        const nickname = await getUserNickname(session, targetUserId) || targetUserId;
+        const nickname = await state.getUserNickname(session, targetUserId) || targetUserId;
         return `${nickname} 拒绝了和你ccb`;
       }
     }
     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));
@@ -444,66 +487,71 @@ function apply(ctx, config) {
       V = parseFloat((V * 2).toFixed(2));
       crit = true;
     }
-    const pic = getAvatar(targetUserId);
-    const exists = await ctx.database.get("ccb_record", {
-      groupId: session.guildId,
-      userId: targetUserId
-    });
+    const pic = state.getAvatar(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);
-      }
+      const nickname = await state.getUserNickname(session, targetUserId);
+      message = await updateCCBRecord(ctx, session, session.guildId, targetUserId, duration, V, nickname, crit, pic);
     } catch (e) {
       console.error(`报错: ${e}`);
       return "对方拒绝了和你ccb";
     }
     if (Math.random() < currentConfig.ywProbability) {
-      banList[actorId] = now + currentConfig.ywBanDuration;
+      state.banList[actorId] = now + currentConfig.ywBanDuration;
       await session.send(message);
-      return "💥你炸膛了！再也不能ccb了（悲）";
+      return "💥你炸膛了！不能ccb了（悲）";
     }
     return message;
   });
+}
+__name(applyCcbCommand, "applyCcbCommand");
+
+// src/commands/rank.ts
+function applyRankCommands(ctx, state) {
+  async function buildRanking(session, title, data, formatLine) {
+    const nicknameMap = /* @__PURE__ */ new Map();
+    await Promise.all(data.map(async (r) => {
+      nicknameMap.set(r.userId, await state.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);
+    const checkResult = state.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);
+    const checkResult = state.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.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);
+    const checkResult = state.checkGroupCommand(session);
     if (checkResult) return checkResult;
     const groupData = await ctx.database.get("ccb_record", { groupId: session.guildId });
     if (!groupData.length) return "当前群暂无ccb记录。";
@@ -543,7 +591,7 @@ function apply(ctx, config) {
     const uniqueUserIds = [...new Set(userIds)];
     const nicknameMap = /* @__PURE__ */ new Map();
     await Promise.all(uniqueUserIds.map(async (uid) => {
-      nicknameMap.set(uid, await getUserNickname(session, uid));
+      nicknameMap.set(uid, await state.getUserNickname(session, uid));
     }));
     let msg = "单次最大注入排行榜 TOP5：\n";
     for (let i = 0; i < entries.length; i++) {
@@ -556,19 +604,23 @@ function apply(ctx, config) {
     }
     return msg.trim();
   });
+}
+__name(applyRankCommands, "applyRankCommands");
+
+// src/commands/info.ts
+function applyInfoCommand(ctx, state) {
   ctx.command("ccbinfo [target:user]", "查询某人ccb信息").action(async ({ session }, target) => {
-    const checkResult = checkGroupCommand(session);
+    const checkResult = state.checkGroupCommand(session);
     if (checkResult) return checkResult;
-    let targetUserId = session.userId;
-    if (target) {
-      const match = target.match(/^[^:]+:(.+)$/);
-      if (match) targetUserId = match[1];
+    let targetUserId = await state.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) {
@@ -592,20 +644,25 @@ function apply(ctx, config) {
         }
       }
     }
-    const target_nick = await getUserNickname(session, targetUserId);
-    const first_nick = first_actor ? await getUserNickname(session, first_actor) : "未知";
+    const target_nick = await state.getUserNickname(session, targetUserId);
+    const first_nick = first_actor ? await state.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 }) => {
-    const checkResult = checkGroupCommand(session);
+}
+__name(applyInfoCommand, "applyInfoCommand");
+
+// src/commands/charm.ts
+function applyCharmCommand(ctx, state) {
+  ctx.command("ccbcharm", "魅力榜 - 计算群中最受欢迎的群友").action(async ({ session }) => {
+    const checkResult = state.checkGroupCommand(session);
     if (checkResult) return checkResult;
     const w_num = 1;
     const w_vol = 0.1;
@@ -626,23 +683,43 @@ function apply(ctx, config) {
     }).sort((a, b) => b.val - a.val).slice(0, 5);
     const nicknameMap = /* @__PURE__ */ new Map();
     await Promise.all(ranking.map(async (r) => {
-      nicknameMap.set(r.userId, await getUserNickname(session, r.userId));
+      nicknameMap.set(r.userId, await state.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();
   });
 }
+__name(applyCharmCommand, "applyCharmCommand");
+
+// src/commands/index.ts
+function applyCommands(ctx, config, state) {
+  applyCcbCommand(ctx, config, state);
+  applyRankCommands(ctx, state);
+  applyInfoCommand(ctx, state);
+  applyCharmCommand(ctx, state);
+}
+__name(applyCommands, "applyCommands");
+
+// src/index.ts
+var name = "ccb-plus";
+var inject = ["database"];
+function apply(ctx, config) {
+  applyDatabase(ctx);
+  const state = new CcbState(ctx);
+  applyCommands(ctx, config, state);
+}
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,
   apply,
+  applyDatabase,
   inject,
   name
 });

package/lib/model.d.ts

@@ -0,0 +1,28 @@
+import { Context } from 'koishi';
+export interface CCBRecord {
+    groupId: string;
+    userId: string;
+    num: number;
+    vol: number;
+    max: number;
+    ccb_by: {
+        [actorId: string]: {
+            count: number;
+            first: boolean;
+            max: boolean;
+        };
+    };
+}
+export interface CCBUserSetting {
+    userId: string;
+    optOut: boolean;
+    lastToggleTime: number;
+    overrides: Record<string, boolean>;
+}
+declare module 'koishi' {
+    interface Tables {
+        ccb_record: CCBRecord;
+        ccb_setting: CCBUserSetting;
+    }
+}
+export declare function applyDatabase(ctx: Context): void;

package/lib/utils.d.ts

@@ -0,0 +1,19 @@
+import { Context, Session } from 'koishi';
+export declare class CcbState {
+    actionTimes: Record<string, number[]>;
+    banList: Record<string, number>;
+    nicknameCache: Map<string, {
+        name: string;
+        timestamp: number;
+    }>;
+    private static MAX_CACHE_SIZE;
+    private static CACHE_DURATION;
+    private cleanupTimer;
+    constructor(ctx: Context);
+    private cleanup;
+    getAvatar(userId: string): string;
+    getUserNickname(session: Session, userId: string): Promise<string>;
+    checkGroupCommand(session: Session): string | null;
+    findTargetUser(session: Session, input: string): Promise<string | null>;
+    validateTargetUser(session: Session, target: string): Promise<string>;
+}

package/package.json

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

package/readme.md

@@ -8,4 +8,4 @@ Koishi插件，与群友发生ccb行为。(移植自astrbot_plugin_ccb_plus)
 
 以后会进行小幅修改
 
-> 使用 Qwen3-Coder & Gemini-3-Pro-Preview 协助完成
+> 使用 Qwen3-Coder & Gemini-3.1-Pro-Preview 协助完成