koishi-plugin-cs2-server-query 2.6.0 → 2.6.2

package/lib/index.js

@@ -437,22 +437,45 @@ function apply(ctx, config) {
     const relevantSubs = subscriptions.filter(
       (sub) => sub.groupName === group.name && sub.mapName === newMap && canPush(server.ip, newMap)
     );
-    for (const sub of relevantSubs) {
-      const image = await generatePushImage(server, mapTranslations);
-      const targetId = sub.pushType === "私聊" ? sub.userId : sub.channelId;
-      const message = [
-        import_koishi.h.image(image, "image/png"),
-        `connect ${server.ip}`
-      ];
-      await sendMessageToTarget(
-        ctx,
-        targetId,
-        sub.pushType,
-        message,
-        sub.userId
-      );
-      updatePushRecord(server.ip, newMap);
+    if (relevantSubs.length === 0) return;
+    const groupedSubs = {};
+    relevantSubs.forEach((sub) => {
+      const key = sub.pushType === "群聊" ? `group_${sub.channelId}` : `private_${sub.userId}`;
+      if (!groupedSubs[key]) {
+        groupedSubs[key] = [];
+      }
+      groupedSubs[key].push(sub);
+    });
+    for (const [key, subs] of Object.entries(groupedSubs)) {
+      if (subs[0].pushType === "私聊") {
+        for (const sub of subs) {
+          const image = await generatePushImage(server, mapTranslations);
+          const message = [
+            import_koishi.h.image(image, "image/png"),
+            `connect ${server.ip}`
+          ];
+          await sendMessageToTarget(
+            ctx,
+            sub.userId,
+            "私聊",
+            message,
+            sub.userId
+          );
+        }
+      } else {
+        const channelId = subs[0].channelId;
+        const userIds = subs.map((sub) => sub.userId);
+        const image = await generatePushImage(server, mapTranslations);
+        const atUsers = userIds.map((userId) => import_koishi.h.at(userId)).join(" ");
+        const message = [
+          atUsers,
+          import_koishi.h.image(image, "image/png"),
+          `connect ${server.ip}`
+        ];
+        await ctx.bots[0].sendMessage(channelId, message);
+      }
     }
+    updatePushRecord(server.ip, newMap);
   }
   __name(processMapChange, "processMapChange");
   async function handleOfflineServers(groups2) {
@@ -1087,14 +1110,9 @@ ${mapList}
   __name(calculateDifficultyStats, "calculateDifficultyStats");
   async function sendMessageToTarget(ctx2, targetId, pushType, message, userId) {
     try {
-      if (pushType === "群聊" && userId) {
-        message = [import_koishi.h.at(userId), ...Array.isArray(message) ? message : [message]];
-      }
-      if (Array.isArray(message)) {
-        const combinedMessage = (0, import_koishi.h)("message", message);
-        await sendSingleMessage(ctx2, targetId, pushType, combinedMessage);
-      } else {
-        await sendSingleMessage(ctx2, targetId, pushType, message);
+      if (pushType === "私聊") {
+        const finalMessage = Array.isArray(message) ? (0, import_koishi.h)("message", message) : message;
+        await ctx2.bots[0].sendPrivateMessage(targetId, finalMessage);
       }
     } catch (err) {
       ctx2.logger("cs2-server-query").error(`发送消息失败: ${err.message}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cs2-server-query",
   "description": "自用,不推荐下载",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [