koishi-plugin-best-cave 2.3.13 → 2.3.15

package/lib/index.d.ts

@@ -3,12 +3,20 @@ import { CaveHashObject } from './HashManager';
 export declare const name = "best-cave";
 export declare const inject: string[];
 export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n  <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n  <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n  <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n  <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n  <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
+/**
+ * @description 存储在合并转发中的单个节点的数据结构。
+ */
+export interface ForwardNode {
+    userId: string;
+    userName: string;
+    elements: StoredElement[];
+}
 /**
  * @description 存储在数据库中的单个消息元素。
  */
 export interface StoredElement {
     type: 'text' | 'image' | 'video' | 'audio' | 'file' | 'at' | 'forward' | 'reply';
-    content?: string;
+    content?: string | ForwardNode[];
     file?: string;
 }
 /**

package/lib/index.js

@@ -300,7 +300,7 @@ async function buildCaveMessage(cave, config, fileManager, logger2) {
       if (el.type === "reply") return (0, import_koishi.h)("reply", { id: el.content });
       if (el.type === "forward") {
         try {
-          const forwardNodes = JSON.parse(el.content || "[]");
+          const forwardNodes = Array.isArray(el.content) ? el.content : [];
           const messageNodes = await Promise.all(forwardNodes.map(async (node) => {
             const author = (0, import_koishi.h)("author", { id: node.userId, name: node.userName });
             const content = await transformToH(node.elements);
@@ -435,13 +435,30 @@ async function processMessageElements(sourceElements, newId, session, config, lo
           if (!node.message || !Array.isArray(node.message)) continue;
           const userId = node.sender?.user_id;
           const userName = node.sender?.nickname;
-          const contentElements = await transform(import_koishi.h.normalize(node.message));
+          const elementsToProcess = node.message.map((segment) => {
+            const { type: type2, data } = segment;
+            const attrs = { ...data };
+            if (type2 === "text" && typeof data.text !== "undefined") {
+              attrs.content = data.text;
+              delete attrs.text;
+            }
+            if (type2 === "at" && typeof data.qq !== "undefined") {
+              attrs.id = data.qq;
+              delete attrs.qq;
+            }
+            if (["image", "video", "audio"].includes(type2) && typeof data.url !== "undefined") {
+              attrs.src = data.url;
+              delete attrs.url;
+            }
+            return (0, import_koishi.h)(type2, attrs);
+          });
+          const contentElements = await transform(elementsToProcess);
           if (contentElements.length > 0) {
             forwardNodes.push({ userId, userName, elements: contentElements });
           }
         }
         if (forwardNodes.length > 0) {
-          result.push({ type: "forward", content: JSON.stringify(forwardNodes) });
+          result.push({ type: "forward", content: forwardNodes });
         }
       } else if (["image", "video", "audio", "file"].includes(type) && el.attrs.src) {
         let fileIdentifier = el.attrs.src;
@@ -1084,7 +1101,7 @@ ${JSON.stringify(finalElementsForDb, null, 2)}`);
       if (finalElementsForDb.length === 0) return "无可添加内容";
       const textHashesToStore = [];
       if (hashManager) {
-        const combinedText = finalElementsForDb.filter((el) => el.type === "text" && el.content).map((el) => el.content).join(" ");
+        const combinedText = finalElementsForDb.filter((el) => el.type === "text" && typeof el.content === "string").map((el) => el.content).join(" ");
         if (combinedText) {
           const newSimhash = hashManager.generateTextSimhash(combinedText);
           if (newSimhash) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞。支持丰富的媒体类型、内容查重、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],