koishi-plugin-forward-hime 1.3.0 → 1.3.1

package/README.md

@@ -7,6 +7,10 @@
 
 </div>
 
+## Screenshot
+
+![screenshot](https://github.com/Nigh/forward-hime/assets/1407471/796b4f1c-c828-438c-85e9-71379c6c7e21)
+
 ## 安装
 
 在 Koishi WebUI 或 Koishi 桌面应用中，打开插件市场，搜索 `forward-hime`，找到本插件后，点击 `添加` 按钮后点击 `安装` 即可。

package/lib/decorator.d.ts

@@ -1,4 +1,5 @@
 import { Session, Element } from "koishi";
 import { ForwardNode } from "./config";
+export declare function MsgMiddlewareCache(session: Session): Promise<void>;
 export declare function MsgDecorator(session: Session, node: ForwardNode): Promise<any>;
 export declare function MsgDecoratorFallback(session: Session, node: ForwardNode): Promise<Element[]>;

package/lib/index.js

@@ -89,14 +89,51 @@ var kook_default = {
 
 // src/decorators/onebot.ts
 var import_koishi4 = require("koishi");
+function cqJsonTranslator(content, elem) {
+  let json = JSON.parse(elem.attrs.data);
+  let hit = 0;
+  if (json) {
+    if (json.prompt) {
+      hit += 1;
+      content.push((0, import_koishi4.h)("p", `${json.prompt}`));
+    }
+    if (json.meta && json.meta.detail_1) {
+      if (json.meta.detail_1.preview) {
+        hit += 1;
+        content.push(import_koishi4.h.image(json.meta.detail_1.preview));
+      }
+      if (json.meta.detail_1.qqdocurl) {
+        hit += 1;
+        content.push((0, import_koishi4.h)("span", `${json.meta.detail_1.qqdocurl}`));
+      }
+    }
+  }
+  if (hit === 0) {
+    content.push((0, import_koishi4.h)("span", `[CQ:JSON消息]`));
+  }
+}
+__name(cqJsonTranslator, "cqJsonTranslator");
 function Middleware(session) {
   const platform = guessPlatform(session);
+  let newContent = [];
   let head = [
     (0, import_koishi4.h)("b", `${session.username}`),
     (0, import_koishi4.h)("span", " 转发自 "),
     (0, import_koishi4.h)("i", `${platform}`),
     (0, import_koishi4.h)("span", `：`)
   ];
+  if (platform === "QQ") {
+    for (const key in session.elements) {
+      if (session.elements[key].type === "forward") {
+        newContent.push((0, import_koishi4.h)("span", `[CQ:转发消息]`));
+      } else if (session.elements[key].type === "json") {
+        cqJsonTranslator(newContent, session.elements[key]);
+      } else {
+        newContent.push(session.elements[key]);
+      }
+    }
+    return { head, content: newContent };
+  }
   return { head, content: session.elements };
 }
 __name(Middleware, "Middleware");
@@ -196,15 +233,52 @@ function defaultMiddleware(session) {
 }
 __name(defaultMiddleware, "defaultMiddleware");
 var localDecorators = [atTranslator, quoteTranslator];
-async function MsgDecorator(session, node) {
+var msgMiddleCache = [];
+function msgMiddleCacheAppend(msg) {
+  msgMiddleCache.push(msg);
+  if (msgMiddleCache.length > 16) {
+    msgMiddleCache.shift();
+  }
+  logger.debug(`[msgMiddleCache]`, msgMiddleCache.length);
+}
+__name(msgMiddleCacheAppend, "msgMiddleCacheAppend");
+function msgMiddleCacheFind(uuid) {
+  for (const item of msgMiddleCache) {
+    if (item.UUID === uuid) {
+      return item.msg;
+    }
+  }
+  return null;
+}
+__name(msgMiddleCacheFind, "msgMiddleCacheFind");
+function MsgToMiddleware(session) {
   let elems = { head: [], content: [] };
   let _platform_in = decorators_exports[session.platform];
-  let _platform_out = decorators_exports[node.Platform];
   if (_platform_in && typeof _platform_in.Middleware === "function") {
     elems = _platform_in.Middleware(session);
   } else {
     elems = defaultMiddleware(session);
   }
+  return elems;
+}
+__name(MsgToMiddleware, "MsgToMiddleware");
+async function MsgMiddlewareCache(session) {
+  let elems = MsgToMiddleware(session);
+  msgMiddleCacheAppend({ UUID: MsgUUIDFromSession(session), msg: elems });
+  logger.debug(`[msgMiddleCache] CACHED`);
+}
+__name(MsgMiddlewareCache, "MsgMiddlewareCache");
+async function MsgDecorator(session, node) {
+  let elems;
+  let _platform_out = decorators_exports[node.Platform];
+  let elemCache = msgMiddleCacheFind(MsgUUIDFromSession(session));
+  if (elemCache) {
+    logger.debug(`[msgMiddleCache] HIT`);
+    elems = elemCache;
+  } else {
+    logger.debug(`[msgMiddleCache] MISSED`);
+    elems = MsgToMiddleware(session);
+  }
   for (const fn of localDecorators) {
     elems = await fn(session, node, elems);
   }
@@ -268,7 +342,8 @@ async function quoteTranslator(session, node, { head, content }) {
   if (cache) {
     let msgid = await msgCacheGetLocalIDByUUID(node, cache.uuid);
     if (msgid) {
-      head.unshift((0, import_koishi5.h)("quote", { id: msgid }));
+      let newHead = [(0, import_koishi5.h)("quote", { id: msgid })].concat(head);
+      return { head: newHead, content };
     } else {
       logger.error(`[msgCacheGetLocalIDByUUID] ${cache.uuid} not found`);
     }
@@ -289,9 +364,14 @@ async function MessageSendWithDecorator(ctx2, node, session, Deco) {
       msgid: res[0],
       uuid
     };
-    msgCache(mc);
-    logger.debug(`[MessageForward] to ${mc.platform} ${mc.uuid}`);
+    if (!mc.msgid) {
+      throw new Error(`Empty Message ID`);
+    } else {
+      msgCache(mc);
+      logger.debug(`[MessageForward] to ${mc.platform} ${mc.uuid}`);
+    }
   }).catch((error) => {
+    logger.error(`content: ${content}`);
     throw error;
   });
 }
@@ -327,6 +407,10 @@ function botExistsCheck(ctx2, node) {
   return true;
 }
 __name(botExistsCheck, "botExistsCheck");
+function MsgUUIDFromSession(session) {
+  return session.channelId + ":" + session.messageId;
+}
+__name(MsgUUIDFromSession, "MsgUUIDFromSession");
 
 // src/index.ts
 var name = `forward hime - 转发姬`;
@@ -362,7 +446,7 @@ function apply(ctx2, cfg) {
             session.platform,
             session.channelId + ":" + session.messageId
           );
-          let uuid = session.channelId + ":" + session.messageId;
+          let uuid = MsgUUIDFromSession(session);
           msgCache({
             platform: session.platform,
             bot: group.Nodes[k].BotID,
@@ -375,6 +459,9 @@ function apply(ctx2, cfg) {
         }
       }
     }
+    if (hitGroup.length > 0) {
+      await MsgMiddlewareCache(session);
+    }
     for (const g in hitGroup) {
       const group = cfg.ForwardGroups[hitGroup[g]];
       for (const k in group.Nodes) {

package/lib/message.d.ts

@@ -4,3 +4,4 @@ import { MsgCache } from "./cache";
 export declare function MessageForward(ctx: Context, node: ForwardNode, session: Session): Promise<void>;
 export declare function MessageDelete(ctx: Context, msg: MsgCache): Promise<void>;
 export declare function MessageEdit(ctx: Context, node: ForwardNode, session: Session): Promise<void>;
+export declare function MsgUUIDFromSession(session: Session): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "koishi-plugin-forward-hime",
 	"description": "多群组消息互通",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"author": {
 		"name": "xianii",
 		"email": "jiyucheng007@gmail.com"
@@ -15,7 +15,7 @@
 		"browser": true
 	},
 	"license": "MIT",
-	"homepage": "https://github.com/Nigh/forward-hime",
+	"homepage": "https://nigh.github.io/forward-hime/",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/Nigh/forward-hime.git"