@sjtdev/koishi-plugin-dota2tracker 1.1.8 → 1.1.9

package/lib/index.js

@@ -828,12 +828,10 @@ __name(winRateColor, "winRateColor");
 async function playerisValid(steamAccountId) {
   try {
     let queryRes = await query(VERIFYING_PLAYER(steamAccountId));
-    if (queryRes.status == 200) {
-      if (queryRes.data.data.player.matchCount != null)
-        return { isValid: true };
-      else
-        return { isValid: false, reason: "SteamID无效或无任何场次。" };
-    }
+    if (queryRes.data.player.matchCount != null)
+      return { isValid: true };
+    else
+      return { isValid: false, reason: "SteamID无效或无任何场次。" };
   } catch (error) {
     console.error(error);
     return { isValid: false, reason: "网络状况不佳SteamID验证失败，请稍后重试。" };
@@ -1128,7 +1126,8 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 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 获取")
+    STRATZ_API_TOKEN: import_koishi.Schema.string().required().description("※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取。"),
+    dataParsingTimeoutMinutes: import_koishi.Schema.number().default(60).min(0).max(1440).description("等待比赛数据解析的时间（单位：分钟）。如果数据解析时间超过等待时间，将直接生成战报而不再等待解析完成。")
   }).description("基础设置"),
   import_koishi.Schema.object({
     dailyReportSwitch: import_koishi.Schema.boolean().default(false).description("日报功能").experimental()
@@ -1153,20 +1152,20 @@ async function apply(ctx, config) {
   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];
+      let currentGuild = (await ctx.database.get("dt_subscribed_guilds", { guildId: session.event.channel.id, platform: session.event.platform }))[0];
       if (currentGuild)
         session.send("本群已订阅，无需重复订阅。");
       else {
-        ctx.database.create("dt_subscribed_guilds", { guildId: session.event.guild.id, platform: session.event.platform });
+        ctx.database.create("dt_subscribed_guilds", { guildId: session.event.channel.id, platform: session.event.platform });
         session.send("订阅成功。");
       }
     }
   });
   ctx.command("取消订阅", "取消订阅本群").action(async ({ session }) => {
     if (session.guild) {
-      let cancelingGuild = (await ctx.database.get("dt_subscribed_guilds", { guildId: session.event.guild.id, platform: session.event.platform }))[0];
+      let cancelingGuild = (await ctx.database.get("dt_subscribed_guilds", { guildId: session.event.channel.id, platform: session.event.platform }))[0];
       if (cancelingGuild) {
-        ctx.database.remove("dt_subscribed_guilds", session.event.guild.id);
+        ctx.database.remove("dt_subscribed_guilds", session.event.channel.id);
         session.send("取消订阅成功。");
         return;
       }
@@ -1179,7 +1178,7 @@ async function apply(ctx, config) {
         session.send("SteamID无效。");
         return;
       }
-      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, userId: session.event.user.id }))[0];
+      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, userId: session.event.user.id }))[0];
       if (sessionPlayer) {
         session.send(
           `
@@ -1207,12 +1206,12 @@ async function apply(ctx, config) {
                     别名：${nick_name || ""}
                     SteamID：${steam_id}`.replace(/\n\s+/g, " ")
       );
-      ctx.database.create("dt_subscribed_players", { userId: session.event.user.id, guildId: session.event.guild.id, platform: session.event.platform, steamId: parseInt(steam_id), nickName: nick_name || null });
+      ctx.database.create("dt_subscribed_players", { userId: session.event.user.id, guildId: session.event.channel.id, platform: session.event.platform, steamId: parseInt(steam_id), nickName: nick_name || null });
     }
   });
   ctx.command("取消绑定", "取消绑定你的个人信息").action(async ({ session }) => {
     if (session.guild) {
-      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, userId: session.event.user.id }))[0];
+      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, userId: session.event.user.id }))[0];
       if (sessionPlayer) {
         await ctx.database.remove("dt_subscribed_players", sessionPlayer.id);
         session.send("取消绑定成功。");
@@ -1222,7 +1221,7 @@ async function apply(ctx, config) {
   });
   ctx.command("改名 <nick_name>", "修改绑定时设定的别名").example("-改名 李四").action(async ({ session }, nick_name) => {
     if (session.guild) {
-      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, userId: session.event.user.id }))[0];
+      let sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, userId: session.event.user.id }))[0];
       if (sessionPlayer) {
         if (!nick_name) {
           session.send("请输入你的别名。");
@@ -1242,14 +1241,14 @@ async function apply(ctx, config) {
   });
   ctx.command("查询群友", "查询本群已绑定的玩家").action(async ({ session }) => {
     if (session.guild) {
-      const subscribedPlayers = await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.platform });
+      const subscribedPlayers = await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.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);
+          const memberList = await session.bot.getGuildMemberList(session.event.channel.id);
           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));
@@ -1282,12 +1281,12 @@ async function apply(ctx, config) {
       } else {
         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")))) {
+      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 */)));
         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: [] }] });
+        pendingMatches.push({ matchId, guilds: [{ platform: session.event.platform, guildId: session.event.channel.id, players: [] }] });
         session.send("比赛尚未解析，将在解析完成后发布。");
       }
     } catch (error) {
@@ -1314,13 +1313,13 @@ async function apply(ctx, config) {
     if (session.guild) {
       let sessionPlayer;
       if (!input_data) {
-        sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, userId: session.event.user.id }))[0];
+        sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, userId: session.event.user.id }))[0];
         if (!sessionPlayer) {
           session.send("无参数时默认从已绑定SteamID玩家中寻找你的信息，但你似乎并没有绑定。\n请在本群绑定SteamID。（可输入【-绑定 -h】获取帮助）\n或在指令后跟上希望查询的SteamID或已绑定玩家的别名。");
           return;
         }
       }
-      let flagBindedPlayer = sessionPlayer || (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, nickName: input_data }))[0];
+      let flagBindedPlayer = sessionPlayer || (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, nickName: input_data }))[0];
       if (!(flagBindedPlayer || /^\d{1,11}$/.test(input_data))) {
         session.send("SteamID不合法并且未在本群找到此玩家。");
         return;
@@ -1340,13 +1339,13 @@ async function apply(ctx, config) {
     if (session.guild) {
       let sessionPlayer;
       if (!input_data) {
-        sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, userId: session.event.user.id }))[0];
+        sessionPlayer = (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, userId: session.event.user.id }))[0];
         if (!sessionPlayer) {
           session.send("无参数时默认从已绑定SteamID玩家中寻找你的信息，但你似乎并没有绑定。\n请在本群绑定SteamID。（可输入【-绑定 -h】获取帮助）\n或在指令后跟上希望查询的SteamID或已绑定玩家的别名。");
           return;
         }
       }
-      let flagBindedPlayer = sessionPlayer || (await ctx.database.get("dt_subscribed_players", { guildId: session.event.guild.id, platform: session.event.platform, nickName: input_data }))[0];
+      let flagBindedPlayer = sessionPlayer || (await ctx.database.get("dt_subscribed_players", { guildId: session.event.channel.id, platform: session.event.platform, nickName: input_data }))[0];
       if (!(flagBindedPlayer || /^\d{1,11}$/.test(input_data))) {
         session.send("SteamID不合法并且未在本群找到此玩家。");
         return;
@@ -1414,7 +1413,7 @@ async function apply(ctx, config) {
         let AbilitiesConstantsCN;
         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) {
+        if (!AbilitiesConstantsCN || AbilitiesConstantsCN.gameVersionId < 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 }]);
@@ -1581,6 +1580,10 @@ 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(session);
+    ctx.broadcast(["kook:9510442027074966"], "test");
+  });
   ctx.on("ready", async () => {
     const tables = await ctx.database.tables;
     if (!("dt_subscribed_guilds" in tables)) {
@@ -1711,7 +1714,7 @@ async function apply(ctx, config) {
             ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
           } 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"))) {
+          if (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(config.dataParsingTimeoutMinutes, "minutes"))) {
             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) {

package/package.json

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

package/readme.md

@@ -8,7 +8,7 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 
 ### 使用
 需在插件配置页填入STRATZ API TOKEN，否则无法使用。(配置中提供了API的获取链接)  
-在希望推送战报信息的群组使用指令`订阅本群`，玩家可使用指令`绑定`来将自身账号与Steam账号绑定，bot会尝试追踪已订阅群组中的绑定玩家的最新对局信息。  
+在希望推送战报信息的群组（或频道）使用指令`订阅本群`，玩家可使用指令`绑定`来将自身账号与Steam账号绑定，bot会尝试追踪已订阅群组（或频道）中的绑定玩家的最新对局信息。  
 其他查询功能见下方指令说明。  
 **直接调用help指令可获取更详细的说明，调用【指令 -h】还会有用法示例。（例如：订阅本群 -h）**  
 **更新日志见[changelog](changelog.md)**  
@@ -16,7 +16,8 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
 ### 指令
 指令 <必填参数> [可选参数]
 ##### 订阅
-（bot仅向已订阅群组推送信息）
+（bot仅向已订阅群组/频道推送信息）  
+（若是使用Discord、KOOK频道类平台，订阅与绑定信息仅对单个频道生效，频道间相互独立）
 * `订阅本群`
 * `取消订阅`
 ##### 绑定