koishi-plugin-tmp-bot 1.3.0 → 1.3.2

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
@@ -16,7 +16,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
   }
 
   // 更新数据库
-  guildBind.saveOrUpdate(ctx.database, session.platform, session.guildId, session.userId, session.author.username, tmpId)
+  guildBind.saveOrUpdate(ctx.database, session.platform, session.userId, session.author.username, tmpId)
 
   return `绑定成功 ( ${playerInfo.data.name} )`
 }

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')
 
 /**
@@ -16,7 +16,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
 
     // 如果没有传入tmpId，尝试从数据库查询绑定信息
     if (!tmpId) {
-      let guildBindData = await guildBind.get(ctx.database, session.platform, session.guildId, session.userId)
+      let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId)
       if (!guildBindData) {
         return `请输入正确的玩家编号`
       }

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')
 
@@ -24,7 +24,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
 
   // 如果没有传入tmpId，尝试从数据库查询绑定信息
   if (!tmpId) {
-    let guildBindData = await guildBind.get(ctx.database, session.platform, session.guildId, session.userId)
+    let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId)
     if (!guildBindData) {
       return `请输入正确的玩家编号`
     }
@@ -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/database/guildBind.js

@@ -3,13 +3,11 @@ module.exports = {
    * 获取绑定信息
    * @param db 数据源
    * @param platform 平台
-   * @param guildId 群组编号
    * @param userId 用户编号
    */
-  async get (db, platform, guildId, userId) {
+  async get (db, platform, userId) {
     const guildBindList = await db.get('tmp_guild_bind', {
       platform,
-      guild_id: guildId,
       user_id: userId
     })
 
@@ -23,13 +21,12 @@ module.exports = {
    * 新增或更新绑定信息
    * @param db 数据源
    * @param platform 平台
-   * @param guildId 群组编号
    * @param userId 用户编号
    * @param userName 用户昵称
    * @param tmpId TMP ID
    */
-  saveOrUpdate (db, platform, guildId, userId, userName, tmpId) {
-    this.get(db, platform, guildId, userId).then((data) => {
+  saveOrUpdate (db, platform, userId, userName, tmpId) {
+    this.get(db, platform, userId).then((data) => {
       if (data) {
         db.set('tmp_guild_bind', data.id, {
           tmp_id: tmpId,
@@ -38,7 +35,6 @@ module.exports = {
       } else {
         db.create('tmp_guild_bind', {
           platform: platform,
-          guild_id: guildId,
           user_id: userId,
           user_name: userName,
           tmp_id: tmpId

package/lib/database/model.js

@@ -15,12 +15,6 @@ const modelArray = {
       nullable: false,
       comment: '所属平台'
     },
-    guild_id: {
-      type: 'string',
-      length: 50,
-      nullable: false,
-      comment: '群组编号'
-    },
     user_id: {
       type: 'string',
       length: 50,

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.0",
+  "version": "1.3.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [