koishi-plugin-best-cave 1.5.5 → 1.5.7

package/lib/index.d.ts

@@ -1,6 +1,30 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "best-cave";
 export declare const inject: string[];
+export interface BaseElement {
+    type: 'text' | 'img' | 'video';
+    index: number;
+}
+export interface TextElement extends BaseElement {
+    type: 'text';
+    content: string;
+}
+export interface MediaElement extends BaseElement {
+    type: 'img' | 'video';
+    file?: string;
+    fileName?: string;
+    fileSize?: string;
+    filePath?: string;
+}
+export type Element = TextElement | MediaElement;
+export interface CaveObject {
+    cave_id: number;
+    elements: Element[];
+    contributor_number: string;
+    contributor_name: string;
+}
+export interface PendingCave extends CaveObject {
+}
 /**
  * 插件配置项
  * @type {Schema}

package/lib/index.js

@@ -99,7 +99,7 @@ var FileHandler = class {
           return await operation();
         } catch (error) {
           if (i === this.RETRY_COUNT - 1) throw error;
-          await new Promise((resolve) => setTimeout(resolve, this.RETRY_DELAY));
+          await new Promise((resolve2) => setTimeout(resolve2, this.RETRY_DELAY));
         }
       }
       throw new Error("Operation failed after retries");
@@ -985,10 +985,9 @@ var import_koishi4 = require("koishi");
 var fs4 = __toESM(require("fs"));
 var path4 = __toESM(require("path"));
 var AuditManager = class {
-  constructor(ctx, config, caveDir, idManager) {
+  constructor(ctx, config, idManager) {
     this.ctx = ctx;
     this.config = config;
-    this.caveDir = caveDir;
     this.idManager = idManager;
   }
   static {
@@ -1183,6 +1182,8 @@ ${session.text("commands.cave.audit.from")}${cave.contributor_number}`;
 var import_koishi5 = require("koishi");
 var fs5 = __toESM(require("fs"));
 var path5 = __toESM(require("path"));
+var import_url = require("url");
+var import_path = require("path");
 var logger4 = new import_koishi5.Logger("MediaHandle");
 async function buildMessage(cave, resourceDir, session) {
   if (!cave?.elements?.length) {
@@ -1208,11 +1209,9 @@ async function buildMessage(cave, resourceDir, session) {
     if (element.type === "text") {
       lines.push(element.content);
     } else if (element.type === "img" && element.file) {
-      const filePath = path5.join(resourceDir, element.file);
-      const base64Data = await processMediaFile(filePath, "image");
-      if (base64Data) {
-        lines.push((0, import_koishi5.h)("image", { src: base64Data }));
-      }
+      const filePath = (0, import_path.resolve)(resourceDir, element.file);
+      const fileUrl = (0, import_url.pathToFileURL)(filePath);
+      lines.push((0, import_koishi5.h)("image", { src: fileUrl.toString() }));
     }
   }
   lines.push(session.text("commands.cave.message.contributorSuffix", [cave.contributor_name]));
@@ -1509,7 +1508,7 @@ async function apply(ctx, config) {
   await FileHandler.ensureJsonFile(path7.join(caveDir, "hash.json"));
   const idManager = new IdManager(ctx.baseDir);
   const contentHashManager = new HashManager(caveDir);
-  const auditManager = new AuditManager(ctx, config, caveDir, idManager);
+  const auditManager = new AuditManager(ctx, config, idManager);
   await Promise.all([
     idManager.initialize(path7.join(caveDir, "cave.json"), path7.join(caveDir, "pending.json")),
     contentHashManager.initialize()

package/lib/types.d.ts

@@ -0,0 +1,24 @@
+export interface BaseElement {
+    type: 'text' | 'img' | 'video';
+    index: number;
+}
+export interface TextElement extends BaseElement {
+    type: 'text';
+    content: string;
+}
+export interface MediaElement extends BaseElement {
+    type: 'img' | 'video';
+    file?: string;
+    fileName?: string;
+    fileSize?: string;
+    filePath?: string;
+}
+export type Element = TextElement | MediaElement;
+export interface CaveObject {
+    cave_id: number;
+    elements: Element[];
+    contributor_number: string;
+    contributor_name: string;
+}
+export interface PendingCave extends CaveObject {
+}

package/lib/utils/AuditHandler.d.ts

@@ -1,37 +1,12 @@
 import { Context } from 'koishi';
-import { Config } from '../index';
+import { Config, PendingCave } from '..';
 import { IdManager } from './IdManager';
-export interface CaveObject {
-    cave_id: number;
-    elements: Element[];
-    contributor_number: string;
-    contributor_name: string;
-}
-interface BaseElement {
-    type: 'text' | 'img' | 'video';
-    index: number;
-}
-interface TextElement extends BaseElement {
-    type: 'text';
-    content: string;
-}
-interface MediaElement extends BaseElement {
-    type: 'img' | 'video';
-    file?: string;
-    fileName?: string;
-    fileSize?: string;
-    filePath?: string;
-}
-type Element = TextElement | MediaElement;
-export interface PendingCave extends CaveObject {
-}
 export declare class AuditManager {
     private ctx;
     private config;
-    private caveDir;
     private idManager;
     private logger;
-    constructor(ctx: Context, config: Config, caveDir: string, idManager: IdManager);
+    constructor(ctx: Context, config: Config, idManager: IdManager);
     processAudit(pendingData: PendingCave[], isApprove: boolean, caveFilePath: string, resourceDir: string, pendingFilePath: string, session: any, targetId?: number): Promise<string>;
     private handleSingleAudit;
     private handleBatchAudit;
@@ -40,4 +15,3 @@ export declare class AuditManager {
     private cleanElementsForSave;
     private sendMessage;
 }
-export {};

package/lib/utils/MediaHandler.d.ts

@@ -1,26 +1,5 @@
 import { Context } from 'koishi';
-export interface BaseElement {
-    type: 'text' | 'img' | 'video';
-    index: number;
-}
-interface CaveObject {
-    cave_id: number;
-    elements: Element[];
-    contributor_number: string;
-    contributor_name: string;
-}
-export interface TextElement extends BaseElement {
-    type: 'text';
-    content: string;
-}
-export interface MediaElement extends BaseElement {
-    type: 'img' | 'video';
-    file?: string;
-    fileName?: string;
-    fileSize?: string;
-    filePath?: string;
-}
-export type Element = TextElement | MediaElement;
+import { Element, CaveObject } from '..';
 export declare function buildMessage(cave: CaveObject, resourceDir: string, session?: any): Promise<string>;
 export declare function sendMessage(session: any, key: string, params?: any[], isTemp?: boolean, timeout?: number): Promise<string>;
 export declare function processMediaFile(filePath: string, type: 'image' | 'video'): Promise<string | null>;
@@ -49,4 +28,3 @@ export declare function saveMedia(urls: string[], fileNames: (string | undefined
     imageDuplicateThreshold: number;
     textDuplicateThreshold: number;
 }, ctx: Context, session: any, buffers?: Buffer[]): Promise<string[]>;
-export {};

package/lib/utils/ProcessHandle.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '../index';
+import { Config } from '..';
 import { IdManager } from './IdManager';
 import { HashManager } from './HashManager';
 export declare function processList(session: any, config: Config, idManager: IdManager, userId?: string, pageNum?: number): Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "最好的 cave 插件，可开关的审核系统，可引用添加，支持图文混合内容，可查阅投稿列表，完美复刻你的 .cave 体验！",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],