koishi-plugin-echo-cave 1.16.2 → 1.16.4

package/lib/index.cjs

@@ -372,36 +372,12 @@ async function getUserName(ctx, session, userId) {
     return userId;
   }
 }
-async function checkUsersInGroupDebug(ctx, session, userIds) {
+async function checkUsersInGroup(ctx, session, userIds) {
   try {
-    const channelId = session.channelId;
-    console.log(`
-=== \u8C03\u8BD5\u4FE1\u606F\uFF1AcheckUsersInGroupDebug ===`);
-    console.log(`channelId: ${channelId}`);
-    const groupMembers = await session.onebot.getGroupMemberList(channelId);
-    console.log(`\u7FA4\u6210\u5458\u6570\u91CF\uFF1A${groupMembers.length}`);
-    console.log(`\u7FA4\u6210\u5458ID\u5217\u8868\uFF1A${groupMembers.map((member) => member.user_id).join(", ")}`);
+    const groupMembers = await session.onebot.getGroupMemberList(session.channelId);
     const memberIds = groupMembers.map((member) => member.user_id.toString());
-    const userIdsSet = new Set(userIds);
-    console.log(`\u68C0\u67E5\u7684\u7528\u6237ID\uFF1A${userIds.join(", ")}`);
-    const usersNotHere = userIds.filter((userId) => !memberIds.includes(userId));
-    if (usersNotHere.length > 0) {
-      console.log(`\u274C \u4E0D\u5728\u7FA4\u7EC4\u7684\u7528\u6237ID\uFF1A${usersNotHere.join(", ")}`);
-      console.log(`=== \u8C03\u8BD5\u7ED3\u675F ===
-`);
-      return false;
-    } else {
-      console.log(`\u2705 \u6240\u6709\u7528\u6237\u90FD\u5728\u7FA4\u7EC4\u4E2D`);
-      console.log(`=== \u8C03\u8BD5\u7ED3\u675F ===
-`);
-      return true;
-    }
+    return userIds.every((userId) => memberIds.includes(userId));
   } catch (error) {
-    console.error(`
-=== \u8C03\u8BD5\u9519\u8BEF\uFF1AcheckUsersInGroupDebug ===`);
-    console.error(`\u83B7\u53D6\u7FA4\u6210\u5458\u5217\u8868\u5931\u8D25\uFF1A`, error);
-    console.error(`=== \u8C03\u8BD5\u7ED3\u675F ===
-`);
     ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u5217\u8868\u5931\u8D25\uFF1A`, error);
     return false;
   }
@@ -574,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:string]").action(
+  ctx.command("cave.echo [...userIds:number]").action(
     async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds)
   );
   ctx.command("cave.wipe <id:number>").action(
@@ -584,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:string>", { authority: 4 }).action(
+  ctx.command("cave.bind <id:number> <...userIds:number>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
   );
 }
@@ -701,8 +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());
   if (userIds && userIds.length > 0) {
-    const isAllUsersInGroup = await checkUsersInGroupDebug(ctx, session, userIds);
+    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIdsStr);
     if (!isAllUsersInGroup) {
       return session.text(".userNotInGroup");
     }
@@ -745,7 +722,7 @@ async function addCave(ctx, session, cfg, userIds) {
       originUserId: quote.user.id,
       type,
       content,
-      relatedUsers: userIds || []
+      relatedUsers: userIdsStr || []
     });
     return session.text(".msgSaved", [result.id]);
   } catch (error) {
@@ -762,16 +739,17 @@ 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 checkUsersInGroupDebug(ctx, session, userIds);
+  const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIdsStr);
   if (!isAllUsersInGroup) {
     return session.text(".userNotInGroup");
   }
   await ctx.database.set("echo_cave", id, {
-    relatedUsers: userIds
+    relatedUsers: userIdsStr
   });
   return session.text(".userBoundSuccess", [id]);
 }

package/lib/onebot-helper.d.ts

@@ -4,7 +4,3 @@ export declare function getUserName(ctx: Context, session: Session, userId: stri
  * 检查用户是否属于指定群组
  */
 export declare function checkUsersInGroup(ctx: Context, session: Session, userIds: string[]): Promise<boolean>;
-/**
- * 检查用户是否属于指定群组（调试版本，输出详细信息）
- */
-export declare function checkUsersInGroupDebug(ctx: Context, session: Session, userIds: string[]): Promise<boolean>;

package/package.json

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