@sjtdev/koishi-plugin-dota2tracker 1.1.2-beta.3 → 1.1.2-beta.5

package/lib/index.js

@@ -209,6 +209,11 @@ function PLAYERS_LASTMATCH(steamAccountIds) {
             id
             parsedDateTime
             startDateTime
+            players{
+              steamAccount{
+                id
+              }
+            }
           }
         }
       }
@@ -1201,7 +1206,7 @@ async function apply(ctx, config) {
         session.send(await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
         ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
       } else {
-        pendingMatches.push({ matchId, platform: session.event.platform, guildId: session.event.guild.id });
+        pendingMatches.push({ matchId, guilds: [{ platform: session.event.platform, guildId: session.event.guild.id, players: [] }] });
         session.send("比赛尚未解析，将在解析完成后发布。");
       }
     } catch (error) {
@@ -1441,7 +1446,6 @@ async function apply(ctx, config) {
       ctx.database.remove("dt_previous_query_results", { queryTime: { $lt: oneMonthAgo } });
     });
     ctx.cron("* * * * *", async function() {
-      const scanningMatches = [...pendingMatches];
       const subscribedGuilds = await ctx.database.get("dt_subscribed_guilds", void 0);
       const subscribedPlayersInGuild = (await ctx.database.get("dt_subscribed_players", void 0)).filter((player) => subscribedGuilds.some((guild) => guild.guildId == player.guildId));
       if (subscribedPlayersInGuild.length > 0) {
@@ -1452,22 +1456,28 @@ async function apply(ctx, config) {
             })
           )
         );
-        for (let player of queryRes.data.data.players) {
-          let lastMatch = player.matches[0];
-          if ((await ctx.database.get("dt_sended_match_id", { matchId: lastMatch.id })).length)
-            continue;
-          if (import_moment.default.unix(lastMatch.startDateTime).isBefore((0, import_moment.default)().subtract(1, "days")))
-            continue;
-          for (let subscribed_player of subscribedPlayersInGuild) {
-            if (player.steamAccount.id == subscribed_player.steamId) {
-              scanningMatches.push({ matchId: lastMatch.id, platform: subscribed_player.platform, guildId: subscribed_player.guildId });
-              ctx.logger.info(`追踪到来自群组${subscribed_player.platform}:${subscribed_player.guildId}-用户${subscribed_player.nickName ?? ""}(${subscribed_player.steamId})的尚未播报过的最新比赛 ${lastMatch.id}。`);
+        const lastMatches = queryRes.data.data.players.map((player) => player.matches[0]).filter((item, index, self) => index === self.findIndex((t) => t.id === item.id)).filter((match) => !pendingMatches.some((pendingMatch) => pendingMatch.matchId == match.id));
+        const sendedMatchesIds = (await ctx.database.get("dt_sended_match_id", { matchId: lastMatches.map((match) => match.id) }, ["matchId"])).map((match) => match.matchId);
+        lastMatches.filter((match) => !sendedMatchesIds.includes(match.id)).forEach((match) => {
+          const tempGuilds = [];
+          match.players.forEach((player) => {
+            const subscribedPlayer = subscribedPlayersInGuild.find((subscribedPlayer2) => subscribedPlayer2.steamId === player.steamAccount.id);
+            if (subscribedPlayer) {
+              const tempGuild = tempGuilds.find((guild) => guild.guildId == subscribedPlayer.guildId && guild.platform == subscribedPlayer.platform);
+              if (tempGuild)
+                tempGuild.players.push(subscribedPlayer);
+              else
+                tempGuilds.push({ guildId: subscribedPlayer.guildId, platform: subscribedPlayer.platform, players: [subscribedPlayer] });
             }
-          }
-        }
+          });
+          pendingMatches.push({ matchId: match.id, guilds: tempGuilds });
+          ctx.logger.info(
+            tempGuilds.map((guild) => `追踪到来自群组${guild.platform}:${guild.guildId}的用户${guild.players.map((player) => `[${player.nickName ?? ""}(${player.steamId})]`).join("、")}的尚未播报过的最新比赛 ${match.id}。`).join("")
+          );
+        });
       }
-      if (scanningMatches.length > 0) {
-        const pendingMatch = scanningMatches[0];
+      if (pendingMatches.length > 0) {
+        const pendingMatch = pendingMatches[0];
         try {
           let match;
           let queryLocal = await ctx.database.get("dt_previous_query_results", pendingMatch.matchId, ["data"]);
@@ -1481,13 +1491,11 @@ async function apply(ctx, config) {
             }
           }
           if (match.parsedDateTime || import_moment.default.unix(match.startDateTime).isBefore((0, import_moment.default)().subtract(1, "years"))) {
-            const commingMatches = scanningMatches.filter((item) => item.matchId == match.id);
-            const realCommingMatches = commingMatches.filter((commingMatch, index, self) => index === self.findIndex((t) => t.guildId === commingMatch.guildId && t.platform === commingMatch.platform));
-            let broadMatchMessage = "";
+            pendingMatches = pendingMatches.filter((item) => item.matchId != match.id);
             const img = await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */));
-            for (let comming of realCommingMatches) {
-              let commingSubscribedPlayers = subscribedPlayersInGuild.filter((item) => item.platform == comming.platform && item.guildId == comming.guildId);
-              let idsToFind = commingSubscribedPlayers.map((item) => item.steamId);
+            for (let commingGuild of pendingMatch.guilds) {
+              let broadMatchMessage = "";
+              let idsToFind = commingGuild.players.map((player) => player.steamId);
               let broadPlayers = match.players.filter((item) => idsToFind.includes(item.steamAccountId));
               for (let player of broadPlayers) {
                 let broadPlayerMessage = `${player.steamAccount.name}的${random.pick(HEROES_CHINESE[player.hero.id])}`;
@@ -1506,7 +1514,7 @@ async function apply(ctx, config) {
 KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${player.kills}/${player.deaths}/${player.assists}]，GPM/XPM：${player.goldPerMinute}/${player.experiencePerMinute}，补刀数：${player.numLastHits}/${player.numDenies}，伤害/塔伤：${player.heroDamage}/${player.towerDamage}，参战/参葬率：${(player.killContribution * 100).toFixed(2)}%/${(player.deathContribution * 100).toFixed(2)}%`;
                 broadMatchMessage += broadPlayerMessage + "\n";
               }
-              await ctx.broadcast([`${comming.platform}:${comming.guildId}`], broadMatchMessage + img);
+              await ctx.broadcast([`${commingGuild.platform}:${commingGuild.guildId}`], broadMatchMessage + img);
             }
             ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
             ctx.database.create("dt_sended_match_id", { matchId: match.id, sendTime: /* @__PURE__ */ new Date() });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "",
-  "version": "1.1.2-beta.3",
+  "version": "1.1.2-beta.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/template/guild_member/guild_member.ejs

@@ -28,7 +28,7 @@
 
             .player.full .info {
                 display: grid;
-                grid-template-columns: repeat(2, 64px) auto 64px;
+                grid-template-columns: 64px auto 64px;
                 align-items: center;
                 /* border-bottom: #fff 1px solid; */
                 position: relative;
@@ -37,15 +37,46 @@
             .player.full .info > .name {
                 line-height: 20px;
                 display: grid;
-                grid-template-rows: 24px repeat(2, 20px);
+                grid-template-rows: 24px 18px 14px;
+                grid-template-columns: repeat(2, 1fr);
+                gap: 2px;
                 text-align: center;
+                padding: 2px 0;
             }
             .player.full .info > .name > .nick_name {
-                font-size: 18px;
+                font-size: 20px;
                 line-height: 24px;
+                grid-column: 1/-1;
             }
-            .player.full .info > .name >p{
-                display: flex;justify-content: space-around;
+            .player.full .info > .name > .name {
+                line-height: 18px;
+            }
+            .player.full .info > .name > .id {
+                font-size: 12px;
+                line-height: 14px;
+                color: #888;
+            }
+            .player.full .info > .name > p {
+                display: flex;
+                justify-content: space-around;
+            }
+            .player.full .info > .avatar.steam {
+                position: relative;
+            }
+            .player.full .info > .avatar.steam > .rank {
+                top: 0;
+                right: 0;
+                width: 32px;
+                position: absolute;
+            }
+            .player.full .info > .avatar.steam > p {
+                z-index: 1;
+                position: absolute;
+                bottom: 35px;
+                left: 50%;
+                width: 32px;
+                text-align: center;
+                font-size: 4px;
             }
             .player.full .last_match_date {
                 position: relative;
@@ -95,26 +126,31 @@
         </style>
     </head>
     <body>
-        <% const users = data; %>
+        <% const users = data;
+            users.forEach(player=>{ 
+                player.rank = {
+                    medal: parseInt(player.steamAccount.seasonRank?.toString().split("")[0] ?? 0),
+                    star: parseInt(player.steamAccount.seasonRank?.toString().split("")[1] ?? 0),
+                    leaderboard: player.steamAccount.seasonLeaderboardRank,
+                    inTop100: player.steamAccount.seasonLeaderboardRank ? (player.steamAccount.seasonLeaderboardRank <= 10 ? "8c" : player.steamAccount.seasonLeaderboardRank <= 100 ? "8b" : undefined) : undefined,
+        }});%>
         <%-users.map(user=>`
         <div class="player full">
             <div class="info">
                 <img class="avatar user" src="${user?.user?.avatar}" alt="" />
-                <img class="avatar steam" src="${user.steamAccount.avatar}" alt="" />
                 <div class="name">
-                    <p class="nick_name">
-                        <span>${user.nickName}</span>
-                    </p>
-                    <p class="user">
-                        <span>账号：${user.userId}</span>
-                        <span>用户名：${user?.user?.name}</span>
-                    </p>
-                    <p class="steam">
-                        <span>SteamID：${user.steamId}</span>
-                        <span>Steam用户名：${user.steamAccount.name}</span>
-                    </p>
+                    <span class="nick_name">${user.nickName}</span>
+                    <span class="user name">${user.nick || user.user?.name}</span>
+                    <span class="steam name">${user.steamAccount.name}</span>
+                    <span class="user id">${user.userId}</span>
+                    <span class="steam id">${user.steamId}</span>
+                </div>
+                <div class="avatar steam">
+                    <p>${user.steamAccount.seasonLeaderboardRank??""}</p>
+                    <img class="rank" src="${utils.getImageUrl('star_' + player.rank.star)}" alt="" />
+                    <img class="rank" src="${utils.getImageUrl('medal_' +(player.inTop100??player.rank.medal))}" alt="" />
+                    <img class="avatar" src="${user.steamAccount.avatar}" alt="" />
                 </div>
-                <img class="rank" src="${utils.getImageUrl("medal_"+((!user.steamAccount.seasonRank)?0:Math.floor(user.steamAccount.seasonRank/10)))}" alt="" />
             </div>
             ${users.length<10?
             `<div class="last10match">