@sjtdev/koishi-plugin-dota2tracker 1.1.1 → 1.1.2-beta.1

package/lib/index.js

@@ -251,7 +251,7 @@ function PLAYER_INFO_WITH_25_MATCHES(steamAccountId) {
 			rank
       lobbyType
       gameMode
-			endDateTime
+			startDateTime
 			durationSeconds
 			didRadiantWin
 			topLaneOutcome
@@ -302,6 +302,37 @@ function PLAYER_EXTRA_INFO(steamAccountId, matchCount, totalHeroCount) {
       `;
 }
 __name(PLAYER_EXTRA_INFO, "PLAYER_EXTRA_INFO");
+function PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD(steamAccountIds) {
+  return `{
+    players(steamAccountIds: [${steamAccountIds.join()}]) {
+      steamAccount {
+        id
+        avatar
+        name
+        seasonRank
+      }
+      matches(request: {take: 10}) {
+        didRadiantWin
+        startDateTime
+        players {
+          isRadiant
+          kills
+          deaths
+          assists
+          steamAccount {
+            id
+          }
+          hero {
+            shortName
+          }
+          imp
+        }
+      }
+    }
+  }
+  `;
+}
+__name(PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD, "PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD");
 function CURRENT_GAMEVERSION() {
   return `
     {
@@ -745,6 +776,7 @@ __name(playerisValid, "playerisValid");
 
 // src/index.ts
 var import_fs2 = __toESM(require("fs"));
+var import_path2 = __toESM(require("path"));
 var import_moment = __toESM(require("moment"));
 var dotaconstants3 = __toESM(require("dotaconstants"));
 
@@ -1017,7 +1049,6 @@ var dotaconstants_add_default = {
 // src/index.ts
 var import_koishi2 = require("koishi");
 var ejs = __toESM(require("ejs"));
-var import_path2 = __toESM(require("path"));
 var name = "dota2tracker";
 var usage = "DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑定），以及一系列查询功能。";
 var inject = ["database", "puppeteer", "cron"];
@@ -1080,6 +1111,10 @@ async function apply(ctx, config) {
         session.send(`绑定失败，${verifyRes.reason}`);
         return;
       }
+      if (!/^(?:.{1,20})?$/.test(nick_name ?? "")) {
+        session.send("别名过长，请限制在20个字符以内。（也可以留空）");
+        return;
+      }
       session.send(
         `
                     绑定成功，
@@ -1108,6 +1143,10 @@ async function apply(ctx, config) {
           session.send("请输入你的别名。");
           return;
         }
+        if (!/^.{1,20}$/.test(nick_name ?? "")) {
+          session.send("别名过长，请限制在20个字符以内。");
+          return;
+        }
         sessionPlayer.nickName = nick_name;
         await ctx.database.set("dt_subscribed_players", sessionPlayer.id, { nickName: sessionPlayer.nickName });
         session.send(`改名成功，现在你叫${nick_name}了。`);
@@ -1118,8 +1157,31 @@ async function apply(ctx, config) {
   });
   ctx.command("查询群友", "查询本群已绑定的玩家").action(async ({ session }) => {
     if (session.guild) {
-      let queryRes = await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id });
-      session.send("开发中，未来此功能会重写。\n" + queryRes.map((item) => `${item.nickName ?? ""}，ID：${item.userId}，SteamID：${item.steamId}`).join("\n"));
+      const subscribedPlayers = await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.platform });
+      if (!subscribedPlayers.length) {
+        session.send("本群尚无绑定玩家。");
+        return;
+      }
+      if (subscribedPlayers.length <= 20) {
+        try {
+          const memberList = await session.bot.getGuildMemberList(session.event.guild.id);
+          ctx.logger.info(JSON.stringify(memberList.data));
+          let queryRes = await query(PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD(subscribedPlayers.map((player) => player.steamId)));
+          if (queryRes.status == 200) {
+            const users = subscribedPlayers.map((subscribedPlayer) => {
+              const queryPlayer = queryRes.data.data.players.find((player) => player.steamAccount.id == subscribedPlayer.steamId);
+              const queryMember = memberList.data.find((member) => member.user?.id == subscribedPlayer.userId);
+              return { ...subscribedPlayer, ...queryPlayer, ...queryMember };
+            });
+            console.log(users);
+            session.send(await ctx.puppeteer.render(genImageHTML(users, "guild_member" /* GuildMember */, "guild_member" /* GuildMember */)));
+          } else
+            throw 0;
+        } catch (error) {
+          console.error(error);
+          session.send("查询群友失败。");
+        }
+      }
     }
   });
   async function queryAndDisplayMatch(session, matchId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "",
-  "version": "1.1.1",
+  "version": "1.1.2-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -27,7 +27,6 @@
   ],
   "dependencies": {
     "axios": "^1.6.8",
-    "cheerio": "^1.0.0-rc.12",
     "dotaconstants": "^8.5.0",
     "ejs": "^3.1.10",
     "moment": "^2.30.1"

package/readme.md

@@ -41,7 +41,7 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 
 ### 其他问题
 已知问题：当本插件更新版本后，查询已经查询过的比赛数据可能查询失败。  
-* 原因：插件的缓存功能，查询过的比赛数据会缓存至本地以节省API调用次数与服务器流量，再次查询时优先调用本地数据也会提高处理速度。当插件更新时，有可能会新增数据的处理或API查询字段，导致旧的缓存数据缺失部分属性引发生成时报错。（播报比赛战报应该不会有这个问题）  
+* 原因：插件的缓存功能，查询过的比赛数据会缓存至本地以节省API调用次数与服务器流量，再次查询时优先调用本地数据也会提高处理速度。当插件更新后若新增数据的处理或API查询字段，会导致旧的缓存内缺失部分数据引发生成时报错。（播报比赛战报应该不会有这个问题）  
 * 解决：目前在生成失败时会清除缓存，再查询一次就好了。  
 
 ## 灵感来源&鸣谢

package/template/guild_member/guild_member.ejs

@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
+        <title>Document</title>
+        <style>
+            html,
+            body {
+                background-color: black;
+                color: white;
+                width: 800px;
+            }
+            p {
+                margin: 0;
+            }
+            img {
+                width: 100%;
+                vertical-align: middle;
+            }
+            .player.full {
+                width: 100%;
+                border: 1px #fff solid;
+                border-radius: 5px;
+                box-sizing: border-box;
+            }
+
+            .player.full .info {
+                display: grid;
+                grid-template-columns: repeat(2, 64px) auto 64px;
+                align-items: center;
+                /* border-bottom: #fff 1px solid; */
+                position: relative;
+                padding-bottom: 1px;
+            }
+            .player.full .info > .name {
+                line-height: 20px;
+                display: grid;
+                grid-template-rows: 24px repeat(2, 20px);
+                text-align: center;
+            }
+            .player.full .info > .name > .nick_name {
+                font-size: 18px;
+                line-height: 24px;
+            }.player.full .info > .name >p{display: flex;}
+            .player.full .last_match_date {
+                position: relative;
+                padding-top: 1px;
+            }
+            .player.full .last_match_date::before {
+                content: "";
+                position: absolute;
+                left: 50%;
+                transform: translateX(-50%);
+                top: 0;
+                width: 80%;
+                height: 1px;
+                background-color: #666;
+            }
+
+            .player.full .last10match {
+                display: grid;
+                gap: 5px;
+                grid-template-columns: repeat(5, 1fr);
+                grid-template-rows: repeat(2, 1fr);
+                align-items: center;
+                justify-items: center;
+                margin: 4px;
+            }
+
+            .player.full .last10match .match {
+                width: 150px;
+                height: 36px;
+                border-radius: 36px;
+                padding: 2px;
+                display: flex;
+                box-sizing: border-box;
+                align-items: center;
+                flex-direction: row;
+                justify-content: space-around;
+            }
+            .player.full .last10match .match.win {
+                background-color: #006400;
+            }
+            .player.full .last10match .match.lose {
+                background-color: #8b0000;
+            }
+            .player.full .last10match img {
+                width: 32px;
+            }
+        </style>
+    </head>
+    <body>
+        <%- const users = data;
+        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>
+                </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">
+                ${user.matches.map(match=>{
+                    let playerInMatch = match.players.find(player=>player.steamAccount.id==user.steamId)
+                    return `
+                <div class="match ${match.didRadiantWin==playerInMatch.isRadiant?"win":"lose"}">
+                    <img src="${utils.getImageUrl(playerInMatch.hero.shortName),ImageType.HeroIcons}" alt="" />
+                    <span>${playerInMatch.kills}/${playerInMatch.deaths}/${playerInMatch.assists}</span>
+                    <span>${(playerInMatch.imp > 0 ? "+" : "") + playerInMatch.imp}</span>
+                </div>`}).join("")}
+            </div>`:0;}
+            <div class="last_match_date">最近游戏: ${user.matches[0].startDateTime}</div>
+        </div>`).join("")
+        %>
+    </body>
+</html>

package/template/player/player_1.ejs

@@ -501,7 +501,7 @@
                         <th>英雄</th>
                         <th>KDA(参战率)</th>
                         <th>对线</th>
-                        <th>结束于</th>
+                        <th>时间</th>
                         <th>时长</th>
                         <th>表现</th>
                         <th>段位</th>
@@ -522,7 +522,7 @@
                             <p>${match.players[0].kills}/${match.players[0].deaths}/${match.players[0].assists}</p>
                         </td>
                         <td><div class="player_lane ${match.laneResult}">${laneSVG[match.laneResult]}</div></td>
-                        <td style="line-height: 20px">${moment(new Date(match.endDateTime * 1000)).format("YYYY-MM-DD HH:mm:ss").slice(2)}</td>
+                        <td style="line-height: 20px">${moment(new Date(match.startDateTime * 1000)).format("YYYY-MM-DD HH:mm:ss").slice(2)}</td>
                         <td>${utils.sec2time(match.durationSeconds)}</td>
                         <td>${(match.players[0].imp > 0 ? "+" : "") + match.players[0].imp}</td>
                         <td><img class="medal" src="${utils.getImageUrl("medal_" + match.rank.toString().split("")[0])}" style="width: 100%" /></td>