koishi-plugin-forward-hime 1.2.2 → 1.3.0

package/lib/cache.d.ts

@@ -1,4 +1,5 @@
 import { Context } from "koishi";
+import { ConfigSet } from "./config";
 export interface MsgCache {
     platform: string;
     bot: string;
@@ -11,7 +12,7 @@ declare module "@koishijs/cache" {
         msgCache: MsgCache;
     }
 }
-export declare function msgCacheInit(context: Context): void;
+export declare function msgCacheInit(context: Context, cfg: ConfigSet): 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>;

package/lib/config.d.ts

@@ -8,6 +8,7 @@ export interface ForwardNode {
 export interface ConfigSet {
     WithChannelName: boolean;
     WithPlatformName: boolean;
+    CacheTimeout: number;
     ForwardGroups: {
         Nodes: ForwardNode[];
     }[];

package/lib/decorator.d.ts

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

package/lib/index.js

@@ -35,7 +35,10 @@ var createConfig = /* @__PURE__ */ __name(() => import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     WithChannelName: import_koishi.Schema.boolean().description("是否包含频道名称").default(false),
     WithPlatformName: import_koishi.Schema.boolean().description("是否包含平台名称").default(true)
-  }).description("转发格式"),
+  }).description("转发格式").hidden(),
+  import_koishi.Schema.object({
+    CacheTimeout: import_koishi.Schema.number().description("消息缓存时间（分钟）- 影响跨平台删除与回复等功能").default(120).min(120).max(1440 * 7)
+  }).description("消息缓存"),
   import_koishi.Schema.object({
     ForwardGroups: import_koishi.Schema.array(
       import_koishi.Schema.object({
@@ -112,6 +115,7 @@ var onebot_default = {
 
 // src/cache.ts
 var ctx;
+var cacheTimeout = 86400 * 1e3;
 function cacheNotEnabled() {
   if (!ctx.cache) {
     return true;
@@ -119,8 +123,9 @@ function cacheNotEnabled() {
   return false;
 }
 __name(cacheNotEnabled, "cacheNotEnabled");
-function msgCacheInit(context) {
+function msgCacheInit(context, cfg) {
   ctx = context;
+  cacheTimeout = 60 * cfg.CacheTimeout * 1e3;
 }
 __name(msgCacheInit, "msgCacheInit");
 async function msgCache(mc) {
@@ -129,7 +134,7 @@ async function msgCache(mc) {
   }
   const key = mc.guild + ":" + mc.msgid;
   logger.debug(`[message-cache] ${mc.platform} ${key}`);
-  await ctx.cache.set("msgCache", key, mc, 7200 * 1e3);
+  await ctx.cache.set("msgCache", key, mc, cacheTimeout);
 }
 __name(msgCache, "msgCache");
 async function msgCacheDelete(key) {
@@ -203,9 +208,6 @@ async function MsgDecorator(session, node) {
   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 {
@@ -213,6 +215,30 @@ async function MsgDecorator(session, node) {
   }
 }
 __name(MsgDecorator, "MsgDecorator");
+function defaultDecoratorFallback({ head, content }) {
+  let msg = [];
+  let newContent = [];
+  newContent.push((0, import_koishi5.h)("span", `[消息降级] `));
+  for (const key in content) {
+    if (["img", "audio", "video", "file"].includes(content[key].type)) {
+      newContent.push((0, import_koishi5.h)("span", ` [${content[key].type}] `));
+    } else {
+      newContent.push(content[key]);
+    }
+  }
+  msg = msg.concat(head, (0, import_koishi5.h)("br"), newContent);
+  return msg;
+}
+__name(defaultDecoratorFallback, "defaultDecoratorFallback");
+async function MsgDecoratorFallback(session, node) {
+  let elems = { head: [], content: [] };
+  elems = defaultMiddleware(session);
+  for (const fn of localDecorators) {
+    elems = await fn(session, node, elems);
+  }
+  return defaultDecoratorFallback(elems);
+}
+__name(MsgDecoratorFallback, "MsgDecoratorFallback");
 async function atTranslator(session, node, { head, content }) {
   const newMsg = await new Promise((resolve, reject) => {
     let newContent = [];
@@ -252,40 +278,53 @@ async function quoteTranslator(session, node, { head, content }) {
 __name(quoteTranslator, "quoteTranslator");
 
 // src/message.ts
-async function MessageForward(ctx2, node, session) {
+async function MessageSendWithDecorator(ctx2, node, session, Deco) {
   const uuid = session.channelId + ":" + session.messageId;
-  const content = await MsgDecorator(session, node);
-  try {
-    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}`, content);
+  const content = await Deco(session, 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) => {
+    throw error;
+  });
+}
+__name(MessageSendWithDecorator, "MessageSendWithDecorator");
+async function MessageForward(ctx2, node, session) {
+  if (!botExistsCheck(ctx2, node)) {
+    return;
   }
+  MessageSendWithDecorator(ctx2, node, session, MsgDecorator).catch((error) => {
+    logger.error(`ERROR:<MessageSend ${node.Platform}> ${error}`);
+    MessageSendWithDecorator(ctx2, node, session, MsgDecoratorFallback).catch(
+      (error2) => {
+        logger.error(`ERROR:<MessageSendFallback ${node.Platform}> ${error2}`);
+      }
+    );
+  });
 }
 __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}`);
+  if (!botExistsCheck(ctx2, { Platform: msg.platform, BotID: msg.bot, Guild: msg.guild })) {
+    return;
   }
+  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");
+    logger.error(`ERROR:<BOT not Exist> ${node.Platform}:${node.BotID}`);
+    return false;
   }
+  return true;
 }
 __name(botExistsCheck, "botExistsCheck");
 
@@ -308,15 +347,19 @@ var inject = {
 };
 var Config = createConfig();
 function apply(ctx2, cfg) {
-  msgCacheInit(ctx2);
+  msgCacheInit(ctx2, cfg);
   ctx2.on("message-created", async (session) => {
     const hitGroup = [];
     for (const g in cfg.ForwardGroups) {
       const group = cfg.ForwardGroups[g];
       for (const k in group.Nodes) {
         if (group.Nodes[k].Guild === session.channelId && group.Nodes[k].Platform === session.platform && group.Nodes[k].BotID !== session.userId) {
+          if (!session.channelId || !session.messageId) {
+            continue;
+          }
           logger.debug(
             "[message-created]",
+            session.platform,
             session.channelId + ":" + session.messageId
           );
           let uuid = session.channelId + ":" + session.messageId;

package/package.json

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