koishi-plugin-forward-hime 1.2.1 → 1.2.2

package/lib/cache.d.ts

@@ -11,7 +11,10 @@ declare module "@koishijs/cache" {
         msgCache: MsgCache;
     }
 }
-export declare function msgCache(ctx: Context, mc: MsgCache): Promise<void>;
-export declare function msgCacheDelete(ctx: Context, key: string): Promise<void>;
-export declare function msgCacheFindByKey(ctx: Context, key: string): Promise<MsgCache>;
-export declare function msgCacheFindByUUID(ctx: Context, uuid: string): Promise<any[]>;
+export declare function msgCacheInit(context: Context): void;
+export declare function msgCache(mc: MsgCache): Promise<void>;
+export declare function msgCacheDelete(key: string): Promise<void>;
+export declare function msgCacheFindByKey(key: string): Promise<any>;
+export declare function msgCacheFindByUUID(uuid: string): Promise<any[]>;
+import { ForwardNode } from "./config";
+export declare function msgCacheGetLocalIDByUUID(node: ForwardNode, uuid: string): Promise<any>;

package/lib/decorator.d.ts

@@ -1,3 +1,3 @@
 import { Session } from "koishi";
 import { ForwardNode } from "./config";
-export declare function MsgDecorator(session: Session, node: ForwardNode): any;
+export declare function MsgDecorator(session: Session, node: ForwardNode): Promise<any>;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { Context } from "koishi";
 import { ConfigSet } from "./config";
 export declare const name = "forward hime - \u8F6C\u53D1\u59EC";
-export declare const usage = "\n# forward hime - \u8F6C\u53D1\u59EC <sub>v1.2.1</sub>\n## \u914D\u7F6E\u8BF4\u660E\n1. \u6DFB\u52A0 `\u4E92\u901A\u8F6C\u53D1\u7EC4`\n2. \u4E3A\u6DFB\u52A0\u7684 `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u914D\u7F6E\u8F6C\u53D1\u8282\u70B9\u3002\u6BCF\u4E2A\u8F6C\u53D1\u8282\u70B9\u5BF9\u5E94\u67D0\u4E2A\u5E73\u53F0\u7684\u4E00\u4E2A\u9891\u9053\u6216\u7FA4\u7EC4\n\n\u6CE8\u610F\uFF1A\u5F53\u672A\u914D\u7F6E`cache`\u65F6\uFF0C\u8DE8\u5E73\u53F0\u5220\u9664\u3001\u8DE8\u5E73\u53F0\u56DE\u590D\u7B49\u529F\u80FD\u5C06\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C\u3002\n## \u7279\u6027\n- \u53EF\u4EE5\u914D\u7F6E\u591A\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4`\uFF0C\u6BCF\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u4E4B\u95F4\u76F8\u4E92\u72EC\u7ACB\n- \u542F\u7528\u63D2\u4EF6\u540E\uFF0C\u5F53\u4E00\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u4E2D\u7684\u4EFB\u610F\u8282\u70B9\u6536\u5230\u6D88\u606F\u65F6\uFF0C\u63D2\u4EF6\u4F1A\u81EA\u52A8\u5C06\u6D88\u606F\u8F6C\u53D1\u7ED9**\u8FD9\u4E2A**`\u4E92\u901A\u8F6C\u53D1\u7EC4`\u4E2D\u7684\u5176\u4ED6\u8282\u70B9\u3002\n---";
+export declare const usage = "\n# forward hime - \u8F6C\u53D1\u59EC\n## \u914D\u7F6E\u8BF4\u660E\n1. \u6DFB\u52A0 `\u4E92\u901A\u8F6C\u53D1\u7EC4`\n2. \u4E3A\u6DFB\u52A0\u7684 `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u914D\u7F6E\u8F6C\u53D1\u8282\u70B9\u3002\u6BCF\u4E2A\u8F6C\u53D1\u8282\u70B9\u5BF9\u5E94\u67D0\u4E2A\u5E73\u53F0\u7684\u4E00\u4E2A\u9891\u9053\u6216\u7FA4\u7EC4\n\n\u6CE8\u610F\uFF1A\u5F53\u672A\u914D\u7F6E`cache`\u65F6\uFF0C\u8DE8\u5E73\u53F0\u5220\u9664\u3001\u8DE8\u5E73\u53F0\u56DE\u590D\u7B49\u529F\u80FD\u5C06\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C\u3002\n## \u7279\u6027\n- \u53EF\u4EE5\u914D\u7F6E\u591A\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4`\uFF0C\u6BCF\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u4E4B\u95F4\u76F8\u4E92\u72EC\u7ACB\n- \u542F\u7528\u63D2\u4EF6\u540E\uFF0C\u5F53\u4E00\u4E2A `\u4E92\u901A\u8F6C\u53D1\u7EC4` \u4E2D\u7684\u4EFB\u610F\u8282\u70B9\u6536\u5230\u6D88\u606F\u65F6\uFF0C\u63D2\u4EF6\u4F1A\u81EA\u52A8\u5C06\u6D88\u606F\u8F6C\u53D1\u7ED9**\u8FD9\u4E2A**`\u4E92\u901A\u8F6C\u53D1\u7EC4`\u4E2D\u7684\u5176\u4ED6\u8282\u70B9\u3002\n---";
 export declare const reusable = true;
 export declare const inject: {
     optional: string[];

package/lib/index.js

@@ -55,6 +55,7 @@ var createConfig = /* @__PURE__ */ __name(() => import_koishi.Schema.intersect([
 // src/logger.ts
 var import_koishi2 = require("koishi");
 var logger = new import_koishi2.Logger("forward-hime");
+logger.level = import_koishi2.Logger.INFO;
 
 // src/decorator.ts
 var import_koishi5 = require("koishi");
@@ -109,6 +110,69 @@ var onebot_default = {
   Middleware
 };
 
+// src/cache.ts
+var ctx;
+function cacheNotEnabled() {
+  if (!ctx.cache) {
+    return true;
+  }
+  return false;
+}
+__name(cacheNotEnabled, "cacheNotEnabled");
+function msgCacheInit(context) {
+  ctx = context;
+}
+__name(msgCacheInit, "msgCacheInit");
+async function msgCache(mc) {
+  if (cacheNotEnabled()) {
+    return;
+  }
+  const key = mc.guild + ":" + mc.msgid;
+  logger.debug(`[message-cache] ${mc.platform} ${key}`);
+  await ctx.cache.set("msgCache", key, mc, 7200 * 1e3);
+}
+__name(msgCache, "msgCache");
+async function msgCacheDelete(key) {
+  if (cacheNotEnabled()) {
+    return;
+  }
+  await ctx.cache.delete("msgCache", key);
+}
+__name(msgCacheDelete, "msgCacheDelete");
+async function msgCacheFindByKey(key) {
+  if (cacheNotEnabled()) {
+    return;
+  }
+  return await ctx.cache.get("msgCache", key);
+}
+__name(msgCacheFindByKey, "msgCacheFindByKey");
+async function msgCacheFindByUUID(uuid) {
+  if (cacheNotEnabled()) {
+    return;
+  }
+  let caches = await ctx.cache.entries("msgCache");
+  let result = [];
+  for await (const item of caches) {
+    if (item[1].uuid === uuid) {
+      result.push(item);
+    }
+  }
+  return result;
+}
+__name(msgCacheFindByUUID, "msgCacheFindByUUID");
+async function msgCacheGetLocalIDByUUID(node, uuid) {
+  if (cacheNotEnabled()) {
+    return;
+  }
+  let caches = await ctx.cache.entries("msgCache");
+  for await (const item of caches) {
+    if (item[1].uuid === uuid && item[1].platform === node.Platform && item[1].guild === node.Guild && item[1].bot === node.BotID) {
+      return item[1].msgid;
+    }
+  }
+}
+__name(msgCacheGetLocalIDByUUID, "msgCacheGetLocalIDByUUID");
+
 // src/decorator.ts
 function defaultDecorator({ head, content }) {
   let msg = [];
@@ -126,9 +190,9 @@ function defaultMiddleware(session) {
   return { head, content: session.elements };
 }
 __name(defaultMiddleware, "defaultMiddleware");
-var localDecorators = [at2Name];
-function MsgDecorator(session, node) {
-  let elems;
+var localDecorators = [atTranslator, quoteTranslator];
+async function MsgDecorator(session, node) {
+  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") {
@@ -136,9 +200,12 @@ function MsgDecorator(session, node) {
   } else {
     elems = defaultMiddleware(session);
   }
-  localDecorators.forEach((fn) => {
-    elems = fn(elems);
-  });
+  for (const fn of localDecorators) {
+    elems = await fn(session, node, elems);
+  }
+  if (session.quote && session.quote.id) {
+    elems = await quoteTranslator(session, node, elems);
+  }
   if (_platform_out && typeof _platform_out.Decorator === "function") {
     return _platform_out.Decorator(elems);
   } else {
@@ -146,69 +213,51 @@ function MsgDecorator(session, node) {
   }
 }
 __name(MsgDecorator, "MsgDecorator");
-function at2Name({ head, content }) {
-  for (const key in content) {
-    const element = content[key];
-    if (element.type === "at") {
-      content[key] = (0, import_koishi5.h)("span", `@${element.attrs.name || element.attrs.id}`);
+async function atTranslator(session, node, { head, content }) {
+  const newMsg = await new Promise((resolve, reject) => {
+    let newContent = [];
+    for (const key in content) {
+      const element = content[key];
+      if (element.type === "at") {
+        if (element.attrs.id !== session.selfId) {
+          newContent.push(
+            (0, import_koishi5.h)("span", `@${element.attrs.name || element.attrs.id}`)
+          );
+        }
+      } else {
+        newContent.push(element);
+      }
     }
-  }
-  return { head, content };
-}
-__name(at2Name, "at2Name");
-
-// src/cache.ts
-function cacheNotEnabled(ctx) {
-  if (!ctx.cache) {
-    return true;
-  }
-  return false;
-}
-__name(cacheNotEnabled, "cacheNotEnabled");
-async function msgCache(ctx, mc) {
-  if (cacheNotEnabled(ctx)) {
-    return;
-  }
-  const key = mc.guild + ":" + mc.msgid;
-  logger.debug("[message-cache]", key, mc);
-  await ctx.cache.set("msgCache", key, mc, 7200 * 1e3);
+    resolve({ head, content: newContent });
+  });
+  return newMsg;
 }
-__name(msgCache, "msgCache");
-async function msgCacheDelete(ctx, key) {
-  if (cacheNotEnabled(ctx)) {
-    return;
+__name(atTranslator, "atTranslator");
+async function quoteTranslator(session, node, { head, content }) {
+  if (!session.quote || !session.quote.id) {
+    return { head, content };
   }
-  await ctx.cache.delete("msgCache", key);
-}
-__name(msgCacheDelete, "msgCacheDelete");
-async function msgCacheFindByKey(ctx, key) {
-  if (cacheNotEnabled(ctx)) {
-    return;
-  }
-  return await ctx.cache.get("msgCache", key);
-}
-__name(msgCacheFindByKey, "msgCacheFindByKey");
-async function msgCacheFindByUUID(ctx, uuid) {
-  if (cacheNotEnabled(ctx)) {
-    return;
-  }
-  let caches = await ctx.cache.entries("msgCache");
-  let result = [];
-  for await (const item of caches) {
-    if (item[1].uuid === uuid) {
-      result.push(item);
+  const key = session.channelId + ":" + session.quote.id;
+  const cache = await msgCacheFindByKey(key);
+  if (cache) {
+    let msgid = await msgCacheGetLocalIDByUUID(node, cache.uuid);
+    if (msgid) {
+      head.unshift((0, import_koishi5.h)("quote", { id: msgid }));
+    } else {
+      logger.error(`[msgCacheGetLocalIDByUUID] ${cache.uuid} not found`);
     }
   }
-  return result;
+  return { head, content };
 }
-__name(msgCacheFindByUUID, "msgCacheFindByUUID");
+__name(quoteTranslator, "quoteTranslator");
 
 // src/message.ts
-async function MessageForward(ctx, node, session) {
+async function MessageForward(ctx2, node, session) {
+  const uuid = session.channelId + ":" + session.messageId;
+  const content = await MsgDecorator(session, node);
   try {
-    botExistsCheck(ctx, node);
-    const uuid = session.channelId + ":" + session.messageId;
-    await ctx.bots[`${node.Platform}:${node.BotID}`].sendMessage(node.Guild, MsgDecorator(session, node)).then((res) => {
+    botExistsCheck(ctx2, node);
+    await ctx2.bots[`${node.Platform}:${node.BotID}`].sendMessage(node.Guild, content).then((res) => {
       let mc = {
         platform: node.Platform,
         bot: node.BotID,
@@ -216,25 +265,25 @@ async function MessageForward(ctx, node, session) {
         msgid: res[0],
         uuid
       };
-      msgCache(ctx, mc);
-      logger.debug("Forward", mc);
+      msgCache(mc);
+      logger.debug(`[MessageForward] to ${mc.platform} ${mc.uuid}`);
     });
   } catch (error) {
-    logger.error(`ERROR:<MessageSend> ${error}`);
+    logger.error(`ERROR:<MessageSend> ${error}`, content);
   }
 }
 __name(MessageForward, "MessageForward");
-async function MessageDelete(ctx, msg) {
+async function MessageDelete(ctx2, msg) {
   try {
-    botExistsCheck(ctx, { Platform: msg.platform, BotID: msg.bot, Guild: msg.guild });
-    await ctx.bots[`${msg.platform}:${msg.bot}`].deleteMessage(msg.guild, msg.msgid);
+    botExistsCheck(ctx2, { Platform: msg.platform, BotID: msg.bot, Guild: msg.guild });
+    await ctx2.bots[`${msg.platform}:${msg.bot}`].deleteMessage(msg.guild, msg.msgid);
   } catch (error) {
     logger.error(`ERROR:<MessageDelete> ${error}`);
   }
 }
 __name(MessageDelete, "MessageDelete");
-function botExistsCheck(ctx, node) {
-  if (ctx.bots[`${node.Platform}:${node.BotID}`] == void 0) {
+function botExistsCheck(ctx2, node) {
+  if (ctx2.bots[`${node.Platform}:${node.BotID}`] == void 0) {
     throw new Error("Bot Not Found");
   }
 }
@@ -242,9 +291,8 @@ __name(botExistsCheck, "botExistsCheck");
 
 // src/index.ts
 var name = `forward hime - 转发姬`;
-var version = `<sub>v1.2.1</sub>`;
 var usage = `
-# ${name} ${version}
+# ${name}
 ## 配置说明
 1. 添加 \`互通转发组\`
 2. 为添加的 \`互通转发组\` 配置转发节点。每个转发节点对应某个平台的一个频道或群组
@@ -259,8 +307,9 @@ var inject = {
   optional: ["cache"]
 };
 var Config = createConfig();
-function apply(ctx, cfg) {
-  ctx.on("message-created", async (session) => {
+function apply(ctx2, cfg) {
+  msgCacheInit(ctx2);
+  ctx2.on("message-created", async (session) => {
     const hitGroup = [];
     for (const g in cfg.ForwardGroups) {
       const group = cfg.ForwardGroups[g];
@@ -271,7 +320,7 @@ function apply(ctx, cfg) {
             session.channelId + ":" + session.messageId
           );
           let uuid = session.channelId + ":" + session.messageId;
-          msgCache(ctx, {
+          msgCache({
             platform: session.platform,
             bot: group.Nodes[k].BotID,
             guild: session.channelId,
@@ -287,25 +336,25 @@ function apply(ctx, cfg) {
       const group = cfg.ForwardGroups[hitGroup[g]];
       for (const k in group.Nodes) {
         if (group.Nodes[k].Guild !== session.channelId) {
-          MessageForward(ctx, group.Nodes[k], session);
+          MessageForward(ctx2, group.Nodes[k], session);
         }
       }
     }
   });
-  ctx.on("message-deleted", async (session) => {
+  ctx2.on("message-deleted", async (session) => {
     const cacheKey = session.channelId + ":" + session.messageId;
     logger.debug("[message-deleted]", cacheKey);
-    msgCacheFindByKey(ctx, cacheKey).then((res) => {
+    msgCacheFindByKey(cacheKey).then((res) => {
       if (res) {
         logger.debug("[msgCacheFindByKey]", res);
-        msgCacheDelete(ctx, cacheKey);
+        msgCacheDelete(cacheKey);
         const uuid = res.uuid;
-        msgCacheFindByUUID(ctx, uuid).then((res2) => {
+        msgCacheFindByUUID(uuid).then((res2) => {
           if (res2) {
             for (const k in res2) {
               logger.debug("[message-delete]", res2[k][1]);
-              msgCacheDelete(ctx, res2[k][0]).then(() => {
-                MessageDelete(ctx, res2[k][1]);
+              msgCacheDelete(res2[k][0]).then(() => {
+                MessageDelete(ctx2, res2[k][1]);
               });
             }
           }
@@ -313,7 +362,7 @@ function apply(ctx, cfg) {
       }
     });
   });
-  ctx.on("message-updated", async (session) => {
+  ctx2.on("message-updated", async (session) => {
     logger.debug("[message-updated]", session.messageId, session);
   });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "koishi-plugin-forward-hime",
 	"description": "多群组消息互通",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"author": {
 		"name": "xianii",
 		"email": "jiyucheng007@gmail.com"