koishi-plugin-tmp-bot 1.14.1 → 1.14.3

package/lib/api/evmOpenApi.js

@@ -22,6 +22,50 @@ module.exports = {
       data.data = result.data
     }
 
+    return data
+  },
+  /**
+   * 查询在线玩家
+   */
+  async mapPlayerList(http, serverId, ax, ay, bx, by) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/map/playerList?aAxisX=${ax}&aAxisY=${ay}&bAxisX=${bx}&bAxisY=${by}&serverId=${serverId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: result.code !== 200
+    }
+    if (!data.error) {
+      data.data = result.data
+    }
+    return data
+  },
+  /**
+   * 查询玩家信息
+   */
+  async playerInfo (http, tmpId) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/player/info?tmpId=${tmpId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: result.code !== 200
+    }
+    if (!data.error) {
+      data.data = result.data
+    }
     return data
   }
 }

package/lib/command/tmpPosition.js

@@ -3,7 +3,7 @@ const { resolve } = require('path')
 const guildBind = require('../database/guildBind')
 const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
-const truckersMpMapApi = require('../api/truckersMpMapApi')
+const evmOpenApi = require('../api/evmOpenApi')
 const baiduTranslate = require('../util/baiduTranslate')
 const common = require('../util/common')
 
@@ -41,7 +41,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
 
     // 查询周边玩家，并处理数据
-    let areaPlayersData = await truckersMpMapApi.area(ctx.http, playerMapInfo.data.server,
+    let areaPlayersData = await evmOpenApi.mapPlayerList(ctx.http, playerMapInfo.data.server,
         playerMapInfo.data.x - 4000,
         playerMapInfo.data.y + 2500,
         playerMapInfo.data.x + 4000,
@@ -50,16 +50,16 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     if (!areaPlayersData.error) {
       areaPlayerList = areaPlayersData.data
       let index = areaPlayerList.findIndex((player) => {
-        return player.MpId.toString() === tmpId.toString()
+        return player.tmpId.toString() === tmpId.toString()
       })
       if (index !== -1) {
         areaPlayerList.splice(index, 1)
       }
     }
     areaPlayerList.push({
-      X: playerMapInfo.data.x,
-      Y: playerMapInfo.data.y,
-      MpId: tmpId
+      axisX: playerMapInfo.data.x,
+      axisY: playerMapInfo.data.y,
+      tmpId
     })
 
     // promods服ID集合

package/lib/command/tmpQuery.js

@@ -1,7 +1,7 @@
 const dayjs = require('dayjs')
 const guildBind = require('../database/guildBind')
-const truckersMpApi = require('../api/truckersMpApi')
 const truckyAppApi = require('../api/truckyAppApi')
+const evmOpenApi = require('../api/evmOpenApi')
 const baiduTranslate = require('../util/baiduTranslate')
 
 /**
@@ -34,7 +34,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
   }
 
   // 查询玩家信息
-  let playerInfo = await truckersMpApi.player(ctx.http, tmpId)
+  let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId)
   if (playerInfo.error) {
     return '查询玩家信息失败，请重试'
   }
@@ -47,44 +47,31 @@ module.exports = async (ctx, cfg, session, tmpId) => {
   if (cfg.queryShowAvatarEnable) {
     message += `<img src="${playerInfo.data.avatar}"/>\n`
   }
-  message += '🆔TMP编号: ' + playerInfo.data.id
+  message += '🆔TMP编号: ' + playerInfo.data.tmpId
   message += '\n😀玩家名称: ' + playerInfo.data.name
-  message += '\n🎮SteamID: ' + playerInfo.data.steamID64
-  let registerDate = dayjs(playerInfo.data.joinDate + 'Z')
+  message += '\n🎮SteamID: ' + playerInfo.data.steamId
+  let registerDate = dayjs(playerInfo.data.registerTime)
   message += '\n📑注册日期: ' + registerDate.format('YYYY年MM月DD日') + ` (${dayjs().diff(registerDate, 'day')}天)`
   message += '\n💼所属分组: ' + (userGroup[playerInfo.data.groupName] || playerInfo.data.groupName)
-  if (playerInfo.data.vtc && playerInfo.data.vtc.inVTC) {
-    message += '\n🚚所属车队: ' + playerInfo.data.vtc.name
-    // 补充车队信息
-    try {
-      let vtcMemberResult = await truckersMpApi.vtcMember(ctx.http, playerInfo.data.vtc.id, playerInfo.data.vtc.memberID)
-      console.log(vtcMemberResult)
-      if (!vtcMemberResult.error) {
-        message += '\n🚚车队角色: ' + vtcMemberResult.data.role
-      }
-    } catch (e) {}
+  if (playerInfo.data.isJoinVtc) {
+    message += '\n🚚所属车队: ' + playerInfo.data.vtcName
+    message += '\n🚚车队角色: ' + playerInfo.data.vtcRole
   }
-  message += '\n🚫是否封禁: ' + (playerInfo.data.banned ? '是' : '否')
-  if (playerInfo.data.banned) {
+  message += '\n🚫是否封禁: ' + (playerInfo.data.isBan ? '是' : '否')
+  if (playerInfo.data.isBan) {
     message += '\n🚫封禁截止: '
-    if (!playerInfo.data.displayBans) {
+    if (playerInfo.data.banHide) {
       message += '隐藏'
     } else {
-      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, false)
+      if (!playerInfo.data.banUntil) {
+        message += '永久'
       } else {
-        message += '查询失败'
+        message += dayjs(playerInfo.data.banUntil).format('YYYY年MM月DD日 HH:mm')
       }
+      message += "\n🚫封禁原因: " + (playerInfo.data.banReasonZh || playerInfo.data.banReason)
     }
   }
-  message += '\n🚫封禁次数: ' + playerInfo.data.bansCount || 0
+  message += '\n🚫封禁次数: ' + playerInfo.data.banCount || 0
   if (playerMapInfo && !playerMapInfo.error) {
     message += '\n📶在线状态: ' + (playerMapInfo.data.online ? `在线🟢 (${playerMapInfo.data.serverDetails.name})` : '离线⚫')
     if (playerMapInfo.data.online) {
@@ -94,11 +81,10 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName)
     }
   }
-  let patreon = playerInfo.data.patreon
-  if (patreon && patreon.active) {
+  if (playerInfo.data.isSponsor) {
     message += '\n🎁赞助用户'
-    if (!patreon.hidden) {
-      message += ` (\$${Math.floor(patreon.currentPledge / 100)})`
+    if (!playerInfo.data.sponsorHide) {
+      message += ` (\$${Math.floor(playerInfo.data.sponsorAmount / 100)})`
     }
   }
   return message

package/lib/command/tmpTraffic/tmpTrafficMap.js

@@ -1,5 +1,5 @@
 const truckyAppApi = require('../../api/truckyAppApi')
-const truckersMpMapApi = require('../../api/truckersMpMapApi')
+const evmOpenApi = require('../../api/evmOpenApi')
 const baiduTranslate = require('../../util/baiduTranslate')
 const {resolve} = require("path");
 const common = require("../../util/common");
@@ -87,13 +87,13 @@ module.exports = async (ctx, cfg, serverName) => {
   }
 
   // 查询地图玩家数据
-  let mapData = await truckersMpMapApi.area(ctx.http, serverInfo.serverId, serverInfo.bounds[0][0], serverInfo.bounds[0][1], serverInfo.bounds[1][0], serverInfo.bounds[1][1])
+  let mapData = await evmOpenApi.mapPlayerList(ctx.http, serverInfo.serverId, serverInfo.bounds[0][0], serverInfo.bounds[0][1], serverInfo.bounds[1][0], serverInfo.bounds[1][1])
 
   // 构建路况数据
   let data = {
     mapType: serverInfo.mapType,
     trafficList: [],
-    playerCoordinateList: mapData.error && mapData.data ? [] : mapData.data.map(item => [item.X, item.Y])
+    playerCoordinateList: mapData.error && mapData.data ? [] : mapData.data.map(item => [item.axisX, item.axisY])
   }
   for (const traffic of trafficData.data) {
     data.trafficList.push({

package/lib/resource/position.html

@@ -205,13 +205,13 @@
       document.getElementsByClassName('real-name')[0].innerText = data.realName
 
       for (let player of data.playerList) {
-        L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.X, player.Y), 8), {
+        L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.axisX, player.axisY), 8), {
           color: '#2f2f2f',       // 标记点边框颜色
           weight: 2,              // 标记点边框大小
-          fillColor: data.currentPlayerId.toString() === player.MpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
+          fillColor: data.currentPlayerId.toString() === player.tmpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
           fillOpacity: 1,         // 标记点填充不透明度（0到1之间的值）
           radius: 5,              // 标记点半径（以像素为单位）
-          zIndex: data.currentPlayerId.toString() === player.MpId.toString() ? 1000 : undefined
+          zIndex: data.currentPlayerId.toString() === player.tmpId.toString() ? 1000 : undefined
         }).addTo(map);
       }
 

package/lib/resource/query.html

@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+  <style>
+    .border {
+      border: 1px solid red;
+    }
+
+    .form-box {
+      display: flex;
+      flex-wrap: wrap;
+    }
+    .form-box .form-item {
+      width: 50%;
+    }
+    .form-box .form-item.full {
+      width: 100%;
+    }
+
+    #container {
+      width: 400px;
+      background: linear-gradient(135deg, #1f2f54, #0f2c2a);
+      overflow: hidden;
+    }
+
+    .header {
+      height: 100px;
+      background-color: rgba(0, 0, 0, .1);
+      display: flex;
+      align-items: center;
+      padding: 0 26px;
+      box-shadow: 0 0 16px rgba(0, 0, 0, .4);
+    }
+    .header .avatar {
+      width: 64px;
+      height: 64px;
+    }
+    .header .info {
+      flex: 1;
+      padding-left: 16px;
+    }
+    .header .info .name {
+      color: #b0c7ff;
+      font-size: 18px;
+      font-weight: 600;
+    }
+    .header .info .tmp-id {
+      color: #aaaaaa;
+      font-size: 14px;
+      margin-top: 4px;
+    }
+
+    .details-container {
+      padding: 12px 26px;
+    }
+    .details-container .form-item {
+      margin-top: 12px;
+    }
+    .details-container .form-item:nth-child(1) {
+      margin-top: 0;
+    }
+    .details-container .form-item .label {
+      color: #dddddd;
+    }
+    .details-container .form-item .value {
+      color: #ffffff;
+    }
+
+    .ban-container {
+      margin: 16px 26px;
+      background-color: rgba(227, 92, 92, 0.3);
+    }
+    .ban-header {
+      width: 100%;
+      height: 30px;
+      box-sizing: border-box;
+      padding: 0 12px;
+      color: #ffffff;
+      font-size: 16px;
+      line-height: 30px;
+      background-color: rgba(227, 92, 92, 0.6);
+    }
+    .ban-body {
+      padding: 12px 16px;
+    }
+    .ban-body .ban-hidden {
+      color: #cccccc;
+      font-size: 14px;
+      font-style: italic;
+      text-align: center;
+    }
+    .ban-body .form-item {
+      margin-top: 8px;
+    }
+    .ban-body .form-item:nth-child(1),
+    .ban-body .form-item:nth-child(2){
+      margin-top: 0;
+    }
+    .ban-body .form-item .label {
+      color: #cccccc;
+      font-size: 12px;
+    }
+    .ban-body .form-item .value {
+      color: #eeeeee;
+      font-size: 14px;
+      word-wrap: break-word;
+      word-break: break-all;
+    }
+  </style>
+</head>
+<body>
+  <!--
+🆔TMP编号: 5672599
+😀玩家名称: MakeKazakh
+🎮SteamID: 76561199225329400
+📑注册日期: 2024年11月03日 (186天)
+💼所属分组: 玩家
+🚚所属车队: Kazakhstan-Taraz Truckers
+🚚车队角色: Owner
+🚫是否封禁: 否
+🚫封禁次数: 0
+📶在线状态: 在线🟢 (Simulation 1)
+🌍线上位置: 法国 - 加莱-杜伊斯堡 -->
+  <div id="container">
+    <div class="header">
+      <img class="avatar" src="https://static.truckersmp.com/avatarsN/4763167.1710207515.jpg" alt="avatar"/>
+      <div class="info">
+        <div class="name">*ACC* 014 kuroneko</div>
+        <div class="tmp-id">TMP#4763167</div>
+      </div>
+    </div>
+    <div class="details-container">
+      <div class="form-box">
+        <div class="form-item">
+          <div class="label">🎮SteamID</div>
+          <div class="value">76561198354836885</div>
+        </div>
+        <div class="form-item full">
+          <div class="label">📑注册日期</div>
+          <div class="value">2024年12月18日 (141天)</div>
+        </div>
+        <div class="form-item full">
+          <div class="label">💼所属分组</div>
+          <div class="value">玩家</div>
+        </div>
+        <div class="form-item full">
+          <div class="label">🚚所属车队</div>
+          <div class="value">Kazakhstan-Taraz Truckers</div>
+        </div>
+        <div class="form-item full">
+          <div class="label">🚚车队角色</div>
+          <div class="value">Owner</div>
+        </div>
+      </div>
+    </div>
+    <div class="ban-container">
+      <div class="ban-header">封禁中</div>
+      <div class="ban-body">
+        <div class="ban-hidden">玩家隐藏</div>
+<!--        <div class="form-box">-->
+<!--          <div class="form-item">-->
+<!--            <div class="label">截止时间</div>-->
+<!--            <div class="value">2020-09-09 09:09:09</div>-->
+<!--          </div>-->
+<!--          <div class="form-item">-->
+<!--            <div class="label">封禁次数</div>-->
+<!--            <div class="value">5次</div>-->
+<!--          </div>-->
+<!--          <div class="form-item full">-->
+<!--            <div class="label">原因</div>-->
+<!--            <div class="value">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>-->
+<!--          </div>-->
+<!--        </div>-->
+      </div>
+    </div>
+  </div>
+</body>
+</html>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-tmp-bot",
   "description": "欧洲卡车模拟2 TMP查询插件，不会部署的可以直接使用此机器人->QQ:3523283907",
-  "version": "1.14.1",
+  "version": "1.14.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/79887143/koishi-plugin-tmp-bot",