koishi-plugin-ccb-plus 0.2.9-beta.1 → 0.2.9

package/lib/index.js

@@ -217,25 +217,51 @@ var CcbState = class _CcbState {
   }
   async findTargetUser(session, input) {
     if (!input) return null;
-    const trimmed = input.trim();
     try {
-      const elements = import_koishi2.h.parse(trimmed);
+      const elements = import_koishi2.h.parse(input);
       const atEl = elements.find((el) => el.type === "at");
       if (atEl?.attrs?.id) {
         return String(atEl.attrs.id);
       }
     } catch (e) {
     }
-    const atMatch = trimmed.match(/<at\s+(?:[^>]*?\s+)?id=(["']?)([^"'\s>]+)\1/i);
+    const atMatch = input.match(/<at\s+[^<]*?id=(["'])(.*?)\1/i);
     if (atMatch) return atMatch[2];
-    const rawAtMatch = trimmed.match(/<at[^>]*?id=([^>\s]+)/i);
-    if (rawAtMatch) return rawAtMatch[1].replace(/['"]/g, "");
-    const colonIndex = trimmed.indexOf(":");
-    if (colonIndex > 0 && colonIndex < trimmed.length - 1) {
-      return trimmed.slice(colonIndex + 1);
+    if (/<at\b/i.test(input)) {
+      const atEl = session.elements?.find((el) => el.type === "at");
+      if (atEl?.attrs?.id) {
+        return String(atEl.attrs.id);
+      }
     }
-    if (/^\d+$/.test(trimmed)) {
-      return trimmed;
+    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;
+        }
+        if (!partialMatchId && cleanNick.includes(targetName)) {
+          partialMatchId = m.user?.id;
+        }
+      }
+      const finalMatch = exactMatchId || partialMatchId;
+      if (finalMatch) return finalMatch;
+    } catch (e) {
     }
     return null;
   }
@@ -331,7 +357,7 @@ __name(updateCCBRecord, "updateCCBRecord");
 
 // src/commands/ccb.ts
 function applyCcbCommand(ctx, config, state) {
-  ctx.command("ccb [target:user]", "给群友注入生命因子").option("off", "--off [target:user] 将自己加入白名单（禁止被人ccb），可指定用户").option("on", "--on [target:user] 将自己移出白名单（允许被人ccb），可指定用户").action(async ({ session, options }, target) => {
+  ctx.command("ccb [target:user]", "给群友注入生命因子").option("off", "--off [user:string] 将自己加入白名单（禁止被人ccb），可指定用户").option("on", "--on [user:string] 将自己移出白名单（允许被人ccb），可指定用户").action(async ({ session, options }, target) => {
     const checkResult = state.checkGroupCommand(session);
     if (checkResult) return checkResult;
     const senderId = session.userId;

package/package.json

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