fix: types

packages/bot/src/commands/breakdown/index.tsx

@@ -1,4 +1,4 @@
-import { getBlitzStarsLinkButton } from '../../core/blitzstars/getBlitzStarsLinkButton';
+import { getBlitzStarsLinkButton } from '../../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
 import addPeriodicFilterOptions from '../../core/discord/addPeriodicFilterOptions';
 import addUsernameChoices from '../../core/discord/addUsernameChoices';
 import autocompleteTanks from '../../core/discord/autocompleteTanks';

packages/bot/src/commands/breakdown/render.tsx

@@ -1,27 +1,28 @@
-import getStatsInPeriod from '@blitzkit/core/src/blitzstars/getStatsInPeriod';
+import {
+  BlitzStats,
+  filterStats,
+  StatFilters,
+  TankDefinition,
+  tankDefinitions,
+} from '@blitzkit/core';
+import calculateWN8 from '@blitzkit/core/src/statistics/calculateWN8';
+import getWN8Percentile from '@blitzkit/core/src/statistics/getWN8Percentile';
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash';
+import { getAccountInfo } from '../../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../../website/src/core/blitz/getClanAccountInfo';
+import getTankStats from '../../../../website/src/core/blitz/getTankStats';
+import { filtersToDescription } from '../../../../website/src/core/blitzkit/filtersToDescription';
+import { tankAverages } from '../../../../website/src/core/blitzstars/tankAverages';
+import { UserError } from '../../../../website/src/hooks/userError';
 import * as Breakdown from '../../components/Breakdown';
 import CommandWrapper from '../../components/CommandWrapper';
 import NoData from '../../components/NoData';
 import TitleBar from '../../components/TitleBar';
-import { getAccountInfo } from '../../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../../core/blitz/getClanAccountInfo';
-import getTankStats from '../../core/blitz/getTankStats';
-import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
-import {
-  TankDefinition,
-  tankDefinitions,
-} from '../../core/blitzkit/tankDefinitions';
-import { tankAverages } from '../../core/blitzstars/tankAverages';
+import getStatsInPeriod from '../../core/blitzstars/getStatsInPeriod';
 import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
 import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
 import { translator } from '../../core/localization/translator';
-import calculateWN8 from '../../core/statistics/calculateWN8';
-import { BlitzStats } from '../../core/statistics/compositeStats/constants';
-import { StatFilters, filterStats } from '../../core/statistics/filterStats';
-import getWN8Percentile from '../../core/statistics/getWN8Percentile';
-import { UserError } from '../../hooks/userError';
 
 const ROWS_PER_PAGE = 8;
 const MAX_PAGES = 9;

packages/bot/src/commands/debug.ts

@@ -1,4 +1,4 @@
-import packageJSON from '../../package.json' assert { type: 'json' };
+import packageJSON from '../../../../package.json' assert { type: 'json' };
 import { client } from '../core/discord/client';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { translator } from '../core/localization/translator';

packages/bot/src/commands/evolution.tsx

@@ -1,16 +1,16 @@
 import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import resolveTankId from '../../../website/src/core/blitz/resolveTankId';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import { getBlitzStarsLinkButton } from '../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
+import getPlayerHistories from '../../../website/src/core/blitzstars/getPlayerHistories';
 import CommandWrapper from '../components/CommandWrapper';
 import * as Graph from '../components/Graph';
 import { LineColor } from '../components/Graph/components/Line/constants';
 import NoData from '../components/NoData';
 import TitleBar from '../components/TitleBar';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import resolveTankId from '../core/blitz/resolveTankId';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import getTankHistories from '../core/blitzkit/getTankHistories';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
-import getPlayerHistories from '../core/blitzstars/getPlayerHistories';
+import getTankHistories from '../core/blitzstars/getTankHistories';
 import { addPeriodSubCommands } from '../core/discord/addPeriodSubCommands';
 import addTankChoices from '../core/discord/addTankChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';

packages/bot/src/commands/fullStats.tsx

@@ -1,15 +1,16 @@
-import getStatsInPeriod from '@blitzkit/core/src/blitzstars/getStatsInPeriod';
+import { StatFilters, filterStats, getTierWeights } from '@blitzkit/core';
 import { Locale } from 'discord.js';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import { filtersToDescription } from '../../../website/src/core/blitzkit/filtersToDescription';
+import { getBlitzStarsLinkButton } from '../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
 import CommandWrapper from '../components/CommandWrapper';
 import GenericAllStats from '../components/GenericAllStats';
 import NoData from '../components/NoData';
 import TierWeights from '../components/TierWeights';
 import TitleBar from '../components/TitleBar';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
 import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
@@ -28,8 +29,6 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
 import resolvePlayerFromCommand, {
   ResolvedPlayer,
 } from '../core/discord/resolvePlayerFromCommand';
-import { StatFilters, filterStats } from '../core/statistics/filterStats';
-import { getTierWeights } from '../core/statistics/getTierWeights';
 import { CommandRegistry } from '../events/interactionCreate';
 
 async function render(

packages/bot/src/commands/inactive.tsx

@@ -1,10 +1,10 @@
 import { Locale } from 'discord.js';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanInfo } from '../../../website/src/core/blitz/getClanInfo';
 import CommandWrapper from '../components/CommandWrapper';
 import GenericStats from '../components/GenericStats';
 import NoData from '../components/NoData';
 import TitleBar from '../components/TitleBar';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanInfo } from '../core/blitz/getClanInfo';
 import addClanChoices from '../core/discord/addClanChoices';
 import autocompleteClan from '../core/discord/autocompleteClan';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
@@ -72,7 +72,9 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
           <TitleBar
             title={clanInfo.name}
             image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`}
-            description={`${translate('bot.commands.inactive.body.subtitle', [`${threshold}`])} • ${new Date().toLocaleDateString(interaction.locale)}`}
+            description={`${translate('bot.commands.inactive.body.subtitle', [
+              `${threshold}`,
+            ])} • ${new Date().toLocaleDateString(interaction.locale)}`}
           />
 
           {!hasInactiveMembers && (

packages/bot/src/commands/link.tsx

@@ -1,9 +1,9 @@
 import { teal } from '@radix-ui/colors';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import { linkBlitzAndDiscord } from '../../../website/src/core/blitzkit/linkBlitzAndDiscord';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import CommandWrapper from '../components/CommandWrapper';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { linkBlitzAndDiscord } from '../core/blitzkit/linkBlitzAndDiscord';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/ownedTanks.tsx

@@ -1,16 +1,16 @@
-import { gameDefinitions } from '@blitzkit/core/src/blitzkit/gameDefinitions';
-import { chunk } from 'lodash';
-import markdownEscape from 'markdown-escape';
-import { TANK_CLASSES } from '../components/Tanks/components/Item/constants';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import getTankStats from '../core/blitz/getTankStats';
 import {
+  TANK_CLASSES,
+  TIER_ROMAN_NUMERALS,
   TankDefinition,
   Tier,
   flags,
   tankDefinitions,
-} from '../core/blitzkit/tankDefinitions';
-import { TIER_ROMAN_NUMERALS } from '../core/blitzkit/tankDefinitions/constants';
+} from '@blitzkit/core';
+import { gameDefinitions } from '@blitzkit/core/src/blitzkit/gameDefinitions';
+import { chunk } from 'lodash';
+import markdownEscape from 'markdown-escape';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import getTankStats from '../../../website/src/core/blitz/getTankStats';
 import addTierChoices from '../core/discord/addTierChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';

packages/bot/src/commands/playerInfo.ts

@@ -1,5 +1,5 @@
 import markdownEscape from 'markdown-escape';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/rating.tsx

@@ -1,24 +1,23 @@
+import { BkrlFormat, deltaBkrlBlitzStats } from '@blitzkit/core';
 import { SlashCommandSubcommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import { getLeagueFromScore } from '../../../website/src/core/blitz/getLeagueFromScore';
+import getRatingInfo from '../../../website/src/core/blitz/getRatingInfo';
+import { getRatingNeighbors } from '../../../website/src/core/blitz/getRatingNeighbors';
+import { normalizeLeagueIcon } from '../../../website/src/core/blitz/normalizeLeagueIcon';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import getArchivedRatingMidnightLeaderboard from '../../../website/src/core/blitzkit/getArchivedRatingMidnightLeaderboard';
+import { iconPng } from '../../../website/src/core/blitzkit/iconPng';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import CommandWrapper from '../components/CommandWrapper';
 import { DeltaCaret } from '../components/DeltaCaret';
 import TitleBar from '../components/TitleBar';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { getLeagueFromScore } from '../core/blitz/getLeagueFromScore';
-import getRatingInfo from '../core/blitz/getRatingInfo';
-import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
-import { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import getArchivedRatingMidnightLeaderboard from '../core/blitzkit/getArchivedRatingMidnightLeaderboard';
-import { iconPng } from '../core/blitzkit/iconPng';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { translator } from '../core/localization/translator';
-import { deltaBkrlBlitzStats } from '../core/statistics/deltaBkrlBlitzStats';
-import { BkrlFormat } from '../core/streams/bkrl';
 import { CommandRegistry } from '../events/interactionCreate';
 import { theme } from '../stitches.config';
 
@@ -122,9 +121,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
           <TitleBar
             title={accountInfo.nickname}
             image={clanImage}
-            description={`${translate(`bot.commands.rating.body.subtitle.${subcommand}`)} • ${new Date().toLocaleDateString(
-              interaction.locale,
-            )}`}
+            description={`${translate(
+              `bot.commands.rating.body.subtitle.${subcommand}`,
+            )} • ${new Date().toLocaleDateString(interaction.locale)}`}
           />
 
           <div
@@ -140,7 +139,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                 padding: 16,
                 backgroundColor: theme.colors[`appBackground2${leagueTheme}`],
                 borderRadius: 4,
-                border: `1px solid ${theme.colors[`componentInteractive${leagueTheme}`]}`,
+                border: `1px solid ${
+                  theme.colors[`componentInteractive${leagueTheme}`]
+                }`,
                 display: 'flex',
                 alignItems: 'center',
                 justifyContent: 'space-between',

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -1,3 +1,9 @@
+import {
+  BkrlDiscriminatedEntries,
+  FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
+  LEAGUES,
+  Region,
+} from '@blitzkit/core';
 import {
   APIApplicationCommandOptionChoice,
   Locale,
@@ -5,22 +11,20 @@ import {
 } from 'discord.js';
 import { range } from 'lodash';
 import markdownEscape from 'markdown-escape';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import getRatingInfo from '../../../website/src/core/blitz/getRatingInfo';
+import { getRatingLeague } from '../../../website/src/core/blitz/getRatingLeague';
+import { getRatingNeighbors } from '../../../website/src/core/blitz/getRatingNeighbors';
+import { isOnGoingRatingSeason } from '../../../website/src/core/blitz/isOnGoingRatingSeason';
+import { getArchivedLatestSeasonNumber } from '../../../website/src/core/blitzkit/getArchivedLatestSeasonNumber';
+import getArchivedRatingInfo from '../../../website/src/core/blitzkit/getArchivedRatingInfo';
+import { getArchivedRatingLeaderboard } from '../../../website/src/core/blitzkit/getArchivedRatingLeaderboard';
+import getArchivedRatingMidnightLeaderboard from '../../../website/src/core/blitzkit/getArchivedRatingMidnightLeaderboard';
+import { UserError } from '../../../website/src/hooks/userError';
 import CommandWrapper from '../components/CommandWrapper';
 import * as Leaderboard from '../components/Leaderboard';
 import TitleBar from '../components/TitleBar';
-import { LEAGUES } from '../constants/leagues';
-import { FIRST_MINIMAL_ARCHIVED_RATING_SEASON } from '../constants/rating';
-import { Region } from '../constants/regions';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import getRatingInfo from '../core/blitz/getRatingInfo';
-import { getRatingLeague } from '../core/blitz/getRatingLeague';
-import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
-import { isOnGoingRatingSeason } from '../core/blitz/isOnGoingRatingSeason';
-import { getArchivedLatestSeasonNumber } from '../core/blitzkit/getArchivedLatestSeasonNumber';
-import getArchivedRatingInfo from '../core/blitzkit/getArchivedRatingInfo';
-import { getArchivedRatingLeaderboard } from '../core/blitzkit/getArchivedRatingLeaderboard';
-import getArchivedRatingMidnightLeaderboard from '../core/blitzkit/getArchivedRatingMidnightLeaderboard';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
@@ -28,9 +32,7 @@ import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { localizationObject } from '../core/discord/localizationObject';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { translator } from '../core/localization/translator';
-import { BkrlDiscriminatedEntries } from '../core/streams/bkrl';
 import { CommandRegistry } from '../events/interactionCreate';
-import { UserError } from '../hooks/userError';
 
 export interface RatingPlayer {
   spa_id: number;
@@ -254,7 +256,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           name_localizations: localizationObject(
                             `common.leagues.${name}`,
                           ),
-                        }) satisfies APIApplicationCommandOptionChoice<string>,
+                        } satisfies APIApplicationCommandOptionChoice<string>),
                     ),
                   )
                   .setRequired(true);
@@ -277,8 +279,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         const season = seasonOption
           ? parseInt(seasonOption)
           : onGoingSeason
-            ? latestArchivedSeasonNumber + 1
-            : latestArchivedSeasonNumber;
+          ? latestArchivedSeasonNumber + 1
+          : latestArchivedSeasonNumber;
         const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
         let titleName: string;
         let titleImage: string | undefined;
@@ -311,7 +313,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       position: player.number,
                       clan: player.clan_tag,
                       nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer,
+                    } satisfies SimplifiedPlayer),
                 ),
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
@@ -347,7 +349,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                             'bot.commands.rating_leaderboard.body.deleted_player',
                             [`${player.id}`],
                           ),
-                      }) satisfies SimplifiedPlayer,
+                      } satisfies SimplifiedPlayer),
                   );
                 },
               );
@@ -396,7 +398,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         score: player.score,
                         clan: player.clan_tag,
                         nickname: player.nickname,
-                      }) satisfies SimplifiedPlayer,
+                      } satisfies SimplifiedPlayer),
                   ),
               )
             : await getArchivedRatingLeaderboard(region, season!).then(

packages/bot/src/commands/replay.tsx

@@ -1,19 +1,21 @@
+import {
+  idToRegion,
+  tankDefinitions,
+  TIER_ROMAN_NUMERALS,
+} from '@blitzkit/core';
 import { tankIcon } from '@blitzkit/core/src/blitzkit/tankIcon';
+import calculateWN8 from '@blitzkit/core/src/statistics/calculateWN8';
 import { clamp } from 'lodash';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import { iconPng } from '../../../website/src/core/blitzkit/iconPng';
+import { mapDefinitions } from '../../../website/src/core/blitzkit/mapDefinitions';
+import { RenderConfiguration } from '../../../website/src/core/blitzkit/renderConfiguration';
+import { tankAverages } from '../../../website/src/core/blitzstars/tankAverages';
 import CommandWrapper from '../components/CommandWrapper';
 import TitleBar from '../components/TitleBar';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { idToRegion } from '../core/blitz/idToRegion';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import { iconPng } from '../core/blitzkit/iconPng';
-import { mapDefinitions } from '../core/blitzkit/mapDefinitions';
-import { RenderConfiguration } from '../core/blitzkit/renderConfiguration';
-import { tankDefinitions } from '../core/blitzkit/tankDefinitions';
-import { TIER_ROMAN_NUMERALS } from '../core/blitzkit/tankDefinitions/constants';
-import { tankAverages } from '../core/blitzstars/tankAverages';
 import buttonLink from '../core/discord/buttonLink';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import calculateWN8 from '../core/statistics/calculateWN8';
 import { CommandRegistry } from '../events/interactionCreate';
 import { theme } from '../stitches.config';
 

packages/bot/src/commands/research.tsx

@@ -1,22 +1,22 @@
-import { Locale, escapeMarkdown } from 'discord.js';
+import {
+  asset,
+  equipmentPriceMatrix,
+  TANK_ICONS,
+  tankDefinitions,
+  TIER_ROMAN_NUMERALS,
+} from '@blitzkit/core';
+import { escapeMarkdown, Locale } from 'discord.js';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import getTankStats from '../../../website/src/core/blitz/getTankStats';
+import resolveTankId from '../../../website/src/core/blitz/resolveTankId';
+import { buildTechTreeLine } from '../../../website/src/core/blitzkit/buildTechTreeLine';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import { iconPng } from '../../../website/src/core/blitzkit/iconPng';
+import { resolveAncestry } from '../../../website/src/core/blitzkit/resolveAncestry';
+import { tankIconPng } from '../../../website/src/core/blitzkit/tankIconPng';
 import CommandWrapper from '../components/CommandWrapper';
 import TitleBar from '../components/TitleBar';
-import { equipmentPriceMatrix } from '../constants/equipmentPrice';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import getTankStats from '../core/blitz/getTankStats';
-import resolveTankId from '../core/blitz/resolveTankId';
-import { asset } from '../core/blitzkit/asset';
-import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import { iconPng } from '../core/blitzkit/iconPng';
-import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
-import { tankDefinitions } from '../core/blitzkit/tankDefinitions';
-import {
-  TANK_ICONS,
-  TIER_ROMAN_NUMERALS,
-} from '../core/blitzkit/tankDefinitions/constants';
-import { tankIconPng } from '../core/blitzkit/tankIconPng';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
@@ -220,7 +220,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           <TitleBar
             title={nickname}
             image={clanImage}
-            description={`${t`bot.commands.research.body.subtitle`} • ${targetTank.name}`}
+            description={`${t`bot.commands.research.body.subtitle`} • ${
+              targetTank.name
+            }`}
           />
 
           <div

packages/bot/src/commands/searchClans.ts

@@ -1,7 +1,7 @@
+import { Region } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { Region } from '../constants/regions';
-import fetchBlitz from '../core/blitz/fetchBlitz';
+import fetchBlitz from '../../../website/src/core/blitz/fetchBlitz';
 import addClanChoices from '../core/discord/addClanChoices';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/searchPlayers.ts

@@ -1,9 +1,9 @@
+import { Region } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { Region } from '../constants/regions';
-import fetchBlitz from '../core/blitz/fetchBlitz';
-import { AccountList } from '../core/blitz/searchPlayersAcrossRegions';
-import { usernamePattern } from '../core/blitz/searchPlayersAcrossRegions/constants';
+import fetchBlitz from '../../../website/src/core/blitz/fetchBlitz';
+import { AccountList } from '../../../website/src/core/blitz/searchPlayersAcrossRegions';
+import { usernamePattern } from '../../../website/src/core/blitz/searchPlayersAcrossRegions/constants';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/stats.tsx

@@ -1,14 +1,15 @@
-import getStatsInPeriod from '@blitzkit/core/src/blitzstars/getStatsInPeriod';
+import { StatFilters, filterStats } from '@blitzkit/core';
 import { Locale } from 'discord.js';
+import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo';
+import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
+import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
+import { filtersToDescription } from '../../../website/src/core/blitzkit/filtersToDescription';
+import { getBlitzStarsLinkButton } from '../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
 import AllStatsOverview from '../components/AllStatsOverview';
 import CommandWrapper from '../components/CommandWrapper';
 import NoData from '../components/NoData';
 import TitleBar from '../components/TitleBar';
-import { getAccountInfo } from '../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
-import { emblemURL } from '../core/blitzkit/emblemURL';
-import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
 import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
@@ -27,7 +28,6 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
 import resolvePlayerFromCommand, {
   ResolvedPlayer,
 } from '../core/discord/resolvePlayerFromCommand';
-import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { CommandRegistry } from '../events/interactionCreate';
 
 async function render(

packages/bot/src/commands/today.ts

@@ -1,5 +1,5 @@
 import { gameDefinitions } from '@blitzkit/core/src/blitzkit/gameDefinitions';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import { getBlitzStarsLinkButton } from '../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
 import { addFilterOptions } from '../core/discord/addFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';