koishi-plugin-echo-cave 1.16.6 → 1.16.8

package/lib/cqcode-helper.d.ts

@@ -1,6 +1,11 @@
+export interface ParseResult {
+    parsedUserIds: string[];
+    error?: string;
+}
 export declare function createTextMsg(content: string): {
     type: string;
     data: {
         text: string;
     };
 };
+export declare function parseUserIds(userIds: string[]): ParseResult;

package/lib/index.cjs

@@ -97,7 +97,8 @@ var require_zh_CN = __commonJS({
             existingMsg: "\u267B\uFE0F \u8BE5\u6D88\u606F\u5DF2\u5B58\u5728\u4E8E\u56DE\u58F0\u6D1E\u7A74\u4E2D\uFF01",
             msgSaved: "\u2705 \u56DE\u58F0\u6D1E\u6D88\u606F\u5DF2\u6210\u529F\u5B58\u5165\uFF0C\u6D88\u606F ID\uFF1A{0}",
             msgFailedToSave: "\u274C \u56DE\u58F0\u6D1E\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01",
-            userNotInGroup: "\u274C \u63D0\u4F9B\u7684\u7528\u6237 ID \u4E0D\u5168\u5C5E\u4E8E\u8BE5\u7FA4\u7EC4\uFF01"
+            userNotInGroup: "\u274C \u63D0\u4F9B\u7684\u7528\u6237 ID \u4E0D\u5168\u5C5E\u4E8E\u8BE5\u7FA4\u7EC4\uFF01",
+            invalidAllMention: "\u274C \u4E0D\u652F\u6301 @\u5168\u4F53\u6210\u5458\uFF0C\u8BF7\u76F4\u63A5\u6307\u5B9A\u5177\u4F53\u7528\u6237\uFF01"
           }
         },
         "cave.wipe": {
@@ -135,7 +136,8 @@ var require_zh_CN = __commonJS({
             msgNotFound: "\u{1F50D} \u672A\u627E\u5230\u8BE5 ID \u7684\u56DE\u58F0\u6D1E\u6D88\u606F",
             userBoundSuccess: "\u2705 \u5DF2\u6210\u529F\u5C06\u7528\u6237\u7ED1\u5B9A\u5230\u56DE\u58F0\u6D1E #{0}\uFF01",
             userAlreadyBound: "\u2139\uFE0F \u8BE5\u7528\u6237\u5DF2\u7ED1\u5B9A\u5230\u56DE\u58F0\u6D1E #{0}\uFF01",
-            userNotInGroup: "\u274C \u63D0\u4F9B\u7684\u7528\u6237 ID \u4E0D\u5168\u5C5E\u4E8E\u8BE5\u7FA4\u7EC4\uFF01"
+            userNotInGroup: "\u274C \u63D0\u4F9B\u7684\u7528\u6237 ID \u4E0D\u5168\u5C5E\u4E8E\u8BE5\u7FA4\u7EC4\uFF01",
+            invalidAllMention: "\u274C \u4E0D\u652F\u6301 @\u5168\u4F53\u6210\u5458\uFF0C\u8BF7\u76F4\u63A5\u6307\u5B9A\u5177\u4F53\u7528\u6237\uFF01"
           }
         }
       }
@@ -152,9 +154,10 @@ __export(index_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi_plugin_adapter_onebot = require("@pynickle/koishi-plugin-adapter-onebot");
+var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
 
 // src/cqcode-helper.ts
+var import_koishi_plugin_adapter_onebot = require("@pynickle/koishi-plugin-adapter-onebot");
 function createTextMsg(content) {
   return {
     type: "text",
@@ -163,6 +166,39 @@ function createTextMsg(content) {
     }
   };
 }
+function parseUserIds(userIds) {
+  const parsedUserIds = [];
+  for (const userIdStr of userIds) {
+    try {
+      const cqCode = import_koishi_plugin_adapter_onebot.CQCode.from(userIdStr);
+      if (cqCode.type === "at") {
+        const qq = cqCode.data.qq;
+        if (qq === "all") {
+          return {
+            parsedUserIds: [],
+            error: "invalid_all_mention"
+          };
+        }
+        if (qq) {
+          parsedUserIds.push(qq);
+        }
+      } else {
+        const num = Number(userIdStr);
+        if (!Number.isNaN(num)) {
+          parsedUserIds.push(String(num));
+        }
+      }
+    } catch (e) {
+      const num = Number(userIdStr);
+      if (!Number.isNaN(num)) {
+        parsedUserIds.push(String(num));
+      }
+    }
+  }
+  return {
+    parsedUserIds
+  };
+}
 
 // src/media-helper.ts
 var import_axios = __toESM(require("axios"), 1);
@@ -510,7 +546,7 @@ async function processMessageContent(ctx, msg, cfg) {
 }
 
 // src/index.ts
-var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
+var import_koishi_plugin_adapter_onebot3 = require("@pynickle/koishi-plugin-adapter-onebot");
 var import_koishi = require("koishi");
 var name = "echo-cave";
 var inject = ["database"];
@@ -550,7 +586,7 @@ function apply(ctx, cfg) {
   ctx.command("cave [id:number]").action(
     async ({ session }, id) => await getCave(ctx, session, cfg, id)
   );
-  ctx.command("cave.echo [...userIds:string]").action(
+  ctx.command("cave.echo [...userIds:user]").action(
     async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds)
   );
   ctx.command("cave.wipe <id:number>").action(
@@ -560,7 +596,7 @@ function apply(ctx, cfg) {
   ctx.command("cave.trace").action(
     async ({ session }) => await getCaveListByOriginUser(ctx, session)
   );
-  ctx.command("cave.bind <id:number> <...userIds:string>", { authority: 4 }).action(
+  ctx.command("cave.bind <id:number> <...userIds:user>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
   );
 }
@@ -677,9 +713,15 @@ async function addCave(ctx, session, cfg, userIds) {
   }
   const { userId, channelId, quote } = session;
   const messageId = quote.id;
-  const correctUserIds = userIds.map((s) => Number(s)).filter((n) => !Number.isNaN(n)).map(String);
+  let parsedUserIds = [];
   if (userIds && userIds.length > 0) {
-    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, correctUserIds);
+    const result = parseUserIds(userIds);
+    if (result.error === "invalid_all_mention") {
+      return session.text(".invalidAllMention");
+    }
+    parsedUserIds = result.parsedUserIds;
+    ctx.logger.info(`Parsed userIds in addCave: ${JSON.stringify(parsedUserIds)}`);
+    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, parsedUserIds);
     if (!isAllUsersInGroup) {
       return session.text(".userNotInGroup");
     }
@@ -700,7 +742,7 @@ async function addCave(ctx, session, cfg, userIds) {
     const message = (await session.onebot.getMsg(messageId)).message;
     let msgJson;
     if (typeof message === "string") {
-      msgJson = import_koishi_plugin_adapter_onebot2.CQCode.parse(message);
+      msgJson = import_koishi_plugin_adapter_onebot3.CQCode.parse(message);
     } else {
       if (message[0].type === "video" || message[0].type === "file") {
         type = "forward";
@@ -722,7 +764,7 @@ async function addCave(ctx, session, cfg, userIds) {
       originUserId: quote.user.id,
       type,
       content,
-      relatedUsers: correctUserIds || []
+      relatedUsers: parsedUserIds || []
     });
     return session.text(".msgSaved", [result.id]);
   } catch (error) {
@@ -739,16 +781,23 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (!userIds || userIds.length === 0) {
     return session.text(".noUserIdProvided");
   }
+  let parsedUserIds = [];
+  const result = parseUserIds(userIds);
+  if (result.error === "invalid_all_mention") {
+    return session.text(".invalidAllMention");
+  }
+  parsedUserIds = result.parsedUserIds;
+  ctx.logger.info(`Parsed userIds: ${JSON.stringify(parsedUserIds)}`);
   const caves = await ctx.database.get("echo_cave", id);
   if (caves.length === 0) {
     return session.text("echo-cave.general.noMsgWithId");
   }
-  const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIds);
+  const isAllUsersInGroup = await checkUsersInGroup(ctx, session, parsedUserIds);
   if (!isAllUsersInGroup) {
     return session.text(".userNotInGroup");
   }
   await ctx.database.set("echo_cave", id, {
-    relatedUsers: userIds
+    relatedUsers: parsedUserIds
   });
   return session.text(".userBoundSuccess", [id]);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.16.6",
+  "version": "1.16.8",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",