koishi-plugin-lili-hub 0.3.2 → 0.3.3

package/lib/index.js

@@ -1207,29 +1207,67 @@ ${formatChain(chain)}`);
       });
       if (isFwd && forwardTexts.length > 0) {
         dbg("\u67E5\u91CD\u68C0\u6D4B", { gid, forwardTextsCount: forwardTexts.length });
+        const textContents = [];
+        const imageContents = [];
         for (const fwdText of forwardTexts) {
           if (!fwdText) continue;
-          try {
-            const sevenDaysAgoMs = Date.now() - 7 * 24 * 60 * 60 * 1e3;
-            const recentMsgs = await ctx.database.get("lili_message", { gid, timestamp: { $gte: sevenDaysAgoMs } }, { sort: { timestamp: "asc" }, limit: 1e3 });
-            const match = recentMsgs.find((m) => {
-              if (m.content === fwdText) return true;
-              return normalizeText(m.content) === fwdText;
-            });
-            dbg("\u67E5\u91CD\u67E5\u8BE2", { gid, fwdText: fwdText.substring(0, 50), recentMsgCount: recentMsgs?.length || 0, matched: !!match });
-            if (match) {
-              const original = match;
-              const dateStr = new Date(original.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
-              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();
+          if (fwdText.startsWith("[img:")) {
+            imageContents.push(fwdText);
+          } else if (fwdText.startsWith("[face:") || fwdText.startsWith("[mface:")) {
+          } else {
+            textContents.push(fwdText);
+          }
+        }
+        const sevenDaysAgoMs = Date.now() - 7 * 24 * 60 * 60 * 1e3;
+        let recentMsgs = [];
+        try {
+          recentMsgs = await ctx.database.get("lili_message", { gid, timestamp: { $gte: sevenDaysAgoMs } }, { sort: { timestamp: "asc" }, limit: 1e3 });
+        } catch (e) {
+          dbg("\u67E5\u91CD\u67E5\u8BE2\u5F02\u5E38", { gid, error: String(e) });
+        }
+        let matched = null;
+        for (const fwdText of textContents) {
+          if (fwdText.length <= 30) continue;
+          const match = recentMsgs.find((m) => {
+            if (m.content === fwdText) return true;
+            return normalizeText(m.content) === fwdText;
+          });
+          if (match) {
+            matched = match;
+            dbg("\u67E5\u91CD\u547D\u4E2D-\u6587\u5B57", { gid, fwdText: fwdText.substring(0, 50), length: fwdText.length });
+            break;
+          }
+        }
+        if (!matched && imageContents.length >= 2) {
+          let imageMatchCount = 0;
+          let firstImgMatch = null;
+          for (const imgContent of imageContents) {
+            const found = recentMsgs.find((m) => m.content === imgContent || normalizeText(m.content) === imgContent);
+            if (found) {
+              imageMatchCount++;
+              if (!firstImgMatch) firstImgMatch = found;
             }
-          } catch (e) {
-            dbg("\u67E5\u91CD\u67E5\u8BE2\u5F02\u5E38", { gid, error: String(e) });
           }
+          if (imageMatchCount >= 2) {
+            matched = firstImgMatch;
+            dbg("\u67E5\u91CD\u547D\u4E2D-\u56FE\u7247", { gid, imageMatchCount, totalImages: imageContents.length });
+          }
+        }
+        dbg("\u67E5\u91CD\u7ED3\u679C", {
+          gid,
+          textCount: textContents.length,
+          imageCount: imageContents.length,
+          matched: !!matched
+        });
+        if (matched) {
+          const original = matched;
+          const dateStr = new Date(original.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+          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();
         }
       }
     }

package/package.json

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