koishi-plugin-echo-cave 1.28.1 → 1.28.2

package/lib/core/command/admin.d.ts

@@ -3,4 +3,4 @@ import { Context, Session } from 'koishi';
 export declare function mergeCavesBetweenChannels(ctx: Context, session: Session, cfg: Config, sourceChannelId: string, targetChannelId: string, keepSourceOption?: string): Promise<string>;
 export declare function migrateLegacyLocalMedia(ctx: Context, session: Session, cfg: Config): Promise<string>;
 export declare function migrateMediaToS3(ctx: Context, session: Session, cfg: Config, keepLocalOption?: string): Promise<string>;
-export declare function inspectMediaRefsForMigration(ctx: Context, session: Session, cfg: Config): Promise<string>;
+export declare function inspectMediaRefsForMigration(ctx: Context, session: Session, cfg: Config, idRangesOption?: string): Promise<string>;

package/lib/index.cjs

@@ -33555,7 +33555,11 @@ 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));
@@ -33840,7 +33844,12 @@ 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);
@@ -33919,7 +33928,13 @@ 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
@@ -33948,7 +33963,13 @@ async function transferMediaRefToChannel(ctx, fileRef, type, targetChannelId, ta
     if (!source) {
       throw new Error(`Invalid S3 uri: ${fileRef}`);
     }
-    const nextRef2 = await transferS3ObjectToChannel(cfg, source, type, targetChannelId, transferMode);
+    const nextRef2 = await transferS3ObjectToChannel(
+      cfg,
+      source,
+      type,
+      targetChannelId,
+      transferMode
+    );
     const targetLocation2 = parseS3Uri(nextRef2);
     const plan2 = {
       nextRef: nextRef2,
@@ -34034,7 +34055,9 @@ 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 {
@@ -34077,10 +34100,13 @@ async function collectMessageMediaRefs(ctx, content) {
   }
   return refs;
 }
-async function inspectCaveMediaRefs(ctx) {
+async function inspectCaveMediaRefs(ctx, shouldInclude) {
   const caves = await ctx.database.get("echo_cave_v2", {});
   const results = [];
   for (const cave of caves) {
+    if (shouldInclude && !shouldInclude(cave.id)) {
+      continue;
+    }
     try {
       const refs = await collectMessageMediaRefs(ctx, cave.content);
       if (refs.length > 0) {
@@ -34361,7 +34387,9 @@ 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);
@@ -34591,7 +34619,9 @@ async function processForwardMessageContent(ctx, session, msg, cfg) {
 // src/core/parser/msg-parser.ts
 async function processMessageContent(ctx, msg, cfg, channelId) {
   return Promise.all(
-    msg.map(async (element) => await processMediaElement(ctx, element, cfg, channelId))
+    msg.map(
+      async (element) => await processMediaElement(ctx, element, cfg, channelId)
+    )
   );
 }
 
@@ -34785,6 +34815,40 @@ function appendFailedRecordSummary(message, failedRecordIds) {
   return `${message}
 \u26A0\uFE0F \u5931\u8D25\u8BB0\u5F55 ID\uFF1A${failedRecordIds.join(", ")}`;
 }
+function parseIdRanges(value) {
+  if (!value?.trim()) {
+    return [];
+  }
+  const segments = value.split(",").map((segment) => segment.trim()).filter(Boolean);
+  if (segments.length === 0) {
+    return [];
+  }
+  const ranges = [];
+  for (const segment of segments) {
+    if (/^\d+$/.test(segment)) {
+      const id = Number(segment);
+      ranges.push({ start: id, end: id });
+      continue;
+    }
+    const rangeMatch = segment.match(/^(\d+)-(\d+)$/);
+    if (!rangeMatch) {
+      return null;
+    }
+    const start = Number(rangeMatch[1]);
+    const end = Number(rangeMatch[2]);
+    if (start > end) {
+      return null;
+    }
+    ranges.push({ start, end });
+  }
+  return ranges;
+}
+function isIdInRanges(id, ranges) {
+  if (ranges.length === 0) {
+    return true;
+  }
+  return ranges.some((range2) => id >= range2.start && id <= range2.end);
+}
 async function requestSecondConfirmation(ctx, session, summary, retryMessage, timeoutMessage, cancelledMessage) {
   return new Promise((resolve) => {
     listenForUserMessage(
@@ -34915,14 +34979,35 @@ async function migrateMediaToS3(ctx, session, cfg, keepLocalOption) {
     result.failedRecordIds
   );
 }
-async function inspectMediaRefsForMigration(ctx, session, cfg) {
+async function inspectMediaRefsForMigration(ctx, session, cfg, idRangesOption) {
   const accessError = ensureAdminPrivateAccess(session, cfg);
   if (accessError) {
     return accessError;
   }
-  const results = await inspectCaveMediaRefs(ctx);
+  const idRanges = parseIdRanges(idRangesOption);
+  if (idRanges === null) {
+    return session.text("commands.cave.admin.inspect-media.messages.invalidRange");
+  }
+  const displayRanges = idRangesOption?.trim() || "\u5168\u90E8";
+  const results = await inspectCaveMediaRefs(ctx, (id) => isIdInRanges(id, idRanges));
   if (results.length === 0) {
-    return session.text("commands.cave.admin.inspect-media.messages.noMediaFound");
+    return session.text("commands.cave.admin.inspect-media.messages.noMediaFound", {
+      idRanges: displayRanges
+    });
+  }
+  const confirmed = await requestSecondConfirmation(
+    ctx,
+    session,
+    session.text("commands.cave.admin.inspect-media.messages.confirmSummary", {
+      idRanges: displayRanges,
+      matchedCount: results.length
+    }),
+    session.text("commands.cave.admin.inspect-media.messages.confirmRetry"),
+    session.text("commands.cave.admin.inspect-media.messages.confirmTimeout"),
+    session.text("commands.cave.admin.inspect-media.messages.confirmCancelled")
+  );
+  if (!confirmed) {
+    return;
   }
   for (const { id, refs } of results) {
     await session.send(`\u56DE\u58F0\u6D1E #${id}
@@ -35050,7 +35135,9 @@ 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);
@@ -35621,7 +35708,12 @@ var zh_CN_default = {
     "cave.admin.inspect-media": {
       description: "\u68C0\u6D4B\u56DE\u58F0\u6D1E\u4E2D\u7684\u5A92\u4F53\u94FE\u63A5\uFF0C\u4E0D\u6267\u884C\u5B9E\u9645\u8FC1\u79FB",
       messages: {
-        noMediaFound: "\u{1F50D} \u672A\u68C0\u6D4B\u5230\u4EFB\u4F55\u5A92\u4F53\u94FE\u63A5\u3002"
+        invalidRange: "\u274C \u8303\u56F4\u53C2\u6570\u683C\u5F0F\u65E0\u6548\u3002\u8BF7\u4F7F\u7528 0-100,105-240 \u6216 12,18-20 \u8FD9\u6837\u7684\u683C\u5F0F\u3002",
+        noMediaFound: "\u{1F50D} \u5728\u8303\u56F4 {idRanges} \u5185\u672A\u68C0\u6D4B\u5230\u4EFB\u4F55\u5A92\u4F53\u94FE\u63A5\u3002",
+        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u6267\u884C\u5A92\u4F53\u94FE\u63A5\u68C0\u6D4B\uFF08\u53EA\u8BFB\uFF09\n\u68C0\u6D4B\u8303\u56F4\uFF1A{idRanges}\n\u547D\u4E2D\u56DE\u58F0\u6D1E\u6570\uFF1A{matchedCount}\n\n\u672C\u6B21\u64CD\u4F5C\u4E0D\u4F1A\u4E0A\u4F20 S3\u3001\u4E0D\u4F1A\u5220\u9664\u672C\u5730\u5A92\u4F53\u3001\u4E0D\u4F1A\u6539\u5199\u6570\u636E\u5E93\uFF0C\u4F46\u4F1A\u9010\u6761\u53D1\u9001\u68C0\u6D4B\u7ED3\u679C\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
+        confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
+        confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u68C0\u6D4B\u3002",
+        confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u68C0\u6D4B\u672A\u6267\u884C\u3002"
       }
     }
   }
@@ -35764,7 +35856,9 @@ function apply(ctx, cfg) {
   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(
+  ctx.command(
+    "cave.admin.merge <sourceChannelId:string> <targetChannelId:string> [keepSource:string]"
+  ).action(
     async ({ session }, sourceChannelId, targetChannelId, keepSource) => await mergeCavesBetweenChannels(
       ctx,
       session,
@@ -35780,8 +35874,8 @@ function apply(ctx, 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").action(
-    async ({ session }) => await inspectMediaRefsForMigration(ctx, session, cfg)
+  ctx.command("cave.admin.inspect-media [idRanges:text]").action(
+    async ({ session }, idRanges) => await inspectMediaRefsForMigration(ctx, session, cfg, idRanges)
   );
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/utils/media/media-helper.d.ts

@@ -14,7 +14,7 @@ interface CaveMediaRefs {
     id: number;
     refs: string[];
 }
-export declare function inspectCaveMediaRefs(ctx: Context): Promise<CaveMediaRefs[]>;
+export declare function inspectCaveMediaRefs(ctx: Context, shouldInclude?: (caveId: number) => boolean): Promise<CaveMediaRefs[]>;
 export declare function saveMedia(ctx: Context, mediaElement: Record<string, unknown>, type: MediaType, cfg: Config, channelId: string): Promise<string>;
 export declare function processMediaElement(ctx: Context, element: MaybeMediaElement, cfg: Config, channelId: string): Promise<MaybeMediaElement>;
 export declare function resolveMediaElementForSend(ctx: Context, element: MaybeMediaElement, cfg: Config): Promise<MaybeMediaElement>;

package/package.json

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