@sjtdev/koishi-plugin-dota2tracker 1.2.1 → 1.2.2

package/lib/index.js

@@ -1469,7 +1469,7 @@ async function apply(ctx, config) {
       }
     }
   });
-  ctx.command("查询英雄 <input_data>", "查询英雄技能/面板信息").usage("查询英雄的技能说明与各项数据，生成图片发布。\n参数可输入英雄ID、英雄名、英雄常用别名").option("random", "-r 随机选择英雄").option("refresh", "-f 忽略缓存刷新数据").example("-查询英雄 15").example("-查询英雄 雷泽").example("-查询英雄 电魂").action(async ({ session, options }, input_data) => {
+  ctx.command("查询英雄 <input_data>", "查询英雄技能/面板信息").usage("查询英雄的技能说明与各项数据，生成图片发布。\n参数可输入英雄ID、英雄名、英雄常用别名").option("random", "-r 随机选择英雄").example("-查询英雄 15").example("-查询英雄 雷泽").example("-查询英雄 电魂").action(async ({ session, options }, input_data) => {
     if (options.random)
       input_data = random.pick(Object.keys(HEROES_CHINESE));
     if (input_data) {
@@ -1478,94 +1478,81 @@ async function apply(ctx, config) {
         session.send("未找到输入的英雄，请确认后重新输入。");
         return;
       }
+      await session.send("正在获取英雄数据，请稍后...");
       try {
-        const tempHero = await ctx.database.get("dt_hero_data_cache", hero.id);
-        if (tempHero.length && !options.refresh) {
-          const gameVersionId = (await query(CURRENT_GAMEVERSION())).data.constants.gameVersions[0].id;
-          if (tempHero[0].gameVersionId >= gameVersionId) {
-            hero = tempHero[0].hero;
+        const queryHero = await queryHeroFromValve(hero.id);
+        Object.assign(hero, queryHero);
+        hero.facet_abilities.forEach((fa, i) => {
+          if (fa.abilities.length) {
+            fa.abilities.forEach((ab) => {
+              if (!hero.facets[i].abilities)
+                hero.facets[i].abilities = [];
+              if (hero.facets[i].description_loc !== ab.desc_loc)
+                hero.facets[i].abilities.push({ id: ab.id, name: ab.name, name_loc: ab.name_loc, description_ability_loc: formatHeroDesc(ab.desc_loc, ab.special_values, "facet" /* Facet */) });
+              else
+                hero.facets[i].description_loc = formatHeroDesc(hero.facets[i].description_loc, ab.special_values, "facet" /* Facet */);
+              ab.ability_is_facet = true;
+              hero.abilities.push(ab);
+            });
           }
-        } else {
-          const queryHero = await queryHeroFromValve(hero.id);
-          Object.assign(hero, queryHero);
-          hero.facet_abilities.forEach((fa, i) => {
-            if (fa.abilities.length) {
-              fa.abilities.forEach((ab) => {
-                if (!hero.facets[i].abilities)
-                  hero.facets[i].abilities = [];
-                if (hero.facets[i].description_loc !== ab.desc_loc)
-                  hero.facets[i].abilities.push({ id: ab.id, name: ab.name, name_loc: ab.name_loc, description_ability_loc: formatHeroDesc(ab.desc_loc, ab.special_values, "facet" /* Facet */) });
-                else
-                  hero.facets[i].description_loc = formatHeroDesc(hero.facets[i].description_loc, ab.special_values, "facet" /* Facet */);
-                hero.abilities.push(ab);
-              });
+        });
+        const all_special_values = [...hero.abilities.flatMap((ab) => ab.special_values), ...hero.facet_abilities.flatMap((fas) => fas.abilities.flatMap((fa) => fa.special_values))];
+        hero.abilities.forEach((ab) => {
+          ab.facets_loc.forEach((facet, i) => {
+            if (facet) {
+              if (!hero.facets[i].abilities)
+                hero.facets[i].abilities = [];
+              hero.facets[i].abilities.push({ id: ab.id, name: ab.name, name_loc: ab.name_loc, description_ability_loc: formatHeroDesc(facet, all_special_values, "facet" /* Facet */), attributes: [] });
             }
           });
-          const all_special_values = [...hero.abilities.flatMap((ab) => ab.special_values), ...hero.facet_abilities.flatMap((fas) => fas.abilities.flatMap((fa) => fa.special_values))];
-          hero.abilities.forEach((ab) => {
-            ab.facets_loc.forEach((facet, i) => {
-              if (facet) {
-                if (!hero.facets[i].abilities)
-                  hero.facets[i].abilities = [];
-                hero.facets[i].abilities.push({ id: ab.id, name: ab.name, name_loc: ab.name_loc, description_ability_loc: formatHeroDesc(facet, all_special_values, "facet" /* Facet */), attributes: [] });
+          hero.facets.forEach((facet) => {
+            const svs = ab.special_values.filter((sv) => sv.facet_bonus.name === facet.name);
+            svs.forEach((sv) => {
+              if (sv.heading_loc) {
+                facet.abilities.find((ability) => ab.id == ability.id)?.attributes.push({ heading_loc: sv.heading_loc, values: [...sv.facet_bonus.values] });
               }
             });
-            hero.facets.forEach((facet) => {
-              const svs = ab.special_values.filter((sv) => sv.facet_bonus.name === facet.name);
-              svs.forEach((sv) => {
-                if (sv.heading_loc) {
-                  facet.abilities.find((ability) => ab.id == ability.id)?.attributes.push({ heading_loc: sv.heading_loc, values: [...sv.facet_bonus.values] });
-                }
-              });
-            });
-            ab.desc_loc = formatHeroDesc(ab.desc_loc, all_special_values);
-            ab.notes_loc = ab.notes_loc.map((note) => formatHeroDesc(note, all_special_values));
-            if (ab.ability_has_scepter)
-              ab.scepter_loc = formatHeroDesc(ab.scepter_loc, ab.special_values, "scepter" /* Scepter */);
-            if (ab.ability_has_shard)
-              ab.shard_loc = formatHeroDesc(ab.shard_loc, ab.special_values, "shard" /* Shard */);
           });
-          hero.talents.forEach((talent) => {
-            const regex = /\{s:(.*?)\}/g;
-            let match;
-            while ((match = regex.exec(talent.name_loc)) !== null) {
-              const specialValueName = match[1];
-              const target = talent.special_values?.find((sv) => sv.name === specialValueName);
-              if (target) {
-                talent.name_loc = talent.name_loc.replace(match[0], target.values_float.join("/"));
-              } else {
-                const ability = hero.abilities.find((ability2) => ability2.special_values.some((specialValue) => specialValue.bonuses.some((bonus) => bonus.name === talent.name)));
-                if (ability) {
-                  const specialValues = ability.special_values.filter((specialValue) => specialValue.bonuses.some((bonus) => bonus.name === talent.name));
-                  const regex2 = /{s:bonus_(.*?)}/g;
-                  let match2;
-                  const replacements = [];
-                  while ((match2 = regex2.exec(talent.name_loc)) !== null) {
-                    const specialValue = specialValues.find((sv) => sv.name === String(match2[1]));
-                    const replacement = specialValue?.bonuses.find((bonus) => bonus.name === talent.name)?.value;
-                    if (replacement !== void 0) {
-                      replacements.push({ original: match2[0], replacement });
-                    }
+          ab.desc_loc = formatHeroDesc(ab.desc_loc, all_special_values);
+          ab.notes_loc = ab.notes_loc.map((note) => formatHeroDesc(note, all_special_values));
+          if (ab.ability_has_scepter)
+            ab.scepter_loc = formatHeroDesc(ab.scepter_loc, ab.special_values, "scepter" /* Scepter */);
+          if (ab.ability_has_shard)
+            ab.shard_loc = formatHeroDesc(ab.shard_loc, ab.special_values, "shard" /* Shard */);
+        });
+        hero.talents.forEach((talent) => {
+          const regex = /\{s:(.*?)\}/g;
+          let match;
+          while ((match = regex.exec(talent.name_loc)) !== null) {
+            const specialValueName = match[1];
+            const target = talent.special_values?.find((sv) => sv.name === specialValueName);
+            if (target) {
+              talent.name_loc = talent.name_loc.replace(match[0], target.values_float.join("/"));
+            } else {
+              const ability = hero.abilities.find((ability2) => ability2.special_values.some((specialValue) => specialValue.bonuses.some((bonus) => bonus.name === talent.name)));
+              if (ability) {
+                const specialValues = ability.special_values.filter((specialValue) => specialValue.bonuses.some((bonus) => bonus.name === talent.name));
+                const regex2 = /{s:bonus_(.*?)}/g;
+                let match2;
+                const replacements = [];
+                while ((match2 = regex2.exec(talent.name_loc)) !== null) {
+                  const specialValue = specialValues.find((sv) => sv.name === String(match2[1]));
+                  const replacement = specialValue?.bonuses.find((bonus) => bonus.name === talent.name)?.value;
+                  if (replacement !== void 0) {
+                    replacements.push({ original: match2[0], replacement });
                   }
-                  replacements.forEach(({ original, replacement }) => {
-                    talent.name_loc = talent.name_loc.replace(original, replacement);
-                  });
                 }
+                replacements.forEach(({ original, replacement }) => {
+                  talent.name_loc = talent.name_loc.replace(original, replacement);
+                });
               }
             }
-          });
-          try {
-            const gameVersionId = (await query(CURRENT_GAMEVERSION())).data.constants.gameVersions[0].id;
-            await ctx.database.upsert("dt_hero_data_cache", (row) => [{ id: hero.id, hero, gameVersionId }]);
-          } catch (error) {
-            ctx.logger.error(error);
-            await session.send("数据缓存失败。");
           }
-        }
+        });
         await session.send(await ctx.puppeteer.render(genImageHTML(hero, config.template_hero, "hero" /* Hero */)));
       } catch (error) {
         ctx.logger.error(error);
-        await session.send("获取数据失败");
+        session.send("获取数据失败");
       }
     } else {
       session.send("请输入参数。");
@@ -1641,9 +1628,6 @@ async function apply(ctx, config) {
     if (!("dt_previous_query_results" in tables)) {
       ctx.model.extend("dt_previous_query_results", { matchId: "unsigned", data: "json", queryTime: "timestamp" }, { primary: "matchId" });
     }
-    if (!("dt_hero_data_cache" in tables)) {
-      ctx.model.extend("dt_hero_data_cache", { id: "unsigned", gameVersionId: "unsigned", hero: "json" });
-    }
     ctx.cron("0 */6 * * *", () => {
       const oneMonthAgo = (0, import_moment.default)().subtract(1, "months").toDate();
       ctx.database.remove("dt_sended_match_id", { sendTime: { $lt: oneMonthAgo } });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "koishi插件-追踪群友的DOTA2对局",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -31,7 +31,7 @@
     "moment": "^2.30.1"
   },
   "peerDependencies": {
-    "koishi": "^4.17.3"
+    "koishi": "^4.17.8"
   },
   "koishi": {
     "preview": "true",

package/readme.md

@@ -4,7 +4,8 @@
 
 DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑定），以及一系列查询功能。
 ### 安装
-在koishi插件市场搜索安装
+在koishi插件市场搜索安装  
+有关koishi的使用说明：（[koishi官方文档](https://koishi.chat/)）
 
 ### 使用
 需在插件配置页填入STRATZ API TOKEN，否则无法使用。(配置中提供了API的获取链接)  
@@ -36,10 +37,11 @@ DOTA2Bot插件-提供自动追踪群友的最新对局的功能（需群友绑
   返回一张图片，包含英雄属性与技能详情。（此处英雄名为中文名）
 * <del>`查询英雄对战 <英雄ID|英雄名|英雄常用别名>`</del>  
   好像不是很实用
-* `7.36 [英雄ID|英雄名|英雄常用别名] [--refresh|-r]`  
-  查询官网7.36更新日志中指定英雄的改动信息  
+* <del>`7.36 [英雄ID|英雄名|英雄常用别名] [--refresh|-r]`</del>  
+  <del>查询官网7.36更新日志中指定英雄的改动信息  
   无英雄参数时直接返回官网7.36更新日志网址  
-  首次使用时将缓存更新日志网页，若读取失败或出错，可添加`--refresh`或`-r`指令重新缓存  
+  首次使用时将缓存更新日志网页，若读取失败或出错，可添加`--refresh`或`-r`指令重新缓存</del>  
+  `查询英雄`指令已适配7.36改动，所以此指令已废弃
 
 ### 英雄ID|英雄名|英雄常用别名 列表
 [dotaconstants_add.json](https://github.com/sjtdev/koishi-plugin-dota2tracker/blob/master/src/dotaconstants_add.json#L102-L226)  

package/template/hero/hero_1.ejs

@@ -189,9 +189,6 @@
                 background-color: #444;
             }
 
-            .details .list {
-            }
-
             .details .list td {
                 width: 50%;
                 text-align: center;
@@ -648,10 +645,10 @@
             <div class="skills">
                 ${hero.abilities//.filter((item) => dotaconstants.abilities[item.name].behavior != "Hidden")
                 .map((item) => `
-                <div class="skill" data-ability="${item.ability_is_innate}">
+                <div class="skill" data-innate="${item.ability_is_innate&&!item.ability_is_facet}">
                     <p class="title">
                         <span class="name">${item.name_loc}</span>
-                        ${item.ability_is_innate?`<span class="is_innate">先天技能</span>`:""}
+                        ${item.ability_is_innate&&!item.ability_is_facet?`<span class="is_innate">先天技能</span>`:""}
                         ${item.ability_is_granted_by_scepter ?`<img src="${utils.getImageUrl("scepter")}" class="scepter">`:""}
                         ${item.ability_is_granted_by_shard ?`<img src="${utils.getImageUrl("shard")}" class="shard">`:""}
                     </p>
@@ -736,7 +733,7 @@
             const items = document.querySelectorAll('.skills > .skill');
             items.forEach(item => {
                 // const name = item.getAttribute('data-name');
-                const abilityIsInnate = item.getAttribute('data-ability') === 'true';
+                const abilityIsInnate = item.getAttribute('data-innate') === 'true';
                 const img = item.querySelector('.img_stats > img');
                 const imageUrl = img.src;