koishi-plugin-tmp-bot 1.11.0 → 1.12.1

package/lib/api/truckersMpApi.js

@@ -88,5 +88,28 @@ module.exports = {
       error: false,
       data: result
     }
+  },
+  /**
+   * 查询车队成员信息
+   */
+  async vtcMember (http, vtcId, memberId) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/vtc/${vtcId}/member/${memberId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: JSON.parse(result.error)
+    }
+    if (!data.error) {
+      data.data = result.response
+    }
+
+    return data
   }
 }

package/lib/command/tmpQuery.js

@@ -41,12 +41,10 @@ module.exports = async (ctx, cfg, session, tmpId) => {
 
   // 查询线上信息
   let playerMapInfo = await truckyAppApi.online(ctx.http, tmpId)
-  if (playerMapInfo.error) {
-    return '查询玩家信息失败，请重试'
-  }
 
   // 拼接消息模板
   let message = `<img src="${playerInfo.data.avatar}"/>`
+  message += '\n🆔TMP编号: ' + playerInfo.data.id
   message += '\n😀玩家名称: ' + playerInfo.data.name
   message += '\n🎮SteamID: ' + playerInfo.data.steamID64
   let registerDate = dayjs(playerInfo.data.joinDate + 'Z')
@@ -54,6 +52,14 @@ module.exports = async (ctx, cfg, session, tmpId) => {
   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) {}
   }
   message += '\n🚫是否封禁: ' + (playerInfo.data.banned ? '是' : '否')
   if (playerInfo.data.banned) {
@@ -76,12 +82,14 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
   }
   message += '\n🚫封禁次数: ' + playerInfo.data.bansCount || 0
-  message += '\n📶在线状态: ' + (playerMapInfo.data.online ? `在线🟢 (${playerMapInfo.data.serverDetails.name})` : '离线⚫')
-  if (playerMapInfo.data.online) {
-    message += '\n🌍线上位置: '
-    message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country)
-    message += ' - '
-    message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName)
+  if (playerMapInfo && !playerMapInfo.error) {
+    message += '\n📶在线状态: ' + (playerMapInfo.data.online ? `在线🟢 (${playerMapInfo.data.serverDetails.name})` : '离线⚫')
+    if (playerMapInfo.data.online) {
+      message += '\n🌍线上位置: '
+      message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country)
+      message += ' - '
+      message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName)
+    }
   }
   let patreon = playerInfo.data.patreon
   if (patreon && patreon.active) {

package/package.json

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

package/readme.md

@@ -13,3 +13,4 @@
 | tmptraffic   | 查询服务器热门地点路况信息，仅支持使用服务器简称查询，具体支持查询的服务器和服务器简称信息如下</br>Simulation 1 (简称: s1)</br>Simulation 2 (简称: s2)</br>ProMods (简称: p)</br>Arcade  (简称: a) | tmptraffic s1   |
 | tmpserverats | 查询美卡服务器信息列表                                                                                                                                 | tmpserverats    |
 | tmpserverets | 查询欧卡服务器信息列表                                                                                                                                 | tmpserverets    |
+| tmpversion   | 查询版本信息                                                                                                                                      | tmpversion      |