koishi-plugin-echo-cave 1.25.0 → 1.25.2

package/lib/index.cjs

@@ -93,46 +93,31 @@ function parseUserIds(userIds) {
 }
 
 // src/utils/msg/message-listener.ts
-async function listenForUserMessage(options) {
-  const { ctx, session, prompt, timeout, onTimeout, onMessage } = options;
-  const userId = session.userId;
-  const channelId = session.channelId;
-  const promptMessage = await session.send(prompt);
-  let promptMessageId = "";
-  try {
-    const msgObj = promptMessage;
-    if (msgObj && typeof msgObj === "object" && msgObj.messageId) {
-      promptMessageId = String(msgObj.messageId);
-    }
-  } catch (error) {
-  }
-  let timeoutId;
+async function listenForUserMessage(ctx, session, prompt, timeout, onMessage, onTimeout) {
+  const { userId, channelId } = session;
+  const promptMessageId = await session.onebot.sendGroupMsg(channelId, prompt);
   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);
-        if (promptMessageId) {
-          try {
-            await session.onebot.deleteMsg(promptMessageId);
-          } catch (error) {
-          }
+        cancelListener();
+        try {
+          await session.onebot.deleteMsg(promptMessageId);
+        } catch (error) {
         }
+        cancelTimeout();
       }
     }
   };
-  ctx.on("message", listener);
-  timeoutId = setTimeout(async () => {
-    ctx.off("message", listener);
+  const cancelListener = ctx.on("message", listener);
+  const cancelTimeout = ctx.setTimeout(async () => {
+    cancelListener();
     if (onTimeout) {
       await onTimeout();
     }
-    if (promptMessageId) {
-      try {
-        await session.onebot.deleteMsg(promptMessageId);
-      } catch (error) {
-      }
+    try {
+      await session.onebot.deleteMsg(promptMessageId);
+    } catch (error) {
     }
   }, timeout);
 }
@@ -470,16 +455,13 @@ ${index + 1}: ${user.nickname}`;
       });
       prompt += `
 ${session.text(".selectInstruction")}`;
-      listenForUserMessage({
+      listenForUserMessage(
         ctx,
         session,
         prompt,
-        timeout: (cfg.forwardSelectTimeout || 20) * 1e3,
+        cfg.forwardSelectTimeout * 1e3,
         // Convert seconds to milliseconds
-        onTimeout: async () => {
-          resolve([]);
-        },
-        onMessage: async (message) => {
+        async (message) => {
           const trimmedMessage = message.trim();
           let selectedUsers = [];
           if (trimmedMessage.toLowerCase() === "all") {
@@ -500,8 +482,11 @@ ${session.text(".selectInstruction")}`;
           }
           resolve(selectedUsers);
           return false;
+        },
+        async () => {
+          resolve([]);
         }
-      });
+      );
     });
     parsedUserIds = await userSelectionPromise;
   }
@@ -1072,7 +1057,7 @@ var zh_CN_default = {
         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",
         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",
+        selectInstruction: "\u8F93\u5165\u793A\u4F8B\uFF1A1 3 \u6216 all \u6216 skip",
         invalidSelection: "\u274C \u65E0\u6548\u7684\u9009\u62E9\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165\uFF01"
       }
     },

package/lib/utils/msg/message-listener.d.ts

@@ -1,10 +1,2 @@
 import { Context, Session } from 'koishi';
-export interface MessageListenerOptions {
-    ctx: Context;
-    session: Session;
-    prompt: string;
-    timeout: number;
-    onTimeout?: () => Promise<void>;
-    onMessage: (message: string) => Promise<boolean>;
-}
-export declare function listenForUserMessage(options: MessageListenerOptions): Promise<void>;
+export declare function listenForUserMessage(ctx: Context, session: Session, prompt: string, timeout: number, onMessage: (message: string) => Promise<boolean>, onTimeout?: () => Promise<void>): Promise<void>;

package/package.json

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