koishi-plugin-echo-cave 1.25.1 → 1.26.0

package/lib/index.cjs

@@ -94,16 +94,13 @@ function parseUserIds(userIds) {
 
 // src/utils/msg/message-listener.ts
 async function listenForUserMessage(ctx, session, prompt, timeout, onMessage, onTimeout) {
-  const userId = session.userId;
-  const channelId = session.channelId;
+  const { userId, channelId } = session;
   const promptMessageId = await session.onebot.sendGroupMsg(channelId, prompt);
-  let timeoutId;
   const listener = async (msgSession) => {
     if (msgSession.userId === userId && msgSession.channelId === channelId) {
-      clearTimeout(timeoutId);
       const shouldContinue = await onMessage(msgSession.content);
       if (!shouldContinue) {
-        ctx.off("message", listener);
+        cancelListener();
         try {
           await session.onebot.deleteMsg(promptMessageId);
         } catch (error) {
@@ -112,9 +109,9 @@ async function listenForUserMessage(ctx, session, prompt, timeout, onMessage, on
       }
     }
   };
-  ctx.on("message", listener);
+  const cancelListener = ctx.on("message", listener);
   const cancelTimeout = ctx.setTimeout(async () => {
-    ctx.off("message", listener);
+    cancelListener();
     if (onTimeout) {
       await onTimeout();
     }
@@ -408,6 +405,7 @@ async function addCave(ctx, session, cfg, userIds) {
       }
     }
   }
+  let selectedUsersWithNames = [];
   let content;
   let type;
   let forwardUsers = [];
@@ -450,49 +448,53 @@ async function addCave(ctx, session, cfg, userIds) {
     content = JSON.stringify(await processMessageContent(ctx, msgJson, cfg));
   }
   if (type === "forward" && forwardUsers.length > 0 && parsedUserIds.length === 0 && cfg.enableForwardUserSelection) {
-    const userSelectionPromise = new Promise((resolve) => {
-      let prompt = session.text(".selectRelatedUsers");
-      forwardUsers.forEach((user, index) => {
-        prompt += `
+    const userSelectionPromise = new Promise(
+      (resolve) => {
+        let prompt = session.text(".selectRelatedUsers");
+        forwardUsers.forEach((user, index) => {
+          prompt += `
 ${index + 1}: ${user.nickname}`;
-      });
-      prompt += `
+        });
+        prompt += `
 ${session.text(".selectInstruction")}`;
-      listenForUserMessage(
-        ctx,
-        session,
-        prompt,
-        cfg.forwardSelectTimeout * 1e3,
-        // Convert seconds to milliseconds
-        async (message) => {
-          const trimmedMessage = message.trim();
-          let selectedUsers = [];
-          if (trimmedMessage.toLowerCase() === "all") {
-            selectedUsers = forwardUsers.map((user) => user.userId);
-          } else if (trimmedMessage.toLowerCase() === "skip") {
-            selectedUsers = [];
-          } else {
-            const indices = trimmedMessage.split(/\s+/).map((index) => parseInt(index.trim()) - 1);
-            const validIndices = indices.filter(
-              (index) => index >= 0 && index < forwardUsers.length
-            );
-            if (validIndices.length > 0) {
-              selectedUsers = validIndices.map((index) => forwardUsers[index].userId);
+        listenForUserMessage(
+          ctx,
+          session,
+          prompt,
+          cfg.forwardSelectTimeout * 1e3,
+          // Convert seconds to milliseconds
+          async (message) => {
+            const trimmedMessage = message.trim();
+            let selectedUsers = [];
+            if (trimmedMessage.toLowerCase() === "all") {
+              selectedUsers = [...forwardUsers];
+            } else if (trimmedMessage.toLowerCase() === "skip") {
+              selectedUsers = [];
             } else {
-              await session.send(session.text(".invalidSelection"));
-              return true;
+              const indices = trimmedMessage.split(/\s+/).map((index) => parseInt(index.trim()) - 1);
+              const validIndices = indices.filter(
+                (index) => index >= 0 && index < forwardUsers.length
+              );
+              if (validIndices.length > 0) {
+                selectedUsers = validIndices.map((index) => forwardUsers[index]);
+              } else {
+                await session.send(session.text(".invalidSelection"));
+                return true;
+              }
             }
+            resolve(selectedUsers);
+            return false;
+          },
+          async () => {
+            resolve([]);
           }
-          resolve(selectedUsers);
-          return false;
-        },
-        async () => {
-          resolve([]);
-        }
-      );
-    });
-    parsedUserIds = await userSelectionPromise;
+        );
+      }
+    );
+    selectedUsersWithNames = await userSelectionPromise;
   }
+  const finalParsedUserIds = selectedUsersWithNames.map((user) => user.userId);
+  const relatedUsersFormatted = selectedUsersWithNames.map((user) => user.nickname).join(", ");
   try {
     const result = await ctx.database.create("echo_cave_v2", {
       channelId,
@@ -501,9 +503,9 @@ ${session.text(".selectInstruction")}`;
       originUserId: quote.user.id,
       type,
       content,
-      relatedUsers: parsedUserIds || []
+      relatedUsers: finalParsedUserIds
     });
-    return session.text(".msgSaved", [result.id]);
+    return session.text(".msgSaved", { id: result.id, relatedUsers: relatedUsersFormatted });
   } catch (error) {
     return session.text(".msgFailedToSave");
   }
@@ -1057,7 +1059,7 @@ var zh_CN_default = {
       description: "\u5C06\u6D88\u606F\u5B58\u5165\u56DE\u58F0\u6D1E",
       messages: {
         noMsgQuoted: "\u{1F4A1} \u8BF7\u5F15\u7528\u4E00\u6761\u6D88\u606F\u540E\u518D\u4F7F\u7528\u6B64\u547D\u4EE4\uFF01",
-        msgSaved: "\u2705 \u56DE\u58F0\u6D1E\u6D88\u606F\u5DF2\u6210\u529F\u5B58\u5165\uFF0C\u6D88\u606F ID\uFF1A{0}",
+        msgSaved: "\u2705 \u56DE\u58F0\u6D1E\u6D88\u606F\u5DF2\u6210\u529F\u5B58\u5165\uFF0C\u6D88\u606F ID\uFF1A{id}",
         msgFailedToSave: "\u274C \u56DE\u58F0\u6D1E\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01",
         selectRelatedUsers: "\u8BF7\u9009\u62E9\u8981\u5173\u8054\u7684\u7528\u6237\uFF08\u4EE5\u7A7A\u683C\u5206\u9694\u5E8F\u53F7\uFF0C\u8F93\u5165'all'\u9009\u62E9\u5168\u90E8\uFF09\uFF1A",
         selectInstruction: "\u8F93\u5165\u793A\u4F8B\uFF1A1 3 \u6216 all \u6216 skip",

package/package.json

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