koishi-plugin-cs2-server-query 2.6.4 → 2.6.5

package/lib/index.js

@@ -434,59 +434,52 @@ function apply(ctx, config) {
     if (!mapStats[group.name][newMap]) mapStats[group.name][newMap] = [];
     mapStats[group.name][newMap].push(Date.now());
     saveMapStats();
-    const relevantSubs = subscriptions.filter(
+    const matchedSubs = subscriptions.filter(
       (sub) => sub.groupName === group.name && sub.mapName === newMap && canPush(server.ip, newMap)
     );
-    if (relevantSubs.length === 0) {
-      return;
-    }
-    const groupedSubs = {};
-    for (const sub of relevantSubs) {
-      const targetId = sub.pushType === "私聊" ? sub.userId : sub.channelId;
-      if (!groupedSubs[targetId]) {
-        groupedSubs[targetId] = {
+    if (matchedSubs.length === 0) return;
+    const pushGroups = /* @__PURE__ */ new Map();
+    for (const sub of matchedSubs) {
+      const key = sub.pushType === "私聊" ? `private:${sub.userId}` : `group:${sub.channelId}`;
+      if (!pushGroups.has(key)) {
+        pushGroups.set(key, {
           pushType: sub.pushType,
-          users: []
-        };
-      }
-      if (!groupedSubs[targetId].users.includes(sub.userId)) {
-        groupedSubs[targetId].users.push(sub.userId);
+          channelId: sub.channelId,
+          users: /* @__PURE__ */ new Set()
+        });
       }
+      pushGroups.get(key).users.add(sub.userId);
     }
-    for (const [targetId, groupInfo] of Object.entries(groupedSubs)) {
-      const image = await generatePushImage(server, mapTranslations);
+    const image = await generatePushImage(server, mapTranslations);
+    for (const groupInfo of pushGroups.values()) {
       if (groupInfo.pushType === "私聊") {
-        for (const userId of groupInfo.users) {
-          const message = [
-            import_koishi.h.image(image, "image/png"),
-            `connect ${server.ip}`
-          ];
+        for (const uid of groupInfo.users) {
           await sendMessageToTarget(
             ctx,
-            userId,
+            uid,
             "私聊",
-            message,
-            userId
+            [
+              import_koishi.h.image(image, "image/png"),
+              `connect ${server.ip}`
+            ],
+            uid
           );
         }
       } else {
-        const atUsers = groupInfo.users.map((userId) => import_koishi.h.at(userId)).join(" ");
-        const message = [
-          atUsers,
-          import_koishi.h.image(image, "image/png"),
-          `connect ${server.ip}`
-        ];
+        const atAll = Array.from(groupInfo.users).map((uid) => import_koishi.h.at(uid));
         await sendMessageToTarget(
           ctx,
-          targetId,
+          groupInfo.channelId,
           "群聊",
-          message,
-          void 0
-          // 不在函数内部添加@，因为已经在消息中包含了
+          [
+            ...atAll,
+            import_koishi.h.image(image, "image/png"),
+            `connect ${server.ip}`
+          ]
         );
       }
-      updatePushRecord(server.ip, newMap);
     }
+    updatePushRecord(server.ip, newMap);
   }
   __name(processMapChange, "processMapChange");
   async function handleOfflineServers(groups2) {
@@ -1120,20 +1113,11 @@ ${mapList}
   }
   __name(calculateDifficultyStats, "calculateDifficultyStats");
   async function sendMessageToTarget(ctx2, targetId, pushType, message, userId) {
-    try {
-      if (Array.isArray(message)) {
-        const combinedMessage = (0, import_koishi.h)("message", message);
-        await sendSingleMessage(ctx2, targetId, pushType, combinedMessage);
-      } else {
-        if (pushType === "群聊" && userId) {
-          const atMessage = import_koishi.h.at(userId) + " " + message;
-          await sendSingleMessage(ctx2, targetId, pushType, atMessage);
-        } else {
-          await sendSingleMessage(ctx2, targetId, pushType, message);
-        }
-      }
-    } catch (err) {
-      ctx2.logger("cs2-server-query").error(`发送消息失败: ${err.message}`);
+    const finalMessage = Array.isArray(message) ? (0, import_koishi.h)("message", message) : message;
+    if (pushType === "私聊") {
+      await ctx2.bots[0].sendPrivateMessage(targetId, finalMessage);
+    } else {
+      await ctx2.bots[0].sendMessage(targetId, finalMessage);
     }
   }
   __name(sendMessageToTarget, "sendMessageToTarget");

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-cs2-server-query",
   "private": false,
   "description": "自用,不推荐下载",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [