feat: extracted renderer from /stats

src/commands/eligible.ts

@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWN8 from '../core/blitz/getWN8.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import sumStats from '../core/blitz/sumStats.js';
@@ -12,6 +11,7 @@ import cleanTable, { TableInput } from '../core/interaction/cleanTable.js';
 import negativeEmbed from '../core/interaction/negativeEmbed.js';
 import positiveEmbed from '../core/interaction/positiveEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
@@ -48,7 +48,7 @@ export default {
 
   async execute(interaction) {
     const clan = interaction.options.getString('clan') as SkilledClan;
-    const { id, server } = await getBlitzAccount(interaction);
+    const { id, server } = await resolvePlayer(interaction);
     const accountInfo = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
     );

src/commands/evolution.tsx

@@ -7,7 +7,6 @@ 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 getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import resolveTankId from '../core/blitz/resolveTankId.js';
 import resolveTankName from '../core/blitz/resolveTankName.js';
@@ -20,7 +19,8 @@ import {
   RELATIVE_PERIOD_NAMES,
 } from '../core/options/addPeriodSubCommands.js';
 import addStatsSubCommandGroups from '../core/options/addStatsSubCommandGroups.js';
-import getPeriodDataFromSubcommand from '../core/options/getPeriodDataFromSubcommand.js';
+import resolvePeriod from '../core/options/resolvePeriod.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
@@ -29,7 +29,7 @@ import { PlayerClanData } from '../types/playerClanData.js';
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: addStatsSubCommandGroups(
@@ -40,7 +40,7 @@ export default {
 
   async execute(interaction) {
     const commandGroup = interaction.options.getSubcommandGroup()!;
-    const { id, server } = await getBlitzAccount(interaction);
+    const { id, server } = await resolvePlayer(interaction);
     let nameDiscriminator: string | undefined;
     let image: string | undefined;
     const tankIdRaw = interaction.options.getString('tank')!;
@@ -65,8 +65,7 @@ export default {
 
     let histories: Histories;
 
-    const { evolutionName, start, end } =
-      getPeriodDataFromSubcommand(interaction);
+    const { evolutionName, start, end } = resolvePeriod(interaction);
 
     if (commandGroup === 'player') {
       histories = await getPlayerHistories(server, id, {

src/commands/ownedtanks.tsx

@@ -6,7 +6,6 @@ import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getTankStats from '../core/blitz/getTankStats.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import {
@@ -15,6 +14,7 @@ import {
   tankopedia,
 } from '../core/blitz/tankopedia.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
@@ -71,7 +71,7 @@ export default {
 
   async execute(interaction) {
     const tier = Number(interaction.options.getString('tier'));
-    const account = await getBlitzAccount(interaction);
+    const account = await resolvePlayer(interaction);
     const { id, server } = account;
     const accountInfo = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,

src/commands/playerachievements.ts

@@ -2,11 +2,11 @@ import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
 import usernameAutocomplete from '../core/autocomplete/username.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import cleanTable, { TableInputEntry } from '../core/interaction/cleanTable.js';
 import infoEmbed from '../core/interaction/infoEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountAchievements } from '../types/accountAchievements.js';
@@ -35,7 +35,7 @@ export default {
 
   async execute(interaction) {
     const sortBy = (interaction.options.getString('sort') ?? 'name') as SortBy;
-    const account = await getBlitzAccount(interaction);
+    const account = await resolvePlayer(interaction);
     const { id, server } = account;
     const accounts = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,

src/commands/playerinfo.ts

@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import usernameAutocomplete from '../core/autocomplete/username.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import cleanTable from '../core/interaction/cleanTable.js';
 import infoEmbed from '../core/interaction/infoEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
@@ -21,7 +21,7 @@ export default {
     .addStringOption(addUsernameOption),
 
   async execute(interaction) {
-    const account = await getBlitzAccount(interaction);
+    const account = await resolvePlayer(interaction);
     const { id, server } = account;
     const accounts = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,

src/commands/stats.tsx

@@ -1,32 +1,12 @@
 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 TierWeights, { TierWeightsRecord } from '../components/TierWeights.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 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 { Tier, tankopedia } from '../core/blitz/tankopedia.js';
-import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
-import { tankAverages } from '../core/blitzstars/tankAverages.js';
 import addStatsSubCommandGroups from '../core/options/addStatsSubCommandGroups.js';
-import getPeriodDataFromSubcommand from '../core/options/getPeriodDataFromSubcommand.js';
-import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
+import resolvePeriod from '../core/options/resolvePeriod.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
-import {
-  AccountInfo,
-  AllStats,
-  SupplementaryStats,
-} from '../types/accountInfo.js';
-import { PlayerClanData } from '../types/playerClanData.js';
+import stats, { StatType } from '../renderers/stats.js';
 
 export default {
   inProduction: true,
@@ -40,120 +20,15 @@ export default {
   ),
 
   async execute(interaction) {
-    const commandGroup = interaction.options.getSubcommandGroup()!;
-    const { id, server } = await getBlitzAccount(interaction);
-    let nameDiscriminator: string | undefined;
-    let image: string | undefined;
+    const commandGroup = interaction.options.getSubcommandGroup(
+      true,
+    ) as StatType;
+    const player = await resolvePlayer(interaction);
+    const period = resolvePeriod(interaction);
     const tankIdRaw = interaction.options.getString('tank')!;
+    const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : 0;
 
-    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 = resolveTankId(tankIdRaw);
-      nameDiscriminator = `(${resolveTankName(tankId)})`;
-      image = tankopedia[tankId].images.normal;
-    }
-
-    const { statsName, start, end } = getPeriodDataFromSubcommand(interaction);
-
-    const tankStats = await getTankStatsOverTime(server, id, start, end);
-    let stats: AllStats;
-    let supplementaryStats: SupplementaryStats;
-    let tierWeights: TierWeightsRecord;
-
-    if (commandGroup === 'player') {
-      const entries = Object.entries(tankStats);
-      stats = sumStats(entries.map(([, stats]) => stats));
-      const battles = entries.reduce((accumulator, [tankIdString, stats]) => {
-        const tankId = parseInt(tankIdString);
-        const tankAverage = tankAverages[tankId];
-
-        return tankAverage ? accumulator + stats.battles : accumulator;
-      }, 0);
-
-      supplementaryStats = {
-        WN8:
-          entries.reduce((accumulator, [tankIdString, stats]) => {
-            const tankId = parseInt(tankIdString);
-            const tankAverage = tankAverages[tankId];
-
-            return tankAverage
-              ? accumulator + getWN8(tankAverage.all, stats) * stats.battles
-              : accumulator;
-          }, 0) / battles,
-        tier:
-          entries.reduce((accumulator, [tankIdString, stats]) => {
-            const tankId = parseInt(tankIdString);
-            const tankAverage = tankAverages[tankId];
-
-            return tankAverage
-              ? accumulator + tankopedia[tankId].tier * stats.battles
-              : accumulator;
-          }, 0) / battles,
-      };
-      tierWeights = entries.reduce<TierWeightsRecord>(
-        (accumulator, [tankIdString, stats]) => {
-          const tankId = parseInt(tankIdString);
-          const tier = tankopedia[tankId].tier as Tier;
-
-          if (accumulator[tier]) {
-            accumulator[tier]! += stats.battles;
-          } else {
-            accumulator[tier] = stats.battles;
-          }
-
-          return accumulator;
-        },
-        {},
-      );
-    } else {
-      const tankId = resolveTankId(tankIdRaw);
-      stats = tankStats[tankId];
-
-      supplementaryStats = {
-        WN8: getWN8(tankAverages[tankId].all, tankStats[tankId]),
-        tier: tankopedia[tankId].tier,
-      };
-    }
-
-    const accountInfo = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-    );
-
-    return (
-      <Wrapper>
-        <TitleBar
-          name={accountInfo[id].nickname}
-          nameDiscriminator={nameDiscriminator}
-          image={image}
-          description={`${statsName} • ${new Date().toDateString()} • ${
-            BLITZ_SERVERS[server]
-          }`}
-        />
-
-        {stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
-        {stats.battles > 0 && commandGroup === 'player' && (
-          <TierWeights weights={tierWeights!} />
-        )}
-        {stats.battles > 0 && (
-          <GenericAllStats
-            stats={stats}
-            supplementaryStats={supplementaryStats}
-          />
-        )}
-
-        <PoweredByBlitzStars />
-      </Wrapper>
-    );
+    return await stats(commandGroup, period, player, tankId);
   },
 
   autocomplete: (interaction) => {

src/commands/today.tsx

@@ -6,7 +6,6 @@ import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.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';
@@ -14,19 +13,21 @@ import resolveTankName from '../core/blitz/resolveTankName.js';
 import sumStats from '../core/blitz/sumStats.js';
 import { tankopedia } from '../core/blitz/tankopedia.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
-import last5AM from '../core/blitzstars/last5AM.js';
+import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
 import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
 import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
+import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -35,12 +36,12 @@ export default {
     .addStringOption(addUsernameOption),
 
   async execute(interaction) {
-    const { id, server } = await getBlitzAccount(interaction);
+    const { id, server } = await resolvePlayer(interaction);
     const tankStatsOverTime = await getTankStatsOverTime(
       server,
       id,
-      last5AM().getTime() / 1000,
-      new Date().getTime() / 1000,
+      getTimeDaysAgo(0),
+      getPeriodNow(),
     );
     const accountInfo = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,

src/commands/verify.ts

@@ -2,11 +2,11 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
 import usernameAutocomplete from '../core/autocomplete/username.js';
-import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import negativeEmbed from '../core/interaction/negativeEmbed.js';
 import positiveEmbed from '../core/interaction/positiveEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
+import resolvePlayer from '../core/options/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
@@ -23,7 +23,7 @@ export default {
     .addStringOption((option) => addUsernameOption(option).setRequired(true)),
 
   async execute(interaction) {
-    const blitzAccount = await getBlitzAccount(interaction);
+    const blitzAccount = await resolvePlayer(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}`,