koishi-plugin-echo-cave 1.24.18 → 1.25.0

package/lib/config/config.d.ts

@@ -12,5 +12,7 @@ export interface Config {
     useBase64ForMedia?: boolean;
     sendAllAsForwardMsg?: boolean;
     rankingTopCount?: number;
+    forwardSelectTimeout?: number;
+    enableForwardUserSelection?: boolean;
 }
 export declare const Config: Schema<Config>;

package/lib/index.cjs

@@ -92,6 +92,51 @@ 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;
+  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) {
+          }
+        }
+      }
+    }
+  };
+  ctx.on("message", listener);
+  timeoutId = setTimeout(async () => {
+    ctx.off("message", listener);
+    if (onTimeout) {
+      await onTimeout();
+    }
+    if (promptMessageId) {
+      try {
+        await session.onebot.deleteMsg(promptMessageId);
+      } catch (error) {
+      }
+    }
+  }, timeout);
+}
+
 // src/utils/media/media-helper.ts
 var import_axios = __toESM(require("axios"), 1);
 var import_node_fs = require("node:fs");
@@ -126,7 +171,7 @@ async function saveMedia(ctx, mediaElement, type, cfg) {
         ctx.logger.warn(`Invalid image content-type: ${contentType}`);
         return mediaUrl;
       }
-      if (type === "video" && !contentType.startsWith("video/")) {
+      if (type === "video" && !contentType.startsWith("video/") && contentType !== "application/octet-stream") {
         ctx.logger.warn(`Invalid video content-type: ${contentType}`);
         return mediaUrl;
       }
@@ -377,6 +422,7 @@ async function addCave(ctx, session, cfg, userIds) {
   }
   let content;
   let type;
+  let forwardUsers = [];
   if (quote.elements[0].type === "forward") {
     type = "forward";
     const message = await reconstructForwardMsg(
@@ -386,6 +432,20 @@ async function addCave(ctx, session, cfg, userIds) {
       cfg
     );
     content = JSON.stringify(message);
+    const userMap = /* @__PURE__ */ new Map();
+    for (const node of message) {
+      if (node.type === "node" && node.data) {
+        const userId2 = String(node.data.user_id);
+        const nickname = node.data.nickname;
+        if (userId2 && nickname && !userMap.has(userId2)) {
+          userMap.set(userId2, nickname);
+        }
+      }
+    }
+    forwardUsers = Array.from(userMap.entries()).map(([userId2, nickname]) => ({
+      userId: userId2,
+      nickname
+    }));
   } else {
     type = "msg";
     const message = (await session.onebot.getMsg(messageId)).message;
@@ -401,6 +461,50 @@ 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 += `
+${index + 1}: ${user.nickname}`;
+      });
+      prompt += `
+${session.text(".selectInstruction")}`;
+      listenForUserMessage({
+        ctx,
+        session,
+        prompt,
+        timeout: (cfg.forwardSelectTimeout || 20) * 1e3,
+        // Convert seconds to milliseconds
+        onTimeout: async () => {
+          resolve([]);
+        },
+        onMessage: 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);
+            } else {
+              await session.send(session.text(".invalidSelection"));
+              return true;
+            }
+          }
+          resolve(selectedUsers);
+          return false;
+        }
+      });
+    });
+    parsedUserIds = await userSelectionPromise;
+  }
   try {
     const result = await ctx.database.create("echo_cave_v2", {
       channelId,
@@ -914,7 +1018,7 @@ async function searchCave(ctx, session, userIds) {
     channelId
   });
   const matchingCaves = caves.filter(
-    (cave) => cave.originUserId === targetUserId || cave.relatedUsers.includes(targetUserId)
+    (cave) => cave.relatedUsers.length === 0 ? cave.originUserId === targetUserId : cave.relatedUsers.includes(targetUserId)
   );
   if (matchingCaves.length === 0) {
     return session.text(".noMatchingCaves", [targetUserId]);
@@ -966,7 +1070,10 @@ var zh_CN_default = {
       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}",
-        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",
+        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",
+        invalidSelection: "\u274C \u65E0\u6548\u7684\u9009\u62E9\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165\uFF01"
       }
     },
     "cave.drop": {
@@ -1056,7 +1163,9 @@ var zh_CN_default2 = {
   maxRecordSize: "\u6700\u5927\u5F55\u97F3\u5927\u5C0F (MB)",
   useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri",
   sendAllAsForwardMsg: "\u662F\u5426\u5C06\u6240\u6709\u6D88\u606F\u4EE5\u8F6C\u53D1\u6D88\u606F\u5F62\u5F0F\u53D1\u9001\uFF0C\u5F00\u542F\u540E\u666E\u901A\u6D88\u606F\u4E5F\u4F1A\u8F6C\u6362\u4E3A\u8F6C\u53D1\u6D88\u606F\u683C\u5F0F",
-  rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF"
+  rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF",
+  forwardSelectTimeout: "\u5408\u5E76\u8F6C\u53D1\u6D88\u606F\u9009\u62E9\u5173\u8054\u7528\u6237\u7684\u8D85\u65F6\u65F6\u95F4 (\u79D2)",
+  enableForwardUserSelection: "\u662F\u5426\u542F\u7528\u5408\u5E76\u8F6C\u53D1\u6D88\u606F\u7684\u5173\u8054\u7528\u6237\u9009\u62E9\u529F\u80FD"
 };
 
 // src/config/config.ts
@@ -1073,7 +1182,9 @@ var Config = import_koishi2.Schema.object({
   maxRecordSize: import_koishi2.Schema.number().default(512),
   useBase64ForMedia: import_koishi2.Schema.boolean().default(false),
   sendAllAsForwardMsg: import_koishi2.Schema.boolean().default(false),
-  rankingTopCount: import_koishi2.Schema.number().default(10)
+  rankingTopCount: import_koishi2.Schema.number().default(10),
+  forwardSelectTimeout: import_koishi2.Schema.number().default(20),
+  enableForwardUserSelection: import_koishi2.Schema.boolean().default(true)
 }).i18n({
   "zh-CN": zh_CN_default2
 });

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

@@ -0,0 +1,10 @@
+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>;

package/package.json

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