From 5fb36352d2ba6191f9886f4a41e82d2d50bc8387 Mon Sep 17 00:00:00 2001 From: tresabhi Date: Tue, 27 Jun 2023 19:10:12 +0000 Subject: [PATCH] feat: renamed stats to statsfull --- .vscode/settings.json | 1 + src/commands/evolution.tsx | 2 +- src/commands/{stats.tsx => statsfull.tsx} | 14 +++++++------- src/renderers/evolution.tsx | 2 +- src/renderers/{stats.tsx => statsfull.tsx} | 2 +- src/routers/stats.tsx | 4 ++-- tsconfig.json | 7 +------ 7 files changed, 14 insertions(+), 18 deletions(-) rename src/commands/{stats.tsx => statsfull.tsx} (88%) rename src/renderers/{stats.tsx => statsfull.tsx} (98%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 68ad53f7a..bc8e18f0c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,6 +20,7 @@ "SKLLD", "Smri", "startcase", + "statsfull", "strvk", "tankaverages", "tankopedia", diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx index 165fe79bc..3dc6d6ddb 100644 --- a/src/commands/evolution.tsx +++ b/src/commands/evolution.tsx @@ -7,7 +7,7 @@ import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.j import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js'; import { CommandRegistry } from '../events/interactionCreate/index.js'; import evolution from '../renderers/evolution.js'; -import { StatType } from '../renderers/stats.js'; +import { StatType } from '../renderers/statsfull.js'; export default { inProduction: true, diff --git a/src/commands/stats.tsx b/src/commands/statsfull.tsx similarity index 88% rename from src/commands/stats.tsx rename to src/commands/statsfull.tsx index 8194b7db2..92a1341c2 100644 --- a/src/commands/stats.tsx +++ b/src/commands/statsfull.tsx @@ -13,17 +13,17 @@ import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.j import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js'; import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js'; import { CommandRegistry } from '../events/interactionCreate/index.js'; -import stats, { StatType } from '../renderers/stats.js'; +import statsfull, { StatType } from '../renderers/statsfull.js'; export default { inProduction: true, - inDevelopment: false, + inDevelopment: true, inPublic: true, command: addStatTypeSubCommandGroups( new SlashCommandBuilder() - .setName('stats') - .setDescription('In-game statistics'), + .setName('statsfull') + .setDescription('Full in-game statistics'), ), async handler(interaction) { @@ -37,14 +37,14 @@ export default { const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : 0; const start = interaction.options.getInteger('start'); const end = interaction.options.getInteger('end'); - const path = `stats/${commandGroup}/${subcommand}?server=${ + const path = `statsfull/${commandGroup}/${subcommand}?server=${ player.server }&id=${player.id}&tankId=${tankId}&start=${start ?? 0}&end=${end ?? 0}`; interactionToURL(interaction); return [ - await stats(commandGroup, period, player, tankId), + await statsfull(commandGroup, period, player, tankId), primaryButton(path, 'Refresh'), linkButton(path, 'Embed'), ]; @@ -62,7 +62,7 @@ export default { const period = resolvePeriodFromButton(interaction); const player = await resolvePlayerFromButton(interaction); - return await stats( + return await statsfull( commandGroup, period, player, diff --git a/src/renderers/evolution.tsx b/src/renderers/evolution.tsx index cff891b6c..7048ed115 100644 --- a/src/renderers/evolution.tsx +++ b/src/renderers/evolution.tsx @@ -15,7 +15,7 @@ import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js'; import { AccountInfo } from '../types/accountInfo.js'; import { Histories } from '../types/histories.js'; import { PlayerClanData } from '../types/playerClanData.js'; -import { StatType } from './stats.js'; +import { StatType } from './statsfull.js'; export default async function evolution( type: Type, diff --git a/src/renderers/stats.tsx b/src/renderers/statsfull.tsx similarity index 98% rename from src/renderers/stats.tsx rename to src/renderers/statsfull.tsx index 13e5a6235..33fa798de 100644 --- a/src/renderers/stats.tsx +++ b/src/renderers/statsfull.tsx @@ -24,7 +24,7 @@ import { PlayerClanData } from '../types/playerClanData.js'; export type StatType = 'player' | 'tank'; -export default async function stats( +export default async function statsfull( type: Type, { start, end, statsName }: ResolvedPeriod, { server, id }: ResolvedPlayer, diff --git a/src/routers/stats.tsx b/src/routers/stats.tsx index 521dbf9a5..cdaea9824 100644 --- a/src/routers/stats.tsx +++ b/src/routers/stats.tsx @@ -1,6 +1,6 @@ import resolvePeriodFromRequest from '../core/express/resolvePeriodFromRequest.js'; import resolvePlayerFromRequest from '../core/express/resolvePlayerFromRequest.js'; -import stats, { StatType } from '../renderers/stats.js'; +import statsfull, { StatType } from '../renderers/statsfull.js'; import { RouterRegistry } from '../server.js'; export default { @@ -13,7 +13,7 @@ export default { const period = resolvePeriodFromRequest(req); const player = resolvePlayerFromRequest(req); - return await stats( + return await statsfull( type, period, player, diff --git a/tsconfig.json b/tsconfig.json index f4fceb5f4..8d1a8a7e4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,10 +11,5 @@ "resolveJsonModule": true, "jsx": "react-jsx" }, - "include": [ - "src/**/*.ts", - "src/renderers/stats.tsx", - "src/events/interactionCreate/handlers/button.tsx", - "src/routers/stats.tsx" - ] + "include": ["src/**/*.ts"] }