koishi-plugin-echo-cave 1.29.13 → 1.29.14

package/lib/index.cjs

@@ -33706,11 +33706,7 @@ function getLocalMediaV2Root(ctx) {
   return import_node_path.default.join(getLocalMediaRoot(ctx), "v2");
 }
 function getLocalMediaV2Dir(ctx, channelId, type) {
-  return import_node_path.default.join(
-    getLocalMediaV2Root(ctx),
-    encodeURIComponent(channelId),
-    getMediaDirName(type)
-  );
+  return import_node_path.default.join(getLocalMediaV2Root(ctx), encodeURIComponent(channelId), getMediaDirName(type));
 }
 function getLegacyMediaDir(ctx, type) {
   return import_node_path.default.join(getLocalMediaRoot(ctx), getMediaDirName(type));
@@ -34004,12 +34000,7 @@ async function transferS3ObjectToChannel(cfg, source, type, targetChannelId, mod
     throw new Error("S3 bucket is not configured.");
   }
   const extension = import_node_path.default.extname(source.key).slice(1) || getDefaultExtension(type);
-  const key = buildS3Key(
-    cfg,
-    targetChannelId,
-    type,
-    `${(0, import_uuid2.v4)().replace(/-/g, "")}.${extension}`
-  );
+  const key = buildS3Key(cfg, targetChannelId, type, `${(0, import_uuid2.v4)().replace(/-/g, "")}.${extension}`);
   const target = { bucket, key };
   if (source.bucket === target.bucket && source.key === target.key) {
     return toS3Uri(source);
@@ -34088,13 +34079,7 @@ async function transferMediaRefToChannel(ctx, fileRef, type, targetChannelId, ta
     }
     const loaded2 = await loadMediaBuffer(ctx, fileRef, cfg);
     const extension2 = import_node_path.default.extname(loaded2.sourceKey).slice(1) || getDefaultExtension(type);
-    const targetPath = await writeLocalMedia(
-      ctx,
-      targetChannelId,
-      type,
-      loaded2.buffer,
-      extension2
-    );
+    const targetPath = await writeLocalMedia(ctx, targetChannelId, type, loaded2.buffer, extension2);
     const plan2 = {
       nextRef: toFileUri(targetPath),
       rollback: createDeleteLocalFilePlan(targetPath).rollback
@@ -34215,9 +34200,7 @@ async function mutateMessageContent(ctx, content, handler) {
       const nextContent = await Promise.all(
         contentValue.map(async (child) => mutateElement(child))
       );
-      const hasChildChange = nextContent.some(
-        (child, index) => child !== contentValue[index]
-      );
+      const hasChildChange = nextContent.some((child, index) => child !== contentValue[index]);
       if (hasChildChange) {
         changed = true;
         return {
@@ -34304,9 +34287,7 @@ async function deleteCavesForOversizedMedia(ctx, caves, cfg) {
       await removeCaveByEntryId(ctx, cave.entryId);
       ctx.logger.info(`Deleted cave #${cave.id} because its media exceeded the size limit.`);
     } catch (error2) {
-      ctx.logger.warn(
-        `Failed to delete cave #${cave.id} during oversized media cleanup: ${error2}`
-      );
+      ctx.logger.warn(`Failed to delete cave #${cave.id} during oversized media cleanup: ${error2}`);
     }
   }
 }
@@ -34637,9 +34618,7 @@ async function checkAndCleanMediaFiles(ctx, cfg, type) {
     }
     const totalSize = fileInfos.reduce((sum, file) => sum + file.size, 0);
     if (totalSize <= maxSize) {
-      ctx.logger.debug(
-        `${type} check completed in ${Date.now() - startTime}ms: no cleanup needed`
-      );
+      ctx.logger.debug(`${type} check completed in ${Date.now() - startTime}ms: no cleanup needed`);
       return;
     }
     fileInfos.sort((a5, b5) => a5.mtime - b5.mtime);
@@ -35542,9 +35521,7 @@ async function restoreReindexBackup(ctx, session, cfg, backupPathInput) {
 }
 async function runScheduledReindex(ctx, cfg) {
   if (caveMaintenanceLock) {
-    ctx.logger.warn(
-      "Skipped scheduled cave reindex because another maintenance task is running."
-    );
+    ctx.logger.warn("Skipped scheduled cave reindex because another maintenance task is running.");
     return;
   }
   const caves = (await getAllCaves(ctx)).sort((a5, b5) => a5.id - b5.id);
@@ -35604,13 +35581,7 @@ function registerAutoReindexScheduler(ctx, cfg) {
 async function reconstructForwardMsg(ctx, session, message, cfg, processMedia = true) {
   return Promise.all(
     message.map(async (msg) => {
-      const content = await processForwardMessageContent(
-        ctx,
-        session,
-        msg,
-        cfg,
-        processMedia
-      );
+      const content = await processForwardMessageContent(ctx, session, msg, cfg, processMedia);
       const senderNickname = msg.sender.nickname;
       let senderUserId = msg.sender.user_id;
       senderUserId = senderUserId === 1094950020 ? await getUserIdFromNickname(session, senderNickname, senderUserId) : senderUserId;
@@ -35754,13 +35725,7 @@ async function addCave(ctx, session, cfg, userIds) {
       session,
       cfg,
       hasMedia,
-      async (progressOptions) => await processStoredMessageMedia(
-        ctx,
-        content,
-        cfg,
-        channelId,
-        progressOptions
-      )
+      async (progressOptions) => await processStoredMessageMedia(ctx, content, cfg, channelId, progressOptions)
     );
   }
   const finalParsedUserIds = selectedUsersWithNames.length !== 0 ? selectedUsersWithNames.map((user) => user.userId) : parsedUserIds;
@@ -35807,9 +35772,7 @@ async function formatRelatedUsers(ctx, session, selectedUsersWithNames, relatedU
   }
   if (relatedUserIds.length !== 0) {
     const relatedUserNames = await Promise.all(
-      relatedUserIds.map(
-        async (relatedUserId) => await getUserName(ctx, session, relatedUserId)
-      )
+      relatedUserIds.map(async (relatedUserId) => await getUserName(ctx, session, relatedUserId))
     );
     return relatedUserNames.join(", ");
   }
@@ -35874,16 +35837,12 @@ ${promptFooter}`;
           selectedUsers = [];
         } else {
           const indices = trimmedMessage.split(/\s+/).map((index) => parseInt(index.trim()) - 1);
-          const validIndices = indices.filter(
-            (index) => index >= 0 && index < forwardUsers.length
-          );
+          const validIndices = indices.filter((index) => index >= 0 && index < forwardUsers.length);
           if (validIndices.length > 0) {
             selectedUsers = validIndices.map((index) => forwardUsers[index]);
           } else {
             sentMessageIds.push(
-              ...normalizeMessageIds(
-                await session.send(session.text(".invalidSelection"))
-              )
+              ...normalizeMessageIds(await session.send(session.text(".invalidSelection")))
             );
             return true;
           }
@@ -35918,9 +35877,13 @@ async function confirmSpecialForwardStorage(ctx, session, previewMessage) {
   sentMessageIds.push(
     ...normalizeMessageIds(await session.send(session.text(".specialForwardUserConfirmNotice")))
   );
-  sentMessageIds.push(...normalizeMessageIds(await session.send(previewMessage)));
+  if (session.onebot) {
+    sentMessageIds.push(
+      (await session.onebot.sendGroupForwardMsg(session.channelId, previewMessage)).toString()
+    );
+  }
   scheduleSilentDelete(ctx, session, SPECIAL_FORWARD_RECALL_DELAY, sentMessageIds);
-  const shouldStore = await new Promise((resolve) => {
+  return await new Promise((resolve) => {
     listenForUserMessage(
       ctx,
       session,
@@ -35948,7 +35911,6 @@ async function confirmSpecialForwardStorage(ctx, session, previewMessage) {
       }
     ).then((promptMessageIds) => sentMessageIds.push(...promptMessageIds));
   });
-  return shouldStore;
 }
 
 // src/core/command/delete-cave.ts
@@ -36163,9 +36125,7 @@ async function flushSendFailureSummary(ctx, cfg) {
     const [platform, selfId] = botKey.split(":");
     const bot = ctx.bots.find((item) => item.platform === platform && item.selfId === selfId);
     if (!bot) {
-      ctx.logger.warn(
-        `Skipped cave send failure summary because bot ${botKey} is unavailable.`
-      );
+      ctx.logger.warn(`Skipped cave send failure summary because bot ${botKey} is unavailable.`);
       continue;
     }
     const messages = buildSummaryMessages(ctx, entries);
@@ -36347,9 +36307,7 @@ async function sendCaveMsg(ctx, session, caveMsg, cfg) {
   const { channelId } = session;
   let content = JSON.parse(caveMsg.content);
   content = await Promise.all(
-    content.map(
-      async (element) => await resolveMediaElementForSend(ctx, element, cfg)
-    )
+    content.map(async (element) => await resolveMediaElementForSend(ctx, element, cfg))
   );
   const date2 = formatDate(caveMsg.createTime);
   const originName = await getUserName(ctx, session, caveMsg.originUserId);
@@ -36564,11 +36522,7 @@ async function getCave(ctx, session, cfg, target) {
     if (parseResult.parsedUserIds.length === 0) {
       return session.text("echo-cave.general.noMsgWithId");
     }
-    const targetedResult = await getTargetedUserCave(
-      ctx,
-      session,
-      parseResult.parsedUserIds[0]
-    );
+    const targetedResult = await getTargetedUserCave(ctx, session, parseResult.parsedUserIds[0]);
     if (!targetedResult) {
       return session.text(".noMatchingUserCave");
     }
@@ -36913,8 +36867,8 @@ var zh_CN_default = {
         selectInstructionDetailed: "\u8F93\u5165\u793A\u4F8B\uFF1A1 2 \u6216 all \u6216 skip",
         selectInstructionBrief: "\u56DE\u590D\u5E8F\u53F7 / all / skip",
         invalidSelection: "\u274C \u65E0\u6548\u7684\u9009\u62E9\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165\uFF01",
-        specialForwardUserBlocked: "\u26A0\uFE0F \u68C0\u6D4B\u5230\u8BE5\u5408\u5E76\u8F6C\u53D1\u4E2D\u5305\u542B\u7279\u6B8A\u7528\u6237 1094950020\uFF0C\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u5B58\u50A8\u8FD9\u6761\u56DE\u58F0\u6D1E\u3002\u8BE5\u63D0\u793A\u4F1A\u5728 1 \u5206\u949F\u540E\u81EA\u52A8\u64A4\u56DE\u3002",
-        specialForwardUserConfirmNotice: "\u26A0\uFE0F \u68C0\u6D4B\u5230\u8BE5\u5408\u5E76\u8F6C\u53D1\u4E2D\u5305\u542B\u7279\u6B8A\u7528\u6237 1094950020\u3002\u4E0B\u9762\u4F1A\u91CD\u65B0\u53D1\u51FA\u8BFB\u53D6\u5230\u7684\u8F6C\u53D1\u5185\u5BB9\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u4ECD\u8981\u5B58\u50A8\u3002",
+        specialForwardUserBlocked: "\u26A0\uFE0F \u68C0\u6D4B\u5230\u8BE5\u5408\u5E76\u8F6C\u53D1\u4E2D\u7684\u7528\u6237\u4FE1\u606F\u65E0\u6CD5\u8BFB\u53D6\uFF0C\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u5B58\u50A8\u8FD9\u6761\u56DE\u58F0\u6D1E\u3002\u8BE5\u63D0\u793A\u4F1A\u5728 1 \u5206\u949F\u540E\u81EA\u52A8\u64A4\u56DE\u3002",
+        specialForwardUserConfirmNotice: "\u26A0\uFE0F \u68C0\u6D4B\u5230\u8BE5\u5408\u5E76\u8F6C\u53D1\u4E2D\u7684\u7528\u6237\u4FE1\u606F\u65E0\u6CD5\u8BFB\u53D6\u3002\u4E0B\u9762\u4F1A\u91CD\u65B0\u53D1\u51FA\u8BFB\u53D6\u5230\u7684\u8F6C\u53D1\u5185\u5BB9\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u4ECD\u8981\u5B58\u50A8\u3002",
         specialForwardUserConfirmPrompt: "\u8BF7\u5728 60 \u79D2\u5185\u56DE\u590D\u201C\u5B58\u50A8\u201D\u7EE7\u7EED\uFF0C\u56DE\u590D\u201C\u53D6\u6D88\u201D\u6216\u201C\u4E0D\u5B58\u201D\u653E\u5F03\u3002",
         specialForwardUserConfirmRetry: "\u26A0\uFE0F \u65E0\u6CD5\u8BC6\u522B\u8F93\u5165\uFF0C\u8BF7\u56DE\u590D\u201C\u5B58\u50A8\u201D\u6216\u201C\u53D6\u6D88\u201D\u3002"
       }
@@ -37138,9 +37092,7 @@ var Config = import_koishi2.Schema.intersect([
     enableForwardUserSelection: import_koishi2.Schema.boolean().default(true),
     forwardSelectTimeout: import_koishi2.Schema.number().default(20),
     autoBindSingleForwardUser: import_koishi2.Schema.boolean().default(false),
-    forwardSpecialUserHandlingMode: import_koishi2.Schema.union(["ignore", "reject", "confirm"]).default(
-      "ignore"
-    )
+    forwardSpecialUserHandlingMode: import_koishi2.Schema.union(["ignore", "reject", "confirm"]).default("ignore")
   }).description("\u6D88\u606F\u884C\u4E3A"),
   import_koishi2.Schema.object({
     deleteMediaWhenDeletingMsg: import_koishi2.Schema.boolean().default(true),
@@ -37299,31 +37251,17 @@ function apply(ctx, cfg) {
       await database.create(ACTIVE_CAVE_TABLE, toV3Record(record));
     }
   });
-  ctx.command("cave [target:text]").action(
-    async ({ session }, target) => await getCave(ctx, session, cfg, target)
-  );
+  ctx.command("cave [target:text]").action(async ({ session }, target) => await getCave(ctx, session, cfg, target));
   ctx.command("cave.listen").action(async ({ session }) => await getCaveListByUser(ctx, session));
-  ctx.command("cave.trace").action(
-    async ({ session }) => await getCaveListByOriginUser(ctx, session)
-  );
-  ctx.command("cave.echo [...userIds]").action(
-    async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds)
-  );
-  ctx.command("cave.drop <id:number>").action(
-    async ({ session }, id) => await deleteCave(ctx, session, cfg, id)
-  );
-  ctx.command("cave.purge <...ids:number>").action(
-    async ({ session }, ...ids) => await deleteCaves(ctx, session, cfg, ids)
-  );
-  ctx.command("cave.search <id>").action(
-    async ({ session }, id) => await searchCave(ctx, session, id)
-  );
+  ctx.command("cave.trace").action(async ({ session }) => await getCaveListByOriginUser(ctx, session));
+  ctx.command("cave.echo [...userIds]").action(async ({ session }, ...userIds) => await addCave(ctx, session, cfg, userIds));
+  ctx.command("cave.drop <id:number>").action(async ({ session }, id) => await deleteCave(ctx, session, cfg, id));
+  ctx.command("cave.purge <...ids:number>").action(async ({ session }, ...ids) => await deleteCaves(ctx, session, cfg, ids));
+  ctx.command("cave.search <id>").action(async ({ session }, id) => await searchCave(ctx, session, id));
   ctx.command("cave.bind <id:number> <...userIds>", { authority: 4 }).action(
     async ({ session }, id, ...userIds) => await bindUsersToCave(ctx, session, id, userIds)
   );
-  ctx.command("cave.rank [period:string]").action(
-    async ({ session }, period) => await getRanking(ctx, session, cfg, period)
-  );
+  ctx.command("cave.rank [period:string]").action(async ({ session }, period) => await getRanking(ctx, session, cfg, period));
   ctx.command(
     "cave.admin.merge <sourceChannelId:string> <targetChannelId:string> [keepSource:string]"
   ).action(
@@ -37336,18 +37274,12 @@ function apply(ctx, cfg) {
       keepSource
     )
   );
-  ctx.command("cave.admin.migrate-local-v2").action(
-    async ({ session }) => await migrateLegacyLocalMedia(ctx, session, cfg)
-  );
-  ctx.command("cave.admin.migrate-s3 [keepLocal:string]").action(
-    async ({ session }, keepLocal) => await migrateMediaToS3(ctx, session, cfg, keepLocal)
-  );
+  ctx.command("cave.admin.migrate-local-v2").action(async ({ session }) => await migrateLegacyLocalMedia(ctx, session, cfg));
+  ctx.command("cave.admin.migrate-s3 [keepLocal:string]").action(async ({ session }, keepLocal) => await migrateMediaToS3(ctx, session, cfg, keepLocal));
   ctx.command("cave.admin.inspect-media [idRanges:text]").action(
     async ({ session }, idRanges) => await inspectMediaRefsForMigration(ctx, session, cfg, idRanges)
   );
-  ctx.command("cave.admin.reindex").action(
-    async ({ session }) => await reindexCaveIds(ctx, session, cfg)
-  );
+  ctx.command("cave.admin.reindex").action(async ({ session }) => await reindexCaveIds(ctx, session, cfg));
   ctx.command("cave.admin.restore-reindex <backupPath:text>").action(
     async ({ session }, backupPath) => await restoreReindexBackup(ctx, session, cfg, backupPath)
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.29.13",
+  "version": "1.29.14",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",
@@ -33,7 +33,7 @@
     ]
   },
   "peerDependencies": {
-    "koishi": "^4.18.10"
+    "koishi": "^4.18.11"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1029.0",