fix: port to core 4

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

@@ -13,12 +13,12 @@ import {
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash';
-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 { UserError } from '../../core/blitzkit/userError';
 import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
 import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
 import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';

packages/bot/src/commands/evolution.tsx

@@ -1,6 +1,5 @@
-import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
+import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
 import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';
 import * as Graph from '../components/Graph';
 import { LineColor } from '../components/Graph/components/Line/constants';

packages/bot/src/commands/fullStats.tsx

@@ -1,12 +1,12 @@
 import {
   StatFilters,
+  emblemURL,
   filterStats,
   getAccountInfo,
   getClanAccountInfo,
   getTierWeights,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { GenericAllStats } from '../components/GenericAllStats';
 import { NoData } from '../components/NoData';

packages/bot/src/commands/link.tsx

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

packages/bot/src/commands/rating.tsx

@@ -1,6 +1,7 @@
 import {
   BkrlFormat,
   deltaBkrlBlitzStats,
+  emblemURL,
   getAccountInfo,
   getArchivedRatingMidnightLeaderboard,
   getClanAccountInfo,
@@ -10,7 +11,6 @@ import {
 } from '@blitzkit/core';
 import { SlashCommandSubcommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { DeltaCaret } from '../components/DeltaCaret';

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -10,6 +10,7 @@ import {
   getRatingInfo,
   getRatingLeague,
   getRatingNeighbors,
+  isOnGoingRatingSeason,
   LEAGUES,
   RatingInfo,
   Region,
@@ -21,11 +22,10 @@ import {
 } from 'discord.js';
 import { range } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import { isOnGoingRatingSeason } from '../../../website/src/core/blitz/isOnGoingRatingSeason';
-import { UserError } from '../../../website/src/hooks/userError';
 import { CommandWrapper } from '../components/CommandWrapper';
 import * as Leaderboard from '../components/Leaderboard';
 import { TitleBar } from '../components/TitleBar';
+import { UserError } from '../core/blitzkit/userError';
 import { addRegionChoices } from '../core/discord/addRegionChoices';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteUsername } from '../core/discord/autocompleteUsername';

packages/bot/src/commands/replay.tsx

@@ -1,15 +1,15 @@
 import {
   blitzStarsTankAverages,
   calculateWN8,
+  emblemURL,
   getClanAccountInfo,
   idToRegion,
+  mapDefinitions,
   tankDefinitions,
   tankIcon,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { clamp } from 'lodash';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
-import { mapDefinitions } from '../../../website/src/core/blitzkit/mapDefinitions';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { TitleBar } from '../components/TitleBar';
 import { iconPng } from '../core/blitzkit/iconPng';

packages/bot/src/commands/research.tsx

@@ -1,5 +1,6 @@
 import {
   asset,
+  emblemURL,
   equipmentPriceMatrix,
   getAccountInfo,
   getClanAccountInfo,
@@ -9,14 +10,13 @@ import {
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { escapeMarkdown, Locale } from 'discord.js';
-import { buildTechTreeLine } from '../../../website/src/core/blitzkit/buildTechTreeLine';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
-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 { resolveTankId } from '../core/blitz/resolveTankId';
+import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
 import { iconPng } from '../core/blitzkit/iconPng';
+import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
+import { tankIconPng } from '../core/blitzkit/tankIconPng';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteTanks } from '../core/discord/autocompleteTanks';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/stats.tsx

@@ -1,11 +1,11 @@
 import {
   StatFilters,
+  emblemURL,
   filterStats,
   getAccountInfo,
   getClanAccountInfo,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { AllStatsOverview } from '../components/AllStatsOverview';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { NoData } from '../components/NoData';

packages/bot/src/core/blitz/resolveTankId.ts

@@ -2,7 +2,7 @@ import { tankDefinitions, tankNames } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../website/src/hooks/userError';
+import { UserError } from '../blitzkit/userError';
 import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
 import { translator } from '../localization/translator';
 

packages/bot/src/core/blitzkit/buildTechTreeLine.ts

@@ -0,0 +1,20 @@
+import { tankDefinitions } from '@blitzkit/core';
+import { resolveAncestry } from './resolveAncestry';
+
+export async function buildTechTreeLine(start: number, end: number) {
+  const awaitedTankDefinitions = await tankDefinitions;
+  const endTank = awaitedTankDefinitions[end];
+  if (!endTank.ancestors) throw new Error('End tank has no ancestors');
+  const line = [end];
+
+  if (start === end) return line;
+  for (const ancestorId of endTank.ancestors) {
+    if ((await resolveAncestry(ancestorId)).includes(start)) {
+      const ancestorTree = await buildTechTreeLine(start, ancestorId);
+      line.push(...ancestorTree);
+      break;
+    }
+  }
+
+  return line;
+}

packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts

@@ -1,5 +1,4 @@
-import { idToRegion, usersDatabase } from '@blitzkit/core';
-import { flagUserActivity } from '../../../../website/src/core/blitzkit/flagUserActivity';
+import { flagUserActivity, idToRegion, usersDatabase } from '@blitzkit/core';
 
 export async function getBlitzFromDiscord(discordId: bigint) {
   const unique = await usersDatabase.discordUser.findUnique({

packages/bot/src/core/blitzkit/getPeriodStart.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { PeriodSize } from '../discord/addPeriodSubCommands';
 
 export function getPeriodStart(region: Region, period: PeriodSize) {

packages/bot/src/core/blitzkit/resolveAncestry.ts

@@ -0,0 +1,25 @@
+import { tankDefinitions } from '@blitzkit/core';
+
+export async function resolveAncestry(id: number) {
+  const awaitedTankDefinitions = await tankDefinitions;
+  const tank = awaitedTankDefinitions[id];
+  const ancestors: number[] = [];
+
+  if (tank.ancestors) {
+    for (const ancestor of tank.ancestors) {
+      if (!ancestors.includes(ancestor)) {
+        ancestors.push(ancestor);
+
+        for (const ancestorLayer2 of await resolveAncestry(ancestor)) {
+          if (!ancestors.includes(ancestorLayer2)) {
+            ancestors.push(ancestorLayer2);
+          }
+        }
+      }
+    }
+  }
+
+  return ancestors.sort(
+    (a, b) => awaitedTankDefinitions[b].tier - awaitedTankDefinitions[a].tier,
+  );
+}

packages/bot/src/core/blitzkit/userError.ts

@@ -0,0 +1,6 @@
+/**
+ * Discriminator for user caused errors to not report in logs
+ */
+export class UserError {
+  constructor(public message: string) {}
+}

packages/bot/src/core/blitzstars/getTankHistories.ts

@@ -1,12 +1,12 @@
 import { Region, emptyAllStats, getTankStats } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { UserError } from '../../../../website/src/hooks/userError';
 import {
   GetHistoriesOptions,
   Histories,
   History,
   getHistoriesDefaultOptions,
 } from '../../types/histories';
+import { UserError } from '../blitzkit/userError';
 import { translator } from '../localization/translator';
 
 export interface TankHistory extends History {

packages/bot/src/core/discord/resolveClanFromCommand.ts

@@ -1,9 +1,9 @@
 import { Region, searchClansAcrossRegions } from '@blitzkit/core';
 import { ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../website/src/hooks/userError';
 import { translator } from '../localization/translator';
 import { serverAndIdPattern } from './resolvePlayerFromCommand/constants';
+import { UserError } from '../blitzkit/userError';
 
 export async function resolveClanFromCommand(
   interaction: ChatInputCommandInteraction,

packages/bot/src/core/discord/resolvePeriodFromButton.ts

@@ -1,6 +1,5 @@
-import { Region } from '@blitzkit/core';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { ButtonInteraction } from 'discord.js';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
 import { getPeriodNow } from '../blitzkit/getPeriodNow';
 import { getPeriodStart } from '../blitzkit/getPeriodStart';
 import { PeriodType } from './addPeriodSubCommands';

packages/bot/src/core/discord/resolvePeriodFromCommand.ts

@@ -1,6 +1,5 @@
-import { Region } from '@blitzkit/core';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
 import { getPeriodNow } from '../blitzkit/getPeriodNow';
 import { getPeriodStart } from '../blitzkit/getPeriodStart';
 import { translator } from '../localization/translator';

packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts

@@ -1,10 +1,10 @@
 import { Region, searchPlayersAcrossRegions } from '@blitzkit/core';
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../../website/src/hooks/userError';
 import { getBlitzFromDiscord } from '../../blitzkit/getBlitzFromDiscord';
 import { translator } from '../../localization/translator';
 import { serverAndIdPattern } from './constants';
+import { UserError } from '../../blitzkit/userError';
 
 export interface ResolvedPlayer {
   region: Region;

packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts

@@ -8,13 +8,13 @@ import {
   InteractionReplyOptions,
 } from 'discord.js';
 import { InteractionRawReturnable, commands } from '..';
-import { UserError } from '../../../../../website/src/hooks/userError';
 import { buttonLink } from '../../../core/discord/buttonLink';
 import { embedWarning } from '../../../core/discord/embedWarning';
 import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable';
 import { psa } from '../../../core/discord/psa';
 import { translator } from '../../../core/localization/translator';
 import { Writeable } from '../../../types/writable';
+import { UserError } from '../../../core/blitzkit/userError';
 
 export async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,