@sjtdev/koishi-plugin-dota2tracker 1.1.5 → 1.1.6-hotfix

package/lib/index.js

@@ -525,11 +525,21 @@ function getFormattedMatchData(match) {
   ["radiant", "dire"].forEach((team) => {
     match[team] = { killsCount: match[team + "Kills"]?.reduce((acc, cva) => acc + cva, 0) ?? 0, damageReceived: 0, heroDamage: 0, networth: 0, experience: 0 };
   });
+  if (!match.parsedDateTime) {
+    match.players.reduce((acc, player) => {
+      if (player.isRadiant) {
+        acc.radiant.killsCount += player.kills;
+      } else {
+        acc.dire.killsCount += player.kills;
+      }
+      return acc;
+    }, match);
+  }
   match.party = {};
   let party_index = 0;
   const party_mark = ["I", "II", "III", "IV"];
   let heroOrderList = {};
-  for (let hero of match.pickBans) {
+  for (let hero of match.pickBans ?? []) {
     if (hero.isPick)
       heroOrderList[hero.heroId] = hero.order;
   }
@@ -561,27 +571,29 @@ function getFormattedMatchData(match) {
     };
     player.killContribution = (player.kills + player.assists) / match[player.team].killsCount;
     player.deathContribution = player.deaths / match[player.team === "radiant" ? "dire" : player.team].killsCount;
-    player.damageReceived = player.stats?.heroDamageReport?.receivedTotal.physicalDamage + player.stats?.heroDamageReport?.receivedTotal.magicalDamage + player.stats?.heroDamageReport?.receivedTotal.pureDamage;
+    player.damageReceived = (player.stats?.heroDamageReport?.receivedTotal?.physicalDamage ?? 0) + (player.stats?.heroDamageReport?.receivedTotal?.magicalDamage ?? 0) + (player.stats?.heroDamageReport?.receivedTotal?.pureDamage ?? 0);
     match[player.team].heroDamage = (match[player.team].heroDamage ?? 0) + player.heroDamage;
     match[player.team].damageReceived = (match[player.team].damageReceived ?? 0) + player.damageReceived;
     match[player.team].networth += player.networth;
     match[player.team].experience += Math.floor(player.experiencePerMinute / 60 * match.durationSeconds);
     player.titles = [];
     player.mvpScore = // 计算MVP分数
-    player.kills * 5 + player.assists * 3 + player.stats.heroDamageReport.dealtTotal.stunDuration / 100 * 0.1 + player.stats.heroDamageReport.dealtTotal.disableDuration / 100 * 0.05 + player.stats.heroDamageReport.dealtTotal.slowDuration / 100 * 0.025 + player.heroDamage * 1e-3 + player.towerDamage * 0.01 + player.heroHealing * 2e-3 + player.imp * 0.25;
+    player.kills * 5 + player.assists * 3 + (player.stats.heroDamageReport?.dealtTotal.stunDuration ?? 0) / 100 * 0.1 + (player.stats.heroDamageReport?.dealtTotal.disableDuration ?? 0) / 100 * 0.05 + (player.stats.heroDamageReport?.dealtTotal.slowDuration ?? 0) / 100 * 0.025 + player.heroDamage * 1e-3 + player.towerDamage * 0.01 + player.heroHealing * 2e-3 + player.imp * 0.25;
     player.order = heroOrderList[player.hero.id];
     if (player.partyId != null) {
       if (!match.party[player.partyId])
         match.party[player.partyId] = party_mark[party_index++];
     }
-    const maxStackCountsByAbilityOrItem = player.stats.matchPlayerBuffEvent.reduce((acc, event) => {
-      const key = event.abilityId !== null ? `ability-${event.abilityId}` : `item-${event.itemId}`;
-      if (!acc[key] || event.stackCount > acc[key].stackCount) {
-        acc[key] = event;
-      }
-      return acc;
-    }, {});
-    player.stats.matchPlayerBuffEvent.splice(0, player.stats.matchPlayerBuffEvent.length, ...Object.values(maxStackCountsByAbilityOrItem));
+    if (match.parsedDateTime) {
+      const maxStackCountsByAbilityOrItem = player.stats.matchPlayerBuffEvent.reduce((acc, event) => {
+        const key = event.abilityId !== null ? `ability-${event.abilityId}` : `item-${event.itemId}`;
+        if (!acc[key] || event.stackCount > acc[key].stackCount) {
+          acc[key] = event;
+        }
+        return acc;
+      }, {});
+      player.stats.matchPlayerBuffEvent.splice(0, player.stats.matchPlayerBuffEvent.length, ...Object.values(maxStackCountsByAbilityOrItem));
+    }
     switch (player.lane) {
       case "SAFE_LANE":
         player.laneResult = laneResult[player.isRadiant ? "bottom" : "top"][player.team];
@@ -726,18 +738,20 @@ function getFormattedMatchData(match) {
   ).titles.push({ name: "魂", color: "#6cf" });
   findMaxByProperty("networth").titles.push({ name: "富", color: "#FFD700" });
   findMaxByProperty("experiencePerMinute").titles.push({ name: "睿", color: "#8888FF" });
-  match.players.reduce(
-    (max, player) => player.stats.heroDamageReport.dealtTotal.stunDuration + player.stats.heroDamageReport.dealtTotal.disableDuration / 2 + player.stats.heroDamageReport.dealtTotal.slowDuration / 4 > max.stats.heroDamageReport.dealtTotal.stunDuration + max.stats.heroDamageReport.dealtTotal.disableDuration / 2 + max.stats.heroDamageReport.dealtTotal.slowDuration / 4 ? player : max
-  ).titles.push({ name: "控", color: "#FF00FF" });
+  if (match.parsedDateTime) {
+    match.players.reduce(
+      (max, player) => player.stats.heroDamageReport.dealtTotal.stunDuration + player.stats.heroDamageReport.dealtTotal.disableDuration / 2 + player.stats.heroDamageReport.dealtTotal.slowDuration / 4 > max.stats.heroDamageReport.dealtTotal.stunDuration + max.stats.heroDamageReport.dealtTotal.disableDuration / 2 + max.stats.heroDamageReport.dealtTotal.slowDuration / 4 ? player : max
+    ).titles.push({ name: "控", color: "#FF00FF" });
+    match.players.reduce(
+      (max, player) => player.stats.heroDamageReport.receivedTotal.physicalDamage + player.stats.heroDamageReport.receivedTotal.magicalDamage + player.stats.heroDamageReport.receivedTotal.pureDamage > max.stats.heroDamageReport.receivedTotal.physicalDamage + max.stats.heroDamageReport.receivedTotal.magicalDamage + max.stats.heroDamageReport.receivedTotal.pureDamage ? player : max
+    ).titles.push({ name: "耐", color: "#84A1C7" });
+  }
   findMaxByProperty("heroDamage").titles.push({ name: "爆", color: "#CC0088" });
   findMaxByProperty("kills", "heroDamage").titles.push({ name: "破", color: "#DD0000" });
   findMaxByProperty("deaths", "networth", void 0, void 0, "min" /* Min */).titles.push({ name: "鬼", color: "#CCCCCC" });
   findMaxByProperty("assists", "heroDamage").titles.push({ name: "助", color: "#006400" });
   findMaxByProperty("towerDamage", "heroDamage").titles.push({ name: "拆", color: "#FEDCBA" });
   findMaxByProperty("heroHealing").titles.push({ name: "奶", color: "#00FF00" });
-  match.players.reduce(
-    (max, player) => player.stats.heroDamageReport.receivedTotal.physicalDamage + player.stats.heroDamageReport.receivedTotal.magicalDamage + player.stats.heroDamageReport.receivedTotal.pureDamage > max.stats.heroDamageReport.receivedTotal.physicalDamage + max.stats.heroDamageReport.receivedTotal.magicalDamage + max.stats.heroDamageReport.receivedTotal.pureDamage ? player : max
-  ).titles.push({ name: "耐", color: "#84A1C7" });
   match.players.reduce((lowest, player) => {
     const currentContribution = (player.kills + player.assists) / match[player.team].KillsCount;
     const lowestContribution = (lowest.kills + lowest.assists) / match[lowest.team].KillsCount;
@@ -1249,9 +1263,10 @@ async function apply(ctx, config) {
           match = getFormattedMatchData(queryRes.data.data.match);
         }
       }
-      if (match && match.parsedDateTime) {
+      if (match && (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(1, "hours")))) {
         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() }]);
+        if (match.parsedDateTime)
+          ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
       } else {
         pendingMatches.push({ matchId, guilds: [{ platform: session.event.platform, guildId: session.event.guild.id, players: [] }] });
         session.send("比赛尚未解析，将在解析完成后发布。");
@@ -1477,7 +1492,7 @@ async function apply(ctx, config) {
       });
     });
     let heroes3 = Array.from(mergedMap.values());
-    return heroes3.find((hero) => hero.names_cn.includes(input) || hero.shortName === input.toLowerCase() || hero.id == input);
+    return heroes3.find((hero) => hero.names_cn.some((cn) => cn.toLowerCase() == input.toLowerCase()) || hero.shortName === input.toLowerCase() || hero.id == input);
   }
   __name(findingHero, "findingHero");
   ctx.command("7.36 <input_data>", "查询7.36改动").option("refresh", "-r 重新获取数据").usage("可查询英雄改动并生成图片返回").example("7.36 小松许").action(async ({ session, options }, input_data) => {
@@ -1574,9 +1589,6 @@ async function apply(ctx, config) {
     } else
       session.send("https://www.dota2.com/patches/7.36");
   });
-  ctx.command("test <input_data>").option("a", "a").action(async ({ session, options }, input_data) => {
-    console.log((await ctx.database.get("dt_7_36", [0]))[0].data);
-  });
   ctx.on("ready", async () => {
     const tables = await ctx.database.tables;
     if (!("dt_subscribed_guilds" in tables)) {
@@ -1713,10 +1725,10 @@ async function apply(ctx, config) {
           } else {
             let queryRes = await query(MATCH_INFO(pendingMatch.matchId));
             if (queryRes.status == 200) {
-              match = queryRes.data.data.match.parsedDateTime ? getFormattedMatchData(queryRes.data.data.match) : queryRes.data.data.match;
+              match = getFormattedMatchData(queryRes.data.data.match);
             }
           }
-          if (match.parsedDateTime || import_moment.default.unix(match.startDateTime).isBefore((0, import_moment.default)().subtract(1, "years"))) {
+          if (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(1, "hours"))) {
             pendingMatches = pendingMatches.filter((item) => item.matchId != match.id);
             const img = await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */));
             for (let commingGuild of pendingMatch.guilds) {
@@ -1743,7 +1755,8 @@ KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${
               await ctx.broadcast([`${commingGuild.platform}:${commingGuild.guildId}`], broadMatchMessage + img);
               ctx.logger.info(`已解析${match.id}并发布于${commingGuild.platform}:${commingGuild.guildId}。`);
             }
-            ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
+            if (match.parsedDateTime)
+              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() });
           } else
             ctx.logger.info("比赛 %d 尚未解析完成，继续等待。", match.id);
@@ -1769,7 +1782,7 @@ function genImageHTML(data, template, type) {
     moment: import_moment.default
   };
   let result = "";
-  ejs.renderFile(templatePath, templateData, (err, html) => {
+  ejs.renderFile(templatePath, templateData, { strict: false }, (err, html) => {
     if (err)
       throw err;
     else

package/package.json

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

package/readme.md

@@ -17,27 +17,35 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 指令 <必填参数> [可选参数]
 ##### 订阅
 （bot仅向已订阅群组推送信息）
-* <input type="checkbox" checked>`订阅本群`
-* <input type="checkbox" checked>`取消订阅`
+* `订阅本群`
+* `取消订阅`
 ##### 绑定
 （bot会追踪每位绑定玩家的最新对局）
-* <input type="checkbox" checked>`绑定 <玩家SteamID> [玩家别名]`
-* <input type="checkbox" checked>`取消绑定`
-* <input type="checkbox" checked>`改名 <新玩家别名>`
+* `绑定 <玩家SteamID> [玩家别名]`
+* `取消绑定`
+* `改名 <新玩家别名>`
 ##### 查询
-* <input type="checkbox" checked>`查询玩家 [SteamID|别名] [<--hero|-o> <英雄ID|英雄名|英雄常用别名>]`  
+* `查询玩家 [SteamID|别名] [<--hero|-o> <英雄ID|英雄名|英雄常用别名>]`  
   返回一张图片，包含玩家各类信息。（缺省参数时并且调用者已绑定将自查）（输入--hero或-o并跟上查询英雄的参数时，将查询玩家指定英雄）
-* <input type="checkbox" checked>`查询比赛 <比赛ID>`  
+* `查询比赛 <比赛ID>`  
   返回一张图片，包含比赛对战信息。
-* <input type="checkbox" checked>`查询最近比赛 [SteamID|别名]`  
+* `查询最近比赛 [SteamID|别名]`  
   查询指定玩家的最近一场比赛，效果同上。（缺省参数时并且调用者已绑定将自查）
-* <input type="checkbox" checked>`查询英雄 <英雄ID|英雄名|英雄常用别名>`  
+* `查询英雄 <英雄ID|英雄名|英雄常用别名>`  
   返回一张图片，包含英雄属性与技能详情。（此处英雄名为中文名）
-* <input type="checkbox" checked><del>`查询英雄对战 <英雄ID|英雄名|英雄常用别名>`</del>  
+* <del>`查询英雄对战 <英雄ID|英雄名|英雄常用别名>`</del>  
   好像不是很实用
+* `7.36 [英雄ID|英雄名|英雄常用别名] [--refresh|-r]`  
+  查询官网7.36更新日志中指定英雄的改动信息  
+  无英雄参数时直接返回官网7.36更新日志网址  
+  首次使用时将缓存更新日志网页，若读取失败或出错，可添加`--refresh`或`-r`指令重新缓存  
+
+### 英雄ID|英雄名|英雄常用别名 列表
+[dotaconstants_add.json](https://github.com/sjtdev/koishi-plugin-dota2tracker/blob/master/src/dotaconstants_add.json#L102-L226)  
+补充或纠错请提issue
 
 ### 图片模板列表
-展示见[wiki](./wiki)  
+展示见[wiki](https://github.com/sjtdev/koishi-plugin-dota2tracker/wiki)  
 生成图片已使用ejs模板实现，所有模板都在[template]文件夹下，若是有大佬想自己设计模板欢迎联系我完善数据接口。（当前有很多在模板中后处理的数据，不是很友好）  
 
 ### 其他问题

package/template/match/match_1.ejs

@@ -718,7 +718,7 @@
                             <img alt="" src="${utils.getImageUrl(player.hero.shortName, ImageType.Heroes)}" />
                             <p class="party_line${player.partyId != null ? " party_" + match.party[player.partyId] : ""}"></p>
                             <p class="party_mark${player.partyId != null ? " party_" + match.party[player.partyId] : ""}"></p>
-                            <p class="position p${Math.floor(player.order / 4) + 1}">${player.isRandom ? "随机" : `第<span>${player.order == null ? "-" : player.order + 1}</span>手`}<br/>${d2a.position[player.position?.slice(-1)]}</p>
+                            <p class="position p${Math.floor(player.order / 4) + 1}">${player.isRandom ? "随机" : `第<span>${player.order == null ? "-" : player.order + 1}</span>手`}<br/>${d2a.position[player.position?.slice(-1)]??""}</p>
                             <p class="level">${player.level}</p>
                         </div>
                         <div class="player_info">
@@ -804,7 +804,7 @@
                                 <p>${buff.stackCount ?? ""}</p>
                             </div>`
                                 )
-                                .join("")}
+                                .join("")??""}
                         </section>
                         <section>
                             <div class="support_item"${player.supportItemsCount[30] > 0 ? "" : ' style="display:none"'}>
@@ -946,19 +946,19 @@
                         <section>英雄伤害：<span class="hero_damage">${player.heroDamage}</span></section>
                         <section>建筑伤害：<span class="building_damage">${player.towerDamage}</span></section>
                         <section>受到伤害(减免后)：<span class="tak">${
-                            player.stats?.heroDamageReport?.receivedTotal.physicalDamage + player.stats?.heroDamageReport?.receivedTotal.magicalDamage + player.stats?.heroDamageReport?.receivedTotal.pureDamage
+                            (player.stats?.heroDamageReport?.receivedTotal.physicalDamage??0) + (player.stats?.heroDamageReport?.receivedTotal.magicalDamage??0) + (player.stats?.heroDamageReport?.receivedTotal.pureDamage??0)
                         }</span></section>
                         <section>补刀：<span class="lh">${player.numLastHits}</span>/<span class="dn">${player.numDenies}</span></section>
                         <section>GPM/XPM：<span class="gpm">${player.goldPerMinute}</span>/<span class="xpm">${player.experiencePerMinute}</span></section>
                         <section>治疗量：<span class="heal">${player.heroHealing}</span></section>
-                        <section>控制时间：<span class="building_damage">${(player.stats?.heroDamageReport?.dealtTotal.stunDuration / 100).toFixed(2)}/${(player.stats?.heroDamageReport?.dealtTotal.slowDuration / 100).toFixed(2)}/${(
-                        player.stats?.heroDamageReport?.dealtTotal.disableDuration / 100
+                        <section>控制时间：<span class="building_damage">${((player.stats?.heroDamageReport?.dealtTotal.stunDuration ?? 0) / 100).toFixed(2)}/${((player.stats?.heroDamageReport?.dealtTotal.slowDuration ?? 0) / 100).toFixed(2)}/${(
+                        (player.stats?.heroDamageReport?.dealtTotal.disableDuration ?? 0) / 100
                     ).toFixed(2)}</span>s</section>
                     </div>
                 </div>`).join("") %>
             </div>
             <div class="ban_list">
-                <%- match.pickBans
+                <%- (match.pickBans??[])
                 .filter((hero) => !hero.isPick)
                 .map((hero) => `<div class="ban_hero"><img src="${utils.getImageUrl(/^npc_dota_hero_(?<name>.+)$/.exec(dotaconstants.heroes[hero.bannedHeroId].name)[1], ImageType.Heroes)}" alt="" /></div>`)
                 .join("") %>

package/template/match/match_2.ejs

@@ -396,11 +396,11 @@
                     (${(player.heroDamage / player.networth)?.toFixed(2)})
                 </p>
                 <p class="hero_damage">造成伤害：${player.heroDamage} (${(player.heroDamage/match[player.team].heroDamage*100).toFixed(2)}%)</p>
-                <p class="damage_received">承受伤害：${player.damageReceived} (${(player.damageReceived/match[player.team].damageReceived*100).toFixed(2)}%)</p>
+                <p class="damage_received">承受伤害：${player.damageReceived} (${match[player.team].damageReceived>0?((player.damageReceived/match[player.team].damageReceived*100).toFixed(2)):"0.00"}%)</p>
                 <p class="tower_damage">建筑伤害：${player.towerDamage}</p>
                 <p class="kda row-1">${player.kills}/${player.deaths}/${player.assists} (${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)})</p>
                 <p class="kill_contribution">参战率：${(player.killContribution * 100).toFixed(2)}%</p>
-                <p class="stun_duration">控制时间：${(player.stats.heroDamageReport.dealtTotal.stunDuration / 100).toFixed(2)}s</p>
+                <p class="stun_duration">控制时间：${((player.stats.heroDamageReport?.dealtTotal.stunDuration ?? 0)/ 100).toFixed(2)}s</p>
                 <p class="heal">治疗量：${player.heroHealing}</p>
                 <div class="items row-1">
                     <div class="normal">
@@ -430,8 +430,8 @@
                 </div>
                 <div class="neutral_item row-1" style="background-image: url(${utils.getImageUrl(dotaconstants.item_ids[player.neutral0Id], ImageType.Items)})"></div>
                 <div class="ahgs row-1">
-                    <img src="${utils.getImageUrl("scepter_"+((player.items.concat(player.backpacks).find(item=>item?.id==108)||player.stats.matchPlayerBuffEvent.find(buff=>buff.itemId==108))?1:0))}" alt="" />
-                    <img src="${utils.getImageUrl("shard_"+(player.stats.matchPlayerBuffEvent.find(buff=>buff.itemId==609)?1:0))}" alt="" />
+                    <img src="${utils.getImageUrl("scepter_"+((player.items.concat(player.backpacks).find(item=>item?.id==108)||(player.stats?.matchPlayerBuffEvent||[]).find(buff=>buff.itemId==108))?1:0))}" alt="" />
+                    <img src="${utils.getImageUrl("shard_"+((player.stats?.matchPlayerBuffEvent||[]).find(buff=>buff.itemId==609)?1:0))}" alt="" />
                 </div>
             </div>
             `).join("") %>