koishi-plugin-tmp-bot 1.3.1 → 1.3.3

package/lib/api/{TruckersMpApi.js → truckersMpApi.js}

@@ -45,6 +45,29 @@ module.exports = {
       data.data = result.response
     }
 
+    return data
+  },
+  /**
+   * 查询玩家封禁信息
+   */
+  async bans (http, tmpId) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/bans/${tmpId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: JSON.parse(result.error)
+    }
+    if (!data.error) {
+      data.data = result.response
+    }
+
     return data
   }
 }

package/lib/command/tmpBind.js

@@ -1,5 +1,5 @@
 const guildBind = require('../database/guildBind')
-const truckersMpApi = require("../api/TruckersMpApi");
+const truckersMpApi = require("../api/truckersMpApi");
 
 /**
  * 绑定 TMP ID

package/lib/command/tmpPosition.js

@@ -2,7 +2,7 @@ const { segment } = require('koishi')
 const { resolve } = require('path')
 const guildBind = require('../database/guildBind')
 const truckyAppApi = require('../api/truckyAppApi')
-const truckersMpApi = require('../api/TruckersMpApi')
+const truckersMpApi = require('../api/truckersMpApi')
 const baiduTranslate = require('../util/baiduTranslate')
 
 /**
@@ -62,7 +62,6 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         }), "image/jpg")
       )
     } catch (e) {
-      console.info(e)
       return '渲染异常，请重试'
     } finally {
       if (page) {

package/lib/command/tmpQuery.js

@@ -1,6 +1,6 @@
 const dayjs = require('dayjs')
 const guildBind = require('../database/guildBind')
-const truckersMpApi = require('../api/TruckersMpApi')
+const truckersMpApi = require('../api/truckersMpApi')
 const truckyAppApi = require('../api/truckyAppApi')
 const baiduTranslate = require('../util/baiduTranslate')
 
@@ -43,7 +43,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     return '查询玩家信息失败，请重试'
   }
 
-  // 拼接消息模板 正常4763167 永久5396563 暂时封号5118166
+  // 拼接消息模板
   let message = `<img src="${playerInfo.data.avatar}"/>`
   message += '\n😀玩家名称: ' + playerInfo.data.name
   message += '\n📑注册日期: ' + dayjs(playerInfo.data.joinDate + 'Z').format('YYYY年MM月DD日')
@@ -56,10 +56,19 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     message += '\n🚫封禁截止: '
     if (!playerInfo.data.displayBans) {
       message += '隐藏'
-    } else if (!playerInfo.data.bannedUntil) {
-      message += '永久'
     } else {
-      message += daiyjs(playerInfo.data.bannedUntil + 'Z').format('YYYY年MM月DD日 HH:mm')
+      let banData = await truckersMpApi.bans(ctx.http, tmpId)
+      if (!banData.error) {
+        let ban = banData.data[0]
+        if (!ban.expiration) {
+          message += '永久'
+        } else {
+          message += dayjs(ban.expiration + 'Z').format('YYYY年MM月DD日 HH:mm')
+        }
+        message += "\n🚫封禁原因: " + await baiduTranslate(ctx, cfg, ban.reason.replace(/((http|ftp|https|file):[^'"\s]+)/, ''), false)
+      } else {
+        message += '查询失败'
+      }
     }
   }
   message += '\n🚫封禁次数: ' + playerInfo.data.bansCount || 0

package/lib/command/tmpServer.js

@@ -1,4 +1,4 @@
-const truckersMpApi = require('../api/TruckersMpApi')
+const truckersMpApi = require('../api/truckersMpApi')
 
 module.exports = async (ctx, cfg, game) => {
   // 查询服务器信息

package/lib/command/tmpTraffic.js

@@ -60,7 +60,6 @@ module.exports = async (ctx, cfg, serverName) => {
     message += await baiduTranslate(ctx, cfg, name) + ` (${typeToZh[type] || type})`
     message += '\n路况: ' + (severityToZh[traffic.newSeverity] || traffic.color)
     message += ' | 人数: ' + traffic.players
-    console.info(traffic)
   }
 
   return message

package/lib/resource/position.html

@@ -10,9 +10,12 @@
       margin: 0;
       padding: 0;
     }
+    * {
+      font-family: "微软雅黑", serif;
+    }
     #container {
-      width: 380px;
-      height: 260px;
+      width: 500px;
+      height: 320px;
       position: relative;
     }
     .map {
@@ -22,7 +25,7 @@
     }
     .user-info-box {
       width: 100%;
-      height: 58px;
+      height: 76px;
       position: absolute;
       bottom: 0;
       z-index: 999;
@@ -31,20 +34,23 @@
       display: flex;
       flex-direction: row;
       align-items: center;
-      padding: 0 12px;
+      padding: 0 14px;
       box-sizing: border-box;
     }
     .avatar {
-      width: 40px;
-      height: 40px;
+      width: 56px;
+      height: 56px;
       border-radius: 4px;
     }
     .user {
-      height: 40px;
-      width: 180px;
+      height: 56px;
+      width: 220px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
     }
     .user {
-      font-size: 14px;
+      font-size: 16px;
       color: #eeeeee;
       margin-left: 10px;
       box-sizing: border-box;
@@ -52,6 +58,7 @@
     .user .server-name-box {
       display: flex;
       align-items: center;
+      margin-top: 4px;
     }
     .user .username {
       white-space: nowrap;
@@ -70,15 +77,18 @@
     .location-box {
       flex-grow: 1;
       color: #eeeeee;
-      font-size: 14px;
-      height: 40px;
+      font-size: 16px;
+      height: 56px;
       box-sizing: border-box;
       border-right: 4px solid #54d354;
       text-align: right;
       padding-right: 6px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
     }
     .location-box>* {
-      width: 116px;
+      width: 174px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -92,25 +102,17 @@
       <img class="avatar" src="https://static.truckersmp.com/avatarsN/small/defaultavatar.png"/>
       <div class="user">
         <div class="username">...</div>
-        <div class="server-name-box">
+        <div class="server-name-box" style="margin-top: 4px">
           <span class="server-name">...</span>游戏中
         </div>
       </div>
       <div class="location-box">
         <div class="country">...</div>
-        <div class="real-name">...</div>
+        <div class="real-name" style="margin-top: 4px">...</div>
       </div>
     </div>
   </div>
   <script>
-    // a: https://static.truckersmp.com/avatarsN/defaultavatar.png
-    // sa: https://static.truckersmp.com/avatarsN/small/defaultavatar.png
-    // name: Damien12345
-    // x: -13426
-    // y: -5998
-    // serverName: Simulation 1
-    // country: Germany
-    // realName: Duisburg
     let multipliers = {
       x: 71292,
       y: 60412
@@ -132,7 +134,7 @@
 
     // 定义地图
     let map = L.map('map', {
-      attributionControl: false, // 去除右下角的 leaflet 标识
+      attributionControl: false,
       crs: L.CRS.Simple,
       zoomControl: false
     });

package/lib/util/baiduTranslate.js

@@ -2,14 +2,14 @@ const md5 = require('js-md5')
 const translateCache = require('../database/translateCache')
 const TRANSLATE_API = 'https://fanyi-api.baidu.com/api/trans/vip/translate'
 
-module.exports = async (ctx, cfg, content) => {
+module.exports = async (ctx, cfg, content, cache = true) => {
   // 没有开启百度翻译功能，直接返回文本
   if (!cfg.baiduTranslateEnable) {
     return content
   }
 
   // 如果开启了缓存，尝试从缓存中查询翻译
-  if (cfg.baiduTranslateCacheEnable) {
+  if (cfg.baiduTranslateCacheEnable && cache) {
     let translateContent = await translateCache.getTranslate(ctx.database, md5(content))
     if (translateContent) {
       return translateContent
@@ -29,7 +29,7 @@ module.exports = async (ctx, cfg, content) => {
   }
 
   // 如果开启了缓存，将翻译内容缓存到数据库
-  if (cfg.baiduTranslateCacheEnable) {
+  if (cfg.baiduTranslateCacheEnable && cache) {
     translateCache.save(ctx.database, md5(content), content, result.trans_result[0].dst)
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-tmp-bot",
   "description": "欧洲卡车模拟2 TMP查询机器人",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [