koishi-plugin-ets2-tools-tmp 2.5.6 → 2.5.8

package/lib/command/tmpFootprint.js

@@ -67,20 +67,8 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
     endTime = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
   }
 
-  if (date === 'thisMonth') {
-    startTime = dayjs().startOf('month').format('YYYY-MM-DD HH:mm:ss');
-    endTime = dayjs().endOf('month').format('YYYY-MM-DD HH:mm:ss');
-  }
-
-  if (date === 'lastMonth') {
-    const lastMonth = dayjs().subtract(1, 'month');
-    startTime = lastMonth.startOf('month').format('YYYY-MM-DD HH:mm:ss');
-    endTime = lastMonth.endOf('month').format('YYYY-MM-DD HH:mm:ss');
-  }
-
-  if (date === 'lastThreeMonths') {
-    const threeMonthsAgo = dayjs().subtract(3, 'month');
-    startTime = threeMonthsAgo.startOf('month').format('YYYY-MM-DD HH:mm:ss');
+  if (date === 'tenday') {
+    startTime = dayjs().subtract(10, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss');
     endTime = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
   }
 
@@ -110,8 +98,8 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
     if (date === 'today') {
       return `今日暂无数据`;
     }
-    if (date === 'thisMonth') {
-      return `本月暂无数据`;
+    if (date === 'tenday') {
+      return `近十天暂无数据`;
     }
     if (date === 'lastMonth') {
       return `上月暂无数据`;

package/lib/command/tmpPosition.js

@@ -44,13 +44,13 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     // 查询玩家信息
     let playerInfo = await truckersMpApi.player(ctx.http, tmpId)
     if (playerInfo.error) {
-      return '查询玩家位置信息失败，请重试'
+      return '玩家位置信息查询失败，请重试'
     }
 
     // 查询线上信息
     let playerMapInfo = await truckyAppApi.online(ctx.http, tmpId)
     if (playerMapInfo.error) {
-      return '查询玩家线上信息失败，请重试'
+      return '玩家线上信息查询失败，请重试'
     }
     if (!playerMapInfo.data.online) {
       return '玩家离线'

package/lib/command/tmpQuery/tmpQueryText.js

@@ -57,7 +57,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         return '玩家不存在';
     }
     else if (playerInfo.error) {
-        return '查询玩家信息失败，请重试';
+        return '玩家信息查询失败，请重试';
     }
     // 查询线上信息
     let playerMapInfo = await truckyAppApi.online(ctx.http, tmpId);

package/lib/index.js

@@ -276,41 +276,17 @@ function registerBaseCommands(ctx, cfg) {
     }
 
     if (cfg.commands?.tmpFootprint) {
-        ctx.command('上月足迹 [tmpId:string]')
-            .usage("查询ETS服务器今日足迹")
-            .example("上月足迹")
-            .example("上月足迹 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId, 'lastMonth'));
-
-        ctx.command('上月足迹p [tmpId:string]')
-            .usage("查询Promods服务器今日足迹")
-            .example("本月上月足迹p足迹p")
-            .example("上月足迹p 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'lastMonth'));
-
-        ctx.command('近三个月足迹 [tmpId:string]')
-            .usage("查询ETS服务器今日足迹")
-            .example("近三个月足迹")
-            .example("近三个月足迹 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId, 'lastThreeMonths'));
-
-        ctx.command('近三个月足迹p [tmpId:string]')
-            .usage("查询Promods服务器今日足迹")
-            .example("近三个月足迹p足迹p")
-            .example("近三个月足迹p 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'lastThreeMonths'));
-
         ctx.command('本月足迹 [tmpId:string]')
             .usage("查询ETS服务器今日足迹")
             .example("本月足迹")
             .example("本月足迹 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId, 'thisMonth'));
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId, 'tenday'));
 
         ctx.command('本月足迹p [tmpId:string]')
             .usage("查询Promods服务器今日足迹")
             .example("本月足迹p")
             .example("本月足迹p 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'thisMonth'));
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'tenday'));
 
         ctx.command('昨日足迹 [tmpId:string]')
             .usage("查询ETS服务器今日足迹")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ets2-tools-tmp",
   "description": "欧卡2 TruckersMP信息查询、车队平台查询及活动提醒",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"