feat: merged stats and tankstats

src/commands/eligible.ts

@@ -5,7 +5,7 @@ import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import sumStats from '../core/blitz/sumStats.js';
 import { tankopedia } from '../core/blitz/tankopedia.js';
 import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
-import getPeriodicStart from '../core/blitzstars/getPeriodStart.js';
+import getPeriodStart from '../core/blitzstars/getPeriodStart.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
 import cleanTable, { TableInput } from '../core/interaction/cleanTable.js';
@@ -62,7 +62,7 @@ export default {
       const tankStatsOverTime = await getTankStatsOverTime(
         server,
         id,
-        getPeriodicStart('30'),
+        getPeriodStart('30'),
         getPeriodNow(),
       );
       const entries = Object.entries(tankStatsOverTime);

src/commands/ping.ts

@@ -4,7 +4,7 @@ import { CommandRegistry } from '../events/interactionCreate.js';
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
   handlesInteraction: true,
 

src/commands/stats.tsx

@@ -5,26 +5,26 @@ import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
+import tanksAutocomplete from '../core/autocomplete/tanks.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
-import getTankStats from '../core/blitz/getTankStats.js';
 import getWN8 from '../core/blitz/getWN8.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import resolveTankId from '../core/blitz/resolveTankId.js';
+import resolveTankName from '../core/blitz/resolveTankName.js';
 import sumStats from '../core/blitz/sumStats.js';
 import { tankopedia } from '../core/blitz/tankopedia.js';
 import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
-import getPeriodicStart from '../core/blitzstars/getPeriodStart.js';
-import getPeriodStartFromDaysAgo from '../core/blitzstars/getPeriodStartFromDaysAgo.js';
+import getPeriodStart from '../core/blitzstars/getPeriodStart.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
+import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
 import cmdName from '../core/interaction/cmdName.js';
-import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
-import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
-import addCustomPeriodOption from '../core/options/addCustomPeriodOption.js';
-import addPeriodChoices, {
-  StatPeriod,
-  statPeriodNames,
-} from '../core/options/addPeriodChoices.js';
+import addPeriodSubCommands, {
+  PERIOD_NAMES,
+  Period,
+} from '../core/options/addPeriodSubCommands.js';
+import addTankChoices from '../core/options/addTankChoices.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
@@ -41,152 +41,142 @@ export default {
   inPublic: true,
 
   command: new SlashCommandBuilder()
+    // TODO: embed cmdName into interaction create
     .setName(cmdName('stats'))
-    .setDescription("Gets the user's in-game statistics")
-    .addSubcommand((option) =>
-      option
-        .setName('period')
-        .setDescription('Pick from a predetermined periods')
-        .addStringOption(addPeriodChoices)
-        .addStringOption(addUsernameOption),
+    .setDescription('In-game statistics')
+    .addSubcommandGroup((option) =>
+      addPeriodSubCommands(option, (option) =>
+        option.addStringOption(addUsernameOption),
+      )
+        .setName('player')
+        .setDescription("Player's statistics"),
     )
-    .addSubcommand((option) =>
-      addCustomPeriodOption(option)
-        .setName('customperiod')
-        .setDescription('Custom periods')
-        .addStringOption(addUsernameOption),
+    .addSubcommandGroup((option) =>
+      addPeriodSubCommands(option, (option) =>
+        option
+          .addStringOption(addTankChoices)
+          .addStringOption(addUsernameOption),
+      )
+        .setName('tank')
+        .setDescription("Tank's statistics"),
     ),
 
   async execute(interaction) {
-    const period = interaction.options.getString('period') as StatPeriod;
+    const commandGroup = interaction.options.getSubcommandGroup()!;
     const { id, server } = await getBlitzAccount(interaction);
-    const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
-    const clanData = await getWargamingResponse<PlayerClanData>(
-      `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
-    );
-    let stats: AllStats;
-    let supplementaryStats: SupplementaryStats | undefined;
-    let hasWN8AccumulatedAtAll = false;
-    const isCustomPeriod =
-      interaction.options.getSubcommand() === 'customperiod';
-    let periodName: string;
-    const startRaw = interaction.options.getInteger('start')!;
-    const endRaw = interaction.options.getInteger('end')!;
-    const start = Math.max(startRaw, endRaw);
-    const end = Math.min(startRaw, endRaw);
+    let nameDiscriminator: string | undefined;
+    let image: string | undefined;
+    const tankIdRaw = interaction.options.getString('tank')!;
 
-    if (isCustomPeriod) {
-      periodName = `${start} to ${end} days ago`;
-    } else {
-      periodName = statPeriodNames[period];
+    if (commandGroup === 'player') {
+      const clan = (
+        await getWargamingResponse<PlayerClanData>(
+          `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
+        )
+      )[id]?.clan;
+
+      if (clan) nameDiscriminator = `[${clan.tag}]`;
+      image = clan
+        ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
+        : undefined;
+    } else if (commandGroup === 'tank') {
+      const tankId = await resolveTankId(tankIdRaw);
+      nameDiscriminator = `(${resolveTankName(tankId)})`;
+      image = tankopedia[tankId].images.normal;
     }
 
-    if (period === 'career') {
-      const tankStats = await getTankStats(server, id);
-      stats = accountInfo[id].statistics.all;
-      const totalBattles = tankStats.reduce(
-        (accumulator, { all }) => accumulator + all.battles,
-        0,
-      );
+    const period = interaction.options.getSubcommand(true) as Period;
+    let periodName: string;
+    let periodStart: number;
+    let periodEnd: number;
 
-      supplementaryStats = {
-        tier:
-          tankStats.reduce(
-            (accumulator, { tank_id, all }) =>
-              accumulator + tankopedia[tank_id].tier * all.battles,
-            0,
-          ) / totalBattles,
-        WN8:
-          tankStats.reduce((accumulator, { tank_id, all }) => {
-            if (tankAverages[tank_id]) {
-              const tankWN8 = getWN8(tankAverages[tank_id].all, all);
+    if (period === 'custom') {
+      const startRaw = interaction.options.getInteger('start')!;
+      const endRaw = interaction.options.getInteger('end')!;
+      const start = Math.max(startRaw, endRaw);
+      const end = Math.min(startRaw, endRaw);
 
-              if (isNaN(tankWN8)) return accumulator;
-
-              hasWN8AccumulatedAtAll = true;
-
-              return accumulator + tankWN8 * all.battles;
-            } else return accumulator;
-          }, 0) / totalBattles,
-      };
+      periodName = `${start} to ${end} days ago`;
+      periodStart = getTimeDaysAgo(start);
+      periodEnd = getTimeDaysAgo(end);
     } else {
-      const tankStatsOverTime = await getTankStatsOverTime(
-        server,
-        id,
-        isCustomPeriod
-          ? getPeriodStartFromDaysAgo(start)
-          : getPeriodicStart(period),
-        isCustomPeriod ? getPeriodStartFromDaysAgo(end) : getPeriodNow(),
-      );
-      const entries = Object.entries(tankStatsOverTime);
-      const totalBattles = entries.reduce(
+      periodName = PERIOD_NAMES[period];
+      periodStart = getPeriodStart(period);
+      periodEnd = getPeriodNow();
+    }
+
+    const tankStats = await getTankStatsOverTime(
+      server,
+      id,
+      periodStart,
+      periodEnd,
+    );
+    let stats: AllStats;
+    let supplementaryStats: SupplementaryStats;
+
+    if (commandGroup === 'player') {
+      const entries = Object.entries(tankStats);
+      stats = sumStats(entries.map(([, stats]) => stats));
+      const battles = entries.reduce(
         (accumulator, [, stats]) => accumulator + stats.battles,
         0,
       );
-
       supplementaryStats = {
-        tier:
-          entries.reduce((accumulator, [tankIdString, stats]) => {
-            const tankId = parseInt(tankIdString);
-            const tankTier = tankopedia[tankId].tier;
-
-            return accumulator + tankTier * stats.battles;
-          }, 0) / totalBattles,
         WN8:
-          entries.reduce((accumulator, [tankIdString, stats]) => {
-            const tankId = parseInt(tankIdString);
-
-            // edge case where new tanks don't have averages
-            if (tankAverages[tankId]) {
-              const tankWN8 = getWN8(tankAverages[tankId].all, stats);
-
-              if (isNaN(tankWN8)) return accumulator;
-
-              hasWN8AccumulatedAtAll = true;
-
-              return accumulator + tankWN8 * stats.battles;
-            } else return accumulator;
-          }, 0) / totalBattles,
+          entries.reduce(
+            (accumulator, [tankIdString, stats]) =>
+              accumulator +
+              getWN8(tankAverages[parseInt(tankIdString)].all, stats) *
+                stats.battles,
+            0,
+          ) / battles,
+        tier:
+          entries.reduce(
+            (accumulator, [tankIdString, stats]) =>
+              accumulator +
+              tankopedia[parseInt(tankIdString)].tier * stats.battles,
+            0,
+          ) / battles,
+      };
+    } else if (commandGroup === 'tank') {
+      const tankId = await resolveTankId(tankIdRaw);
+      stats = tankStats[tankId];
+      supplementaryStats = {
+        WN8: getWN8(tankAverages[tankId].all, tankStats[tankId]),
+        tier: tankopedia[tankId].tier,
       };
-
-      stats = sumStats(entries.map(([, stats]) => stats));
     }
 
-    if (!hasWN8AccumulatedAtAll) supplementaryStats.WN8 = undefined;
+    const accountInfo = await getWargamingResponse<AccountInfo>(
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+    );
 
-    return [
+    return (
       <Wrapper>
         <TitleBar
           name={accountInfo[id].nickname}
-          nameDiscriminator={
-            clanData[id]?.clan ? `[${clanData[id]?.clan?.tag}]` : undefined
-          }
-          image={
-            clanData[id]?.clan
-              ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanData[id]?.clan?.emblem_set_id}.png`
-              : undefined
-          }
+          nameDiscriminator={nameDiscriminator}
+          image={image}
           description={`${periodName} • ${new Date().toDateString()} • ${
             BLITZ_SERVERS[server]
           }`}
         />
 
-        {stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
-        {stats.battles > 0 && (
+        {stats!.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
+        {stats!.battles > 0 && (
           <GenericAllStats
-            stats={stats}
-            supplementaryStats={supplementaryStats}
+            stats={stats!}
+            supplementaryStats={supplementaryStats!}
           />
         )}
 
         <PoweredByBlitzStars />
-      </Wrapper>,
-      fullBlitzStarsStats(server, accountInfo[id].nickname),
-      supportBlitzStars,
-    ];
+      </Wrapper>
+    );
   },
 
-  autocomplete: usernameAutocomplete,
+  autocomplete: (interaction) => {
+    usernameAutocomplete(interaction);
+    tanksAutocomplete(interaction);
+  },
 } satisfies CommandRegistry;

src/commands/tankstats.tsx

@@ -1,140 +0,0 @@
-import { SlashCommandBuilder } from 'discord.js';
-import GenericAllStats from '../components/GenericAllStats.js';
-import NoData, { NoDataType } from '../components/NoData.js';
-import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
-import TitleBar from '../components/TitleBar.js';
-import Wrapper from '../components/Wrapper.js';
-import { BLITZ_SERVERS } from '../constants/servers.js';
-import tanksAutocomplete from '../core/autocomplete/tanks.js';
-import usernameAutocomplete from '../core/autocomplete/username.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
-import getTankStats from '../core/blitz/getTankStats.js';
-import getWN8 from '../core/blitz/getWN8.js';
-import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import resolveTankId from '../core/blitz/resolveTankId.js';
-import resolveTankName from '../core/blitz/resolveTankName.js';
-import { tankopedia } from '../core/blitz/tankopedia.js';
-import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
-import getPeriodicStart from '../core/blitzstars/getPeriodStart.js';
-import getPeriodStartFromDaysAgo from '../core/blitzstars/getPeriodStartFromDaysAgo.js';
-import getTankStatsOverTime, {
-  emptyAllStats,
-} from '../core/blitzstars/getTankStatsOverTime.js';
-import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import cmdName from '../core/interaction/cmdName.js';
-import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
-import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
-import addCustomPeriodOption from '../core/options/addCustomPeriodOption.js';
-import addPeriodChoices, {
-  StatPeriod,
-  statPeriodNames,
-} from '../core/options/addPeriodChoices.js';
-import addTankChoices from '../core/options/addTankChoices.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import { CommandRegistry } from '../events/interactionCreate.js';
-import { AccountInfo, AllStats } from '../types/accountInfo.js';
-
-export default {
-  inProduction: true,
-  inDevelopment: true,
-  inPublic: true,
-
-  command: new SlashCommandBuilder()
-    .setName(cmdName('tankstats'))
-    .setDescription('Stats for a tank over a period')
-    .addSubcommand((option) =>
-      option
-        .setName('period')
-        .setDescription('Pick from a predetermined periods')
-        .addStringOption(addTankChoices)
-        .addStringOption(addPeriodChoices)
-        .addStringOption(addUsernameOption),
-    )
-    .addSubcommand((option) =>
-      addCustomPeriodOption(option)
-        .setName('customperiod')
-        .addStringOption(addTankChoices)
-        .setDescription('Custom periods')
-        .addStringOption(addUsernameOption),
-    ),
-
-  async execute(interaction) {
-    const tank = await resolveTankId(
-      interaction,
-      interaction.options.getString('tank')!,
-    );
-    const period = interaction.options.getString('period') as StatPeriod;
-    const blitzAccount = await getBlitzAccount(interaction);
-    const { id, server } = blitzAccount;
-    const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
-    const tankStats = await getTankStats(server, id);
-    let stats: AllStats;
-    const tankId = Number(tank);
-    const isCustomPeriod =
-      interaction.options.getSubcommand() === 'customperiod';
-    let periodName: string;
-    const startRaw = interaction.options.getInteger('start')!;
-    const endRaw = interaction.options.getInteger('end')!;
-    const start = Math.max(startRaw, endRaw);
-    const end = Math.min(startRaw, endRaw);
-
-    if (isCustomPeriod) {
-      periodName = `${start} to ${end} days ago`;
-    } else {
-      periodName = statPeriodNames[period];
-    }
-
-    if (period === 'career') {
-      stats =
-        tankStats.find((stats) => stats.tank_id === tankId)?.all ??
-        emptyAllStats;
-    } else {
-      const tankStatsOverTime = await getTankStatsOverTime(
-        server,
-        id,
-        isCustomPeriod
-          ? getPeriodStartFromDaysAgo(start)
-          : getPeriodicStart(period),
-        isCustomPeriod ? getPeriodStartFromDaysAgo(end) : getPeriodNow(),
-      );
-
-      stats = tankStatsOverTime[tankId] ?? emptyAllStats;
-    }
-
-    return [
-      <Wrapper>
-        <TitleBar
-          name={accountInfo[id].nickname}
-          nameDiscriminator={`(${resolveTankName(tankId)})`}
-          image={tankopedia[tankId].images.normal}
-          description={`${periodName} • ${new Date().toDateString()} • ${
-            BLITZ_SERVERS[server]
-          }`}
-        />
-
-        {stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
-        {stats.battles > 0 && (
-          <GenericAllStats
-            stats={stats}
-            supplementaryStats={{
-              tier: tankopedia[tankId].tier,
-              WN8: getWN8(tankAverages[tankId].all, stats),
-            }}
-          />
-        )}
-
-        <PoweredByBlitzStars />
-      </Wrapper>,
-      fullBlitzStarsStats(server, accountInfo[id].nickname),
-      supportBlitzStars,
-    ];
-  },
-
-  autocomplete: (interaction) => {
-    tanksAutocomplete(interaction);
-    usernameAutocomplete(interaction);
-  },
-} satisfies CommandRegistry;

src/commands/today.tsx

@@ -27,7 +27,7 @@ import { PlayerClanData } from '../types/playerClanData.js';
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: new SlashCommandBuilder()