koishi-plugin-ets2-tools-tmp 3.0.6 → 3.1.1

package/lib/command/tmpActivityService/tmpActivityServiceV1.js

@@ -57,15 +57,25 @@ module.exports = {
 
             if (response.code === 0 && response.data) {
                 const enableAutoClock = response.data.enableAutoClock;
-                this.logger.debug(`活动 "${activity.themeName}" V1自动打卡状态: ${enableAutoClock}`);
-                return enableAutoClock === 1;
+                const serverId = response.data.serverId;
+                this.logger.debug(`活动 "${activity.themeName}" V1自动打卡状态: ${enableAutoClock}, serverId: ${serverId}`);
+
+                if (enableAutoClock === 1) {
+                    if (serverId != null) {
+                        return { status: 'set', message: '今日活动自动打卡已设置' };
+                    } else {
+                        return { status: 'no_server', message: '今日活动打卡服务器未设置' };
+                    }
+                } else {
+                    return { status: 'not_set', message: '今日活动打卡未设置' };
+                }
             } else {
                 this.logger.error(`V1活动详情API返回错误: ${response.msg || '未知错误'} (代码: ${response.code || '无'})`);
-                return false;
+                return { status: 'not_set', message: '今日活动打卡未设置' };
             }
         } catch (error) {
             this.logger.error(`检查V1活动 "${activity.themeName}" 自动打卡状态失败:`, error.message);
-            return false;
+            return { status: 'not_set', message: '今日活动打卡未设置' };
         }
     }
 };

package/lib/command/tmpActivityService/tmpActivityServiceV2.js

@@ -71,15 +71,25 @@ module.exports = {
 
             if (response.code === 200 && response.data) {
                 const autoCheckInEnable = response.data.autoCheckInEnable;
-                this.logger.debug(`活动 "${activity.themeName}" V2自动打卡状态: ${autoCheckInEnable}`);
-                return autoCheckInEnable === 1;
+                const serverId = response.data.serverId;
+                this.logger.debug(`活动 "${activity.themeName}" V2自动打卡状态: ${autoCheckInEnable}, serverId: ${serverId}`);
+
+                if (autoCheckInEnable === 1) {
+                    if (serverId != null) {
+                        return { status: 'set', message: '今日活动自动打卡已设置' };
+                    } else {
+                        return { status: 'no_server', message: '今日活动打卡服务器未设置' };
+                    }
+                } else {
+                    return { status: 'not_set', message: '今日活动打卡未设置' };
+                }
             } else {
                 this.logger.error(`V2活动详情API返回错误: ${response.msg || '未知错误'} (代码: ${response.code || '无'})`);
-                return false;
+                return { status: 'not_set', message: '今日活动打卡未设置' };
             }
         } catch (error) {
             this.logger.error(`检查V2活动 "${activity.themeName}" 自动打卡状态失败:`, error.message);
-            return false;
+            return { status: 'not_set', message: '今日活动打卡未设置' };
         }
     }
 };

package/lib/command/tmpActivityService.js

@@ -620,13 +620,18 @@ class ActivityService {
 
         for (const activity of this.todayActivities) {
             try {
-                const autoClockEnabled = await this.checkAutoClock(activity);
+                const autoClockResult = await this.checkAutoClock(activity);
 
-                const message = autoClockEnabled
-                    ? `今日活动自动打卡已设置`
-                    : `请注意，今日活动打卡未设置。\n 活动名称： ${activity.themeName || '未知活动'}`;
+                let message;
+                if (autoClockResult.status === 'set') {
+                    message = `今日活动自动打卡已设置`;
+                } else if (autoClockResult.status === 'no_server') {
+                    message = `请注意，今日活动打卡服务器未设置。\n 活动名称： ${activity.themeName || '未知活动'}`;
+                } else {
+                    message = `请注意，今日活动打卡未设置。\n 活动名称： ${activity.themeName || '未知活动'}`;
+                }
 
-                this.logger.message(`自动打卡检查: "${activity.themeName || '未知活动'}" - ${autoClockEnabled ? "已设置" : "未设置"}`);
+                this.logger.message(`自动打卡检查: "${activity.themeName || '未知活动'}" - ${autoClockResult.message}`);
 
                 for (const groupId of this.cfg.admin.groups) {
                     try {

package/lib/command/tmpFootprint.js

@@ -68,7 +68,7 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
   }
 
   if (date === 'tenday') {
-    startTime = dayjs().subtract(10, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss');
+    startTime = dayjs().subtract(7, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss');
     endTime = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
   }
 
@@ -98,8 +98,8 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
     if (date === 'today') {
       return `今日暂无数据`;
     }
-    if (date === 'tenday') {
-      return `近十天暂无数据`;
+    if (date === 'sevenday') {
+      return `近七日暂无数据`;
     }
     if (date === 'lastMonth') {
       return `上月暂无数据`;

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -1,4 +1,6 @@
 const dayjs = require('dayjs');
+const dayjsRelativeTime = require('dayjs/plugin/relativeTime');
+const dayjsLocaleZhCn = require('dayjs/locale/zh-cn');
 const guildBind = require('../../database/guildBind');
 const truckyAppApi = require('../../api/truckyAppApi');
 const evmOpenApi = require('../../api/evmOpenApi');
@@ -6,6 +8,8 @@ const baiduTranslate = require('../../util/baiduTranslate');
 const { resolve } = require("path");
 const common = require("../../util/common");
 const { segment } = require("koishi");
+dayjs.extend(dayjsRelativeTime);
+dayjs.locale(dayjsLocaleZhCn);
 /**
  * 用户组
  */
@@ -21,11 +25,27 @@ const userGroup = {
  * 查询玩家信息
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
+    const { vtcId } = cfg.tmpActivityService?.api || {};
     if (!ctx.puppeteer) {
         return '未启用 puppeteer 服务';
     }
-    if (tmpId && isNaN(tmpId)) {
-        return `请输入正确的玩家编号`;
+    if (tmpId && tmpId.startsWith("<at ")) {
+        let queryQQ = tmpId.replace('<at ', '');
+        let id = '';
+        const idStart = queryQQ.indexOf('id="');
+        if (idStart !== -1) {
+            const valueStart = idStart + 4;
+            const valueEnd = queryQQ.indexOf('"', valueStart);
+            if (valueEnd !== -1) {
+                id = queryQQ.substring(valueStart, valueEnd);
+            }
+        }
+        queryQQ = id;
+        let guildBindData = await guildBind.get(ctx.database, session.platform, queryQQ);
+        if (!guildBindData) {
+            return `该用户没有绑定玩家编号`;
+        }
+        tmpId = guildBindData.tmp_id;
     }
     // 如果没有传入tmpId，尝试从数据库查询绑定信息
     if (!tmpId) {
@@ -50,27 +70,36 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     data.tmpId = playerInfo.data.tmpId;
     data.name = playerInfo.data.name;
     data.steamId = playerInfo.data.steamId;
-    data.registerDate = dayjs(playerInfo.data.registerTime).format('YYYY年MM月DD日');
+    let registerDate = dayjs(playerInfo.data.registerTime);
+    data.registerDate = registerDate.format('YYYY年MM月DD日');
+    data.registerDays = dayjs().diff(registerDate, 'day');
     data.avatarUrl = playerInfo.data.avatarUrl;
     data.groupColor = playerInfo.data.groupColor;
     data.groupName = (userGroup[playerInfo.data.groupName] || playerInfo.data.groupName);
     data.isJoinVtc = playerInfo.data.isJoinVtc;
     data.vtcName = playerInfo.data.vtcName;
     data.vtcRole = playerInfo.data.vtcRole;
+    data.vtcHistory = playerInfo.data.vtcHistory || [];
     data.isSponsor = playerInfo.data.isSponsor;
     data.sponsorAmount = playerInfo.data.sponsorAmount;
     data.sponsorCumulativeAmount = playerInfo.data.sponsorCumulativeAmount;
     data.sponsorHide = playerInfo.data.sponsorHide;
+    data.mileage = playerInfo.data.mileage;
+    data.todayMileage = playerInfo.data.todayMileage;
     data.isOnline = false;
+    data.onlineStatus = '离线';
     if (playerMapInfo && !playerMapInfo.error) {
         data.isOnline = playerMapInfo.data.online;
         if (data.isOnline) {
+            data.onlineStatus = '在线';
             data.onlineServerName = playerMapInfo.data.serverDetails.name;
             data.onlineCountry = await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country);
             data.onlineCity = await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName);
             data.onlineX = playerMapInfo.data.x;
             data.onlineY = playerMapInfo.data.y;
             data.onlineMapType = playerMapInfo.data.serverDetails.id === 50 ? 'promods' : 'ets';
+        } else if (playerInfo.data.lastOnlineTime) {
+            data.lastOnlineTime = dayjs(playerInfo.data.lastOnlineTime).fromNow(false);
         }
     }
     data.isBan = playerInfo.data.isBan;
@@ -79,10 +108,86 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     data.banReasonZh = playerInfo.data.banReasonZh;
     data.banCount = playerInfo.data.banCount;
     data.banHide = playerInfo.data.banHide;
+    // 查询VTC积分（仅主群/管理群显示）
+    data.rewardPoints = 0;
+    if (playerInfo.data.isJoinVtc && cfg.commands?.mainSettings) {
+        const mainGroups = cfg.tmpActivityService?.mainGroup?.groups || [];
+        const adminGroups = cfg.tmpActivityService?.admin?.groups || [];
+        const allowedGroups = [...new Set([...mainGroups, ...adminGroups])];
+        const currentGroupId = session.channelId || '';
+        const isInAllowedGroup = allowedGroups.some(g => currentGroupId.includes(g));
+
+        if (isInAllowedGroup && playerInfo.data.vtcId == vtcId) {
+            const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
+            const platform = (platformVersion || "v1").toLowerCase();
+            try {
+                if (platform === "v2") {
+                    const baseUrl = url;
+                    const userInfoUrl = `https://${baseUrl}/members/get?token=${token}&tmpId=${tmpId}`;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的V2.0积分`);
+                        ctx.logger.info(`[TMP_BOT] 请求V2.0用户信息: ${userInfoUrl}`);
+                    }
+                    const userInfoResponse = await ctx.http.get(userInfoUrl);
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] V2.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+                    }
+                    if (userInfoResponse.code === 200 && userInfoResponse.data) {
+                        data.rewardPoints = userInfoResponse.data.point || 0;
+                    }
+                } else {
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的V1.0积分`);
+                    }
+                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] 请求V1.0用户信息: ${userInfoUrl}`);
+                    }
+                    const userInfoResponse = await ctx.http.post(userInfoUrl);
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] V1.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+                    }
+                    const userList = userInfoResponse.page?.list || [];
+                    const userInfo = userList[0];
+                    data.rewardPoints = userInfo.rewardPoints || 0;
+                }
+            } catch (error) {
+                ctx.logger.error(`积分查询过程出错: ${error}`);
+            }
+        }
+    }
+    // 查询Steam游戏时长
+    data.ets2GameTime = null;
+    data.atsGameTime = null;
+    if (cfg.commands?.tmpQueryGameTime) {
+        try {
+            const steamApiKey = cfg.steamApi?.key;
+            if (steamApiKey) {
+                const steamId = playerInfo.data.steamId;
+                const url = `https://api.114512.xyz/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
+                const response = await ctx.http.get(url);
+                if (response.response && response.response.game_count > 0) {
+                    for (const game of response.response.games) {
+                        const playtimeMinutes = game.playtime_forever;
+                        const hours = Math.floor(playtimeMinutes / 60);
+                        const minutes = playtimeMinutes % 60;
+                        const playtime = `${hours}小时${minutes}分钟`;
+                        if (game.appid === 227300) {
+                            data.ets2GameTime = playtime;
+                        } else if (game.appid === 270880) {
+                            data.atsGameTime = playtime;
+                        }
+                    }
+                }
+            }
+        } catch (error) {
+            ctx.logger.error(`查询Steam游戏时长出错: ${error}`);
+        }
+    }
     let page;
     try {
         page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 1000, height: 1000 });
+        await page.setViewport({ width: 520, height: 1000 });
         await page.goto(`file:///${resolve(__dirname, '../../resource/query.html')}`);
         await page.evaluate(`init(${JSON.stringify(data)})`);
         await common.sleep(100);

package/lib/command/tmpQuery/tmpQueryText.js

@@ -81,7 +81,14 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         }
         message += '\n🚚车队角色: ' + playerInfo.data.vtcRole;
         if (cfg.commands?.mainSettings) {
-            if (playerInfo.data.vtcId == vtcId) {
+            // 仅在主群或管理群中显示车队积分
+            const mainGroups = cfg.tmpActivityService?.mainGroup?.groups || [];
+            const adminGroups = cfg.tmpActivityService?.admin?.groups || [];
+            const allowedGroups = [...new Set([...mainGroups, ...adminGroups])];
+            const currentGroupId = session.channelId || '';
+            const isInAllowedGroup = allowedGroups.some(g => currentGroupId.includes(g));
+
+            if (isInAllowedGroup && playerInfo.data.vtcId == vtcId) {
                 const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
                 const platform = (platformVersion || "v1").toLowerCase();
                 try {

package/lib/index.js

@@ -312,15 +312,15 @@ 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, 'tenday'));
+            .example("近七日足迹")
+            .example("近七日足迹 12345")
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId, 'sevenday'));
 
-        ctx.command('近十日足迹p [tmpId:string]')
+        ctx.command('近七日足迹p [tmpId:string]')
             .usage("查询Promods服务器今日足迹")
-            .example("近十日足迹p")
-            .example("近十日足迹p 12345")
-            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'tenday'));
+            .example("近七日足迹p")
+            .example("近七日足迹p 12345")
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId, 'sevenday'));
 
         ctx.command('昨日足迹 [tmpId:string]')
             .usage("查询ETS服务器今日足迹")