koishi-plugin-lili-hub 0.2.0 → 0.2.2

package/lib/index.js

@@ -308,7 +308,7 @@ function getRandomMuteDuration(cfg) {
 function isForwardMessage(session) {
   if (session.elements) {
     for (const el of session.elements) {
-      if (el.type === "node") return true;
+      if (el.type === "node" || el.type === "forward") return true;
     }
   }
   return false;
@@ -330,7 +330,7 @@ function extractForwardTexts(session) {
   const results = [];
   if (session.elements) {
     for (const el of session.elements) {
-      if (el.type === "node") {
+      if (el.type === "node" || el.type === "forward") {
         const text = extractNodeText(el.attrs);
         if (text) results.push(text);
       }
@@ -747,9 +747,31 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     const plainText = session.elements ? session.elements.filter((el) => el.type === "text").map((el) => el.attrs?.content || "").join("").trim() : content.replace(/<[^>]+>/g, "").trim();
     const normalizedText = normalizeText(plainText);
     const textLen = normalizedText.length;
+    const botId = session.bot.userId || session.bot.selfId;
+    if (botId && String(session.userId) === String(botId)) return next();
+    const isFwd = isForwardMessage(session);
+    let forwardTexts = [];
+    if (isFwd) {
+      forwardTexts = extractForwardTexts(session);
+      dbg("\u8F6C\u53D1\u6D88\u606F\u68C0\u6D4B", {
+        gid,
+        userId: session.userId,
+        elementTypes: session.elements?.map((e) => e.type) || [],
+        forwardTextsCount: forwardTexts.length,
+        forwardTextsPreview: forwardTexts.slice(0, 3).map((t) => t.substring(0, 30))
+      });
+    }
     if (config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups)) {
-      if (isForwardMessage(session)) {
-        const forwardTexts = extractForwardTexts(session);
+      dbg("\u67E5\u91CD-\u4E2D\u95F4\u4EF6\u5165\u53E3", {
+        gid,
+        userId: session.userId,
+        textLen,
+        dedupEnabled: true,
+        isForward: isFwd,
+        contentPreview: normalizedText.substring(0, 50),
+        forwardTextsCount: forwardTexts.length
+      });
+      if (isFwd) {
         const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1e3;
         dbg("\u67E5\u91CD\u68C0\u6D4B", { gid, forwardTextsCount: forwardTexts.length });
         for (const fwdText of forwardTexts) {
@@ -769,7 +791,7 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         if (forwardTexts.length === 0 && session.elements) {
           const nodeIds = [];
           for (const el of session.elements) {
-            if (el.type === "node" && el.attrs?.id && !el.attrs?.content) {
+            if ((el.type === "node" || el.type === "forward") && el.attrs?.id && !el.attrs?.content) {
               nodeIds.push(el.attrs.id);
             }
           }
@@ -798,19 +820,59 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         }
       }
     }
-    const botId = session.bot.userId || session.bot.selfId;
-    if (botId && String(session.userId) === String(botId)) return next();
     const imitationGroups = parseGroupList(config.imitation.groups);
     const dedupGroups = parseGroupList(config.dedup.groups);
     const foldGroups = config.fold.enabled ? parseGroupList(config.fold.groups) : [];
-    const shouldRecordAll = config.fold.enabled && isGroupAllowed(gid, config.fold.groups) || config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups);
+    const dedupInGroup = config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups);
+    const foldInGroup = config.fold.enabled && isGroupAllowed(gid, config.fold.groups);
+    const shouldRecordAll = foldInGroup || dedupInGroup;
     const shouldRecordLimited = textLen >= 15 && textLen <= 60 && normalizedText;
     const recordGroups = /* @__PURE__ */ new Set([...imitationGroups, ...dedupGroups, ...foldGroups]);
     const shouldRecord = shouldRecordAll || shouldRecordLimited && (recordGroups.size === 0 || recordGroups.has(gid));
-    if (shouldRecord && normalizedText) {
+    dbg("\u8BB0\u5F55\u6D88\u606F\u5224\u5B9A", {
+      gid,
+      userId: session.userId,
+      textLen,
+      normalizedText: normalizedText.substring(0, 30),
+      forwardTextsCount: forwardTexts.length,
+      shouldRecordAll,
+      foldInGroup,
+      dedupInGroup,
+      shouldRecordLimited,
+      inRecordGroups: recordGroups.size === 0 || recordGroups.has(gid),
+      shouldRecord
+    });
+    if (shouldRecord && isFwd && forwardTexts.length > 0) {
+      for (const fwdText of forwardTexts) {
+        if (!fwdText) continue;
+        try {
+          await ctx.database.create("lili_message", {
+            gid,
+            userId: session.userId,
+            userName: session.username || session.userId,
+            content: fwdText,
+            timestamp: Date.now(),
+            messageId: session.messageId || ""
+          });
+          dbg("\u8F6C\u53D1\u6D88\u606F\u6587\u5B57\u5DF2\u5165\u5E93", { gid, userId: session.userId, contentLen: fwdText.length });
+        } catch (e) {
+          dbg("\u8F6C\u53D1\u6D88\u606F\u5165\u5E93\u5931\u8D25", { gid, error: String(e) });
+        }
+      }
+    }
+    if (shouldRecord && !isFwd && normalizedText) {
       try {
-        await ctx.database.create("lili_message", { gid, userId: session.userId, userName: session.username || session.userId, content: normalizedText, timestamp: Date.now(), messageId: session.messageId || "" });
-      } catch {
+        await ctx.database.create("lili_message", {
+          gid,
+          userId: session.userId,
+          userName: session.username || session.userId,
+          content: normalizedText,
+          timestamp: Date.now(),
+          messageId: session.messageId || ""
+        });
+        dbg("\u6D88\u606F\u5DF2\u5165\u5E93", { gid, userId: session.userId, contentLen: normalizedText.length, messageId: session.messageId });
+      } catch (e) {
+        dbg("\u6D88\u606F\u5165\u5E93\u5931\u8D25", { gid, error: String(e) });
       }
     }
     if (config.imitation.enabled && isGroupAllowed(gid, config.imitation.groups)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-lili-hub",
   "description": "丽丽Hub — 自用丽丽主题QQ群娱乐插件：俄罗斯轮盘赌、喝酒发酒疯、模仿群友说话、合并消息查重(水过了)",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [