koishi-plugin-tmp-bot 1.19.4 → 1.20.1

package/lib/api/evmOpenApi.js

@@ -117,7 +117,7 @@ module.exports = {
     async mapPlayerHistory(http, tmpId, serverId, startTime, endTime) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/map/playerHistory?tmpId=${tmpId}&serverId=${serverId}&startTime=${startTime}&endTime=${endTime}`);
+            result = await http.get(`${BASE_API}/map/playerHistory?tmpId=${tmpId || ''}&serverId=${serverId || ''}&startTime=${startTime || ''}&endTime=${endTime || ''}`);
         }
         catch {
             return {

package/lib/command/tmpFootprint.d.ts

@@ -1,3 +1,3 @@
-declare function _exports(ctx: any, session: any, serverName: any): Promise<string | segment>;
+declare function _exports(ctx: any, session: any, serverType: any, tmpId: any): Promise<string | segment>;
 export = _exports;
 import { segment } from "@koishijs/core";

package/lib/command/tmpFootprint.js

@@ -2,24 +2,24 @@ const { segment } = require('koishi');
 const dayjs = require('dayjs');
 const { resolve } = require('path');
 const common = require('../util/common');
-const { ServerAliasToId, PromodsIds } = require('../util/constant');
+const { PromodsIds, ServerType } = require('../util/constant');
 const evmOpenApi = require('../api/evmOpenApi');
 const guildBind = require('../database/guildBind');
-module.exports = async (ctx, session, serverName) => {
+module.exports = async (ctx, session, serverType, tmpId) => {
     if (!ctx.puppeteer) {
         return '未启用 puppeteer 服务';
     }
-    // 转换服务器别名到ID
-    let serverId = ServerAliasToId[serverName];
-    if (!serverId) {
-        return '请输入正确的服务器名称 (s1, s2, p, a)';
+    if (tmpId && isNaN(tmpId)) {
+        return `请输入正确的玩家编号，或绑定玩家编号`;
     }
-    // 尝试从数据库查询绑定信息
-    let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
-    if (!guildBindData) {
-        return `请先绑定玩家编号`;
+    // 如果没有传入tmpId，尝试从数据库查询绑定信息
+    if (!tmpId) {
+        let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
+        if (!guildBindData) {
+            return `请输入正确的玩家编号，或绑定玩家编号`;
+        }
+        tmpId = guildBindData.tmp_id;
     }
-    let tmpId = guildBindData.tmp_id;
     // 查询玩家信息
     let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId);
     if (playerInfo.error && playerInfo.code === 10001) {
@@ -31,13 +31,27 @@ module.exports = async (ctx, session, serverName) => {
     // 查询当日历史位置数据
     const startTime = dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss');
     const endTime = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
-    let mapPlayerHistory = await evmOpenApi.mapPlayerHistory(ctx.http, tmpId, serverId, startTime, endTime);
-    if (mapPlayerHistory.data.length === 0) {
+    let mapPlayerHistory = await evmOpenApi.mapPlayerHistory(ctx.http, tmpId, null, startTime, endTime);
+    if (mapPlayerHistory.error) {
+        return '查询玩家历史位置数据失败，请稍后重试';
+    }
+    // 过滤非对应服务器数据
+    const promodsIdSet = new Set(PromodsIds);
+    const mapPlayerHistoryArr = mapPlayerHistory.data.filter(item => {
+        if (ServerType.ets === serverType) {
+            return !promodsIdSet.has(item.serverId);
+        }
+        else if (ServerType.promods === serverType) {
+            return promodsIdSet.has(item.serverId);
+        }
+        return false;
+    });
+    if (mapPlayerHistoryArr.length === 0) {
         return `当日暂无数据`;
     }
     // 拼接数据
     let data = {
-        mapType: PromodsIds.indexOf(serverId) !== -1 ? 'promods' : 'ets',
+        mapType: ServerType.promods === serverType ? 'promods' : 'ets',
         name: playerInfo.data.name,
         smallAvatarUrl: playerInfo.data.smallAvatarUrl,
         todayMileage: playerInfo.data.todayMileage,

package/lib/command/tmpPosition.d.ts

@@ -1,3 +1,3 @@
-declare function _exports(ctx: any, cfg: any, session: any, tmpId: any): Promise<segment | "请输入正确的玩家编号" | "渲染异常，请重试" | "未启用 puppeteer 服务" | "查询玩家信息失败，请重试" | "玩家离线">;
+declare function _exports(ctx: any, cfg: any, session: any, tmpId: any): Promise<segment | "渲染异常，请重试" | "未启用 puppeteer 服务" | "请输入正确的玩家编号，或绑定玩家编号" | "查询玩家信息失败，请重试" | "玩家离线">;
 export = _exports;
 import { segment } from "@koishijs/core";

package/lib/command/tmpPosition.js

@@ -12,13 +12,13 @@ const common = require('../util/common');
 module.exports = async (ctx, cfg, session, tmpId) => {
     if (ctx.puppeteer) {
         if (tmpId && isNaN(tmpId)) {
-            return `请输入正确的玩家编号`;
+            return `请输入正确的玩家编号，或绑定玩家编号`;
         }
         // 如果没有传入tmpId，尝试从数据库查询绑定信息
         if (!tmpId) {
             let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
             if (!guildBindData) {
-                return `请输入正确的玩家编号`;
+                return `请输入正确的玩家编号，或绑定玩家编号`;
             }
             tmpId = guildBindData.tmp_id;
         }

package/lib/command/tmpQuery/tmpQueryImg.d.ts

@@ -1,3 +1,3 @@
-declare function _exports(ctx: any, cfg: any, session: any, tmpId: any): Promise<segment | "请输入正确的玩家编号" | "渲染异常，请重试" | "未启用 puppeteer 服务" | "玩家不存在" | "查询玩家信息失败，请重试">;
+declare function _exports(ctx: any, cfg: any, session: any, tmpId: any): Promise<segment | "渲染异常，请重试" | "未启用 puppeteer 服务" | "请输入正确的玩家编号，或绑定玩家编号" | "玩家不存在" | "查询玩家信息失败，请重试">;
 export = _exports;
 import { segment } from "@koishijs/core";

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -25,13 +25,13 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         return '未启用 puppeteer 服务';
     }
     if (tmpId && isNaN(tmpId)) {
-        return `请输入正确的玩家编号`;
+        return `请输入正确的玩家编号，或绑定玩家编号`;
     }
     // 如果没有传入tmpId，尝试从数据库查询绑定信息
     if (!tmpId) {
         let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
         if (!guildBindData) {
-            return `请输入正确的玩家编号`;
+            return `请输入正确的玩家编号，或绑定玩家编号`;
         }
         tmpId = guildBindData.tmp_id;
     }

package/lib/command/tmpQuery/tmpQueryText.js

@@ -23,13 +23,13 @@ const userGroup = {
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
     if (tmpId && isNaN(tmpId)) {
-        return `请输入正确的玩家编号`;
+        return `请输入正确的玩家编号，或绑定玩家编号`;
     }
     // 如果没有传入tmpId，尝试从数据库查询绑定信息
     if (!tmpId) {
         let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
         if (!guildBindData) {
-            return `请输入正确的玩家编号`;
+            return `请输入正确的玩家编号，或绑定玩家编号`;
         }
         tmpId = guildBindData.tmp_id;
     }

package/lib/index.js

@@ -14,6 +14,7 @@ const tmpVersion = require('./command/tmpVersion');
 const tmpDlcMap = require('./command/tmpDlcMap');
 const tmpMileageRanking = require('./command/tmpMileageRanking');
 const tmpFootprint = require('./command/tmpFootprint');
+const { ServerType } = require('./util/constant');
 exports.name = 'tmp-bot';
 exports.inject = {
     required: ['database'],
@@ -51,5 +52,6 @@ function apply(ctx, cfg) {
     ctx.command('tmpdlcmap').action(async ({ session }) => await tmpDlcMap(ctx, session));
     ctx.command('tmpmileageranking').action(async ({ session }) => await tmpMileageRanking(ctx, session, MileageRankingType.total));
     ctx.command('tmptodaymileageranking').action(async ({ session }) => await tmpMileageRanking(ctx, session, MileageRankingType.today));
-    ctx.command('tmpfootprint').action(async ({ session }, serverName) => await tmpFootprint(ctx, session, serverName));
+    ctx.command('tmpfootprints').action(async ({ session }, tmpId) => await tmpFootprint(ctx, session, ServerType.ets, tmpId));
+    ctx.command('tmpfootprintp').action(async ({ session }, tmpId) => await tmpFootprint(ctx, session, ServerType.promods, tmpId));
 }

package/lib/util/constant.d.ts

@@ -13,3 +13,7 @@ export namespace ServerAliasToId {
     let a: number;
 }
 export let PromodsIds: number[];
+export namespace ServerType {
+    let ets: number;
+    let promods: number;
+}

package/lib/util/constant.js

@@ -25,5 +25,12 @@ module.exports = {
     /**
      * P服务器ID集合
      */
-    PromodsIds: [50, 51]
+    PromodsIds: [50, 51],
+    /**
+     * 服务器类型
+     */
+    ServerType: {
+        ets: 1,
+        promods: 2
+    }
 };

package/package.json

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