koishi-plugin-echo-cave 1.16.10 → 1.16.12

package/lib/cqcode-helper.d.ts

@@ -8,4 +8,4 @@ export declare function createTextMsg(content: string): {
         text: string;
     };
 };
-export declare function parseUserIds(userIds: string[]): ParseResult;
+export declare function parseUserIds(userIds: any[]): ParseResult;

package/lib/index.cjs

@@ -154,10 +154,9 @@ __export(index_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
+var import_koishi_plugin_adapter_onebot = 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",
@@ -168,28 +167,8 @@ 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) {
-      parsedUserIds.push(userIdStr.split(":")[1]);
+  for (const userId of userIds) {
+    if (userId) {
     }
   }
   return {
@@ -543,7 +522,7 @@ async function processMessageContent(ctx, msg, cfg) {
 }
 
 // src/index.ts
-var import_koishi_plugin_adapter_onebot3 = require("@pynickle/koishi-plugin-adapter-onebot");
+var import_koishi_plugin_adapter_onebot2 = require("@pynickle/koishi-plugin-adapter-onebot");
 var import_koishi = require("koishi");
 var name = "echo-cave";
 var inject = ["database"];
@@ -594,7 +573,14 @@ function apply(ctx, cfg) {
     async ({ session }) => await getCaveListByOriginUser(ctx, session)
   );
   ctx.command("cave.bind <id:number> <...userIds>", { authority: 4 }).action(
-    async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
+    async ({ session }, id, ...userIds) => {
+      ctx.logger.info(`Binding users ${JSON.stringify(userIds)} to cave ID ${id}`);
+      for (const uid of userIds) {
+        ctx.logger.info(`User ID to bind: ${uid}`);
+        ctx.logger.info(`userid type: ${typeof uid}`);
+      }
+      await bindUsersToCave(ctx, session, id, userIds);
+    }
   );
 }
 async function getCaveListByUser(ctx, session) {
@@ -718,7 +704,6 @@ async function addCave(ctx, session, cfg, userIds) {
       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");
@@ -740,7 +725,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_onebot3.CQCode.parse(message);
+      msgJson = import_koishi_plugin_adapter_onebot2.CQCode.parse(message);
     } else {
       if (message[0].type === "video" || message[0].type === "file") {
         type = "forward";
@@ -785,7 +770,6 @@ async function bindUsersToCave(ctx, session, id, userIds) {
     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");

package/package.json

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