koishi-plugin-forward-hime 1.2.0 → 1.2.2

package/lib/cache.d.ts

@@ -0,0 +1,20 @@
+import { Context } from "koishi";
+export interface MsgCache {
+    platform: string;
+    bot: string;
+    guild: string;
+    msgid: string;
+    uuid: string;
+}
+declare module "@koishijs/cache" {
+    interface Tables {
+        msgCache: MsgCache;
+    }
+}
+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,10 @@
 import { Context } from "koishi";
 import { ConfigSet } from "./config";
-export declare const reusable = true;
 export declare const name = "forward hime - \u8F6C\u53D1\u59EC";
-export declare const usage = "\n# forward hime - \u8F6C\u53D1\u59EC <sub>v1.2.0</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## \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[];
+};
 export declare const Config: import("schemastery")<ConfigSet>;
 export declare function apply(ctx: Context, cfg: ConfigSet): void;

package/lib/index.js

@@ -22,6 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  inject: () => inject,
   name: () => name,
   reusable: () => reusable,
   usage: () => usage
@@ -54,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");
@@ -108,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 = [];
@@ -125,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") {
@@ -135,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 {
@@ -145,49 +213,103 @@ 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);
+      }
+    }
+    resolve({ head, content: newContent });
+  });
+  return newMsg;
+}
+__name(atTranslator, "atTranslator");
+async function quoteTranslator(session, node, { head, content }) {
+  if (!session.quote || !session.quote.id) {
+    return { head, content };
+  }
+  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 { head, content };
 }
-__name(at2Name, "at2Name");
+__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 {
-    if (ctx.bots[`${node.Platform}:${node.BotID}`] == void 0) {
-      throw new Error("Bot Not Found");
-    }
-    await ctx.bots[`${node.Platform}:${node.BotID}`].sendMessage(
-      node.Guild,
-      MsgDecorator(session, node)
-    );
+    botExistsCheck(ctx2, node);
+    await ctx2.bots[`${node.Platform}:${node.BotID}`].sendMessage(node.Guild, content).then((res) => {
+      let mc = {
+        platform: node.Platform,
+        bot: node.BotID,
+        guild: node.Guild,
+        msgid: res[0],
+        uuid
+      };
+      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(ctx2, msg) {
+  try {
+    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(ctx2, node) {
+  if (ctx2.bots[`${node.Platform}:${node.BotID}`] == void 0) {
+    throw new Error("Bot Not Found");
+  }
+}
+__name(botExistsCheck, "botExistsCheck");
 
 // src/index.ts
-var reusable = true;
 var name = `forward hime - 转发姬`;
-var version = `<sub>v1.2.0</sub>`;
 var usage = `
-# ${name} ${version}
+# ${name}
 ## 配置说明
 1. 添加 \`互通转发组\`
 2. 为添加的 \`互通转发组\` 配置转发节点。每个转发节点对应某个平台的一个频道或群组
+
+注意：当未配置\`cache\`时，跨平台删除、跨平台回复等功能将无法正常工作。
 ## 特性
 - 可以配置多个 \`互通转发组\`，每个 \`互通转发组\` 之间相互独立
 - 启用插件后，当一个 \`互通转发组\` 中的任意节点收到消息时，插件会自动将消息转发给**这个**\`互通转发组\`中的其他节点。
 ---`;
+var reusable = true;
+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];
@@ -195,9 +317,16 @@ function apply(ctx, cfg) {
         if (group.Nodes[k].Guild === session.channelId && group.Nodes[k].Platform === session.platform && group.Nodes[k].BotID !== session.userId) {
           logger.debug(
             "[message-created]",
-            session.messageId,
-            session.elements
+            session.channelId + ":" + session.messageId
           );
+          let uuid = session.channelId + ":" + session.messageId;
+          msgCache({
+            platform: session.platform,
+            bot: group.Nodes[k].BotID,
+            guild: session.channelId,
+            msgid: session.messageId,
+            uuid
+          });
           hitGroup.push(g);
           break;
         }
@@ -207,15 +336,33 @@ 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) => {
-    logger.debug("[message-deleted]", session.messageId);
+  ctx2.on("message-deleted", async (session) => {
+    const cacheKey = session.channelId + ":" + session.messageId;
+    logger.debug("[message-deleted]", cacheKey);
+    msgCacheFindByKey(cacheKey).then((res) => {
+      if (res) {
+        logger.debug("[msgCacheFindByKey]", res);
+        msgCacheDelete(cacheKey);
+        const uuid = res.uuid;
+        msgCacheFindByUUID(uuid).then((res2) => {
+          if (res2) {
+            for (const k in res2) {
+              logger.debug("[message-delete]", res2[k][1]);
+              msgCacheDelete(res2[k][0]).then(() => {
+                MessageDelete(ctx2, res2[k][1]);
+              });
+            }
+          }
+        });
+      }
+    });
   });
-  ctx.on("message-updated", async (session) => {
+  ctx2.on("message-updated", async (session) => {
     logger.debug("[message-updated]", session.messageId, session);
   });
 }
@@ -224,6 +371,7 @@ __name(apply, "apply");
 0 && (module.exports = {
   Config,
   apply,
+  inject,
   name,
   reusable,
   usage

package/lib/message.d.ts

@@ -1,3 +1,6 @@
 import { Context, Session } from "koishi";
 import { ForwardNode } from "./config";
+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>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "koishi-plugin-forward-hime",
 	"description": "多群组消息互通",
-	"version": "1.2.0",
+	"version": "1.2.2",
 	"author": {
 		"name": "xianii",
 		"email": "jiyucheng007@gmail.com"
@@ -12,7 +12,6 @@
 		"lib"
 	],
 	"koishi": {
-		"preview": true,
 		"browser": true
 	},
 	"license": "MIT",