koishi-plugin-echo-cave 1.15.0 → 1.16.0

package/lib/index.cjs

@@ -96,7 +96,8 @@ var require_zh_CN = __commonJS({
             noMsgQuoted: "\u{1F4A1} \u8BF7\u5F15\u7528\u4E00\u6761\u6D88\u606F\u540E\u518D\u4F7F\u7528\u6B64\u547D\u4EE4\uFF01",
             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"
+            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"
           }
         },
         "cave.wipe": {
@@ -125,6 +126,17 @@ var require_zh_CN = __commonJS({
             msgListHeader: "\u{1F4DC} \u60A8\u5728\u672C\u9891\u9053\u53D1\u8A00\u7684\u56DE\u58F0\u6D1E\u6D88\u606F\u5217\u8868\uFF1A\n",
             msgListItem: "ID: {0} | \u521B\u5EFA\u65F6\u95F4: {1}\n"
           }
+        },
+        "cave.bind": {
+          description: "\u5C06\u7528\u6237\u7ED1\u5B9A\u5230\u7279\u5B9A\u56DE\u58F0\u6D1E",
+          messages: {
+            noIdProvided: "\u274C \u8BF7\u63D0\u4F9B\u8981\u7ED1\u5B9A\u7528\u6237\u7684\u56DE\u58F0\u6D1E\u6D88\u606F ID\uFF01",
+            noUserIdProvided: "\u274C \u8BF7\u63D0\u4F9B\u8981\u7ED1\u5B9A\u7684\u7528\u6237 ID\uFF01",
+            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"
+          }
         }
       }
     };
@@ -360,6 +372,16 @@ async function getUserName(ctx, session, userId) {
     return userId;
   }
 }
+async function checkUsersInGroup(ctx, session, userIds) {
+  try {
+    const groupMembers = await session.onebot.getGroupMemberList(session.channelId);
+    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);
+    return false;
+  }
+}
 
 // src/cave-helper.ts
 async function sendCaveMsg(ctx, session, caveMsg, cfg) {
@@ -373,11 +395,19 @@ async function sendCaveMsg(ctx, session, caveMsg, cfg) {
   const date = formatDate(caveMsg.createTime);
   const originName = await getUserName(ctx, session, caveMsg.originUserId);
   const userName = await getUserName(ctx, session, caveMsg.userId);
+  let relatedUsersFormatted = "";
+  if (caveMsg.relatedUsers && caveMsg.relatedUsers.length > 0) {
+    const relatedUserNames = await Promise.all(
+      caveMsg.relatedUsers.map(async (userId) => await getUserName(ctx, session, userId))
+    );
+    relatedUsersFormatted = relatedUserNames.join(", ");
+  }
   const templateData = {
     id: caveMsg.id.toString(),
     date,
     originName,
     userName,
+    relatedUsers: relatedUsersFormatted,
     nl: "\n"
   };
   const TEMPLATE_COUNT = 5;
@@ -509,7 +539,8 @@ function apply(ctx, cfg) {
       userId: "string",
       originUserId: "string",
       type: "string",
-      content: "text"
+      content: "text",
+      relatedUsers: "list"
     },
     {
       primary: "id",
@@ -519,7 +550,9 @@ function apply(ctx, cfg) {
   ctx.command("cave [id:number]").action(
     async ({ session }, id) => await getCave(ctx, session, cfg, id)
   );
-  ctx.command("cave.echo").action(async ({ session }) => await addCave(ctx, session, cfg));
+  ctx.command("cave.echo [...userIds:string]").action(
+    async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds)
+  );
   ctx.command("cave.wipe <id:number>").action(
     async ({ session }, id) => await deleteCave(ctx, session, cfg, id)
   );
@@ -527,6 +560,9 @@ 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(
+    async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
+  );
 }
 async function getCaveListByUser(ctx, session) {
   if (!session.guildId) {
@@ -632,7 +668,7 @@ async function deleteCave(ctx, session, cfg, id) {
   await ctx.database.remove("echo_cave", id);
   return session.text(".msgDeleted", [id]);
 }
-async function addCave(ctx, session, cfg) {
+async function addCave(ctx, session, cfg, userIds) {
   if (!session.guildId) {
     return session.text("echo-cave.general.privateChatReminder");
   }
@@ -671,6 +707,12 @@ async function addCave(ctx, session, cfg) {
       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,
@@ -678,13 +720,37 @@ async function addCave(ctx, session, cfg) {
       userId,
       originUserId: quote.user.id,
       type,
-      content
+      content,
+      relatedUsers: userIds || []
     });
     return session.text(".msgSaved", [result.id]);
   } catch (error) {
     return session.text(".msgFailedToSave");
   }
 }
+async function bindUsersToCave(ctx, session, id, userIds) {
+  if (!session.guildId) {
+    return session.text("echo-cave.general.privateChatReminder");
+  }
+  if (!id) {
+    return session.text(".noIdProvided");
+  }
+  if (!userIds || userIds.length === 0) {
+    return session.text(".noUserIdProvided");
+  }
+  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);
+  if (!isAllUsersInGroup) {
+    return session.text(".userNotInGroup");
+  }
+  await ctx.database.set("echo_cave", id, {
+    relatedUsers: userIds
+  });
+  return session.text(".userBoundSuccess", [id]);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/lib/index.d.ts

@@ -23,6 +23,7 @@ export interface EchoCave {
     originUserId: string;
     type: 'forward' | 'msg';
     content: string;
+    relatedUsers: string[];
 }
 declare module 'koishi' {
     interface Tables {

package/lib/onebot-helper.d.ts

@@ -1,2 +1,6 @@
 import { Context, Session } from 'koishi';
 export declare function getUserName(ctx: Context, session: Session, userId: string): Promise<string>;
+/**
+ * 检查用户是否属于指定群组
+ */
+export declare function checkUsersInGroup(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.15.0",
+  "version": "1.16.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",