koishi-plugin-lili-hub 0.2.2 → 0.3.0

package/lib/index.js

@@ -313,31 +313,6 @@ function isForwardMessage(session) {
   }
   return false;
 }
-function extractNodeText(nodeData) {
-  if (!nodeData) return "";
-  if (nodeData.id && !nodeData.content) return "";
-  const c = nodeData.content;
-  if (!c) return "";
-  if (typeof c === "string") return normalizeText(c);
-  if (Array.isArray(c)) {
-    return normalizeText(
-      c.filter((seg) => seg.type === "text").map((seg) => seg.data?.text || "").join("")
-    );
-  }
-  return "";
-}
-function extractForwardTexts(session) {
-  const results = [];
-  if (session.elements) {
-    for (const el of session.elements) {
-      if (el.type === "node" || el.type === "forward") {
-        const text = extractNodeText(el.attrs);
-        if (text) results.push(text);
-      }
-    }
-  }
-  return results;
-}
 function extractTarget(session, cmdArg) {
   if (session.elements) {
     const atEl = session.elements.find((el) => el.type === "at" && el.attrs?.id);
@@ -504,8 +479,8 @@ function apply(ctx, config) {
       try {
         const history = await ctx.database.get("lili_roulette", { gid }, { sort: { timestamp: "desc" }, limit: config.roulette.maxHistoryRounds });
         const allHitUsers = /* @__PURE__ */ new Set();
-        for (const h of history) {
-          if (h.hitUserId) allHitUsers.add(h.hitUserId);
+        for (const h2 of history) {
+          if (h2.hitUserId) allHitUsers.add(h2.hitUserId);
         }
         const pool = [...allHitUsers].filter((u) => u !== session.userId);
         if (pool.length > 0) {
@@ -751,14 +726,80 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     if (botId && String(session.userId) === String(botId)) return next();
     const isFwd = isForwardMessage(session);
     let forwardTexts = [];
+    async function fetchForwardTextsRecursive(msgId, depth) {
+      if (depth > 3) return [];
+      const results = [];
+      try {
+        const resp = await (session.onebot?.internal || session.bot?.internal)?.getForwardMsg?.(msgId);
+        if (!resp) return results;
+        let nodes = [];
+        if (Array.isArray(resp)) {
+          nodes = resp;
+        } else if (resp?.messages && Array.isArray(resp.messages)) {
+          nodes = resp.messages;
+        } else if (resp?.data?.messages && Array.isArray(resp.data.messages)) {
+          nodes = resp.data.messages;
+        } else if (resp?.data && Array.isArray(resp.data)) {
+          nodes = resp.data;
+        }
+        for (const node of nodes) {
+          const content2 = node.content || node.data && node.data.content;
+          if (Array.isArray(content2)) {
+            const text = normalizeText(
+              content2.filter((seg) => seg.type === "text").map((seg) => seg.data?.text || "").join("")
+            );
+            if (text) results.push(text);
+            for (const seg of content2) {
+              if (seg.type === "image") {
+                const fileId = seg.data?.file || seg.data?.url || "";
+                if (fileId) results.push(`[img:${fileId}]`);
+              }
+              if (seg.type === "face") {
+                const faceId = seg.data?.id || "";
+                if (faceId) results.push(`[face:${faceId}]`);
+              }
+              if (seg.type === "mface") {
+                const emojiId = seg.data?.emoji_id || seg.data?.emojiId || "";
+                if (emojiId) results.push(`[mface:${emojiId}]`);
+              }
+              if ((seg.type === "forward" || seg.type === "node") && seg.data?.id) {
+                const nested = await fetchForwardTextsRecursive(String(seg.data.id), depth + 1);
+                results.push(...nested);
+              }
+            }
+          } else if (typeof content2 === "string") {
+            const text = normalizeText(content2);
+            if (text) results.push(text);
+          }
+        }
+      } catch (e) {
+        dbg("\u9012\u5F52\u83B7\u53D6\u8F6C\u53D1\u6D88\u606F\u5931\u8D25", { gid, msgId, error: String(e) });
+      }
+      return results;
+    }
     if (isFwd) {
-      forwardTexts = extractForwardTexts(session);
+      const topNodeIds = [];
+      if (session.elements) {
+        for (const el of session.elements) {
+          if ((el.type === "node" || el.type === "forward") && el.attrs?.id) {
+            topNodeIds.push(String(el.attrs.id));
+          }
+        }
+      }
+      if (topNodeIds.length > 0) {
+        dbg("\u8F6C\u53D1\u6D88\u606F-\u5F00\u59CB\u9012\u5F52\u83B7\u53D6", { gid, topNodeIds });
+        for (const msgId of topNodeIds) {
+          const texts = await fetchForwardTextsRecursive(msgId, 1);
+          forwardTexts.push(...texts);
+        }
+        forwardTexts = [...new Set(forwardTexts)];
+      }
       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))
+        forwardTextsPreview: forwardTexts.slice(0, 5).map((t) => t.substring(0, 30))
       });
     }
     if (config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups)) {
@@ -771,7 +812,7 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         contentPreview: normalizedText.substring(0, 50),
         forwardTextsCount: forwardTexts.length
       });
-      if (isFwd) {
+      if (isFwd && forwardTexts.length > 0) {
         const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1e3;
         dbg("\u67E5\u91CD\u68C0\u6D4B", { gid, forwardTextsCount: forwardTexts.length });
         for (const fwdText of forwardTexts) {
@@ -782,40 +823,15 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
             if (matches && matches.length > 0 && matches[0].timestamp >= sevenDaysAgo) {
               const original = matches[0];
               const dateStr = new Date(original.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
-              await session.send(`\u{1F4A7} \u6C34\u8FC7\u4E86\uFF01${import_koishi.segment.at(session.userId)} \u8FD9\u6761\u6D88\u606F ${import_koishi.segment.at(original.userId)} \u5728 ${dateStr} \u5C31\u53D1\u8FC7\u4E86\uFF01`);
+              await session.send([
+                (0, import_koishi.h)("quote", { id: original.messageId }),
+                (0, import_koishi.h)("at", { id: session.userId }),
+                import_koishi.h.text(` \u{1F4A7} \u6C34\u8FC7\u4E86\uFF01\u8FD9\u6761\u6D88\u606F\u5728 ${dateStr} \u5C31\u53D1\u8FC7\u4E86\uFF01`)
+              ]);
               return next();
             }
-          } catch {
-          }
-        }
-        if (forwardTexts.length === 0 && session.elements) {
-          const nodeIds = [];
-          for (const el of session.elements) {
-            if ((el.type === "node" || el.type === "forward") && el.attrs?.id && !el.attrs?.content) {
-              nodeIds.push(el.attrs.id);
-            }
-          }
-          if (nodeIds.length > 0) {
-            dbg("\u67E5\u91CD-\u901A\u8FC7 get_forward_msg \u83B7\u53D6\u8282\u70B9\u5185\u5BB9", { gid, nodeIds });
-            for (const msgId of nodeIds) {
-              try {
-                const resp = await (session.onebot?.internal || session.bot?.internal)?.getForwardMsg?.(msgId);
-                if (resp?.messages) {
-                  for (const node of resp.messages) {
-                    const nodeText = normalizeText(typeof node.content === "string" ? node.content : "");
-                    if (!nodeText) continue;
-                    const matches = await ctx.database.get("lili_message", { gid, content: nodeText }, { sort: { timestamp: "asc" }, limit: 1 });
-                    if (matches && matches.length > 0 && matches[0].timestamp >= sevenDaysAgo) {
-                      const original = matches[0];
-                      const dateStr = new Date(original.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
-                      await session.send(`\u{1F4A7} \u6C34\u8FC7\u4E86\uFF01${import_koishi.segment.at(session.userId)} \u8FD9\u6761\u6D88\u606F ${import_koishi.segment.at(original.userId)} \u5728 ${dateStr} \u5C31\u53D1\u8FC7\u4E86\uFF01`);
-                      return next();
-                    }
-                  }
-                }
-              } catch {
-              }
-            }
+          } catch (e) {
+            dbg("\u67E5\u91CD\u67E5\u8BE2\u5F02\u5E38", { gid, error: String(e) });
           }
         }
       }
@@ -854,13 +870,13 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
             timestamp: Date.now(),
             messageId: session.messageId || ""
           });
-          dbg("\u8F6C\u53D1\u6D88\u606F\u6587\u5B57\u5DF2\u5165\u5E93", { gid, userId: session.userId, contentLen: fwdText.length });
+          dbg("\u8F6C\u53D1\u6D88\u606F\u5185\u5BB9\u5DF2\u5165\u5E93", { gid, userId: session.userId, contentLen: fwdText.length, content: fwdText });
         } catch (e) {
           dbg("\u8F6C\u53D1\u6D88\u606F\u5165\u5E93\u5931\u8D25", { gid, error: String(e) });
         }
       }
     }
-    if (shouldRecord && !isFwd && normalizedText) {
+    if (shouldRecord && !isFwd && normalizedText && textLen >= 15 && textLen <= 60) {
       try {
         await ctx.database.create("lili_message", {
           gid,

package/package.json

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