koishi-plugin-808ps-qunmax 0.1.2 → 0.1.3

package/lib/index.js

@@ -309,8 +309,8 @@ var Config = import_koishi.Schema.object({
   外群监控配置: import_koishi.Schema.object({
     主动入群: import_koishi.Schema.boolean().default(true),
     被邀请入群: import_koishi.Schema.boolean().default(true),
-    被踢出群: import_koishi.Schema.boolean().default(false),
-    主动退群: import_koishi.Schema.boolean().default(false)
+    被踢出群: import_koishi.Schema.boolean().default(true),
+    主动退群: import_koishi.Schema.boolean().default(true)
   }).description("【所有未绑定到任何渠道的外群】仅执行此处配置的进退群监控，自动推送给值班人员")
 });
 async function initDatabase(config) {
@@ -986,30 +986,27 @@ async function apply(ctx, config) {
     const channelConfig = getChannelConfigByGroupId(groupId, config);
     if (channelConfig) return;
     if (!groupId || !userId) return;
-    const botList = config.机器人QQ号.map(String).sort();
-    const mainBot = botList[0];
-    const isPushBot = session.bot.selfId === mainBot;
     if (await checkRepeatPushLimit(mainPool, userId, config.重复推送限制小时)) {
       logger.info(`[外群监控-入群] ${userId} 在限制期内，跳过推送`);
       return;
     }
     let subType = eventExtractor.determineAction(session, "enter");
+    if (!subType) subType = "approve";
     const monitorConfig = config.外群监控配置;
     const isApprove = subType === "approve";
     const isInvite = subType === "invite";
-    if (isApprove && !monitorConfig.主动入群 || isInvite && !monitorConfig.被邀请入群) return;
+    if (isApprove && !monitorConfig.主动入群 || isInvite && !monitorConfig.被邀请入群) {
+      logger.debug(`[外群入群] ${userId} 事件类型${subType}未开启监控，跳过`);
+      return;
+    }
     const [memberRows] = await mainPool.execute(`SELECT COUNT(*) AS count FROM our_group_members WHERE qq = ?`, [userId]);
     if (memberRows[0].count > 0) {
       logger.info(`[外群监控] 群${groupId} 用户${userId} 是自有群成员，跳过`);
       return;
     }
     const eventText = eventExtractor.getActionText(subType);
-    if (isPushBot) {
-      await pushDrainData(mainPool, ctx, userId, groupId, subType, eventText, config);
-      logger.info(`[外群入群推送完成] QQ:${userId} 群:${groupId} 事件:${eventText}`);
-    } else {
-      logger.debug(`[副机采集外群入群] 机器人${session.bot.selfId} 群${groupId} 用户${userId}`);
-    }
+    await pushDrainData(mainPool, ctx, userId, groupId, subType, eventText, config);
+    logger.info(`[外群入群推送完成] QQ:${userId} 群:${groupId} 事件:${eventText}`);
   });
   ctx.on("guild-member-removed", async (session) => {
     const groupId = eventExtractor.extractGroupId(session);
@@ -1017,30 +1014,30 @@ async function apply(ctx, config) {
     const channelConfig = getChannelConfigByGroupId(groupId, config);
     if (channelConfig) return;
     if (!groupId || !userId) return;
-    const botList = config.机器人QQ号.map(String).sort();
-    const mainBot = botList[0];
-    const isPushBot = session.bot.selfId === mainBot;
     if (await checkRepeatPushLimit(mainPool, userId, config.重复推送限制小时)) {
       logger.info(`[外群监控-退群] ${userId} 在限制期内，跳过推送`);
       return;
     }
     let subType = eventExtractor.determineAction(session, "leave");
+    if (!subType) subType = "leave";
     const monitorConfig = config.外群监控配置;
     let eventText = "";
-    if (subType === "kick" && monitorConfig.被踢出群) eventText = "被踢出群";
-    else if (subType === "leave" && monitorConfig.主动退群) eventText = "主动退群";
-    if (!eventText) return;
+    if (subType === "kick" && monitorConfig.被踢出群) {
+      eventText = "被踢出群";
+    } else if (subType === "leave" && monitorConfig.主动退群) {
+      eventText = "主动退群";
+    }
+    if (!eventText) {
+      logger.debug(`[外群退群] ${userId} 事件类型${subType}未开启监控，跳过`);
+      return;
+    }
     const [memberRows] = await mainPool.execute(`SELECT COUNT(*) AS count FROM our_group_members WHERE qq = ?`, [userId]);
     if (memberRows[0].count > 0) {
       logger.info(`[外群监控] 群${groupId} 用户${userId} 是自有群成员，跳过`);
       return;
     }
-    if (isPushBot) {
-      await pushDrainData(mainPool, ctx, userId, groupId, subType, eventText, config);
-      logger.info(`[外群退群推送完成] QQ:${userId} 群:${groupId} 事件:${eventText}`);
-    } else {
-      logger.debug(`[副机采集外群退群] 机器人${session.bot.selfId} 群${groupId} 用户${userId}`);
-    }
+    await pushDrainData(mainPool, ctx, userId, groupId, subType, eventText, config);
+    logger.info(`[外群退群推送完成] QQ:${userId} 群:${groupId} 事件:${eventText}`);
   });
   ctx.setInterval(async () => {
     if (!mainPool) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-808ps-qunmax",
   "description": "",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [