koishi-plugin-tmp-bot 1.2.2 → 1.3.1

package/lib/command/tmpBind.js

@@ -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

@@ -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

@@ -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 `请输入正确的玩家编号`
     }

package/lib/command/tmpServer.js

@@ -1,14 +1,14 @@
 const truckersMpApi = require('../api/TruckersMpApi')
 
-module.exports = async (ctx, cfg) => {
+module.exports = async (ctx, cfg, game) => {
   // 查询服务器信息
   let serverData = await truckersMpApi.servers(ctx.http)
   if (serverData.error) {
     return '查询服务器失败，请稍后重试'
   }
 
-  // 过滤非欧卡2服务器
-  let etsServerList = serverData.data.filter(server => server.game === 'ETS2')
+  // 过滤服务器
+  let etsServerList = serverData.data.filter(server => server.game === game)
 
   // 构建消息
   let 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/index.js

@@ -24,7 +24,8 @@ function apply(ctx, cfg) {
     model(ctx);
     // 注册指令
     ctx.command('tmpquery <tmpId>').action(async ({ session }, tmpId) => await tmpQuery(ctx, cfg, session, tmpId));
-    ctx.command('tmpserver').action(async () => await tmpServer(ctx, cfg));
+    ctx.command('tmpserverats').action(async () => await tmpServer(ctx, cfg, 'ATS'));
+    ctx.command('tmpserverets').action(async () => await tmpServer(ctx, cfg, 'ETS2'));
     ctx.command('tmpbind <tmpId>').action(async ({ session }, tmpId) => await tmpBind(ctx, cfg, session, tmpId));
     ctx.command('tmptraffic <serverName>').action(async ({ session }, serverName) => await tmpTraffic(ctx, cfg, serverName));
     ctx.command('tmpposition <tmpId>').action(async ({ session }, tmpId) => await tmpPosition(ctx, cfg, session, tmpId));

package/package.json

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