fix: no cross-bot imports

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

@@ -1,4 +1,4 @@
-import { getBlitzStarsLinkButton } from '../../../../website/src/core/blitzstars/getBlitzStarsLinkButton';
+import { getBlitzStarsLinkButton } from '../../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

@@ -5,6 +5,7 @@ import {
   TankDefinition,
   tankDefinitions,
 } from '@blitzkit/core';
+import { blitzStarsTankAverages } from '@blitzkit/core/src/blitzstars/tankAverages';
 import calculateWN8 from '@blitzkit/core/src/statistics/calculateWN8';
 import getWN8Percentile from '@blitzkit/core/src/statistics/getWN8Percentile';
 import { Locale } from 'discord.js';
@@ -12,13 +13,12 @@ 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 { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
 import getStatsInPeriod from '../../core/blitzstars/getStatsInPeriod';
 import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
 import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
@@ -35,7 +35,7 @@ export async function renderBreakdown(
 ) {
   const { t, translate } = translator(locale);
   const awaitedTankDefinitions = await tankDefinitions;
-  const awaitedTankAverages = await tankAverages;
+  const awaitedTankAverages = await blitzStarsTankAverages;
   const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
   const { filteredOrder } = await filterStats(statsInPeriod, filters);
   const accountInfo = await getAccountInfo(region, id);

packages/bot/src/commands/evolution.tsx

@@ -1,15 +1,15 @@
 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 resolveTankId from '../core/blitz/resolveTankId';
+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';

packages/bot/src/commands/fullStats.tsx

@@ -3,13 +3,13 @@ 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 { 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';

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -2,6 +2,7 @@ import {
   BkrlDiscriminatedEntries,
   FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
   LEAGUES,
+  RatingInfo,
   Region,
 } from '@blitzkit/core';
 import {
@@ -34,93 +35,6 @@ import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { translator } from '../core/localization/translator';
 import { CommandRegistry } from '../events/interactionCreate';
 
-export interface RatingPlayer {
-  spa_id: number;
-  mmr: number;
-  season_number: number;
-  calibrationBattlesLeft: number;
-  number: number;
-  percentile: number;
-  skip: boolean;
-  updated_at: string;
-  score: number;
-  nickname: string;
-  clan_tag: string;
-}
-
-export interface LeagueTop {
-  result: RatingPlayer[];
-}
-
-export type RatingReward = {
-  from_position: number;
-  to_position: number;
-  count: number;
-} & (
-  | {
-      type: 'vehicle';
-
-      vehicle: {
-        id: number;
-        name: string;
-        nation: string;
-        subnation: string;
-        use_subnation_flag: boolean;
-        type_slug: string;
-        level: number;
-        roman_level: string;
-        user_string: string;
-        image_url: string;
-        preview_image_url: string;
-        is_premium: boolean;
-        is_collectible: boolean;
-      };
-    }
-  | {
-      type: 'stuff';
-
-      stuff: {
-        name: string;
-        count: number;
-        title: string;
-        image_url: string;
-        type: string;
-
-        sizes: {};
-      };
-    }
-);
-
-export interface RatingLeague {
-  title: string;
-  small_icon: string;
-  big_icon: string;
-  background: string;
-  index: number;
-  percentile: number;
-}
-
-export type RatingInfo =
-  | {
-      detail: undefined;
-
-      title: string;
-      icon: string | null;
-      start_at: string;
-      finish_at: string;
-      current_season: number;
-      updated_at: string;
-      count: number;
-
-      rewards: RatingReward[];
-      leagues: RatingLeague[];
-    }
-  | { detail: { error: string } };
-
-export interface RatingNeighbors {
-  neighbors: RatingPlayer[];
-}
-
 interface SimplifiedPlayer {
   id: number;
   score: number;
@@ -256,7 +170,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           name_localizations: localizationObject(
                             `common.leagues.${name}`,
                           ),
-                        } satisfies APIApplicationCommandOptionChoice<string>),
+                        }) satisfies APIApplicationCommandOptionChoice<string>,
                     ),
                   )
                   .setRequired(true);
@@ -279,8 +193,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;
@@ -313,7 +227,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(
@@ -349,7 +263,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                             'bot.commands.rating_leaderboard.body.deleted_player',
                             [`${player.id}`],
                           ),
-                      } satisfies SimplifiedPlayer),
+                      }) satisfies SimplifiedPlayer,
                   );
                 },
               );
@@ -398,7 +312,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

@@ -4,6 +4,7 @@ import {
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { tankIcon } from '@blitzkit/core/src/blitzkit/tankIcon';
+import { blitzStarsTankAverages } from '@blitzkit/core/src/blitzstars/tankAverages';
 import calculateWN8 from '@blitzkit/core/src/statistics/calculateWN8';
 import { clamp } from 'lodash';
 import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo';
@@ -11,7 +12,6 @@ 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 buttonLink from '../core/discord/buttonLink';
@@ -221,7 +221,7 @@ async function playerListing(
   winningTeam: number,
   recordingPlayer = false,
 ) {
-  const awaitedTankAverages = await tankAverages;
+  const awaitedTankAverages = await blitzStarsTankAverages;
   const awaitedTankDefinitions = await tankDefinitions;
   const tank = awaitedTankDefinitions[player.vehicle_descr];
   const blockAccent = recordingPlayer ? '_amber' : '';

packages/bot/src/commands/research.tsx

@@ -9,7 +9,6 @@ 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';
@@ -17,6 +16,7 @@ import { resolveAncestry } from '../../../website/src/core/blitzkit/resolveAnces
 import { tankIconPng } from '../../../website/src/core/blitzkit/tankIconPng';
 import CommandWrapper from '../components/CommandWrapper';
 import TitleBar from '../components/TitleBar';
+import resolveTankId from '../core/blitz/resolveTankId';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/searchClans.ts

@@ -1,4 +1,5 @@
 import { Region } from '@blitzkit/core';
+import { ClanList } from '@blitzkit/core/src/blitz/clanList';
 import { Locale } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import fetchBlitz from '../../../website/src/core/blitz/fetchBlitz';
@@ -9,7 +10,6 @@ import embedInfo from '../core/discord/embedInfo';
 import { localizationObject } from '../core/discord/localizationObject';
 import { translator } from '../core/localization/translator';
 import { CommandRegistry } from '../events/interactionCreate';
-import { ClanList } from '../types/clanList';
 
 const DEFAULT_LIMIT = 25;
 

packages/bot/src/commands/stats.tsx

@@ -3,12 +3,12 @@ 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 { 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';

packages/bot/src/commands/today.ts

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