koishi-plugin-ccb-plus 0.1.6 → 0.1.7-beta

package/lib/index.js

@@ -72,7 +72,7 @@ function apply(ctx, config) {
       if (error.code === "ENOENT") {
         return {};
       }
-      console.error("Error reading CCB data:", error);
+      console.error("读取CCB数据出错:", error);
       return {};
     }
   }
@@ -83,7 +83,7 @@ function apply(ctx, config) {
       await import_fs.promises.mkdir(dataDir, { recursive: true });
       await import_fs.promises.writeFile(DATA_FILE, JSON.stringify(data, null, 2), "utf-8");
     } catch (error) {
-      console.error("Error writing CCB data:", error);
+      console.error("写入CCB数据出错:", error);
     }
   }
   __name(writeData, "writeData");
@@ -98,7 +98,7 @@ function apply(ctx, config) {
         }
       } catch (error) {
         if (error.code !== "ENOENT") {
-          console.error("Error reading CCB log:", error);
+          console.error("读取CCB日志出错:", error);
         }
       }
       const entry = {
@@ -124,52 +124,59 @@ function apply(ctx, config) {
     if (cached && now - cached.timestamp < CACHE_DURATION) {
       return cached.name;
     }
-    try {
-      const memberInfo = await session.bot.getGuildMember(session.guildId, userId);
-      const nickname = memberInfo?.nick || memberInfo?.name || `用户${userId}`;
-      nicknameCache.set(cacheKey, { name: nickname, timestamp: now });
-      return nickname;
-    } catch (error) {
+    const setAndReturnName = /* @__PURE__ */ __name((name2) => {
+      if (name2 && name2 !== userId) {
+        const actualName = name2.trim();
+        if (actualName) {
+          nicknameCache.set(cacheKey, { name: actualName, timestamp: now });
+          return actualName;
+        }
+      }
+      return null;
+    }, "setAndReturnName");
+    if (session.guildId && userId) {
       try {
-        const userInfo = await session.bot.getUser(userId);
-        const nickname = userInfo?.name || `用户${userId}`;
-        nicknameCache.set(cacheKey, { name: nickname, timestamp: now });
-        return nickname;
-      } catch (e) {
-        const friendlyName = `用户${userId}`;
-        nicknameCache.set(cacheKey, { name: friendlyName, timestamp: now });
-        return friendlyName;
+        const memberInfo = await session.bot.getGuildMember(session.guildId, userId);
+        const displayName = memberInfo?.nick || memberInfo?.user?.name || memberInfo?.name;
+        const result = setAndReturnName(displayName);
+        if (result) return result;
+      } catch (error) {
       }
     }
+    try {
+      const userInfo = await session.bot.getUser(userId);
+      const displayName = userInfo?.name || userInfo?.nick || userInfo?.nickname;
+      const result = setAndReturnName(displayName);
+      if (result) return result;
+    } catch (e) {
+    }
+    try {
+      if (session.event?.user?.id === userId) {
+        const result = setAndReturnName(session.event?.user?.name);
+        if (result) return result;
+      }
+    } catch (nestedError) {
+    }
+    try {
+      const userData = await session.getUser(userId);
+      const result = setAndReturnName(userData?.name);
+      if (result) return result;
+    } catch (dbError) {
+    }
+    const friendlyName = `用户${userId}`;
+    nicknameCache.set(cacheKey, { name: friendlyName, timestamp: now });
+    return friendlyName;
   }
   __name(getUserNickname, "getUserNickname");
-  ctx.command("ccb [target:user]", "和群友赛博sex的插件PLUS", { authority: 1 }).action(async ({ session }, target) => {
-    const groupId = session.guildId;
-    if (!groupId) {
+  function checkGroupCommand(session) {
+    if (!session.guildId) {
       return "此命令只能在群聊中使用。";
     }
-    const senderId = session.userId;
-    const actorId = senderId;
-    const now = Date.now() / 1e3;
-    const banEnd = banList[actorId] || 0;
-    if (now < banEnd) {
-      const remain = Math.floor(banEnd - now);
-      const m = Math.floor(remain / 60);
-      const s = remain % 60;
-      return `嘻嘻，你已经一滴不剩了，养胃还剩 ${m}分${s}秒`;
-    }
-    const times = actionTimes[actorId] = actionTimes[actorId] || [];
-    const cutoff = now - config.ywWindow;
-    while (times.length > 0 && times[0] < cutoff) {
-      times.shift();
-    }
-    times.push(now);
-    if (times.length > config.ywThreshold) {
-      banList[actorId] = now + config.ywBanDuration;
-      actionTimes[actorId] = [];
-      return "冲得出来吗你就冲，再冲就给你折了";
-    }
-    let targetUserId = senderId;
+    return null;
+  }
+  __name(checkGroupCommand, "checkGroupCommand");
+  async function validateTargetUser(session, target) {
+    let targetUserId = session.userId;
     if (target) {
       const match = target.match(/^[^:]+:(.+)$/);
       if (match) {
@@ -194,6 +201,147 @@ function apply(ctx, config) {
         return "无法找到指定用户，请检查输入是否正确。";
       }
     }
+    return targetUserId;
+  }
+  __name(validateTargetUser, "validateTargetUser");
+  async function updateCCBRecord(session, groupId, targetUserId, duration, V, nickname, crit, pic) {
+    const allData = await readData();
+    const groupData = allData[groupId] || [];
+    const recordIndex = groupData.findIndex((item) => item.id === targetUserId);
+    if (recordIndex !== -1) {
+      const item = groupData[recordIndex];
+      const senderId = session.userId;
+      item.num = (item.num || 0) + 1;
+      item.vol = parseFloat((item.vol + V).toFixed(2));
+      let ccb_by = item.ccb_by || {};
+      if (senderId in ccb_by) {
+        const current = ccb_by[senderId];
+        ccb_by[senderId] = {
+          count: (current?.count || 0) + 1,
+          first: current?.first || false,
+          max: current?.max || false
+        };
+      } else {
+        ccb_by[senderId] = { count: 1, first: false, max: false };
+      }
+      item.ccb_by = ccb_by;
+      let prev_max = item.max || 0;
+      if (prev_max === 0) {
+        const total_vol = item.vol || 0;
+        const total_num = item.num || 0;
+        if (total_num > 0) {
+          prev_max = parseFloat((total_vol / total_num).toFixed(2));
+        }
+      }
+      if (V > prev_max) {
+        item.max = V;
+        for (const k in ccb_by) {
+          const current = ccb_by[k];
+          ccb_by[k] = {
+            count: current?.count || 0,
+            first: current?.first || false,
+            max: false
+          };
+        }
+        const senderData = ccb_by[senderId];
+        ccb_by[senderId] = {
+          count: senderData?.count || 0,
+          first: senderData?.first || false,
+          max: true
+        };
+      } else {
+        for (const k in ccb_by) {
+          const current = ccb_by[k];
+          if (!(current && "max" in current)) {
+            ccb_by[k] = {
+              count: current?.count || 0,
+              first: current?.first || false,
+              max: false
+            };
+          }
+        }
+      }
+      item.ccb_by = ccb_by;
+      let resultMessage = crit ? `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了 💥 暴击！${V.toFixed(2)}ml的生命因子` : `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
+      const message = [
+        resultMessage,
+        import_koishi.segment.image(pic),
+        `这是ta的第${item.num}次。`
+      ].join("\n");
+      allData[groupId] = groupData;
+      await writeData(allData);
+      if (config.isLog) {
+        try {
+          await appendLog(groupId, session.userId, targetUserId, duration, V);
+        } catch (e) {
+          console.warn("记录日志失败:", e);
+        }
+      }
+      return message;
+    } else {
+      return "对方拒绝了和你ccb";
+    }
+  }
+  __name(updateCCBRecord, "updateCCBRecord");
+  async function createNewCCBRecord(session, groupId, targetUserId, duration, V, nickname, pic) {
+    const allData = await readData();
+    const groupData = allData[groupId] || [];
+    const newRecord = {
+      id: targetUserId,
+      num: 1,
+      vol: V,
+      ccb_by: { [session.userId]: { count: 1, first: true, max: true } },
+      max: V
+    };
+    groupData.push(newRecord);
+    allData[groupId] = groupData;
+    await writeData(allData);
+    const resultMessage = `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
+    const message = [
+      resultMessage,
+      import_koishi.segment.image(pic),
+      "这是ta的初体验。"
+    ].join("\n");
+    if (config.isLog) {
+      try {
+        await appendLog(groupId, session.userId, targetUserId, duration, V);
+      } catch (e) {
+        console.warn("记录日志失败:", e);
+      }
+    }
+    return message;
+  }
+  __name(createNewCCBRecord, "createNewCCBRecord");
+  ctx.command("ccb [target:user]", "和群友赛博sex的插件PLUS", { authority: 1 }).action(async ({ session }, target) => {
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
+    }
+    const senderId = session.userId;
+    const actorId = senderId;
+    const now = Date.now() / 1e3;
+    const banEnd = banList[actorId] || 0;
+    if (now < banEnd) {
+      const remain = Math.floor(banEnd - now);
+      const m = Math.floor(remain / 60);
+      const s = remain % 60;
+      return `嘻嘻，你已经一滴不剩了，养胃还剩 ${m}分${s}秒`;
+    }
+    const times = actionTimes[actorId] = actionTimes[actorId] || [];
+    const cutoff = now - config.ywWindow;
+    while (times.length > 0 && times[0] < cutoff) {
+      times.shift();
+    }
+    times.push(now);
+    if (times.length > config.ywThreshold) {
+      banList[actorId] = now + config.ywBanDuration;
+      actionTimes[actorId] = [];
+      return "冲得出来吗你就冲，再冲就给你折了";
+    }
+    let targetUserId = await validateTargetUser(session, target);
+    if (targetUserId.startsWith("无法找到")) {
+      return targetUserId;
+    }
     if (config.whiteList.includes(targetUserId)) {
       const nickname = await getUserNickname(session, targetUserId) || targetUserId;
       return `${nickname} 的后门被后户之神霸占了，不能ccb（悲`;
@@ -211,89 +359,13 @@ function apply(ctx, config) {
     }
     const pic = getAvatar(targetUserId);
     const allData = await readData();
-    const groupData = allData[groupId] || [];
+    const groupData = allData[session.guildId] || [];
     const mode = makeit(groupData, targetUserId);
+    let message;
     if (mode === 1) {
       try {
-        const recordIndex = groupData.findIndex((item) => item.id === targetUserId);
-        if (recordIndex !== -1) {
-          const item = groupData[recordIndex];
-          const nickname = await getUserNickname(session, targetUserId);
-          item.num = (item.num || 0) + 1;
-          item.vol = parseFloat((item.vol + V).toFixed(2));
-          let ccb_by = item.ccb_by || {};
-          if (senderId in ccb_by) {
-            const current = ccb_by[senderId];
-            ccb_by[senderId] = {
-              count: (current?.count || 0) + 1,
-              first: current?.first || false,
-              max: current?.max || false
-            };
-          } else {
-            ccb_by[senderId] = { count: 1, first: false, max: false };
-          }
-          item.ccb_by = ccb_by;
-          let prev_max = item.max || 0;
-          if (prev_max === 0) {
-            const total_vol = item.vol || 0;
-            const total_num = item.num || 0;
-            if (total_num > 0) {
-              prev_max = parseFloat((total_vol / total_num).toFixed(2));
-            }
-          }
-          if (V > prev_max) {
-            item.max = V;
-            for (const k in ccb_by) {
-              const current = ccb_by[k];
-              ccb_by[k] = {
-                count: current?.count || 0,
-                first: current?.first || false,
-                max: false
-              };
-            }
-            const senderData = ccb_by[senderId];
-            ccb_by[senderId] = {
-              count: senderData?.count || 0,
-              first: senderData?.first || false,
-              max: true
-            };
-          } else {
-            for (const k in ccb_by) {
-              const current = ccb_by[k];
-              if (!(current && "max" in current)) {
-                ccb_by[k] = {
-                  count: current?.count || 0,
-                  first: current?.first || false,
-                  max: false
-                };
-              }
-            }
-          }
-          item.ccb_by = ccb_by;
-          let resultMessage = crit ? `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了 💥 暴击！${V.toFixed(2)}ml的生命因子` : `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
-          const message = [
-            resultMessage,
-            import_koishi.segment.image(pic),
-            `这是ta的第${item.num}次。`
-          ].join("\n");
-          allData[groupId] = groupData;
-          await writeData(allData);
-          if (config.isLog) {
-            try {
-              await appendLog(groupId, senderId, targetUserId, duration, V);
-            } catch (e) {
-              console.warn("记录日志失败:", e);
-            }
-          }
-          if (Math.random() < config.ywProbability) {
-            banList[actorId] = now + config.ywBanDuration;
-            await session.send(message);
-            return "💥你的牛牛炸膛了！满身疮痍，再起不能（悲）";
-          }
-          return message;
-        } else {
-          return "对方拒绝了和你ccb";
-        }
+        const nickname = await getUserNickname(session, targetUserId);
+        message = await updateCCBRecord(session, session.guildId, targetUserId, duration, V, nickname, crit, pic);
       } catch (e) {
         console.error(`报错: ${e}`);
         return "对方拒绝了和你ccb";
@@ -301,47 +373,25 @@ function apply(ctx, config) {
     } else {
       try {
         const nickname = await getUserNickname(session, targetUserId);
-        const resultMessage = `你和${nickname}发生了${duration}min长的ccb行为，向ta注入了${V.toFixed(2)}ml的生命因子`;
-        const message = [
-          resultMessage,
-          import_koishi.segment.image(getAvatar(targetUserId)),
-          "这是ta的初体验。"
-        ].join("\n");
-        const newRecord = {
-          id: targetUserId,
-          num: 1,
-          vol: V,
-          ccb_by: { [senderId]: { count: 1, first: true, max: true } },
-          max: V
-        };
-        groupData.push(newRecord);
-        allData[groupId] = groupData;
-        await writeData(allData);
-        if (config.isLog) {
-          try {
-            await appendLog(groupId, senderId, targetUserId, duration, V);
-          } catch (e) {
-            console.warn("记录日志失败:", e);
-          }
-        }
-        if (Math.random() < config.ywProbability) {
-          banList[actorId] = now + config.ywBanDuration;
-          await session.send(message);
-          return "💥你的牛牛炸膛了！满身疮痍，再起不能（悲）";
-        }
-        return message;
+        message = await createNewCCBRecord(session, session.guildId, targetUserId, duration, V, nickname, pic);
       } catch (e) {
         console.error(`报错: ${e}`);
         return "对方拒绝了和你ccb";
       }
     }
+    if (Math.random() < config.ywProbability) {
+      banList[actorId] = now + config.ywBanDuration;
+      await session.send(message);
+      return "💥你的牛牛炸膛了！满身疮痍，再起不能（悲）";
+    }
+    return message;
   });
   ctx.command("ccbtop", "按次数排行", { authority: 1 }).action(async ({ session }) => {
-    const groupId = session.guildId;
-    if (!groupId) {
-      return "此命令只能在群聊中使用。";
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
     }
-    const groupData = (await readData())[groupId] || [];
+    const groupData = (await readData())[session.guildId] || [];
     if (!groupData.length) {
       return "当前群暂无ccb记录。";
     }
@@ -358,11 +408,11 @@ function apply(ctx, config) {
     return msg.trim();
   });
   ctx.command("ccbvol", "按注入量排行", { authority: 1 }).action(async ({ session }) => {
-    const groupId = session.guildId;
-    if (!groupId) {
-      return "此命令只能在群聊中使用。";
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
     }
-    const groupData = (await readData())[groupId] || [];
+    const groupData = (await readData())[session.guildId] || [];
     if (!groupData.length) {
       return "当前群暂无ccb记录。";
     }
@@ -379,11 +429,11 @@ function apply(ctx, config) {
     return msg.trim();
   });
   ctx.command("ccbmax", "按max值排行并输出产生者", { authority: 1 }).action(async ({ session }) => {
-    const groupId = session.guildId;
-    if (!groupId) {
-      return "此命令只能在群聊中使用。";
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
     }
-    const groupData = (await readData())[groupId] || [];
+    const groupData = (await readData())[session.guildId] || [];
     if (!groupData.length) {
       return "当前群暂无ccb记录。";
     }
@@ -456,9 +506,9 @@ function apply(ctx, config) {
     return msg.trim();
   });
   ctx.command("ccbinfo [target:user]", "查询某人ccb信息：第一次对他ccb的人，被ccb的总次数，注入总量", { authority: 1 }).action(async ({ session }, target) => {
-    const groupId = session.guildId;
-    if (!groupId) {
-      return "此命令只能在群聊中使用。";
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
     }
     let targetUserId = session.userId;
     if (target) {
@@ -476,7 +526,7 @@ function apply(ctx, config) {
       }
     }
     const allData = await readData();
-    const groupData = allData[groupId] || [];
+    const groupData = allData[session.guildId] || [];
     const record = groupData.find((r) => r.id === targetUserId);
     if (!record) {
       return "该用户暂无ccb记录。";
@@ -545,15 +595,15 @@ function apply(ctx, config) {
     return msg;
   });
   ctx.command("xnn", "XNN榜 - 计算群中最xnn特质的群友", { authority: 1 }).action(async ({ session }) => {
+    const checkResult = checkGroupCommand(session);
+    if (checkResult) {
+      return checkResult;
+    }
     const w_num = 1;
     const w_vol = 0.1;
     const w_action = 0.5;
-    const groupId = session.guildId;
-    if (!groupId) {
-      return "此命令只能在群聊中使用。";
-    }
     const allData = await readData();
-    const groupData = allData[groupId] || [];
+    const groupData = allData[session.guildId] || [];
     if (!groupData.length) {
       return "当前群暂无ccb记录。";
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ccb-plus",
   "description": "Koishi插件，与群友发生ccb行为。(移植自astrbot_plugin_ccb_plus)",
-  "version": "0.1.6",
+  "version": "0.1.7-beta",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [