koishi-plugin-lili-hub 0.3.1 → 0.3.2

package/lib/index.js

@@ -264,7 +264,6 @@ var Config = import_koishi.Schema.object({
     enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u4E3D\u4E3D\u6298\u53E0\u529F\u80FD").default(false),
     groups: import_koishi.Schema.string().description("\u7FA4\u53F7\u5217\u8868\uFF08\u9017\u53F7\u5206\u9694\uFF09").default(""),
     groupMode: import_koishi.Schema.union(["whitelist", "blacklist"]).description("\u7FA4\u7EC4\u8FC7\u6EE4\u6A21\u5F0F\uFF1A\u767D\u540D\u5355 / \u9ED1\u540D\u5355").default("whitelist"),
-    adminOnly: import_koishi.Schema.boolean().description("\u4EC5\u7FA4\u4E3B\u548C\u7BA1\u7406\u5458\u53EF\u4EE5\u4F7F\u7528\u4E3D\u4E3D\u6298\u53E0").default(false),
     minutes: import_koishi.Schema.number().description("\u6298\u53E0\u65F6\u95F4\u8303\u56F4\uFF08\u5206\u949F\uFF09").default(10).min(1).max(1440)
   }).description("\u{1F4E6} \u4E3D\u4E3D\u6298\u53E0"),
   imitation: import_koishi.Schema.object({
@@ -288,7 +287,12 @@ var Config = import_koishi.Schema.object({
     drawTimeoutSeconds: import_koishi.Schema.number().description("\u62D4\u67AA\u7A97\u53E3\u8D85\u65F6\uFF08\u79D2\uFF09").default(10).min(3).max(60),
     earlyDrawMuteSeconds: import_koishi.Schema.number().description("\u63D0\u524D\u62D4\u67AA\u7981\u8A00\u65F6\u957F\uFF08\u79D2\uFF09").default(600).min(0).max(2592e3),
     lateMuteSeconds: import_koishi.Schema.number().description("\u665A\u62D4\u67AA/\u672A\u62D4\u67AA\u7981\u8A00\u65F6\u957F\uFF08\u79D2\uFF09").default(300).min(0).max(2592e3)
-  }).description("\u2694\uFE0F \u4E3D\u4E3D\u5BF9\u51B3")
+  }).description("\u2694\uFE0F \u4E3D\u4E3D\u5BF9\u51B3"),
+  chain: import_koishi.Schema.object({
+    enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u7FA4\u63A5\u9F99\u529F\u80FD").default(false),
+    groups: import_koishi.Schema.string().description("\u7FA4\u53F7\u5217\u8868\uFF08\u9017\u53F7\u5206\u9694\uFF09").default(""),
+    groupMode: import_koishi.Schema.union(["whitelist", "blacklist"]).description("\u7FA4\u7EC4\u8FC7\u6EE4\u6A21\u5F0F\uFF1A\u767D\u540D\u5355 / \u9ED1\u540D\u5355").default("whitelist")
+  }).description("\u{1F4DD} \u7FA4\u63A5\u9F99")
 });
 function getGroupId(session) {
   return session.guildId || session.channelId;
@@ -389,6 +393,15 @@ function apply(ctx, config) {
   const rouletteStates = /* @__PURE__ */ new Map();
   const imitationCounters = /* @__PURE__ */ new Map();
   const duelStates = /* @__PURE__ */ new Map();
+  const chainStates = /* @__PURE__ */ new Map();
+  function formatChain(chain) {
+    const lines = [chain.content];
+    for (let i = 0; i < chain.participants.length; i++) {
+      const p = chain.participants[i];
+      lines.push(`${i + 1}.${p.userName}\uFF08${p.userId}\uFF09`);
+    }
+    return lines.join("\n");
+  }
   function isDrunk(gid) {
     const s = drinkStates.get(gid);
     if (!s || s.drunkUntil === 0) return false;
@@ -709,26 +722,19 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     const fc = config.fold;
     if (!fc.enabled) return;
     if (!isGroupAllowed(gid, fc.groups, fc.groupMode)) return;
-    if (fc.adminOnly) {
-      try {
-        const info = await session.bot.getGroupMemberInfo(gid, String(session.userId));
-        if (!info || info.role !== "owner" && info.role !== "admin") {
-          return "\u{1F4E6} \u4EC5\u7FA4\u4E3B\u6216\u7BA1\u7406\u5458\u53EF\u4EE5\u4F7F\u7528\u4E3D\u4E3D\u6298\u53E0\u529F\u80FD\u3002";
-        }
-      } catch {
-        return "\u{1F4E6} \u65E0\u6CD5\u9A8C\u8BC1\u7BA1\u7406\u5458\u8EAB\u4EFD\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002";
-      }
-    }
     const targetId = extractTarget(session, targetUser);
     if (!targetId) return "\u{1F4E6} \u65E0\u6CD5\u89E3\u6790\u76EE\u6807\u7528\u6237\u3002\u8BF7\u4F7F\u7528 @ \u529F\u80FD\u6216\u76F4\u63A5\u8F93\u5165 QQ \u53F7\u3002";
     const foldedMinutes = typeof minutesArg === "number" && minutesArg >= 1 && minutesArg <= 1440 ? minutesArg : fc.minutes;
     const since = Date.now() - foldedMinutes * 60 * 1e3;
+    dbg("\u6298\u53E0-\u67E5\u8BE2", { gid, targetId, since: new Date(since).toLocaleTimeString("zh-CN"), foldedMinutes });
     let messages;
     try {
       messages = await ctx.database.get("lili_message", { gid, userId: targetId, timestamp: { $gte: since } }, { sort: { timestamp: "asc" }, limit: 100 });
-    } catch {
+    } catch (e) {
+      dbg("\u6298\u53E0-\u67E5\u8BE2\u5931\u8D25", { gid, error: String(e) });
       return "\u{1F4E6} \u67E5\u8BE2\u6D88\u606F\u5931\u8D25\u3002";
     }
+    dbg("\u6298\u53E0-\u67E5\u8BE2\u7ED3\u679C", { gid, targetId, count: messages?.length || 0 });
     if (!messages || messages.length === 0) return `\u{1F4E6} ${import_koishi.segment.at(targetId)} \u6700\u8FD1 ${foldedMinutes} \u5206\u949F\u5185\u6CA1\u6709\u53D1\u8A00\u8BB0\u5F55\u3002`;
     const nodes = messages.map((m) => ({
       type: "node",
@@ -1031,6 +1037,78 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     }
     return next();
   });
+  ctx.command("\u521B\u5EFA\u63A5\u9F99 <content:string>", "\u521B\u5EFA\u7FA4\u63A5\u9F99\uFF0C\u521B\u5EFA\u8005\u81EA\u52A8\u4E3A\u7B2C\u4E00\u4F4D").action(async ({ session }, content) => {
+    if (!session?.userId) return;
+    const gid = getGroupId(session);
+    const cc = config.chain;
+    if (!cc.enabled) return;
+    if (!isGroupAllowed(gid, cc.groups, cc.groupMode)) return;
+    if (!content || !content.trim()) {
+      return "\u{1F4DD} \u8BF7\u63D0\u4F9B\u63A5\u9F99\u5185\u5BB9\uFF0C\u4F8B\u5982\uFF1A\u521B\u5EFA\u63A5\u9F99 \u4ECA\u5929\u4E2D\u5348\u5403\u4EC0\u4E48";
+    }
+    const chainContent = content.trim();
+    const userId = String(session.userId);
+    const userName = session.username || userId;
+    chainStates.set(gid, {
+      content: chainContent,
+      creatorId: userId,
+      creatorName: userName,
+      participants: [{ userId, userName }],
+      createdAt: Date.now()
+    });
+    dbg("\u63A5\u9F99-\u521B\u5EFA", { gid, creatorId: userId, content: chainContent });
+    return formatChain(chainStates.get(gid));
+  });
+  ctx.command("\u67E5\u770B\u63A5\u9F99", "\u67E5\u770B\u5F53\u524D\u7FA4\u63A5\u9F99").action(async ({ session }) => {
+    const gid = getGroupId(session);
+    const cc = config.chain;
+    if (!cc.enabled) return;
+    if (!isGroupAllowed(gid, cc.groups, cc.groupMode)) return;
+    const chain = chainStates.get(gid);
+    if (!chain) return '\u{1F4DD} \u672C\u7FA4\u6682\u65E0\u63A5\u9F99\uFF0C\u4F7F\u7528"\u521B\u5EFA\u63A5\u9F99 <\u5185\u5BB9>"\u5F00\u59CB\u4E00\u4E2A\u5427\uFF01';
+    return formatChain(chain);
+  });
+  ctx.command("\u9000\u51FA\u63A5\u9F99", "\u9000\u51FA\u5F53\u524D\u7FA4\u63A5\u9F99").alias("\u53D6\u6D88\u63A5\u9F99").action(async ({ session }) => {
+    const gid = getGroupId(session);
+    const cc = config.chain;
+    if (!cc.enabled) return;
+    if (!isGroupAllowed(gid, cc.groups, cc.groupMode)) return;
+    const chain = chainStates.get(gid);
+    if (!chain) return "\u{1F4DD} \u672C\u7FA4\u6682\u65E0\u63A5\u9F99\u3002";
+    const userId = String(session.userId);
+    const idx = chain.participants.findIndex((p) => p.userId === userId);
+    if (idx === -1) return "\u{1F4DD} \u4F60\u6CA1\u6709\u53C2\u4E0E\u8FD9\u4E2A\u63A5\u9F99\u3002";
+    const userName = chain.participants[idx].userName;
+    chain.participants.splice(idx, 1);
+    dbg("\u63A5\u9F99-\u9000\u51FA", { gid, userId, userName, remaining: chain.participants.length });
+    if (chain.participants.length === 0) {
+      chainStates.delete(gid);
+      return "\u{1F4DD} \u4F60\u9000\u51FA\u4E86\u63A5\u9F99\uFF0C\u63A5\u9F99\u5DF2\u56E0\u65E0\u4EBA\u53C2\u4E0E\u800C\u7ED3\u675F\u3002";
+    }
+    await session.send(`\u{1F4DD} ${userName} \u5DF2\u9000\u51FA\u63A5\u9F99\u3002
+
+${formatChain(chain)}`);
+  });
+  ctx.middleware(async (session, next) => {
+    if (!config.chain.enabled) return next();
+    const gid = getGroupId(session);
+    if (!gid) return next();
+    if (!isGroupAllowed(gid, config.chain.groups, config.chain.groupMode)) return next();
+    const text = (session.content || "").trim();
+    if (text !== "\u63A5\u9F99") return next();
+    const chain = chainStates.get(gid);
+    if (!chain) return next();
+    const userId = String(session.userId);
+    if (chain.participants.some((p) => p.userId === userId)) {
+      await session.send("\u{1F4DD} \u4F60\u5DF2\u7ECF\u53C2\u4E0E\u8FC7\u8FD9\u4E2A\u63A5\u9F99\u4E86\uFF01");
+      return;
+    }
+    const userName = session.username || userId;
+    chain.participants.push({ userId, userName });
+    dbg("\u63A5\u9F99-\u53C2\u4E0E", { gid, userId, participantCount: chain.participants.length });
+    await session.send(formatChain(chain));
+    return;
+  });
   ctx.middleware(async (session, next) => {
     const gid = getGroupId(session);
     const content = session.content || "";
@@ -1128,15 +1206,19 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         forwardTextsCount: forwardTexts.length
       });
       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) {
           if (!fwdText) continue;
           try {
-            const matches = await ctx.database.get("lili_message", { gid, content: fwdText }, { sort: { timestamp: "asc" }, limit: 1 });
-            dbg("\u67E5\u91CD\u67E5\u8BE2", { gid, fwdText: fwdText.substring(0, 50), matchCount: matches?.length || 0 });
-            if (matches && matches.length > 0 && matches[0].timestamp >= sevenDaysAgo) {
-              const original = matches[0];
+            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 }),
@@ -1179,8 +1261,8 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         try {
           await ctx.database.create("lili_message", {
             gid,
-            userId: session.userId,
-            userName: session.username || session.userId,
+            userId: String(session.userId),
+            userName: session.username || String(session.userId),
             content: fwdText,
             timestamp: Date.now(),
             messageId: session.messageId || ""
@@ -1191,19 +1273,25 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         }
       }
     }
-    if (shouldRecord && !isFwd && normalizedText && textLen >= 15 && textLen <= 60) {
-      try {
-        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 (shouldRecord && !isFwd) {
+      const shouldStore = shouldRecordAll || normalizedText && textLen >= 15 && textLen <= 60;
+      if (shouldStore) {
+        const storeContent = shouldRecordAll ? session.content || normalizedText || "" : normalizedText;
+        if (storeContent) {
+          try {
+            await ctx.database.create("lili_message", {
+              gid,
+              userId: String(session.userId),
+              userName: session.username || String(session.userId),
+              content: storeContent,
+              timestamp: Date.now(),
+              messageId: session.messageId || ""
+            });
+            dbg("\u6D88\u606F\u5DF2\u5165\u5E93", { gid, userId: String(session.userId), contentLen: storeContent.length, shouldRecordAll, 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, config.imitation.groupMode)) {

package/package.json

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