koishi-plugin-lili-hub 0.2.2 → 0.3.1

package/lib/index.js

@@ -227,7 +227,9 @@ var Config = import_koishi.Schema.object({
     drunkMisfireRate: import_koishi.Schema.number().description("\u9189\u9152\u540E\u5B50\u5F39\u54D1\u5F39\u7684\u6982\u7387 (0-1)").default(0.35).min(0).max(1).step(0.01),
     drunkRampageRate: import_koishi.Schema.number().description("\u9189\u9152\u540E\u8FDE\u7EED\u5F00\u67AA\u7684\u6982\u7387 (0-1)").default(0.3).min(0).max(1).step(0.01),
     drunkRevengeRate: import_koishi.Schema.number().description("\u9189\u9152\u540E\u6CE2\u53CA\u5386\u53F2\u53C2\u4E0E\u8005\u7684\u6982\u7387 (0-1)").default(0.2).min(0).max(1).step(0.01),
-    maxHistoryRounds: import_koishi.Schema.number().description("\u4FDD\u7559\u591A\u5C11\u8F6E\u5386\u53F2\u8BB0\u5F55\uFF08\u7528\u4E8E\u62A5\u4EC7\u673A\u5236\uFF09").default(3).min(1).max(20)
+    maxHistoryRounds: import_koishi.Schema.number().description("\u4FDD\u7559\u591A\u5C11\u8F6E\u5386\u53F2\u8BB0\u5F55\uFF08\u7528\u4E8E\u62A5\u4EC7\u673A\u5236\uFF09").default(3).min(1).max(20),
+    groups: import_koishi.Schema.string().description("\u7FA4\u53F7\u5217\u8868\uFF08\u9017\u53F7\u5206\u9694\uFF0C\u7559\u7A7A\u4E3A\u6240\u6709\u7FA4\uFF09").default(""),
+    groupMode: import_koishi.Schema.union(["whitelist", "blacklist"]).description("\u7FA4\u7EC4\u8FC7\u6EE4\u6A21\u5F0F\uFF1A\u767D\u540D\u5355\uFF08\u4EC5\u5728\u5217\u8868\u4E2D\u7684\u7FA4\u751F\u6548\uFF09/ \u9ED1\u540D\u5355\uFF08\u5217\u8868\u4E2D\u7684\u7FA4\u4E0D\u751F\u6548\uFF09").default("whitelist")
   }).description("\u{1F52B} \u4E3D\u4E3D\u8F6E\u76D8"),
   voice: import_koishi.Schema.object({
     voiceEnabled: import_koishi.Schema.boolean().description("\u662F\u5426\u64AD\u653E\u4E3D\u4E3D\u8BED\u97F3").default(true),
@@ -251,7 +253,8 @@ var Config = import_koishi.Schema.object({
   }).description("\u{1F50A} \u8BED\u97F3\u4E0E\u53F0\u8BCD\u8BBE\u7F6E"),
   voteMute: import_koishi.Schema.object({
     enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u7D2F\u8BA1\u6295\u7968\u7981\u8A00\u529F\u80FD").default(false),
-    groups: import_koishi.Schema.string().description("\u767D\u540D\u5355\u7FA4\u53F7\uFF08\u9017\u53F7\u5206\u9694\uFF0C\u7559\u7A7A\u4E3A\u6240\u6709\u7FA4\uFF09").default(""),
+    groups: import_koishi.Schema.string().description("\u7FA4\u53F7\u5217\u8868\uFF08\u9017\u53F7\u5206\u9694\uFF0C\u7559\u7A7A\u4E3A\u6240\u6709\u7FA4\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"),
     voteWindowDays: import_koishi.Schema.number().description("\u7D2F\u8BA1\u6295\u7968\u7684\u65F6\u95F4\u7A97\u53E3\uFF08\u5929\uFF09").default(7).min(1).max(365),
     muteThreshold: import_koishi.Schema.number().description("\u7D2F\u8BA1\u7981\u8A00\u7968 \u2265 \u6B64\u503C\u65F6\u6267\u884C\u7981\u8A00").default(5).min(1).max(1e3),
     unmuteThreshold: import_koishi.Schema.number().description("\u7981\u8A00\u7968 \u2264 \u6B64\u503C\u65F6\u81EA\u52A8\u89E3\u7981").default(2).min(0).max(1e3),
@@ -259,19 +262,33 @@ var Config = import_koishi.Schema.object({
   }).description("\u{1F5F3}\uFE0F \u7D2F\u8BA1\u6295\u7968\u7981\u8A00"),
   fold: 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("\u767D\u540D\u5355\u7FA4\u53F7\uFF08\u9017\u53F7\u5206\u9694\uFF09").default(""),
+    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({
     enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u6A21\u4EFF\u7FA4\u53CB\u8BF4\u8BDD\u529F\u80FD").default(false),
-    groups: import_koishi.Schema.string().description("\u767D\u540D\u5355\u7FA4\u53F7\uFF08\u9017\u53F7\u5206\u9694\uFF09").default(""),
+    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"),
     interval: import_koishi.Schema.number().description("\u6BCF\u591A\u5C11\u6761\u6D88\u606F\u68C0\u67E5\u4E00\u6B21\u6A21\u4EFF").default(50).min(1).max(1e4),
     rate: import_koishi.Schema.number().description("\u6A21\u4EFF\u89E6\u53D1\u6982\u7387 (0-1)").default(0.05).min(0).max(1).step(0.01)
   }).description("\u{1F5E3}\uFE0F \u6A21\u4EFF\u7FA4\u53CB"),
   dedup: import_koishi.Schema.object({
     enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u5408\u5E76\u6D88\u606F\u67E5\u91CD\u529F\u80FD\uFF08\u6C34\u8FC7\u4E86\uFF09").default(false),
-    groups: import_koishi.Schema.string().description("\u767D\u540D\u5355\u7FA4\u53F7\uFF08\u9017\u53F7\u5206\u9694\uFF09").default("")
-  }).description("\u{1F4A7} \u67E5\u91CD")
+    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{1F4A7} \u67E5\u91CD"),
+  duel: import_koishi.Schema.object({
+    enabled: import_koishi.Schema.boolean().description("\u542F\u7528\u4E3D\u4E3D\u5BF9\u51B3\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"),
+    countdownSeconds: import_koishi.Schema.number().description("\u5012\u8BA1\u65F6\u79D2\u6570").default(5).min(1).max(30),
+    acceptTimeoutSeconds: import_koishi.Schema.number().description("\u7B49\u5F85\u63A5\u53D7\u8D85\u65F6\uFF08\u79D2\uFF09").default(30).min(5).max(120),
+    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")
 });
 function getGroupId(session) {
   return session.guildId || session.channelId;
@@ -289,9 +306,12 @@ function parseGroupList(raw) {
 function normalizeText(text) {
   return text.replace(/\[CQ:[^\]]*\]/g, "").replace(/<[^>]*>/g, " ").replace(/\s+/g, " ").trim();
 }
-function isGroupAllowed(gid, groups) {
+function isGroupAllowed(gid, groups, mode = "whitelist") {
   const list = parseGroupList(groups);
   if (list.length === 0) return true;
+  if (mode === "blacklist") {
+    return !list.includes(gid);
+  }
   return list.includes(gid);
 }
 function getMultiKillEvent(v, killCount) {
@@ -313,31 +333,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);
@@ -379,9 +374,21 @@ function apply(ctx, config) {
     voteType: "string",
     timestamp: "unsigned"
   }, { autoInc: true });
+  ctx.model.extend("lili_duel", {
+    id: "unsigned",
+    gid: "string",
+    winnerId: "string",
+    winnerName: "string",
+    loserId: "string",
+    loserName: "string",
+    winnerTime: "unsigned",
+    loserTime: "unsigned",
+    timestamp: "unsigned"
+  }, { autoInc: true });
   const drinkStates = /* @__PURE__ */ new Map();
   const rouletteStates = /* @__PURE__ */ new Map();
   const imitationCounters = /* @__PURE__ */ new Map();
+  const duelStates = /* @__PURE__ */ new Map();
   function isDrunk(gid) {
     const s = drinkStates.get(gid);
     if (!s || s.drunkUntil === 0) return false;
@@ -504,8 +511,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) {
@@ -560,6 +567,7 @@ function apply(ctx, config) {
   ctx.command("\u4E3D\u4E3D\u8F6E\u76D8", "\u4FC4\u7F57\u65AF\u8F6E\u76D8\u8D4C").alias("\u4E3D\u4E3D\u5F00\u67AA").action(async ({ session }) => {
     if (!session?.userId) return;
     const gid = getGroupId(session);
+    if (!isGroupAllowed(gid, config.roulette.groups, config.roulette.groupMode)) return;
     if (!rouletteStates.has(gid)) {
       const bullet = randInt(1, config.roulette.chamberSize);
       const startTime = Date.now();
@@ -593,6 +601,7 @@ function apply(ctx, config) {
   ctx.command("\u4E3D\u4E3D\u559D\u9152", "\u4E3D\u4E3D\u5F00\u59CB\u559D\u9152\uFF0C\u9700\u8981\u559D 2-4 \u676F\u624D\u4F1A\u559D\u9189").action(async ({ session }) => {
     if (!session?.userId) return;
     const gid = getGroupId(session);
+    if (!isGroupAllowed(gid, config.roulette.groups, config.roulette.groupMode)) return;
     if (isDrunk(gid)) {
       await playEffect(session, config.voice.stillDrunk, 500);
       return;
@@ -641,7 +650,7 @@ function apply(ctx, config) {
     const gid = getGroupId(session);
     const vm = config.voteMute;
     if (!vm.enabled) return;
-    if (!isGroupAllowed(gid, vm.groups)) return;
+    if (!isGroupAllowed(gid, vm.groups, vm.groupMode)) return;
     const targetId = extractTarget(session, targetUser);
     if (!targetId) return "\u{1F507} \u65E0\u6CD5\u89E3\u6790\u76EE\u6807\u7528\u6237\u3002\u8BF7\u4F7F\u7528 @ \u529F\u80FD\u9009\u62E9\u76EE\u6807\u3002";
     if (targetId === session.userId) return "\u{1F507} \u4E0D\u80FD\u7ED9\u81EA\u5DF1\u6295\u7968\u3002";
@@ -673,7 +682,7 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u7981\u8A00 ${timeStr}\u3002`
     const gid = getGroupId(session);
     const vm = config.voteMute;
     if (!vm.enabled) return;
-    if (!isGroupAllowed(gid, vm.groups)) return;
+    if (!isGroupAllowed(gid, vm.groups, vm.groupMode)) return;
     const targetId = extractTarget(session, targetUser);
     if (!targetId) return "\u{1F50A} \u65E0\u6CD5\u89E3\u6790\u76EE\u6807\u7528\u6237\u3002\u8BF7\u4F7F\u7528 @ \u529F\u80FD\u9009\u62E9\u76EE\u6807\u3002";
     try {
@@ -694,22 +703,33 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     return `\u{1F50A} \u5DF2\u64A4\u56DE\u4F60\u5BF9 ${import_koishi.segment.at(targetId)} \u7684\u7981\u8A00\u7968\u3002
 \u{1F4CA} \u5F53\u524D\u7981\u8A00\u7968\uFF1A${muteCount}\uFF08\u9700 \u2264 ${vm.unmuteThreshold} \u624D\u4F1A\u89E3\u7981\uFF09`;
   });
-  ctx.command("\u4E3D\u4E3D\u6298\u53E0 <user:user>", "\u5408\u5E76\u8F6C\u53D1\u5E76\u64A4\u56DE\u76EE\u6807\u7528\u6237\u6700\u8FD1 X \u5206\u949F\u5185\u7684\u6D88\u606F").action(async ({ session }, targetUser) => {
+  ctx.command("\u4E3D\u4E3D\u6298\u53E0 <user:user> [minutes:number]", "\u5408\u5E76\u8F6C\u53D1\u5E76\u64A4\u56DE\u76EE\u6807\u7528\u6237\u6700\u8FD1 X \u5206\u949F\u5185\u7684\u6D88\u606F").action(async ({ session }, targetUser, minutesArg) => {
     if (!session?.userId) return;
     const gid = getGroupId(session);
     const fc = config.fold;
     if (!fc.enabled) return;
-    if (!isGroupAllowed(gid, fc.groups)) 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 since = Date.now() - fc.minutes * 60 * 1e3;
+    const foldedMinutes = typeof minutesArg === "number" && minutesArg >= 1 && minutesArg <= 1440 ? minutesArg : fc.minutes;
+    const since = Date.now() - foldedMinutes * 60 * 1e3;
     let messages;
     try {
       messages = await ctx.database.get("lili_message", { gid, userId: targetId, timestamp: { $gte: since } }, { sort: { timestamp: "asc" }, limit: 100 });
     } catch {
       return "\u{1F4E6} \u67E5\u8BE2\u6D88\u606F\u5931\u8D25\u3002";
     }
-    if (!messages || messages.length === 0) return `\u{1F4E6} ${import_koishi.segment.at(targetId)} \u6700\u8FD1 ${fc.minutes} \u5206\u949F\u5185\u6CA1\u6709\u53D1\u8A00\u8BB0\u5F55\u3002`;
+    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",
       data: { name: m.userName, uin: m.userId, content: m.content, time: String(Math.floor(m.timestamp / 1e3)) }
@@ -729,7 +749,7 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         const time = new Date(m.timestamp).toLocaleTimeString("zh-CN", { hour: "2-digit", minute: "2-digit" });
         return `[${time}] ${m.userName}\uFF1A${m.content}`;
       });
-      await session.send(`\u{1F4E6} \u4E3D\u4E3D\u6298\u53E0\u4E86 ${import_koishi.segment.at(targetId)} \u6700\u8FD1 ${fc.minutes} \u5206\u949F\u7684\u6D88\u606F\uFF1A
+      await session.send(`\u{1F4E6} \u4E3D\u4E3D\u6298\u53E0\u4E86 ${import_koishi.segment.at(targetId)} \u6700\u8FD1 ${foldedMinutes} \u5206\u949F\u7684\u6D88\u606F\uFF1A
 ` + lines.join("\n"));
     }
     for (const m of messages) {
@@ -741,6 +761,276 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
       }
     }
   });
+  ctx.command("\u4E3D\u4E3D\u5BF9\u51B3 <user:user>", "\u53D1\u8D77\u5BF9\u51B3").action(async ({ session }, targetUser) => {
+    if (!session?.userId) return;
+    const gid = getGroupId(session);
+    const dc = config.duel;
+    if (!dc.enabled) return;
+    if (!isGroupAllowed(gid, dc.groups, dc.groupMode)) return;
+    const targetId = extractTarget(session, targetUser);
+    if (!targetId) return "\u2694\uFE0F \u65E0\u6CD5\u89E3\u6790\u76EE\u6807\u7528\u6237\u3002\u8BF7\u4F7F\u7528 @ \u529F\u80FD\u9009\u62E9\u76EE\u6807\u3002";
+    if (targetId === String(session.userId)) return "\u2694\uFE0F \u4E0D\u80FD\u5411\u81EA\u5DF1\u53D1\u8D77\u5BF9\u51B3\uFF01";
+    const botId = session.bot.userId || session.bot.selfId;
+    if (botId && targetId === String(botId)) return "\u2694\uFE0F \u4E0D\u80FD\u5411 Bot \u53D1\u8D77\u5BF9\u51B3\uFF01";
+    const existing = duelStates.get(gid);
+    if (existing && existing.phase !== "finished") {
+      return "\u2694\uFE0F \u672C\u7FA4\u6B63\u5728\u8FDB\u884C\u4E00\u573A\u5BF9\u51B3\uFF0C\u8BF7\u7B49\u5F85\u7ED3\u675F\u540E\u518D\u53D1\u8D77\uFF01";
+    }
+    const challengerId = String(session.userId);
+    const challengerName = session.username || challengerId;
+    const targetName = session.elements?.find((el) => el.type === "at")?.attrs?.name || targetId;
+    const duel = {
+      challengerId,
+      challengerName,
+      targetId,
+      targetName,
+      session,
+      phase: "waiting_accept",
+      countdownEndTime: 0,
+      earlyDrawers: /* @__PURE__ */ new Set(),
+      drawTimes: /* @__PURE__ */ new Map(),
+      acceptTimer: null,
+      countdownTimer: null,
+      drawTimer: null
+    };
+    duel.acceptTimer = setTimeout(() => {
+      const d = duelStates.get(gid);
+      if (d && d.phase === "waiting_accept") {
+        session.send(`\u23F0 \u5BF9\u51B3\u8D85\u65F6\uFF01${targetName} \u672A\u5728 ${dc.acceptTimeoutSeconds} \u79D2\u5185\u63A5\u53D7\u6311\u6218\u3002`);
+        cleanupDuel(gid);
+      }
+    }, dc.acceptTimeoutSeconds * 1e3);
+    duelStates.set(gid, duel);
+    dbg("\u5BF9\u51B3-\u53D1\u8D77", { gid, challengerId, challengerName, targetId, targetName });
+    return `\u2694\uFE0F ${challengerName} \u5411 ${import_koishi.segment.at(targetId)} \u53D1\u8D77\u4E86\u5BF9\u51B3\uFF01
+\u56DE\u590D"\u63A5\u53D7"\u5E94\u6218\uFF08${dc.acceptTimeoutSeconds}\u79D2\u5185\u6709\u6548\uFF09`;
+  });
+  ctx.command("\u4E3D\u4E3D\u5BF9\u51B3\u7FA4\u699C", "\u67E5\u770B\u672C\u7FA4\u5BF9\u51B3\u6392\u884C\u699C").action(async ({ session }) => {
+    const gid = getGroupId(session);
+    try {
+      const records = await ctx.database.get("lili_duel", { gid }, {
+        sort: { winnerTime: "asc" },
+        limit: 10
+      });
+      if (!records || records.length === 0) return "\u{1F3C6} \u672C\u7FA4\u6682\u65E0\u5BF9\u51B3\u8BB0\u5F55\u3002";
+      const lines = ["\u{1F3C6} \u4E3D\u4E3D\u5BF9\u51B3 \u7FA4\u6392\u884C\u699C"];
+      for (let i = 0; i < records.length; i++) {
+        const r = records[i];
+        const time = new Date(r.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+        lines.push(`${i + 1}. ${r.winnerName}  ${r.winnerTime}ms  \u26A1\u80DC  ${r.loserName}  ${r.loserTime >= 0 ? r.loserTime + "ms" : "\u672A\u62D4\u67AA"}    ${time}`);
+      }
+      return lines.join("\n");
+    } catch {
+      return "\u{1F3C6} \u67E5\u8BE2\u6392\u884C\u699C\u5931\u8D25\u3002";
+    }
+  });
+  ctx.command("\u4E3D\u4E3D\u5BF9\u51B3\u603B\u699C", "\u67E5\u770B\u5168\u7FA4\u5BF9\u51B3\u6392\u884C\u699C").action(async () => {
+    try {
+      const records = await ctx.database.get("lili_duel", {}, {
+        sort: { winnerTime: "asc" },
+        limit: 10
+      });
+      if (!records || records.length === 0) return "\u{1F3C6} \u6682\u65E0\u5BF9\u51B3\u8BB0\u5F55\u3002";
+      const lines = ["\u{1F3C6} \u4E3D\u4E3D\u5BF9\u51B3 \u603B\u6392\u884C\u699C"];
+      for (let i = 0; i < records.length; i++) {
+        const r = records[i];
+        const time = new Date(r.timestamp).toLocaleString("zh-CN", { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+        lines.push(`${i + 1}. ${r.winnerName}  ${r.winnerTime}ms  \u26A1\u80DC  ${r.loserName}  ${r.loserTime >= 0 ? r.loserTime + "ms" : "\u672A\u62D4\u67AA"}    ${time}`);
+      }
+      return lines.join("\n");
+    } catch {
+      return "\u{1F3C6} \u67E5\u8BE2\u6392\u884C\u699C\u5931\u8D25\u3002";
+    }
+  });
+  function cleanupDuel(gid) {
+    const duel = duelStates.get(gid);
+    if (!duel) return;
+    if (duel.acceptTimer) clearTimeout(duel.acceptTimer);
+    if (duel.countdownTimer) clearTimeout(duel.countdownTimer);
+    if (duel.drawTimer) clearTimeout(duel.drawTimer);
+    duelStates.delete(gid);
+  }
+  async function resolveDuel(gid) {
+    const duel = duelStates.get(gid);
+    if (!duel || duel.phase === "finished") return;
+    duel.phase = "finished";
+    const dc = config.duel;
+    const { challengerId, challengerName, targetId, targetName, drawTimes, earlyDrawers, session } = duel;
+    if (duel.acceptTimer) clearTimeout(duel.acceptTimer);
+    if (duel.countdownTimer) clearTimeout(duel.countdownTimer);
+    if (duel.drawTimer) clearTimeout(duel.drawTimer);
+    const cTime = drawTimes.get(challengerId) ?? null;
+    const tTime = drawTimes.get(targetId) ?? null;
+    let winnerId, winnerName, loserId, loserName;
+    let winnerTime, loserTime;
+    let muteTargets = [];
+    let resultLines = [];
+    if (earlyDrawers.size > 0) {
+      for (const id of earlyDrawers) {
+        const name2 = id === challengerId ? challengerName : targetName;
+        muteTargets.push({ id, name: name2, duration: dc.earlyDrawMuteSeconds });
+        resultLines.push(`\u26A0\uFE0F ${name2} \u63D0\u524D\u62D4\u67AA\uFF01`);
+      }
+      const otherId = earlyDrawers.has(challengerId) ? targetId : challengerId;
+      const otherName = otherId === challengerId ? challengerName : targetName;
+      winnerId = otherId;
+      winnerName = otherName;
+      loserId = [...earlyDrawers][0];
+      loserName = loserId === challengerId ? challengerName : targetName;
+      winnerTime = drawTimes.get(otherId) ?? 0;
+      loserTime = -1;
+      for (const mt of muteTargets) {
+        await tryMute(session, mt.id, mt.duration);
+        resultLines.push(`\u{1F507} ${mt.name} \u88AB\u7981\u8A00 ${mt.duration} \u79D2\uFF01`);
+      }
+    } else if (cTime !== null && tTime !== null) {
+      if (cTime < tTime) {
+        winnerId = challengerId;
+        winnerName = challengerName;
+        winnerTime = cTime;
+        loserId = targetId;
+        loserName = targetName;
+        loserTime = tTime;
+      } else {
+        winnerId = targetId;
+        winnerName = targetName;
+        winnerTime = tTime;
+        loserId = challengerId;
+        loserName = challengerName;
+        loserTime = cTime;
+      }
+      resultLines.push(`\u{1F52B} ${winnerName} \u62D4\u67AA\u66F4\u5FEB\uFF01`);
+      muteTargets.push({ id: loserId, name: loserName, duration: dc.lateMuteSeconds });
+    } else if (cTime !== null) {
+      winnerId = challengerId;
+      winnerName = challengerName;
+      winnerTime = cTime;
+      loserId = targetId;
+      loserName = targetName;
+      loserTime = -1;
+      resultLines.push(`\u{1F52B} ${winnerName} \u62D4\u67AA\u4E86\uFF0C${loserName} \u6CA1\u6709\u62D4\u67AA\uFF01`);
+      muteTargets.push({ id: loserId, name: loserName, duration: dc.lateMuteSeconds });
+    } else if (tTime !== null) {
+      winnerId = targetId;
+      winnerName = targetName;
+      winnerTime = tTime;
+      loserId = challengerId;
+      loserName = challengerName;
+      loserTime = -1;
+      resultLines.push(`\u{1F52B} ${winnerName} \u62D4\u67AA\u4E86\uFF0C${loserName} \u6CA1\u6709\u62D4\u67AA\uFF01`);
+      muteTargets.push({ id: loserId, name: loserName, duration: dc.lateMuteSeconds });
+    } else {
+      resultLines.push("\u{1F52B} \u53CC\u65B9\u90FD\u6CA1\u6709\u62D4\u67AA\uFF01");
+      muteTargets.push(
+        { id: challengerId, name: challengerName, duration: dc.lateMuteSeconds },
+        { id: targetId, name: targetName, duration: dc.lateMuteSeconds }
+      );
+      winnerId = "";
+      winnerName = "";
+      winnerTime = 0;
+      loserId = "";
+      loserName = "";
+      loserTime = -1;
+    }
+    for (const mt of muteTargets) {
+      const muted = await tryMute(session, mt.id, mt.duration);
+      resultLines.push(muted ? `\u{1F507} ${mt.name} \u88AB\u7981\u8A00 ${mt.duration} \u79D2\uFF01` : `\u{1F507} ${mt.name} \u7981\u8A00\u5931\u8D25\uFF08\u6743\u9650\u4E0D\u8DB3\uFF09`);
+    }
+    if (cTime !== null) {
+      resultLines.push(`${challengerName} \u7528\u65F6\uFF1A${cTime}ms`);
+    } else {
+      resultLines.push(`${challengerName} \u672A\u62D4\u67AA`);
+    }
+    if (tTime !== null) {
+      resultLines.push(`${targetName} \u7528\u65F6\uFF1A${tTime}ms`);
+    } else {
+      resultLines.push(`${targetName} \u672A\u62D4\u67AA`);
+    }
+    if (winnerId && loserId) {
+      try {
+        await ctx.database.create("lili_duel", {
+          gid,
+          winnerId,
+          winnerName,
+          loserId,
+          loserName,
+          winnerTime,
+          loserTime,
+          timestamp: Date.now()
+        });
+      } catch (e) {
+        dbg("\u5BF9\u51B3\u8BB0\u5F55\u5165\u5E93\u5931\u8D25", { gid, error: String(e) });
+      }
+    }
+    await session.send(resultLines.join("\n"));
+    cleanupDuel(gid);
+  }
+  ctx.middleware(async (session, next) => {
+    if (!config.duel.enabled) return next();
+    const gid = getGroupId(session);
+    if (!gid) return next();
+    if (!isGroupAllowed(gid, config.duel.groups, config.duel.groupMode)) return next();
+    const duel = duelStates.get(gid);
+    if (!duel) return next();
+    const text = (session.content || "").trim();
+    const userId = String(session.userId);
+    if (userId !== duel.challengerId && userId !== duel.targetId) return next();
+    if (duel.phase === "waiting_accept" && userId === duel.targetId && text === "\u63A5\u53D7") {
+      if (duel.acceptTimer) clearTimeout(duel.acceptTimer);
+      duel.acceptTimer = null;
+      const dc = config.duel;
+      duel.phase = "countdown";
+      duel.countdownEndTime = Date.now() + dc.countdownSeconds * 1e3;
+      duel.earlyDrawers = /* @__PURE__ */ new Set();
+      duel.drawTimes = /* @__PURE__ */ new Map();
+      dbg("\u5BF9\u51B3-\u5F00\u59CB\u5012\u8BA1\u65F6", { gid, countdownSeconds: dc.countdownSeconds, challenger: duel.challengerId, target: duel.targetId });
+      duel.countdownTimer = setTimeout(async () => {
+        const d = duelStates.get(gid);
+        if (!d || d.phase !== "countdown") return;
+        d.phase = "drawing";
+        try {
+          await duel.session.send("\u2694\uFE0F \u5348\u65F6\u5DF2\u5230\uFF01");
+        } catch {
+        }
+        dbg("\u5BF9\u51B3-\u62D4\u67AA\u9636\u6BB5", { gid });
+        d.drawTimer = setTimeout(() => {
+          const d2 = duelStates.get(gid);
+          if (!d2 || d2.phase !== "drawing") return;
+          resolveDuel(gid);
+        }, dc.drawTimeoutSeconds * 1e3);
+      }, dc.countdownSeconds * 1e3);
+      return;
+    }
+    if (text === "\u62D4\u67AA" && (duel.phase === "countdown" || duel.phase === "drawing")) {
+      const now = Date.now();
+      if (duel.phase === "countdown") {
+        duel.earlyDrawers.add(userId);
+        const name3 = userId === duel.challengerId ? duel.challengerName : duel.targetName;
+        await session.send(`\u26A0\uFE0F ${name3} \u63D0\u524D\u62D4\u67AA\uFF01`);
+        dbg("\u5BF9\u51B3-\u63D0\u524D\u62D4\u67AA", { gid, userId, name: name3 });
+        if (duel.earlyDrawers.size >= 2) {
+          duel.drawTimes.set(userId, now);
+          const otherId = userId === duel.challengerId ? duel.targetId : duel.challengerId;
+          if (!duel.drawTimes.has(otherId)) duel.drawTimes.set(otherId, now);
+          resolveDuel(gid);
+        }
+        return;
+      }
+      if (duel.drawTimes.has(userId)) {
+        await session.send("\u4F60\u5DF2\u7ECF\u62D4\u8FC7\u67AA\u4E86\uFF01");
+        return;
+      }
+      const reactionTime = now - duel.countdownEndTime;
+      duel.drawTimes.set(userId, reactionTime);
+      const name2 = userId === duel.challengerId ? duel.challengerName : duel.targetName;
+      dbg("\u5BF9\u51B3-\u62D4\u67AA", { gid, userId, name: name2, reactionTime });
+      if (duel.drawTimes.has(duel.challengerId) && duel.drawTimes.has(duel.targetId)) {
+        resolveDuel(gid);
+      }
+      return;
+    }
+    return next();
+  });
   ctx.middleware(async (session, next) => {
     const gid = getGroupId(session);
     const content = session.content || "";
@@ -751,17 +1041,83 @@ ${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)) {
+    if (config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups, config.dedup.groupMode)) {
       dbg("\u67E5\u91CD-\u4E2D\u95F4\u4EF6\u5165\u53E3", {
         gid,
         userId: session.userId,
@@ -771,7 +1127,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 +1138,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) });
           }
         }
       }
@@ -823,8 +1154,8 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
     const imitationGroups = parseGroupList(config.imitation.groups);
     const dedupGroups = parseGroupList(config.dedup.groups);
     const foldGroups = config.fold.enabled ? parseGroupList(config.fold.groups) : [];
-    const dedupInGroup = config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups);
-    const foldInGroup = config.fold.enabled && isGroupAllowed(gid, config.fold.groups);
+    const dedupInGroup = config.dedup.enabled && isGroupAllowed(gid, config.dedup.groups, config.dedup.groupMode);
+    const foldInGroup = config.fold.enabled && isGroupAllowed(gid, config.fold.groups, config.fold.groupMode);
     const shouldRecordAll = foldInGroup || dedupInGroup;
     const shouldRecordLimited = textLen >= 15 && textLen <= 60 && normalizedText;
     const recordGroups = /* @__PURE__ */ new Set([...imitationGroups, ...dedupGroups, ...foldGroups]);
@@ -854,13 +1185,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,
@@ -875,7 +1206,7 @@ ${import_koishi.segment.at(targetId)} \u5DF2\u88AB\u89E3\u9664\u7981\u8A00\u3002
         dbg("\u6D88\u606F\u5165\u5E93\u5931\u8D25", { gid, error: String(e) });
       }
     }
-    if (config.imitation.enabled && isGroupAllowed(gid, config.imitation.groups)) {
+    if (config.imitation.enabled && isGroupAllowed(gid, config.imitation.groups, config.imitation.groupMode)) {
       let count = imitationCounters.get(gid) || 0;
       count++;
       imitationCounters.set(gid, count);

package/package.json

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