koishi-plugin-echo-cave 1.16.4 → 1.16.6

package/lib/index.cjs

@@ -368,7 +368,7 @@ async function getUserName(ctx, session, userId) {
     const memberInfo = await session.onebot.getGroupMemberInfo(session.channelId, userId);
     return memberInfo.card || memberInfo.nickname || userId;
   } catch (error) {
-    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u4FE1\u606F\u5931\u8D25\uFF08userId: ${userId}\uFF09\uFF1A`, error);
+    ctx.logger.warn(`Failed to get group member info (userId: ${userId}):`, error);
     return userId;
   }
 }
@@ -378,7 +378,7 @@ async function checkUsersInGroup(ctx, session, userIds) {
     const memberIds = groupMembers.map((member) => member.user_id.toString());
     return userIds.every((userId) => memberIds.includes(userId));
   } catch (error) {
-    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u5217\u8868\u5931\u8D25\uFF1A`, error);
+    ctx.logger.warn(`Failed to get group member list:`, error);
     return false;
   }
 }
@@ -550,7 +550,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:number]").action(
+  ctx.command("cave.echo [...userIds:string]").action(
     async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds)
   );
   ctx.command("cave.wipe <id:number>").action(
@@ -560,7 +560,7 @@ function apply(ctx, cfg) {
   ctx.command("cave.trace").action(
     async ({ session }) => await getCaveListByOriginUser(ctx, session)
   );
-  ctx.command("cave.bind <id:number> <...userIds:number>", { authority: 4 }).action(
+  ctx.command("cave.bind <id:number> <...userIds:string>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
   );
 }
@@ -677,9 +677,9 @@ async function addCave(ctx, session, cfg, userIds) {
   }
   const { userId, channelId, quote } = session;
   const messageId = quote.id;
-  const userIdsStr = userIds.map((id) => id.toString());
+  const correctUserIds = userIds.map((s) => Number(s)).filter((n) => !Number.isNaN(n)).map(String);
   if (userIds && userIds.length > 0) {
-    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIdsStr);
+    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, correctUserIds);
     if (!isAllUsersInGroup) {
       return session.text(".userNotInGroup");
     }
@@ -722,7 +722,7 @@ async function addCave(ctx, session, cfg, userIds) {
       originUserId: quote.user.id,
       type,
       content,
-      relatedUsers: userIdsStr || []
+      relatedUsers: correctUserIds || []
     });
     return session.text(".msgSaved", [result.id]);
   } catch (error) {
@@ -739,17 +739,16 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (!userIds || userIds.length === 0) {
     return session.text(".noUserIdProvided");
   }
-  const userIdsStr = userIds.map((id2) => id2.toString());
   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, userIdsStr);
+  const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIds);
   if (!isAllUsersInGroup) {
     return session.text(".userNotInGroup");
   }
   await ctx.database.set("echo_cave", id, {
-    relatedUsers: userIdsStr
+    relatedUsers: userIds
   });
   return session.text(".userBoundSuccess", [id]);
 }

package/package.json

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