@sjtdev/koishi-plugin-dota2tracker 1.1.3 → 1.1.5-beta.1

package/lib/index.js

@@ -52,6 +52,7 @@ __export(utils_exports, {
   readDirectoryFilesSync: () => readDirectoryFilesSync,
   roundToDecimalPlaces: () => roundToDecimalPlaces,
   sec2time: () => sec2time,
+  testGetHtml: () => testGetHtml,
   winRateColor: () => winRateColor
 });
 var import_axios = __toESM(require("axios"));
@@ -493,6 +494,10 @@ async function query(query_str) {
   });
 }
 __name(query, "query");
+async function testGetHtml(URL) {
+  return await import_axios.default.get(URL);
+}
+__name(testGetHtml, "testGetHtml");
 var ImageType = /* @__PURE__ */ ((ImageType2) => {
   ImageType2["Icons"] = "icons";
   ImageType2["Heroes"] = "heroes";
@@ -1342,6 +1347,12 @@ async function apply(ctx, config) {
               filteredDotaPlus[hero2.hero.id].matchCount = hero2.matchCount;
             }
           });
+          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" : void 0 : void 0
+          };
           player.dotaPlus = Object.values(filteredDotaPlus);
           player.dotaPlus.sort((a, b) => {
             if (b.level !== a.level) {
@@ -1352,7 +1363,14 @@ async function apply(ctx, config) {
           player.heroesPerformanceTop10 = playerExtra.heroesPerformance.slice(0, 10);
         } else
           throw 0;
-        player.genHero = hero ? true : false;
+        if (hero) {
+          const { matchCount, winCount, imp } = player.heroesPerformanceTop10[0];
+          player.matchCount = matchCount;
+          player.winCount = winCount;
+          player.performance.imp = imp;
+          player.dotaPlus = player.dotaPlus.filter((dpHero) => dpHero.heroId == hero.id);
+        }
+        player.genHero = hero;
         session.send(await ctx.puppeteer.render(genImageHTML(player, config.template_player, "player" /* Player */)));
       } catch (error) {
         ctx.logger.error(error);
@@ -1457,6 +1475,34 @@ async function apply(ctx, config) {
     return heroes3.find((hero) => hero.names_cn.includes(input) || hero.shortName === input.toLowerCase() || hero.id == input);
   }
   __name(findingHero, "findingHero");
+  ctx.command("7.36 <input_data>", "查询7.36改动").usage("可查询英雄改动并生成图片返回").example("7.36 小松许").action(async ({ session }, input_data) => {
+    if (input_data) {
+      const page = await ctx.puppeteer.page();
+      await page.goto("https://www.dota2.com/patches/7.36");
+      await page.waitForSelector("body > div:nth-of-type(3) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2) > div:nth-of-type(5) > div:nth-of-type(2) > div:nth-of-type(1)");
+      const hero = findingHero(input_data);
+      await page.evaluate((hero2) => {
+        const divs = document.querySelectorAll("body > div:nth-of-type(3) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2) > div:nth-of-type(5) > div:nth-of-type(2) > div");
+        for (const div of divs) {
+          const firstChild = div.firstElementChild;
+          if (firstChild && firstChild.tagName === "A" && firstChild.getAttribute("href") === "/hero/" + hero2.shortName) {
+            div.classList.add("selector");
+          }
+        }
+        return null;
+      }, hero);
+      const testE = await page.$("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div.selector");
+      const res = await testE.screenshot();
+      const base64String = Buffer.from(res).toString("base64");
+      const imgTag = `<img src="data:image/png;base64,${base64String}" alt="Image" />`;
+      if (process.env.NODE_ENV === "development")
+        import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/temp.png", res);
+      session.send(imgTag);
+    } else
+      session.send("https://www.dota2.com/patches/7.36");
+  });
+  ctx.command("test <input_data>").action(async ({ session }, input_data) => {
+  });
   ctx.on("ready", async () => {
     const tables = await ctx.database.tables;
     if (!("dt_subscribed_guilds" in tables)) {
@@ -1562,7 +1608,7 @@ async function apply(ctx, config) {
             })
           )
         );
-        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 lastMatches = queryRes.data.data.players.map((player) => player.matches[0]).filter((item, index, self) => index === self.findIndex((t) => t.id === item.id)).filter((match) => import_moment.default.unix(match.startDateTime).isAfter((0, import_moment.default)().subtract(1, "days"))).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 = [];

package/package.json

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

package/readme.md

@@ -25,8 +25,8 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 * <input type="checkbox" checked>`取消绑定`
 * <input type="checkbox" checked>`改名 <新玩家别名>`
 ##### 查询
-* <input type="checkbox" checked>`查询玩家 [SteamID|别名]`  
-  返回一张图片，包含玩家各类信息。（缺省参数时并且调用者已绑定将自查）
+* <input type="checkbox" checked>`查询玩家 [SteamID|别名] [<--hero|-o> <英雄ID|英雄名|英雄常用别名>]`  
+  返回一张图片，包含玩家各类信息。（缺省参数时并且调用者已绑定将自查）（输入--hero或-o并跟上查询英雄的参数时，将查询玩家指定英雄）
 * <input type="checkbox" checked>`查询比赛 <比赛ID>`  
   返回一张图片，包含比赛对战信息。
 * <input type="checkbox" checked>`查询最近比赛 [SteamID|别名]`  

package/template/player/player_1.ejs

@@ -410,12 +410,10 @@
                 <%- `
                 <div class="avatar"><img src="${player.steamAccount?.avatar}" alt="" /></div>
                 <div class="info">
-                    <p class="name">${player.steamAccount.name}${player.guildMember ? ` <span class="guild ${guildLevel(player.guildMember.guild.currentPercentile)}">[${player.guildMember.guild.tag}]</span></p>` : ""}
-                    <p class="matches"><span>场次：${player.matchCount}（<span class="win">${player.winCount}</span>/<span class="lose">${player.matchCount - player.winCount}</span>）</span>胜率：<span style="color:${utils.winRateColor(
-                    player.winCount / player.matchCount
-                )};">${((player.winCount / player.matchCount) * 100).toFixed(2)}%</span></p>
+                    <p class="name">${player.steamAccount.name}${player.guildMember ? ` <span class="guild ${guildLevel(player.guildMember.guild.currentPercentile)}">[${player.guildMember.guild.tag}]</span>${player.genHero?` >${player.genHero.names_cn[0]}<`:""}</p>` : ""}
+                    <p class="matches"><span>场次：${player.matchCount}（<span class="win">${player.winCount}</span>/<span class="lose">${player.matchCount - player.winCount}</span>）</span>胜率：<span style="color:${utils.winRateColor(player.winCount / player.matchCount)};">${((player.winCount / player.matchCount) * 100).toFixed(2)}%</span></p>
                     <p class="matches"><span>最近25场：<span class="win">${nearWinCount}</span>/<span class="lose">${nearMatchCount - nearWinCount}</span></span><span>胜率：<span style="color:${utils.winRateColor(nearWinCount / nearMatchCount)};">${(
-                    (nearWinCount / nearMatchCount) * 100).toFixed(2)}%</span></span><span>评分：${player.performance.imp}</span></span></p>
+                    (nearWinCount / nearMatchCount) * 100).toFixed(2)}%</span></span><span>评分：${(player.performance.imp > 0 ? "+" : "") + player.performance.imp}</span></span></p>
                     <p class="matches"><span>对线：<span class="victory">${outcomeCounts.victory + outcomeCounts.stomp}(<span class="stomp">${outcomeCounts.stomp}</span>)</span>-<span class="tie">${outcomeCounts.tie}</span>-<span class="fail">${
                     outcomeCounts.fail + outcomeCounts.stomped
                 }(<span class="stomped">${outcomeCounts.stomped}</span>)</span></span><span>线优：<span style="color:${utils.winRateColor(
@@ -423,23 +421,17 @@
                 )};">${(((outcomeCounts.victory + outcomeCounts.stomp) / (outcomeCounts.victory + outcomeCounts.stomp + outcomeCounts.fail + outcomeCounts.stomped)) * 100).toFixed(2)}%</span></span></p>
                 </div>
                 <div class="rank">
-                    <img class="medal" src="${utils.getImageUrl(
-                        "medal_" +
-                            ((player.steamAccount.seasonLeaderboardRank
-                                ? player.steamAccount.seasonLeaderboardRank <= 100
-                                    ? player.steamAccount.seasonLeaderboardRank <= 10
-                                        ? "8c"
-                                        : "8b"
-                                    : player.steamAccount.seasonRank?.toString().split("")[0]
-                                : player.steamAccount.seasonRank?.toString().split("")[0]) ?? "0")
-                    )}" alt="" />
-                    <img class="star" src="${utils.getImageUrl("star_" + (player.steamAccount.seasonRank?.toString().split("")[1] ?? "0"))}" alt="" />
+                    <img class="medal" src="${utils.getImageUrl('medal_' +(player.inTop100??player.rank.medal))}" alt="" />
+                    <img class="star" src="${utils.getImageUrl('star_' + player.rank.star)}" alt="" />
                     <p>${player.steamAccount.seasonLeaderboardRank ?? ""}</p>    
                 </div>` %>
             </div>
             <div class="hero_winrate">
                 <div class="heroes">
-                    <p class="tip row total">全期场次前十的英雄：</p>
+                    <%- !player.genHero ?
+                    `<p class="tip row total">全期场次前十的英雄：</p>`:
+                    `<p class="tip row total">全期场次：</p>`
+                    %>
                     <span class="tip">英雄</span>
                     <span class="tip" style="margin: 0 4px">场次</span>
                     <span class="tip" style="margin: 0 4px">胜率</span>
@@ -454,7 +446,10 @@
                     <span class="imp">${(hero.imp > 0 ? "+" : "") + hero.imp}</span>
                     <span class="win" style="${hero.winCount == 0 ? "visibility:hidden;" : ""}width: ${hero.winCount * pixelOfPerMatchInTotal}px">${hero.winCount}</span>
                     <span class="lose" style="${hero.matchCount - hero.winCount == 0 ? "visibility:hidden;" : ""}width: ${(hero.matchCount - hero.winCount) * pixelOfPerMatchInTotal}px">${hero.matchCount - hero.winCount}</span>`).join("") %>
-                    <p class="tip row near">近期使用场次大于1的英雄：</p>
+                    <%- !player.genHero ?
+                    `<p class="tip row near">近期使用场次大于1的英雄：</p>`:
+                    `<p class="tip row total">近25场：</p>`
+                    %>
                     <%- player.heroesPerformance
                     .filter((hero) => hero.matchCount > 1)
                     .map((hero, index) => `
@@ -530,14 +525,13 @@
                 </tbody>
             </table>
             <div class="plus">
-                <%- !player.genHero?
-                player.dotaPlus.map((hero) => `
+                <%- player.dotaPlus.map((hero) => `
                 <div class="hero">
                     <img src="${utils.getImageUrl(hero.shortName, ImageType.Heroes)}" alt="" />
                     <div class="level"><img src="${utils.getImageUrl("hero_badge_" + Math.ceil((hero.level + 1) / 6))}" alt="" /><span>${hero.level}</span></div>
                     <span>${((hero.winCount / hero.matchCount) * 100).toFixed(2)}%</span>
                     <span>${hero.matchCount}</span>
-                </div>`).join(""):"" %>
+                </div>`).join("") %>
             </div>
         </div>
     </body>