koishi-plugin-echo-cave 1.16.1 → 1.16.3

package/lib/index.cjs

@@ -372,12 +372,35 @@ async function getUserName(ctx, session, userId) {
     return userId;
   }
 }
-async function checkUsersInGroup(ctx, session, userIds) {
+async function checkUsersInGroupDebug(ctx, session, userIds) {
   try {
-    const groupMembers = await session.onebot.getGroupMemberList(session.channelId);
+    const channelId = session.channelId;
+    ctx.logger.info(`
+=== \u8C03\u8BD5\u4FE1\u606F\uFF1AcheckUsersInGroupDebug ===`);
+    ctx.logger.info(`channelId: ${channelId}`);
+    const groupMembers = await session.onebot.getGroupMemberList(channelId);
+    ctx.logger.info(`\u7FA4\u6210\u5458\u6570\u91CF\uFF1A${groupMembers.length}`);
+    ctx.logger.info(`\u7FA4\u6210\u5458ID\u5217\u8868\uFF1A${groupMembers.map((member) => member.user_id).join(", ")}`);
     const memberIds = groupMembers.map((member) => member.user_id.toString());
-    return userIds.every((userId) => memberIds.includes(userId));
+    ctx.logger.info(`\u68C0\u67E5\u7684\u7528\u6237ID\uFF1A${userIds.join(", ")}`);
+    const usersNotHere = userIds.filter((userId) => !memberIds.includes(userId));
+    if (usersNotHere.length > 0) {
+      ctx.logger.info(`\u274C \u4E0D\u5728\u7FA4\u7EC4\u7684\u7528\u6237ID\uFF1A${usersNotHere.join(", ")}`);
+      ctx.logger.info(`=== \u8C03\u8BD5\u7ED3\u675F ===
+`);
+      return false;
+    } else {
+      ctx.logger.info(`\u2705 \u6240\u6709\u7528\u6237\u90FD\u5728\u7FA4\u7EC4\u4E2D`);
+      ctx.logger.info(`=== \u8C03\u8BD5\u7ED3\u675F ===
+`);
+      return true;
+    }
   } catch (error) {
+    ctx.logger.warn(`
+=== \u8C03\u8BD5\u9519\u8BEF\uFF1AcheckUsersInGroupDebug ===`);
+    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u5217\u8868\u5931\u8D25\uFF1A`, error);
+    ctx.logger.warn(`=== \u8C03\u8BD5\u7ED3\u675F ===
+`);
     ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u5217\u8868\u5931\u8D25\uFF1A`, error);
     return false;
   }
@@ -677,6 +700,12 @@ async function addCave(ctx, session, cfg, userIds) {
   }
   const { userId, channelId, quote } = session;
   const messageId = quote.id;
+  if (userIds && userIds.length > 0) {
+    const isAllUsersInGroup = await checkUsersInGroupDebug(ctx, session, userIds);
+    if (!isAllUsersInGroup) {
+      return session.text(".userNotInGroup");
+    }
+  }
   let content;
   let type;
   if (quote.elements[0].type === "forward") {
@@ -707,12 +736,6 @@ async function addCave(ctx, session, cfg, userIds) {
       return session.text(".existingMsg");
     }
   });
-  if (userIds && userIds.length > 0) {
-    const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIds);
-    if (!isAllUsersInGroup) {
-      return session.text(".userNotInGroup");
-    }
-  }
   try {
     const result = await ctx.database.create("echo_cave", {
       channelId,
@@ -742,7 +765,7 @@ async function bindUsersToCave(ctx, session, id, userIds) {
   if (caves.length === 0) {
     return session.text("echo-cave.general.noMsgWithId");
   }
-  const isAllUsersInGroup = await checkUsersInGroup(ctx, session, userIds);
+  const isAllUsersInGroup = await checkUsersInGroupDebug(ctx, session, userIds);
   if (!isAllUsersInGroup) {
     return session.text(".userNotInGroup");
   }

package/lib/onebot-helper.d.ts

@@ -4,3 +4,7 @@ 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.1",
+  "version": "1.16.3",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",