diff --git a/src/core/discord/resolvePeriodFromCommand.ts b/src/core/discord/resolvePeriodFromCommand.ts index dc172292b..360c54a12 100644 --- a/src/core/discord/resolvePeriodFromCommand.ts +++ b/src/core/discord/resolvePeriodFromCommand.ts @@ -17,7 +17,7 @@ export interface ResolvedPeriod { } export default function resolvePeriodFromCommand( - server: Region, + region: Region, interaction: ChatInputCommandInteraction, ) { let statsName: string; @@ -28,19 +28,19 @@ export default function resolvePeriodFromCommand( const periodOption = interaction.options.getString('period') as PeriodSize; if (periodSubcommand === 'custom') { - const startRaw = interaction.options.getInteger('start')!; - const endRaw = interaction.options.getInteger('end')!; - const startMin = Math.min(startRaw, endRaw); - const endMax = Math.max(startRaw, endRaw); + const startRaw = interaction.options.getInteger('start', true); + const endRaw = interaction.options.getInteger('end', true); + const startDaysAgoMax = Math.min(startRaw, endRaw); + const endDaysAgoMin = Math.max(startRaw, endRaw); - statsName = `${startMin} to ${endMax} days' statistics`; - evolutionName = `${startMin} to ${endMax} days' evolution`; - start = getTimeDaysAgo(server, startMin); - end = getTimeDaysAgo(server, endMax); + statsName = `${startDaysAgoMax} to ${endDaysAgoMin} days' statistics`; + evolutionName = `${startDaysAgoMax} to ${endDaysAgoMin} days' evolution`; + start = getTimeDaysAgo(region, endDaysAgoMin); + end = getTimeDaysAgo(region, startDaysAgoMax); } else { statsName = `${getPeriodOptionName(periodOption)} Statistics`; evolutionName = `${getPeriodOptionName(periodOption)} Evolution`; - start = getPeriodStart(server, periodOption); + start = getPeriodStart(region, periodOption); end = getPeriodNow(); } diff --git a/src/renderers/stats.tsx b/src/renderers/stats.tsx index 6182d0add..831087e2a 100644 --- a/src/renderers/stats.tsx +++ b/src/renderers/stats.tsx @@ -2,14 +2,13 @@ import AllStatsOverview from '../components/AllStatsOverview'; import NoData, { NoDataType } from '../components/NoData'; import PoweredBy, { PoweredByType } from '../components/PoweredBy'; import { TreeTypeString } from '../components/Tanks'; -import { TierWeightsRecord } from '../components/TierWeights'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; import calculateWN8 from '../core/blitz/calculateWN8'; import getWargamingResponse from '../core/blitz/getWargamingResponse'; import resolveTankName from '../core/blitz/resolveTankName'; import sumStats from '../core/blitz/sumStats'; -import { Tier, tankopedia } from '../core/blitz/tankopedia'; +import { tankopedia } from '../core/blitz/tankopedia'; import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats'; import { tankAverages } from '../core/blitzstars/tankAverages'; import { ResolvedPeriod } from '../core/discord/resolvePeriodFromCommand'; @@ -67,7 +66,6 @@ export default async function stats( const awaitedTankopedia = await tankopedia; let stats: AllStats | undefined; let supplementaryStats: SupplementaryStats; - let tierWeights: TierWeightsRecord; if (type === 'player' || type === 'multi-tank') { const typedFilters = filters as Partial | null; @@ -124,21 +122,6 @@ export default async function stats( 0, ) / battlesOfTanksWithTankopediaEntry, }; - tierWeights = filteredOrder.reduce((accumulator, id) => { - const tankopediaEntry = awaitedTankopedia[id]; - - if (!tankopediaEntry) return accumulator; - - const tier = tankopediaEntry.tier as Tier; - - if (accumulator[tier]) { - accumulator[tier]! += diffed[id].battles; - } else { - accumulator[tier] = diffed[id].battles; - } - - return accumulator; - }, {}); } else { stats = diffed[(filters as number)!];