@sjtdev/koishi-plugin-dota2tracker 1.2.9 → 1.2.10-pre.2

package/changelog.md

@@ -1,3 +1,13 @@
+### 1.2.10-pre.2
+**改进**：
+- 调整了总结模板和玩家信息模板中胜负字体颜色样式，使其看起来更清晰。
+- 优化了总结模板中胜负数和胜率的样式。
+
+### 1.2.10-pre
+**修复**：
+- 修复战报图中若玩家名有html标签会导致图片排版错乱的问题。
+- 修复周报与日报中评分条样式不正确的问题。
+
 # 1.2.9
 **改进**：
 - 现在周报与日报改为图片版，依旧由`ejs`生成。去除配置页中周报与日报的“实验性”标识。（目前周报与日报使用同一模板，未来可能会设计数据更丰富的周报，也可能不会_(:3」∠)_

package/lib/index.js

@@ -1222,7 +1222,7 @@ var Config = import_koishi.Schema.intersect([
   }).description("基础设置"),
   import_koishi.Schema.intersect([
     import_koishi.Schema.object({
-      dailyReportSwitch: import_koishi.Schema.boolean().default(false).description("日报功能").experimental()
+      dailyReportSwitch: import_koishi.Schema.boolean().default(false).description("日报功能")
     }).description("总结设置"),
     import_koishi.Schema.union([
       import_koishi.Schema.object({
@@ -1232,7 +1232,7 @@ var Config = import_koishi.Schema.intersect([
       })
     ]),
     import_koishi.Schema.object({
-      weeklyReportSwitch: import_koishi.Schema.boolean().default(false).description("周报功能").experimental()
+      weeklyReportSwitch: import_koishi.Schema.boolean().default(false).description("周报功能")
     }),
     import_koishi.Schema.union([
       import_koishi.Schema.object({
@@ -1875,7 +1875,19 @@ function genImageHTML(data, template, type) {
     ImageFormat,
     d2a: dotaconstants_add_exports,
     dotaconstants: dotaconstants3,
-    moment: import_moment.default
+    moment: import_moment.default,
+    escapeHTML: /* @__PURE__ */ __name(function escapeHTML(str) {
+      return str.replace(/[&<>"']/g, function(match) {
+        const escape = {
+          "&": "&amp;",
+          "<": "&lt;",
+          ">": "&gt;",
+          '"': "&quot;",
+          "'": "&#39;"
+        };
+        return escape[match];
+      });
+    }, "escapeHTML")
   };
   let result = "";
   ejs.renderFile(templatePath, templateData, { strict: false }, (err, html) => {

package/package.json

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

package/template/guild_member/guild_member.ejs

@@ -139,9 +139,9 @@
             <div class="info">
                 <img class="avatar user" src="${user?.user?.avatar}" alt="" />
                 <div class="name">
-                    <span class="nick_name">${user.nickName}</span>
-                    <span class="user name">${user.nick || user.user?.name}</span>
-                    <span class="steam name">${user.steamAccount.name}</span>
+                    <span class="nick_name">${escapeHTML(user.nickName)}</span>
+                    <span class="user name">${escapeHTML(user.nick || user.user?.name)}</span>
+                    <span class="steam name">${escapeHTML(user.steamAccount.name)}</span>
                     <span class="user id">${user.userId}</span>
                     <span class="steam id">${user.steamId}</span>
                 </div>

package/template/match/match_1.ejs

@@ -728,7 +728,7 @@
                             <p class="level">${player.level}</p>
                         </div>
                         <div class="player_info">
-                            <summary class="player_name">${player.steamAccount.name}</summary>
+                            <summary class="player_name">${escapeHTML(player.steamAccount.name)}</summary>
                             <summary class="player_performance">
                                 <span class="kda">${player.kills}/${player.deaths}/${player.assists}</span>&nbsp;&nbsp;
                                 <span class="kc" style="color:${kcndcStyle.kc(player.killContribution * 100)}">${Math.floor(player.killContribution * 100)}%</span>&nbsp;&nbsp;

package/template/match/match_2.ejs

@@ -502,7 +502,7 @@
                 <div class="titles">${player.titles.map((item) => `<span style="color: ${darkenHexColor(item.color, 25)};">${item.name}</span>`).join('')}</div>
                 <div class="player_name row-1">
                     <span class="rank">${`[${d2a.rank[player.rank.medal]}${player.rank.star||""}]`}</span>
-                    <span class="name">${player.steamAccount.name}</span>
+                    <span class="name">${escapeHTML(player.steamAccount.name)}</span>
                 </div>
                 <p class="pick">${player.isRandom?'随机':`第${player.order == null ? "?" : player.order + 1}手`} ${d2a.position[player.position?.slice(-1)]??''}</p>
                 <p class="networth">

package/template/player/player_1.ejs

@@ -78,10 +78,10 @@
             }
 
             .player .info .matches span.win {
-                color: #006400;
+                color: #007A00;
             }
             .player .info .matches span.lose {
-                color: #8b0000;
+                color: #B30000;
             }
 
             .player .info .matches span.victory {
@@ -409,7 +409,7 @@
                 <%- `
                 <div class="avatar"><img src="${player.steamAccount?.avatar}" alt="" /></div>
                 <div class="info">
-                    <p class="name">${player.steamAccount.name}${player.guildMember ? ` <span class="guild ${guildLevel(player.guildMember.guild.currentPercentile)}">[${player.guildMember.guild.tag}]</span>${player.genHero?` >${player.genHero.names_cn[0]}<`:""}</p>` : ""}
+                    <p class="name">${escapeHTML(player.steamAccount.name)}${player.guildMember ? ` <span class="guild ${guildLevel(player.guildMember.guild.currentPercentile)}">[${escapeHTML(player.guildMember.guild.tag)}]</span>${player.genHero?` >${player.genHero.names_cn[0]}<`:""}</p>` : ""}
                     <p class="matches"><span>场次：${player.matchCount}（<span class="win">${player.winCount}</span>/<span class="lose">${player.matchCount - player.winCount}</span>）</span>胜率：<span style="color:${utils.winRateColor(player.winCount / player.matchCount)};">${((player.winCount / player.matchCount) * 100).toFixed(2)}%</span></p>
                     <p class="matches"><span>最近25场：<span class="win">${nearWinCount}</span>/<span class="lose">${nearMatchCount - nearWinCount}</span></span><span>胜率：<span style="color:${utils.winRateColor(nearWinCount / nearMatchCount)};">${(
                     (nearWinCount / nearMatchCount) * 100).toFixed(2)}%</span></span><span>评分：${(player.performance.imp > 0 ? "+" : "") + player.performance.imp}</span></span></p>

package/template/report/daily.ejs

@@ -25,8 +25,6 @@
             span {
                 min-width: 0;
                 white-space: nowrap; /* 不换行 */
-                overflow: hidden; /* 超出部分隐藏 */
-                text-overflow: ellipsis; /* 省略号 */
             }
 
             .title {
@@ -57,8 +55,21 @@
                 display: block;
                 width: 100%;
                 text-align: center;
+                overflow: hidden; /* 超出部分隐藏 */
+                text-overflow: ellipsis; /* 省略号 */
+            }
+            .player > .count {
+                display: grid;
+                grid-template-columns: 1fr 1fr 1.8fr;
+                width: 100%;
             }
 
+            .player > .count > span {
+                text-align: left;
+            }
+            .player > .count > span:last-child {
+                text-align: right;
+            }
             .player > .performance {
                 display: flex;
                 align-items: center;
@@ -82,7 +93,7 @@
                 justify-content: flex-end;
             }
             .player > .performance > .score_bar.neg > .left {
-                background: linear-gradient(to right, #777, #888, #999, #888, #777);
+                background: linear-gradient(to right, #777, #888, #888, #777);
             }
             .player > .performance > .score_bar.pos > .right {
                 background: linear-gradient(to right, #6cf, #7df, #6cf);
@@ -117,10 +128,10 @@
                 margin-left: 4px;
             }
             span.win {
-                color: #006400;
+                color: #007A00;
             }
             span.lose {
-                color: #8b0000;
+                color: #B30000;
             }
         </style>
     </head>
@@ -138,18 +149,18 @@
                     <span>胜率<%= Math.round((player.winCount / player.matches.length) * 100) %>%</span>
                 </span>
                 <div class="performance">
-                    <% const imp = {sign : "", left : 0, right : 0} %>
+                    <% const imp = {sign : "", left : 0, right : 0, absValue : Math.abs(player.avgImp)} %>
                     <% if (player.avgImp > 0) imp.sign = "+"; %>
                     <% if (player.avgImp < 0) imp.sign = "-"; %>
-                    <% if (Math.abs(player.avgImp) > 25) { %>
+                    <% if (imp.absValue > 25) { %>
                         <% imp.isOver = true; %>
-                        <% if (player.avgImp > 0) imp.right = player.avgImp; %> 
-                        <% if (player.avgImp < 0) imp.left = player.avgImp; %> 
-                    <% } else imp.left = imp.right = player.avgImp; %>
-                    <div class="score_bar<%= Math.abs(player.avgImp) > 0 ? " pos" : " neg" %><%= Math.abs(player.avgImp) > 25 ? " over" : "" %>">
-                        <div class="left" style="width: <%= imp.left %>px"></div>
+                        <% if (player.avgImp > 0) imp.right = imp.absValue; %> 
+                        <% if (player.avgImp < 0) imp.left = imp.absValue; %> 
+                    <% } else imp.left = imp.right = imp.absValue; %>
+                    <div class="score_bar<%= player.avgImp > 0 ? " pos" : " neg" %><%= Math.abs(player.avgImp) > 25 ? " over" : "" %>">
+                        <div class="left" <%- `style="width: ${imp.left}px"` %>></div>
                         <div class="pipe"></div>
-                        <div class="right" style="width: <%= imp.right %>px"></div>
+                        <div class="right" <%- `style="width: ${imp.right}px"` %>></div>
                     </div>
                     <span class="score_value"><%= `${player.avgImp > 0 ? imp.sign : ""}${player.avgImp}` %></span>
                 </div>