npm - @sjtdev/koishi-plugin-dota2tracker - Versions diffs - 1.1.6-hotfix → 1.1.8-beta.1 - Mend

@sjtdev/koishi-plugin-dota2tracker 1.1.6-hotfix → 1.1.8-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/index.js +153 -168
package/package.json +1 -2
package/template/player/player_1.ejs +3 -3

package/lib/index.js CHANGED Viewed

@@ -52,15 +52,28 @@ __export(utils_exports, {
   readDirectoryFilesSync: () => readDirectoryFilesSync,
   roundToDecimalPlaces: () => roundToDecimalPlaces,
   sec2time: () => sec2time,
-  testGetHtml: () => testGetHtml,
+  setHttp: () => setHttp,
   winRateColor: () => winRateColor
 });
-var import_axios = __toESM(require("axios"));
 var import_fs = __toESM(require("fs"));
 var dotaconstants2 = __toESM(require("dotaconstants"));
 var import_path = __toESM(require("path"));
 // src/queries.ts
+var queries_exports = {};
+__export(queries_exports, {
+  ALL_ABILITIES_CHINESE_NAME: () => ALL_ABILITIES_CHINESE_NAME,
+  CURRENT_GAMEVERSION: () => CURRENT_GAMEVERSION,
+  HERO_INFO: () => HERO_INFO,
+  HERO_MATCHUP_WINRATE: () => HERO_MATCHUP_WINRATE,
+  MATCHES_FOR_DAILY: () => MATCHES_FOR_DAILY,
+  MATCH_INFO: () => MATCH_INFO,
+  PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD: () => PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD,
+  PLAYERS_LASTMATCH: () => PLAYERS_LASTMATCH,
+  PLAYER_EXTRA_INFO: () => PLAYER_EXTRA_INFO,
+  PLAYER_INFO_WITH_25_MATCHES: () => PLAYER_INFO_WITH_25_MATCHES,
+  VERIFYING_PLAYER: () => VERIFYING_PLAYER
+});
 var dotaconstants = __toESM(require("dotaconstants"));
 function MATCH_INFO(matchId) {
   return `
@@ -254,60 +267,60 @@ function PLAYER_INFO_WITH_25_MATCHES(steamAccountId, heroId) {
     {
 		player(steamAccountId: ${steamAccountId}) {
 		  steamAccount {
-			avatar
-			name
-			seasonRank
-			seasonLeaderboardRank
-			id
+        avatar
+        name
+        seasonRank
+        seasonLeaderboardRank
+        id
 		  }
 		  guildMember {
-			guild {
-			  tag
-			}
+        guild {
+          tag
+        }
 		  }
 		  matchCount
 		  winCount
 		  performance {
-			imp
+			  imp
 		  }
 		  heroesPerformance(take: 25, request: {matchGroupOrderBy: WIN_COUNT take: 25 ${heroId ? "heroIds:" + heroId : ""}}) {
-			hero {
-			  id
-			  shortName
-			}
-			imp
-			winCount
-			matchCount
+        hero {
+          id
+          shortName
+        }
+        imp
+        winCount
+        matchCount
 		  }
 		  matches(request: {take: 25 ${heroId ? "heroIds:" + heroId : ""}}) {
-			id
-			rank
-      lobbyType
-      gameMode
-			startDateTime
-			durationSeconds
-			didRadiantWin
-			topLaneOutcome
-			midLaneOutcome
-			bottomLaneOutcome
-			radiantKills
-			direKills
-			players(steamAccountId: ${steamAccountId}) {
-			  isRadiant
-			  lane
-			  kills
-			  deaths
-			  assists
-        position
-			  award
-			  imp
-			  hero {
-				id
-				shortName
-			  }
-			}
-		  }
-		}
+        id
+        rank
+        lobbyType
+        gameMode
+        startDateTime
+        durationSeconds
+        didRadiantWin
+        topLaneOutcome
+        midLaneOutcome
+        bottomLaneOutcome
+        radiantKills
+        direKills
+        players(steamAccountId: ${steamAccountId}) {
+          isRadiant
+          lane
+          kills
+          deaths
+          assists
+          position
+          award
+          imp
+          hero {
+          id
+          shortName
+          }
+        }
+        }
+      }
 	  }
@@ -485,8 +498,14 @@ __name(HERO_MATCHUP_WINRATE, "HERO_MATCHUP_WINRATE");
 // src/utils.ts
 var CONFIGS = { STRATZ_API: { URL: "https://api.stratz.com/graphql", TOKEN: "" } };
+var http = null;
+function setHttp(newHttp) {
+  http = newHttp;
+}
+__name(setHttp, "setHttp");
 async function query(query_str) {
-  return await import_axios.default.post(CONFIGS.STRATZ_API.URL, query_str, {
+  return await http.post(CONFIGS.STRATZ_API.URL, query_str, {
+    responseType: "json",
     headers: {
       "Content-Type": "application/graphql",
       Authorization: `Bearer ${CONFIGS.STRATZ_API.TOKEN}`
@@ -494,12 +513,9 @@ 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["IconsFacets"] = "icons/facets";
   ImageType2["Heroes"] = "heroes";
   ImageType2["HeroIcons"] = "heroes/icons";
   ImageType2["Items"] = "items";
@@ -1108,8 +1124,8 @@ var ejs = __toESM(require("ejs"));
 var name = "dota2tracker";
 var usage = `
 DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑定），以及一系列查询功能。
-**更多信息请进入插件主页查看。**`;
-var inject = ["database", "puppeteer", "cron"];
+**更多信息请进入插件主页（github本项目仓库）查看。**`;
+var inject = ["http", "database", "cron", "puppeteer"];
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     STRATZ_API_TOKEN: import_koishi.Schema.string().required().description("※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取")
@@ -1134,6 +1150,7 @@ var pendingMatches = [];
 var random = new import_koishi2.Random(() => Math.random());
 async function apply(ctx, config) {
   CONFIGS.STRATZ_API.TOKEN = config.STRATZ_API_TOKEN;
+  setHttp(ctx.http);
   ctx.command("订阅本群", "订阅后还需玩家在本群绑定SteamID").usage("订阅后还需玩家在本群绑定SteamID，BOT将订阅本群中已绑定玩家的新比赛数据，在STRATZ比赛解析完成后将比赛数据生成为图片战报发布至本群中。").action(async ({ session }) => {
     if (session.guild) {
       let currentGuild = (await ctx.database.get("dt_subscribed_guilds", { guildId: session.event.guild.id, platform: session.event.platform }))[0];
@@ -1233,16 +1250,21 @@ async function apply(ctx, config) {
       if (subscribedPlayers.length <= 20) {
         try {
           const memberList = await session.bot.getGuildMemberList(session.event.guild.id);
-          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 };
-            });
-            session.send(await ctx.puppeteer.render(genImageHTML(users, "guild_member" /* GuildMember */, "guild_member" /* GuildMember */)));
-          } else
-            throw 0;
+          async function getUsers(subscribedPlayers2, utils, queries, memberList2) {
+            const playerSteamIds = subscribedPlayers2.map((player) => player.steamId);
+            const queryResult = await utils.query(queries.PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD(playerSteamIds));
+            const playersInfo = queryResult.data.players;
+            const users2 = [];
+            for (const subscribedPlayer of subscribedPlayers2) {
+              const queryPlayer = playersInfo.find((player) => player.steamAccount.id == subscribedPlayer.steamId);
+              const queryMember = memberList2.data.find((member) => member.user?.id == subscribedPlayer.userId);
+              users2.push({ ...subscribedPlayer, ...queryPlayer, ...queryMember });
+            }
+            return users2;
+          }
+          __name(getUsers, "getUsers");
+          const users = await getUsers(subscribedPlayers, utils_exports, queries_exports, memberList);
+          session.send(await ctx.puppeteer.render(genImageHTML(users, "guild_member" /* GuildMember */, "guild_member" /* GuildMember */)));
         } catch (error) {
           ctx.logger.error(error);
           session.send("查询群友失败。");
@@ -1258,10 +1280,7 @@ async function apply(ctx, config) {
         match = queryLocal[0].data;
         ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
       } else {
-        let queryRes = await query(MATCH_INFO(matchId));
-        if (queryRes.status == 200) {
-          match = getFormattedMatchData(queryRes.data.data.match);
-        }
+        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(1, "hours")))) {
         session.send(await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
@@ -1309,8 +1328,7 @@ async function apply(ctx, config) {
       let lastMatchId = 0;
       try {
         session.send("正在搜索对局详情，请稍后...");
-        let queryRes = await query(PLAYERS_LASTMATCH([parseInt(flagBindedPlayer ? flagBindedPlayer.steamId : input_data)]));
-        lastMatchId = queryRes.data.data.players[0].matches[0].id;
+        lastMatchId = (await query(PLAYERS_LASTMATCH([parseInt(flagBindedPlayer ? flagBindedPlayer.steamId : input_data)]))).data.players[0].matches[0].id;
       } catch {
         session.send("获取玩家最近比赛失败。");
         return;
@@ -1338,46 +1356,38 @@ async function apply(ctx, config) {
       let steamId = flagBindedPlayer?.steamId ?? input_data;
       let player;
       try {
-        let queryRes = await query(PLAYER_INFO_WITH_25_MATCHES(steamId, hero?.id));
-        if (queryRes.status == 200) {
-          player = queryRes.data.data.player;
-        } else
-          throw 0;
-        let queryRes2 = await query(PLAYER_EXTRA_INFO(steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero?.id));
-        if (queryRes2.status == 200) {
-          let playerExtra = queryRes2.data.data.player;
-          let filteredDotaPlus = {};
-          playerExtra.dotaPlus.forEach((item) => {
-            if (!filteredDotaPlus[item.heroId] || filteredDotaPlus[item.heroId].level < item.level) {
-              filteredDotaPlus[item.heroId] = {
-                heroId: item.heroId,
-                level: item.level
-              };
-            }
-          });
-          playerExtra.heroesPerformance.forEach((hero2) => {
-            if (filteredDotaPlus[hero2.hero.id]) {
-              filteredDotaPlus[hero2.hero.id].shortName = hero2.hero.shortName;
-              filteredDotaPlus[hero2.hero.id].winCount = hero2.winCount;
-              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) {
-              return b.level - a.level;
-            }
-            return a.heroId - b.heroId;
-          });
-          player.heroesPerformanceTop10 = playerExtra.heroesPerformance.slice(0, 10);
-        } else
-          throw 0;
+        player = (await query(PLAYER_INFO_WITH_25_MATCHES(steamId, hero?.id))).data.player;
+        let playerExtra = (await query(PLAYER_EXTRA_INFO(steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero?.id))).data.player;
+        let filteredDotaPlus = {};
+        playerExtra.dotaPlus.forEach((item) => {
+          if (!filteredDotaPlus[item.heroId] || filteredDotaPlus[item.heroId].level < item.level) {
+            filteredDotaPlus[item.heroId] = {
+              heroId: item.heroId,
+              level: item.level
+            };
+          }
+        });
+        playerExtra.heroesPerformance.forEach((hero2) => {
+          if (filteredDotaPlus[hero2.hero.id]) {
+            filteredDotaPlus[hero2.hero.id].shortName = hero2.hero.shortName;
+            filteredDotaPlus[hero2.hero.id].winCount = hero2.winCount;
+            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) {
+            return b.level - a.level;
+          }
+          return a.heroId - b.heroId;
+        });
+        player.heroesPerformanceTop10 = playerExtra.heroesPerformance.slice(0, 10);
         if (hero) {
           const { matchCount, winCount, imp } = player.heroesPerformanceTop10[0];
           player.matchCount = matchCount;
@@ -1395,37 +1405,23 @@ async function apply(ctx, config) {
   });
   ctx.command("查询英雄 <input_data>", "查询英雄技能/面板信息").usage("查询英雄的技能说明与各项数据，生成图片发布。\n参数可输入英雄ID、英雄名、英雄常用别名").example("-查询英雄 15").example("-查询英雄 雷泽").example("-查询英雄 电魂").action(async ({ session }, input_data) => {
     if (input_data) {
-      let hero = findingHero(input_data);
-      if (!hero) {
+      let fhero = findingHero(input_data);
+      if (!fhero) {
         session.send("未找到输入的英雄，请确认后重新输入。");
         return;
       }
       try {
         let AbilitiesConstantsCN;
-        let queryRes = await query(CURRENT_GAMEVERSION());
-        if (queryRes.status == 200) {
-          let queryConstants = queryRes.data.data.constants;
-          AbilitiesConstantsCN = (await ctx.database.get("dt_constants_abilities_cn", [1]))[0];
-          if (!AbilitiesConstantsCN || AbilitiesConstantsCN.gameVersionsId < queryConstants.gameVersions[0].id) {
-            session.send("初次使用或版本更新，正在更新英雄技能数据中……");
-            let queryRes2 = await query(ALL_ABILITIES_CHINESE_NAME());
-            if (queryRes2.status == 200) {
-              AbilitiesConstantsCN = { data: queryRes2.data.data.constants };
-              await ctx.database.upsert("dt_constants_abilities_cn", (row) => [
-                { id: 1, data: AbilitiesConstantsCN, gameVersionId: queryConstants.gameVersions[0].id, gameVersionName: queryConstants.gameVersions[0].name }
-              ]);
-            } else
-              throw 0;
-          }
-        } else
-          throw 0;
-        let queryRes3 = await query(HERO_INFO(hero.id));
-        if (queryRes3.status == 200) {
-          let hero2 = queryRes3.data.data.constants.hero;
-          hero2.talents.forEach((talent) => talent.name_cn = AbilitiesConstantsCN.data.abilities.find((item) => item.id == talent.abilityId).language.displayName);
-          await session.send(await ctx.puppeteer.render(genImageHTML(hero2, config.template_hero, "hero" /* Hero */)));
-        } else
-          throw 0;
+        let queryConstants = (await query(CURRENT_GAMEVERSION())).data.constants;
+        AbilitiesConstantsCN = (await ctx.database.get("dt_constants_abilities_cn", [1]))[0];
+        if (!AbilitiesConstantsCN || AbilitiesConstantsCN.gameVersionsId < queryConstants.gameVersions[0].id) {
+          session.send("初次使用或版本更新，正在更新英雄技能数据中……");
+          AbilitiesConstantsCN = { data: (await query(ALL_ABILITIES_CHINESE_NAME())).data.constants };
+          await ctx.database.upsert("dt_constants_abilities_cn", (row) => [{ id: 1, data: AbilitiesConstantsCN, gameVersionId: queryConstants.gameVersions[0].id, gameVersionName: queryConstants.gameVersions[0].name }]);
+        }
+        let hero = (await query(HERO_INFO(fhero.id))).data.constants.hero;
+        hero.talents.forEach((talent) => talent.name_cn = AbilitiesConstantsCN.data.abilities.find((item) => item.id == talent.abilityId).language.displayName);
+        await session.send(await ctx.puppeteer.render(genImageHTML(hero, config.template_hero, "hero" /* Hero */)));
       } catch (error) {
         ctx.logger.error(error);
         session.send("获取数据失败");
@@ -1443,24 +1439,21 @@ async function apply(ctx, config) {
         return;
       }
       try {
-        let queryRes = await query(HERO_MATCHUP_WINRATE(hero.id));
-        if (queryRes.status == 200) {
-          let heroStats = queryRes.data.data.heroStats;
-          let withTopFive = heroStats.matchUp[0].with.filter((item) => item.matchCount / heroStats.matchUp[0].matchCountWith > Math.max(0, Math.min(5, options.filter)) / 100).map((item) => {
-            const winRate = item.winCount / item.matchCount;
-            return { ...item, winRate: winRate.toFixed(3) };
-          }).sort((a, b) => b.winRate - a.winRate).slice(0, Math.max(1, Math.min(Object.keys(dotaconstants3.heroes).length - 1, options.limit)));
-          let vsBottomFive = heroStats.matchUp[0].vs.filter((item) => item.matchCount / heroStats.matchUp[0].matchCountVs > Math.max(0, Math.min(5, options.filter)) / 100).map((item) => {
-            const winRate = item.winCount / item.matchCount;
-            return { ...item, winRate: winRate.toFixed(3) };
-          }).sort((a, b) => a.winRate - b.winRate).slice(0, Math.max(1, Math.min(Object.keys(dotaconstants3.heroes).length - 1, options.limit)));
-          session.send(
-            `你查询的英雄是${HEROES_CHINESE[heroStats.matchUp[0].heroId][0]}（ID：${heroStats.matchUp[0].heroId}），
+        let heroStats = (await query(HERO_MATCHUP_WINRATE(hero.id))).data.heroStats;
+        let withTopFive = heroStats.matchUp[0].with.filter((item) => item.matchCount / heroStats.matchUp[0].matchCountWith > Math.max(0, Math.min(5, options.filter)) / 100).map((item) => {
+          const winRate = item.winCount / item.matchCount;
+          return { ...item, winRate: winRate.toFixed(3) };
+        }).sort((a, b) => b.winRate - a.winRate).slice(0, Math.max(1, Math.min(Object.keys(dotaconstants3.heroes).length - 1, options.limit)));
+        let vsBottomFive = heroStats.matchUp[0].vs.filter((item) => item.matchCount / heroStats.matchUp[0].matchCountVs > Math.max(0, Math.min(5, options.filter)) / 100).map((item) => {
+          const winRate = item.winCount / item.matchCount;
+          return { ...item, winRate: winRate.toFixed(3) };
+        }).sort((a, b) => a.winRate - b.winRate).slice(0, Math.max(1, Math.min(Object.keys(dotaconstants3.heroes).length - 1, options.limit)));
+        session.send(
+          `你查询的英雄是${HEROES_CHINESE[heroStats.matchUp[0].heroId][0]}（ID：${heroStats.matchUp[0].heroId}），
 以下是7天内传奇-万古分段比赛数据总结而来的搭档与克制关系
 最佳搭档（组合胜率前${options.limit}）：${withTopFive.map((item) => `${HEROES_CHINESE[item.heroId2][0]}(胜率${(item.winRate * 100).toFixed(1)}%)`).join("、")}
 最佳克星（对抗胜率倒${options.limit}）：${vsBottomFive.map((item) => `${HEROES_CHINESE[item.heroId2][0]}(胜率${(item.winRate * 100).toFixed(1)}%)`).join("、")}`
-          );
-        }
+        );
       } catch (error) {
         ctx.logger.error(error);
         session.send("获取数据失败");
@@ -1532,7 +1525,6 @@ async function apply(ctx, config) {
       });
       heroes3.push({ id: 0, data: result.remainingContent });
       await ctx.database.upsert("dt_7_36", (row) => heroes3);
-      import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/remainingContent.html", result.remainingContent);
       await session.send("数据获取完成。");
       await page.close();
     }
@@ -1616,13 +1608,12 @@ async function apply(ctx, config) {
         const oneDayAgo = (0, import_moment.default)().subtract(1, "days").unix();
         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));
-        let queryRes = await query(
+        const players = (await query(
           MATCHES_FOR_DAILY(
             subscribedPlayersInGuild.map((player) => player.steamId).filter((value, index, self) => self.indexOf(value) === index),
             oneDayAgo
           )
-        );
-        const players = queryRes.data.data.players.filter((player) => player.matches.length > 0);
+        )).data.players.filter((player) => player.matches.length > 0);
         const matches = players.map((player) => player.matches.map((match) => match)).flat().filter((item, index, self) => index === self.findIndex((t) => t.id === item.id));
         for (let subPlayer of subscribedPlayersInGuild) {
           let player = players.find((player2) => subPlayer.steamId == player2.steamAccount.id);
@@ -1687,14 +1678,12 @@ async function apply(ctx, config) {
       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) {
-        let queryRes = await query(
-          PLAYERS_LASTMATCH(
-            subscribedPlayersInGuild.map((player) => player.steamId).filter(function(value, index, self) {
-              return self.indexOf(value) === index;
-            })
-          )
+        const subscribedPlayersSteamIds = PLAYERS_LASTMATCH(
+          subscribedPlayersInGuild.map((player) => player.steamId).filter(function(value, index, self) {
+            return self.indexOf(value) === index;
+          })
         );
-        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 lastMatches = (await query(subscribedPlayersSteamIds)).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 = [];
@@ -1722,12 +1711,8 @@ async function apply(ctx, config) {
           if (queryLocal.length > 0) {
             match = queryLocal[0].data;
             ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
-          } else {
-            let queryRes = await query(MATCH_INFO(pendingMatch.matchId));
-            if (queryRes.status == 200) {
-              match = getFormattedMatchData(queryRes.data.data.match);
-            }
-          }
+          } else
+            match = getFormattedMatchData((await query(MATCH_INFO(pendingMatch.matchId))).data.match);
           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 */));
@@ -1753,7 +1738,7 @@ KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${
                 broadMatchMessage += broadPlayerMessage + "\n";
               }
               await ctx.broadcast([`${commingGuild.platform}:${commingGuild.guildId}`], broadMatchMessage + img);
-              ctx.logger.info(`已解析${match.id}并发布于${commingGuild.platform}:${commingGuild.guildId}。`);
+              ctx.logger.info(`${match.id}${match.parsedDateTime ? "已解析，" : "已结束超过1小时仍未被解析，放弃解析直接"}生成图片并发布于${commingGuild.platform}:${commingGuild.guildId}。`);
             }
             if (match.parsedDateTime)
               ctx.database.upsert("dt_previous_query_results", (row) => [{ matchId: match.id, data: match, queryTime: /* @__PURE__ */ new Date() }]);

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "",
-  "version": "1.1.6-hotfix",
+  "version": "1.1.8-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -26,7 +26,6 @@
     "dota2"
   ],
   "dependencies": {
-    "axios": "^1.6.8",
     "dotaconstants": "^8.5.0",
     "ejs": "^3.1.10",
     "moment": "^2.30.1"

package/template/player/player_1.ejs CHANGED Viewed

@@ -385,13 +385,13 @@
         player.positionPerformance=[];
         // 瞎j8定义的各位置代表物品，以后看情况调整
-        const positionItems=["greater_crit","dagon_5","heart","hand_of_midas","ward_observer"];
+        const positionIcons = ["damage","nuke","armor","speed","healing"];
         for (let index = 0; index < 5; index++) {
             let currentPositionMatches = player.matches.filter(match=>match.players[0].position == ("POSITION_"+(index+1)))
             let winCount = currentPositionMatches.filter(match=>match.didRadiantWin == match.players[0].isRadiant).length;
             player.positionPerformance.push({
                 position : (index + 1),
-                icon : positionItems[index],
+                icon : positionIcons[index],
                 matchCount : currentPositionMatches.length,
                 winCount : winCount,
                 loseCount : currentPositionMatches.length - winCount,
@@ -468,7 +468,7 @@
                     <span class="tip lose_count" style="justify-self: start; margin-left: 2px">败场</span>
                     <%- player.positionPerformance
                     .map((position) => `
-                    <span><img src="${utils.getImageUrl(position.icon,ImageType.Items)}"></span>
+                    <span><img src="${utils.getImageUrl(position.icon,ImageType.IconsFacets)}"></span>
                     <span class="count">${position.matchCount}</span>
                     <span class="win_rate">${position.matchCount>0?(((position.winCount / position.matchCount) * 100).toFixed(0)):"-"}%</span>
                     <span class="imp">${(position.imp > 0 ? "+" : "") + position.imp}</span>