@sjtdev/koishi-plugin-dota2tracker 1.2.6 → 1.2.7-beta.2

package/changelog.md

@@ -1,3 +1,8 @@
+### 1.2.7-beta
+**新增**：可在配置页设置发布战报时附带stratz比赛链接、查询玩家信息时附带stratz玩家页面链接，这些选项均默认关闭。  
+**修复**：(beta测试中) 尝试修复当同一个steamId在多个已订阅群组中绑定时，仅会向最早绑定的群组发送战报的问题。  
+**修复**：现在若所有玩家某项属性都为0时不会错误地将对应称号赋予玩家1，而是取消此称号赋予。（此版本前例如所有玩家治疗量都为0，玩家1会获得“奶”称号，而现在将不会有玩家获得“奶”称号）  
+
 ### 1.2.6
 因koishi更新至4.17.10修复了主动发送消息的函数，本插件的发送消息方式也换回之前的方案以避免可能的代码问题。（功能使用上与1.2.6-pre3版本一致）
 
@@ -12,7 +17,7 @@
 
 #### pre3
 **改进&修复**：继续优化`查询英雄`代码结构使由命石、神杖、魔晶改变的技能属性更直观；修复某些技能数据中有旧天赋加成数据留存、导致的天赋数值未被正确填充。  
-**改进**：为`艾欧`添加别名：["艾欧", "小精灵"] → ["艾欧", "小精灵", "精灵", "IO"]  
+**改进**：为英雄`艾欧`添加别名：["艾欧", "小精灵"] → ["艾欧", "小精灵", "精灵", "IO"]  
 
 ### 1.2.5-fix
 **修复**：使用临时替代方案修复由koishi-4.17.9的bug引起的无法主动发送消息（播报战报等）,待koishi更新修复后回滚此改动。  

package/lib/index.js

@@ -770,7 +770,7 @@ function getFormattedMatchData(match) {
     ComparisonMode2["Min"] = "min";
   })(ComparisonMode || (ComparisonMode = {}));
   function findMaxByProperty(primaryProperty, secondaryProperty = null, players = match.players, primaryMode = "max" /* Max */, secondaryMode = "max" /* Max */) {
-    return players.reduce((result, player) => {
+    let maxPlayer = players.reduce((result, player) => {
       const primaryComparison = primaryMode === "max" /* Max */ ? player[primaryProperty] > result[primaryProperty] : player[primaryProperty] < result[primaryProperty];
       const secondaryComparison = secondaryMode === "max" /* Max */ ? player[secondaryProperty] > result[secondaryProperty] : player[secondaryProperty] < result[secondaryProperty];
       if (primaryComparison) {
@@ -780,20 +780,21 @@ function getFormattedMatchData(match) {
       }
       return result;
     });
+    return maxPlayer[primaryProperty] > 0 ? maxPlayer : null;
   }
   __name(findMaxByProperty, "findMaxByProperty");
   findMaxByProperty(
     "mvpScore",
     void 0,
     match.players.filter((player) => match.didRadiantWin == player.isRadiant)
-  ).titles.push({ name: "MVP", color: "#FFA500" });
+  )?.titles.push({ name: "MVP", color: "#FFA500" });
   findMaxByProperty(
     "mvpScore",
     void 0,
     match.players.filter((player) => match.didRadiantWin != player.isRadiant)
-  ).titles.push({ name: "魂", color: "#6cf" });
-  findMaxByProperty("networth").titles.push({ name: "富", color: "#FFD700" });
-  findMaxByProperty("experiencePerMinute").titles.push({ name: "睿", color: "#8888FF" });
+  )?.titles.push({ name: "魂", color: "#6cf" });
+  findMaxByProperty("networth")?.titles.push({ name: "富", color: "#FFD700" });
+  findMaxByProperty("experiencePerMinute")?.titles.push({ name: "睿", color: "#8888FF" });
   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
@@ -802,12 +803,12 @@ function getFormattedMatchData(match) {
       (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" });
+  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((lowest, player) => {
     const currentContribution = (player.kills + player.assists) / match[player.team].killsCount;
     const lowestContribution = (lowest.kills + lowest.assists) / match[lowest.team].killsCount;
@@ -1213,6 +1214,11 @@ var Config = import_koishi.Schema.intersect([
     }),
     import_koishi.Schema.object({})
   ]),
+  import_koishi.Schema.object({
+    urlInMessageType: import_koishi.Schema.array(
+      import_koishi.Schema.union([import_koishi.Schema.const("match").description("在查询比赛与战报消息中附带stratz比赛链接"), import_koishi.Schema.const("player").description("在查询玩家信息消息中附带stratz玩家链接"), import_koishi.Schema.const("hero").description("---").disabled()])
+    ).role("checkbox").description("在消息中附带链接，<br/>请选择消息类型：")
+  }),
   import_koishi.Schema.object({
     template_match: import_koishi.Schema.union([...readDirectoryFilesSync(`./node_modules/@sjtdev/koishi-plugin-${name}/template/match`)]).default("match_1").description("生成比赛信息图片使用的模板，见 https://github.com/sjtdev/koishi-plugin-dota2tracker/wiki 有模板展示。"),
     template_player: import_koishi.Schema.union([...readDirectoryFilesSync(`./node_modules/@sjtdev/koishi-plugin-${name}/template/player`)]).default("player_1").description("生成玩家信息图片使用的模板。（目前仅有一张模板）"),
@@ -1345,7 +1351,7 @@ async function apply(ctx, config) {
       }
     }
   });
-  async function queryAndDisplayMatch(session, matchId) {
+  async function queryMatchAndSend(session, matchId) {
     try {
       let match;
       let queryLocal = await ctx.database.get("dt_previous_query_results", matchId, ["data"]);
@@ -1356,7 +1362,7 @@ async function apply(ctx, config) {
         match = getFormattedMatchData((await query(MATCH_INFO(matchId))).data.match);
       }
       if (match && (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(config.dataParsingTimeoutMinutes, "minutes")))) {
-        session.send(await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
+        session.send((ctx.config.urlInMessageType.some((type) => type == "match") ? "https://stratz.com/matches/" + matchId : "") + await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
         if (match.parsedDateTime)
           ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);
       } else {
@@ -1369,7 +1375,7 @@ async function apply(ctx, config) {
       ctx.database.remove("dt_previous_query_results", { matchId: parseInt(matchId) });
     }
   }
-  __name(queryAndDisplayMatch, "queryAndDisplayMatch");
+  __name(queryMatchAndSend, "queryMatchAndSend");
   ctx.command("查询比赛 <match_id>", "查询比赛ID").usage("查询指定比赛ID的比赛数据，生成图片发布。").example("查询比赛 1234567890").action(async ({ session }, match_id) => {
     if (!match_id) {
       session.send("请输入比赛ID。");
@@ -1381,7 +1387,7 @@ async function apply(ctx, config) {
       return;
     }
     session.send("正在搜索对局详情，请稍后...");
-    queryAndDisplayMatch(session, match_id);
+    queryMatchAndSend(session, match_id);
   });
   ctx.command("查询最近比赛 [input_data]", "查询玩家的最近比赛").usage("查询指定玩家的最近一场比赛的比赛数据，生成图片发布。\n参数可输入该玩家的SteamID或已在本群绑定玩家的别名，无参数时尝试查询调用指令玩家的SteamID").example("查询最近比赛 123456789").example("查询最近比赛 张三").action(async ({ session }, input_data) => {
     if (session.guild) {
@@ -1406,7 +1412,7 @@ async function apply(ctx, config) {
         session.send("获取玩家最近比赛失败。");
         return;
       }
-      queryAndDisplayMatch(session, lastMatchId);
+      queryMatchAndSend(session, lastMatchId);
     }
   });
   ctx.command("查询玩家 <input_data>", "查询玩家信息，可指定英雄").usage("查询指定玩家的个人信息与最近战绩，生成图片发布。\n参数可输入该玩家的SteamID或已在本群绑定玩家的别名，无参数时尝试查询调用指令玩家的SteamID").option("hero", "-o <value:string> 查询玩家指定英雄使用情况（同其他英雄查询，可用简称与ID）").example("查询玩家 123456789").example("查询玩家 张三").example("查询玩家 张三 hero 敌法师").action(async ({ session, options }, input_data) => {
@@ -1469,7 +1475,9 @@ async function apply(ctx, config) {
           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 */)));
+        session.send(
+          (ctx.config.urlInMessageType.some((type) => type == "player") ? "https://stratz.com/players/" + player.steamAccount.id : "") + await ctx.puppeteer.render(genImageHTML(player, config.template_player, "player" /* Player */))
+        );
       } catch (error) {
         ctx.logger.error(error);
         session.send("获取玩家信息失败。");
@@ -1657,7 +1665,12 @@ async function apply(ctx, config) {
           let player = players.find((player2) => subPlayer.steamId == player2.steamAccount.id);
           if (!player)
             continue;
-          const guildMember = await ctx.bots.find((bot) => bot.platform == subPlayer.platform)?.getGuildMember(subPlayer.guildId, subPlayer.userId);
+          let guildMember;
+          try {
+            guildMember = await ctx.bots.find((bot) => bot.platform == subPlayer.platform)?.getGuildMember(subPlayer.guildId, subPlayer.userId);
+          } catch (error) {
+            ctx.logger.error("获取群组信息失败。Error:" + error);
+          }
           subPlayer.name = subPlayer.nickName || (guildMember?.nick ?? players.find((player2) => player2.steamAccount.id == subPlayer.steamId)?.steamAccount.name);
           player.winCount = player.matches.filter((match) => match.didRadiantWin == match.players.find((innerPlayer) => innerPlayer.steamAccount.id == player.steamAccount.id).isRadiant).length;
           player.loseCount = player.matches.length - player.winCount;
@@ -1728,14 +1741,15 @@ async function apply(ctx, config) {
         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] });
-            }
+            subscribedPlayersInGuild.filter((subscribedPlayer) => subscribedPlayer.steamId === player.steamAccount.id).forEach((subscribedPlayer) => {
+              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(
@@ -1777,7 +1791,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([`${commingGuild.platform}:${commingGuild.guildId}`], broadMatchMessage + img);
+              await ctx.broadcast([`${commingGuild.platform}:${commingGuild.guildId}`], broadMatchMessage + (ctx.config.urlInMessageType.some((type) => type == "match") ? "https://stratz.com/matches/" + match.id : "") + img);
               ctx.logger.info(`${match.id}${match.parsedDateTime ? "已解析，" : "已结束超过1小时仍未被解析，放弃解析直接"}生成图片并发布于${commingGuild.platform}:${commingGuild.guildId}。`);
             }
             if (match.parsedDateTime)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "koishi插件-追踪群友的DOTA2对局",
-  "version": "1.2.6",
+  "version": "1.2.7-beta.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [