diff --git a/src/core/blitz/getWN8Percentile.ts b/src/LEGACY_core/blitz/getWN8Percentile.ts similarity index 100% rename from src/core/blitz/getWN8Percentile.ts rename to src/LEGACY_core/blitz/getWN8Percentile.ts diff --git a/src/core/blitz/listClans.ts b/src/LEGACY_core/blitz/listClans.ts similarity index 96% rename from src/core/blitz/listClans.ts rename to src/LEGACY_core/blitz/listClans.ts index e047aed81..3625c12a4 100644 --- a/src/core/blitz/listClans.ts +++ b/src/LEGACY_core/blitz/listClans.ts @@ -1,6 +1,6 @@ -import fetchBlitz from '../../_core/blitz/fetchWargaming'; import { Region } from '../../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID'; +import fetchBlitz from '../../core/blitz/fetchWargaming'; import { Clan, ClanList } from '../../types/clanList'; export type ClanListWithRegion = (Clan & { diff --git a/src/core/blitz/listPlayers.ts b/src/LEGACY_core/blitz/listPlayers.ts similarity index 97% rename from src/core/blitz/listPlayers.ts rename to src/LEGACY_core/blitz/listPlayers.ts index 0a4242b04..c0ca7b393 100644 --- a/src/core/blitz/listPlayers.ts +++ b/src/LEGACY_core/blitz/listPlayers.ts @@ -1,6 +1,6 @@ -import fetchBlitz from '../../_core/blitz/fetchWargaming'; import { Region } from '../../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID'; +import fetchBlitz from '../../core/blitz/fetchWargaming'; interface Account { nickname: string; diff --git a/src/core/blitz/numberToRomanNumeral.ts b/src/LEGACY_core/blitz/numberToRomanNumeral.ts similarity index 100% rename from src/core/blitz/numberToRomanNumeral.ts rename to src/LEGACY_core/blitz/numberToRomanNumeral.ts diff --git a/src/core/blitz/regionToRegionSubdomain.ts b/src/LEGACY_core/blitz/regionToRegionSubdomain.ts similarity index 100% rename from src/core/blitz/regionToRegionSubdomain.ts rename to src/LEGACY_core/blitz/regionToRegionSubdomain.ts diff --git a/src/core/blitz/resolveTankId.ts b/src/LEGACY_core/blitz/resolveTankId.ts similarity index 100% rename from src/core/blitz/resolveTankId.ts rename to src/LEGACY_core/blitz/resolveTankId.ts diff --git a/src/core/blitz/resolveTankName.ts b/src/LEGACY_core/blitz/resolveTankName.ts similarity index 100% rename from src/core/blitz/resolveTankName.ts rename to src/LEGACY_core/blitz/resolveTankName.ts diff --git a/src/core/blitz/sumStats.ts b/src/LEGACY_core/blitz/sumStats.ts similarity index 95% rename from src/core/blitz/sumStats.ts rename to src/LEGACY_core/blitz/sumStats.ts index 63a002b37..e2de6e3ab 100644 --- a/src/core/blitz/sumStats.ts +++ b/src/LEGACY_core/blitz/sumStats.ts @@ -1,4 +1,4 @@ -import { AllStats } from '../../_core/blitz/getAccountInfo'; +import { AllStats } from '../../core/blitz/getAccountInfo'; import { emptyAllStats } from '../blitzstars/getDiffedTankStats'; export default function sumStats(allStatsCollection: AllStats[]) { diff --git a/src/core/blitz/tankopedia.ts b/src/LEGACY_core/blitz/tankopedia.ts similarity index 98% rename from src/core/blitz/tankopedia.ts rename to src/LEGACY_core/blitz/tankopedia.ts index a525d86bd..16e33672f 100644 --- a/src/core/blitz/tankopedia.ts +++ b/src/LEGACY_core/blitz/tankopedia.ts @@ -1,7 +1,7 @@ import { deburr } from 'lodash'; -import fetchBlitz from '../../_core/blitz/fetchWargaming'; import { TreeTypeString } from '../../components/Tanks'; import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID'; +import fetchBlitz from '../../core/blitz/fetchWargaming'; import { context } from '../blitzkrieg/context'; export interface TankopediaEntry { diff --git a/src/core/blitzkrieg/addStatPropertyOptions.ts b/src/LEGACY_core/blitzkrieg/addStatPropertyOptions.ts similarity index 100% rename from src/core/blitzkrieg/addStatPropertyOptions.ts rename to src/LEGACY_core/blitzkrieg/addStatPropertyOptions.ts diff --git a/src/core/blitzkrieg/context.ts b/src/LEGACY_core/blitzkrieg/context.ts similarity index 100% rename from src/core/blitzkrieg/context.ts rename to src/LEGACY_core/blitzkrieg/context.ts diff --git a/src/core/blitzkrieg/filtersToDescription.ts b/src/LEGACY_core/blitzkrieg/filtersToDescription.ts similarity index 92% rename from src/core/blitzkrieg/filtersToDescription.ts rename to src/LEGACY_core/blitzkrieg/filtersToDescription.ts index 08bb64349..ef49cdf62 100644 --- a/src/core/blitzkrieg/filtersToDescription.ts +++ b/src/LEGACY_core/blitzkrieg/filtersToDescription.ts @@ -1,5 +1,5 @@ -import { StatFilters } from '../../_core/statistics/filterStats'; import { TREE_TYPE_NAMES } from '../../components/Tanks'; +import { StatFilters } from '../../core/statistics/filterStats'; import resolveTankName from '../blitz/resolveTankName'; import { TIER_ROMAN_NUMERALS, Tier, tankopediaInfo } from '../blitz/tankopedia'; diff --git a/src/core/blitzkrieg/getTierWeights.ts b/src/LEGACY_core/blitzkrieg/getTierWeights.ts similarity index 90% rename from src/core/blitzkrieg/getTierWeights.ts rename to src/LEGACY_core/blitzkrieg/getTierWeights.ts index cf4a079ea..7f88ab7a1 100644 --- a/src/core/blitzkrieg/getTierWeights.ts +++ b/src/LEGACY_core/blitzkrieg/getTierWeights.ts @@ -1,5 +1,5 @@ -import { AllStats } from '../../_core/blitz/getAccountInfo'; import { TierWeightsRecord } from '../../components/TierWeights'; +import { AllStats } from '../../core/blitz/getAccountInfo'; import { tankopedia } from '../blitz/tankopedia'; export async function getTierWeights( diff --git a/src/core/blitzstars/getBlitzStarsLinkButton.ts b/src/LEGACY_core/blitzstars/getBlitzStarsLinkButton.ts similarity index 86% rename from src/core/blitzstars/getBlitzStarsLinkButton.ts rename to src/LEGACY_core/blitzstars/getBlitzStarsLinkButton.ts index 78e0388f8..c603dd8a1 100644 --- a/src/core/blitzstars/getBlitzStarsLinkButton.ts +++ b/src/LEGACY_core/blitzstars/getBlitzStarsLinkButton.ts @@ -1,5 +1,5 @@ -import { getAccountInfo } from '../../_core/blitz/getAccountInfo'; import { Region } from '../../constants/regions'; +import { getAccountInfo } from '../../core/blitz/getAccountInfo'; import linkButton from '../discord/linkButton'; export async function getBlitzStarsLinkButton( diff --git a/src/core/blitzstars/getDiffedTankStats.ts b/src/LEGACY_core/blitzstars/getDiffedTankStats.ts similarity index 98% rename from src/core/blitzstars/getDiffedTankStats.ts rename to src/LEGACY_core/blitzstars/getDiffedTankStats.ts index dc571d972..68027d79b 100644 --- a/src/core/blitzstars/getDiffedTankStats.ts +++ b/src/LEGACY_core/blitzstars/getDiffedTankStats.ts @@ -1,5 +1,5 @@ -import { AllStats } from '../../_core/blitz/getAccountInfo'; import { Region } from '../../constants/regions'; +import { AllStats } from '../../core/blitz/getAccountInfo'; import getTankHistories, { TankHistories, TankHistoryRaw, diff --git a/src/core/blitzstars/getPeriodNow.ts b/src/LEGACY_core/blitzstars/getPeriodNow.ts similarity index 100% rename from src/core/blitzstars/getPeriodNow.ts rename to src/LEGACY_core/blitzstars/getPeriodNow.ts diff --git a/src/core/blitzstars/getPeriodStart.ts b/src/LEGACY_core/blitzstars/getPeriodStart.ts similarity index 100% rename from src/core/blitzstars/getPeriodStart.ts rename to src/LEGACY_core/blitzstars/getPeriodStart.ts diff --git a/src/core/blitzstars/getPlayerHistories.ts b/src/LEGACY_core/blitzstars/getPlayerHistories.ts similarity index 92% rename from src/core/blitzstars/getPlayerHistories.ts rename to src/LEGACY_core/blitzstars/getPlayerHistories.ts index c546c3907..c17d22f8e 100644 --- a/src/core/blitzstars/getPlayerHistories.ts +++ b/src/LEGACY_core/blitzstars/getPlayerHistories.ts @@ -1,6 +1,6 @@ -import { getAccountInfo } from '../../_core/blitz/getAccountInfo'; -import { PlayerStats } from '../../_core/blitzstars/getPlayerStats'; import { Region } from '../../constants/regions'; +import { getAccountInfo } from '../../core/blitz/getAccountInfo'; +import { PlayerStats } from '../../core/blitzstars/getPlayerStats'; import { GetHistoriesOptions, Histories, diff --git a/src/core/blitzstars/getTankHistories.ts b/src/LEGACY_core/blitzstars/getTankHistories.ts similarity index 98% rename from src/core/blitzstars/getTankHistories.ts rename to src/LEGACY_core/blitzstars/getTankHistories.ts index b37a6b508..2a210b0ae 100644 --- a/src/core/blitzstars/getTankHistories.ts +++ b/src/LEGACY_core/blitzstars/getTankHistories.ts @@ -1,5 +1,5 @@ -import getTankStats from '../../_core/blitz/getTankStats'; import { Region } from '../../constants/regions'; +import getTankStats from '../../core/blitz/getTankStats'; import { GetHistoriesOptions, Histories, diff --git a/src/core/blitzstars/getTimeDaysAgo.ts b/src/LEGACY_core/blitzstars/getTimeDaysAgo.ts similarity index 100% rename from src/core/blitzstars/getTimeDaysAgo.ts rename to src/LEGACY_core/blitzstars/getTimeDaysAgo.ts diff --git a/src/core/blitzstars/tankAverages.ts b/src/LEGACY_core/blitzstars/tankAverages.ts similarity index 97% rename from src/core/blitzstars/tankAverages.ts rename to src/LEGACY_core/blitzstars/tankAverages.ts index 23d5599ee..cd86c1236 100644 --- a/src/core/blitzstars/tankAverages.ts +++ b/src/LEGACY_core/blitzstars/tankAverages.ts @@ -1,4 +1,4 @@ -import { AllStats } from '../../_core/blitz/getAccountInfo'; +import { AllStats } from '../../core/blitz/getAccountInfo'; import { context } from '../blitzkrieg/context'; export interface SpecialStats { diff --git a/src/core/cockroackdb/discordBlitz.ts b/src/LEGACY_core/cockroackdb/discordBlitz.ts similarity index 100% rename from src/core/cockroackdb/discordBlitz.ts rename to src/LEGACY_core/cockroackdb/discordBlitz.ts diff --git a/src/core/database/getMidnightLeaderboard.ts b/src/LEGACY_core/database/getMidnightLeaderboard.ts similarity index 100% rename from src/core/database/getMidnightLeaderboard.ts rename to src/LEGACY_core/database/getMidnightLeaderboard.ts diff --git a/src/core/discord/addClanChoices.ts b/src/LEGACY_core/discord/addClanChoices.ts similarity index 100% rename from src/core/discord/addClanChoices.ts rename to src/LEGACY_core/discord/addClanChoices.ts diff --git a/src/core/discord/addPeriodSubCommands.ts b/src/LEGACY_core/discord/addPeriodSubCommands.ts similarity index 100% rename from src/core/discord/addPeriodSubCommands.ts rename to src/LEGACY_core/discord/addPeriodSubCommands.ts diff --git a/src/core/discord/addRegionChoices.ts b/src/LEGACY_core/discord/addRegionChoices.ts similarity index 100% rename from src/core/discord/addRegionChoices.ts rename to src/LEGACY_core/discord/addRegionChoices.ts diff --git a/src/core/discord/addStatTypeSubCommands.ts b/src/LEGACY_core/discord/addStatTypeSubCommands.ts similarity index 100% rename from src/core/discord/addStatTypeSubCommands.ts rename to src/LEGACY_core/discord/addStatTypeSubCommands.ts diff --git a/src/core/discord/addTankChoices.ts b/src/LEGACY_core/discord/addTankChoices.ts similarity index 100% rename from src/core/discord/addTankChoices.ts rename to src/LEGACY_core/discord/addTankChoices.ts diff --git a/src/core/discord/addTierChoices.ts b/src/LEGACY_core/discord/addTierChoices.ts similarity index 100% rename from src/core/discord/addTierChoices.ts rename to src/LEGACY_core/discord/addTierChoices.ts diff --git a/src/core/discord/addUsernameChoices.ts b/src/LEGACY_core/discord/addUsernameChoices.ts similarity index 100% rename from src/core/discord/addUsernameChoices.ts rename to src/LEGACY_core/discord/addUsernameChoices.ts diff --git a/src/core/discord/autocompleteClan.ts b/src/LEGACY_core/discord/autocompleteClan.ts similarity index 100% rename from src/core/discord/autocompleteClan.ts rename to src/LEGACY_core/discord/autocompleteClan.ts diff --git a/src/core/discord/autocompleteStatProperty.ts b/src/LEGACY_core/discord/autocompleteStatProperty.ts similarity index 100% rename from src/core/discord/autocompleteStatProperty.ts rename to src/LEGACY_core/discord/autocompleteStatProperty.ts diff --git a/src/core/discord/autocompleteTanks.ts b/src/LEGACY_core/discord/autocompleteTanks.ts similarity index 100% rename from src/core/discord/autocompleteTanks.ts rename to src/LEGACY_core/discord/autocompleteTanks.ts diff --git a/src/core/discord/autocompleteUsername.ts b/src/LEGACY_core/discord/autocompleteUsername.ts similarity index 100% rename from src/core/discord/autocompleteUsername.ts rename to src/LEGACY_core/discord/autocompleteUsername.ts diff --git a/src/core/discord/client.ts b/src/LEGACY_core/discord/client.ts similarity index 100% rename from src/core/discord/client.ts rename to src/LEGACY_core/discord/client.ts diff --git a/src/core/discord/embedInfo.ts b/src/LEGACY_core/discord/embedInfo.ts similarity index 100% rename from src/core/discord/embedInfo.ts rename to src/LEGACY_core/discord/embedInfo.ts diff --git a/src/core/discord/embedNegative.ts b/src/LEGACY_core/discord/embedNegative.ts similarity index 100% rename from src/core/discord/embedNegative.ts rename to src/LEGACY_core/discord/embedNegative.ts diff --git a/src/core/discord/embedPositive.ts b/src/LEGACY_core/discord/embedPositive.ts similarity index 100% rename from src/core/discord/embedPositive.ts rename to src/LEGACY_core/discord/embedPositive.ts diff --git a/src/core/discord/embedWarning.ts b/src/LEGACY_core/discord/embedWarning.ts similarity index 100% rename from src/core/discord/embedWarning.ts rename to src/LEGACY_core/discord/embedWarning.ts diff --git a/src/core/discord/getCustomPeriodParams.ts b/src/LEGACY_core/discord/getCustomPeriodParams.ts similarity index 100% rename from src/core/discord/getCustomPeriodParams.ts rename to src/LEGACY_core/discord/getCustomPeriodParams.ts diff --git a/src/core/discord/getFiltersFromButton.ts b/src/LEGACY_core/discord/getFiltersFromButton.ts similarity index 90% rename from src/core/discord/getFiltersFromButton.ts rename to src/LEGACY_core/discord/getFiltersFromButton.ts index 7bef99461..d8b07b1d2 100644 --- a/src/core/discord/getFiltersFromButton.ts +++ b/src/LEGACY_core/discord/getFiltersFromButton.ts @@ -1,6 +1,6 @@ import { ButtonInteraction } from 'discord.js'; -import { StatFilters } from '../../_core/statistics/filterStats'; import { TreeTypeString } from '../../components/Tanks'; +import { StatFilters } from '../../core/statistics/filterStats'; export function getFiltersFromButton(interaction: ButtonInteraction) { const url = new URL(`https://example.com/${interaction.customId}`); diff --git a/src/core/discord/getFiltersFromCommand.ts b/src/LEGACY_core/discord/getFiltersFromCommand.ts similarity index 90% rename from src/core/discord/getFiltersFromCommand.ts rename to src/LEGACY_core/discord/getFiltersFromCommand.ts index d5ebb0baa..5a01d9084 100644 --- a/src/core/discord/getFiltersFromCommand.ts +++ b/src/LEGACY_core/discord/getFiltersFromCommand.ts @@ -1,6 +1,6 @@ import { ChatInputCommandInteraction } from 'discord.js'; -import { StatFilters } from '../../_core/statistics/filterStats'; import { TreeTypeString } from '../../components/Tanks'; +import { StatFilters } from '../../core/statistics/filterStats'; export function getFiltersFromCommand( interaction: ChatInputCommandInteraction, diff --git a/src/core/discord/interactionToURL.ts b/src/LEGACY_core/discord/interactionToURL.ts similarity index 100% rename from src/core/discord/interactionToURL.ts rename to src/LEGACY_core/discord/interactionToURL.ts diff --git a/src/core/discord/linkButton.ts b/src/LEGACY_core/discord/linkButton.ts similarity index 100% rename from src/core/discord/linkButton.ts rename to src/LEGACY_core/discord/linkButton.ts diff --git a/src/core/discord/markdownTable.ts b/src/LEGACY_core/discord/markdownTable.ts similarity index 100% rename from src/core/discord/markdownTable.ts rename to src/LEGACY_core/discord/markdownTable.ts diff --git a/src/core/discord/normalizeInteractionReturnable.ts b/src/LEGACY_core/discord/normalizeInteractionReturnable.ts similarity index 100% rename from src/core/discord/normalizeInteractionReturnable.ts rename to src/LEGACY_core/discord/normalizeInteractionReturnable.ts diff --git a/src/core/discord/primaryButton.ts b/src/LEGACY_core/discord/primaryButton.ts similarity index 100% rename from src/core/discord/primaryButton.ts rename to src/LEGACY_core/discord/primaryButton.ts diff --git a/src/core/discord/psa.ts b/src/LEGACY_core/discord/psa.ts similarity index 100% rename from src/core/discord/psa.ts rename to src/LEGACY_core/discord/psa.ts diff --git a/src/core/discord/refreshButton.ts b/src/LEGACY_core/discord/refreshButton.ts similarity index 100% rename from src/core/discord/refreshButton.ts rename to src/LEGACY_core/discord/refreshButton.ts diff --git a/src/core/discord/resolveClanFromCommand.ts b/src/LEGACY_core/discord/resolveClanFromCommand.ts similarity index 100% rename from src/core/discord/resolveClanFromCommand.ts rename to src/LEGACY_core/discord/resolveClanFromCommand.ts diff --git a/src/core/discord/resolvePeriodFromButton.ts b/src/LEGACY_core/discord/resolvePeriodFromButton.ts similarity index 100% rename from src/core/discord/resolvePeriodFromButton.ts rename to src/LEGACY_core/discord/resolvePeriodFromButton.ts diff --git a/src/core/discord/resolvePeriodFromCommand.ts b/src/LEGACY_core/discord/resolvePeriodFromCommand.ts similarity index 100% rename from src/core/discord/resolvePeriodFromCommand.ts rename to src/LEGACY_core/discord/resolvePeriodFromCommand.ts diff --git a/src/core/discord/resolvePlayerFromButton.ts b/src/LEGACY_core/discord/resolvePlayerFromButton.ts similarity index 100% rename from src/core/discord/resolvePlayerFromButton.ts rename to src/LEGACY_core/discord/resolvePlayerFromButton.ts diff --git a/src/core/discord/resolvePlayerFromCommand.ts b/src/LEGACY_core/discord/resolvePlayerFromCommand.ts similarity index 100% rename from src/core/discord/resolvePlayerFromCommand.ts rename to src/LEGACY_core/discord/resolvePlayerFromCommand.ts diff --git a/src/core/github/octokit.ts b/src/LEGACY_core/github/octokit.ts similarity index 100% rename from src/core/github/octokit.ts rename to src/LEGACY_core/github/octokit.ts diff --git a/src/core/node/getClientId.ts b/src/LEGACY_core/node/getClientId.ts similarity index 100% rename from src/core/node/getClientId.ts rename to src/LEGACY_core/node/getClientId.ts diff --git a/src/core/node/isDev.ts b/src/LEGACY_core/node/isDev.ts similarity index 100% rename from src/core/node/isDev.ts rename to src/LEGACY_core/node/isDev.ts diff --git a/src/core/node/isNumber.ts b/src/LEGACY_core/node/isNumber.ts similarity index 100% rename from src/core/node/isNumber.ts rename to src/LEGACY_core/node/isNumber.ts diff --git a/src/core/node/jsxToPng.ts b/src/LEGACY_core/node/jsxToPng.ts similarity index 100% rename from src/core/node/jsxToPng.ts rename to src/LEGACY_core/node/jsxToPng.ts diff --git a/src/core/node/jsxToSvg.ts b/src/LEGACY_core/node/jsxToSvg.ts similarity index 100% rename from src/core/node/jsxToSvg.ts rename to src/LEGACY_core/node/jsxToSvg.ts diff --git a/src/core/node/processes.ts b/src/LEGACY_core/node/processes.ts similarity index 100% rename from src/core/node/processes.ts rename to src/LEGACY_core/node/processes.ts diff --git a/src/core/node/secrets.ts b/src/LEGACY_core/node/secrets.ts similarity index 100% rename from src/core/node/secrets.ts rename to src/LEGACY_core/node/secrets.ts diff --git a/src/core/node/svgToPng.ts b/src/LEGACY_core/node/svgToPng.ts similarity index 100% rename from src/core/node/svgToPng.ts rename to src/LEGACY_core/node/svgToPng.ts diff --git a/src/core/node/throwError.ts b/src/LEGACY_core/node/throwError.ts similarity index 100% rename from src/core/node/throwError.ts rename to src/LEGACY_core/node/throwError.ts diff --git a/src/app/api/tank-averages/route.ts b/src/app/api/tank-averages/route.ts index 7f5ab96bf..caf1f5d34 100644 --- a/src/app/api/tank-averages/route.ts +++ b/src/app/api/tank-averages/route.ts @@ -1,5 +1,5 @@ import { NextResponse } from 'next/server'; -import { tankAverages } from '../../../core/blitzstars/tankAverages'; +import { tankAverages } from '../../../LEGACY_core/blitzstars/tankAverages'; export async function GET() { return NextResponse.json(await tankAverages); diff --git a/src/app/api/tankopedia/route.ts b/src/app/api/tankopedia/route.ts index 665728654..5000b80d4 100644 --- a/src/app/api/tankopedia/route.ts +++ b/src/app/api/tankopedia/route.ts @@ -1,5 +1,5 @@ import { NextResponse } from 'next/server'; -import { tankopedia } from '../../../core/blitz/tankopedia'; +import { tankopedia } from '../../../LEGACY_core/blitz/tankopedia'; export async function GET() { return NextResponse.json(await tankopedia); diff --git a/src/app/embeds/session/page.tsx b/src/app/embeds/session/page.tsx index 95984a340..850e818ef 100644 --- a/src/app/embeds/session/page.tsx +++ b/src/app/embeds/session/page.tsx @@ -2,15 +2,18 @@ import { ContextMenu } from '@radix-ui/themes'; import { useEffect, useState } from 'react'; -import fetchBlitz from '../../../_core/blitz/fetchWargaming'; -import calculateWN8 from '../../../_core/statistics/calculateWN8'; -import { deltaTankStats } from '../../../_core/statistics/deltaTankStats'; +import getWN8Percentile from '../../../LEGACY_core/blitz/getWN8Percentile'; +import { + TankopediaEntry, + tankopedia, +} from '../../../LEGACY_core/blitz/tankopedia'; +import { tankAverages } from '../../../LEGACY_core/blitzstars/tankAverages'; import * as Breakdown from '../../../components/Breakdown'; import { TreeTypeEnum } from '../../../components/Tanks'; import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID'; -import getWN8Percentile from '../../../core/blitz/getWN8Percentile'; -import { TankopediaEntry, tankopedia } from '../../../core/blitz/tankopedia'; -import { tankAverages } from '../../../core/blitzstars/tankAverages'; +import fetchBlitz from '../../../core/blitz/fetchWargaming'; +import calculateWN8 from '../../../core/statistics/calculateWN8'; +import { deltaTankStats } from '../../../core/statistics/deltaTankStats'; import { useSession } from '../../../stores/session'; import { IndividualTankStats, TanksStats } from '../../../types/tanksStats'; import { CustomColumnDisplay } from '../../tools/session/components/CustomColumn'; diff --git a/src/app/tools/session/page.tsx b/src/app/tools/session/page.tsx index a946386a7..500424052 100644 --- a/src/app/tools/session/page.tsx +++ b/src/app/tools/session/page.tsx @@ -18,13 +18,13 @@ import { } from '@radix-ui/themes'; import { debounce } from 'lodash'; import { ChangeEvent, useRef, useState } from 'react'; -import fetchBlitz from '../../../_core/blitz/fetchWargaming'; +import listPlayers, { + AccountListWithServer, +} from '../../../LEGACY_core/blitz/listPlayers'; import PageWrapper from '../../../components/PageWrapper'; import { REGION_NAMES, Region } from '../../../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID'; -import listPlayers, { - AccountListWithServer, -} from '../../../core/blitz/listPlayers'; +import fetchBlitz from '../../../core/blitz/fetchWargaming'; import { useSession } from '../../../stores/session'; import { NormalizedTankStats, TanksStats } from '../../../types/tanksStats'; import SessionPage from '../../embeds/session/page'; diff --git a/src/bot.ts b/src/bot.ts index 4506ce218..5daff8a42 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -1,6 +1,6 @@ -import { client } from './core/discord/client'; -import { registerProcesses } from './core/node/processes'; -import { secrets } from './core/node/secrets'; +import { client } from './LEGACY_core/discord/client'; +import { registerProcesses } from './LEGACY_core/node/processes'; +import { secrets } from './LEGACY_core/node/secrets'; registerProcesses(); client.login(secrets.DISCORD_TOKEN); diff --git a/src/commands/clanEvent.ts b/src/commands/clanEvent.ts index f51a9a7f2..6be992a47 100644 --- a/src/commands/clanEvent.ts +++ b/src/commands/clanEvent.ts @@ -7,15 +7,15 @@ // import { SlashCommandBuilder, escapeMarkdown } from 'discord.js'; // import markdownEscape from 'markdown-escape'; -// import { getAccountAchievements } from '../_core/blitz/getAccountAchievements'; -// import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -// import { getClanInfo } from '../_core/blitz/getClanInfo'; -// import { PlayerHistoriesRaw } from '../core/blitzstars/getPlayerHistories'; -// import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo'; -// import addClanChoices from '../core/discord/addClanChoices'; -// import autocompleteClan from '../core/discord/autocompleteClan'; -// import embedWarning from '../core/discord/embedWarning'; -// import resolveClanFromCommand from '../core/discord/resolveClanFromCommand'; +// import { getAccountAchievements } from '../core/blitz/getAccountAchievements'; +// import { getAccountInfo } from '../core/blitz/getAccountInfo'; +// import { getClanInfo } from '../core/blitz/getClanInfo'; +// import { PlayerHistoriesRaw } from '../LEGACY_core/blitzstars/getPlayerHistories'; +// import getTimeDaysAgo from '../LEGACY_core/blitzstars/getTimeDaysAgo'; +// import addClanChoices from '../LEGACY_core/discord/addClanChoices'; +// import autocompleteClan from '../LEGACY_core/discord/autocompleteClan'; +// import embedWarning from '../LEGACY_core/discord/embedWarning'; +// import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand'; // import { CommandRegistry } from '../events/interactionCreate'; // export const clanEventCommand: CommandRegistry = { diff --git a/src/commands/debug.ts b/src/commands/debug.ts index e3afbe119..37a49094b 100644 --- a/src/commands/debug.ts +++ b/src/commands/debug.ts @@ -1,11 +1,11 @@ import { SlashCommandBuilder } from 'discord.js'; import packageJSON from '../../package.json' assert { type: 'json' }; -import { tankopedia } from '../core/blitz/tankopedia'; -import { tankAverages } from '../core/blitzstars/tankAverages'; -import { client } from '../core/discord/client'; -import embedInfo from '../core/discord/embedInfo'; -import markdownTable from '../core/discord/markdownTable'; -import getClientId from '../core/node/getClientId'; +import { tankopedia } from '../LEGACY_core/blitz/tankopedia'; +import { tankAverages } from '../LEGACY_core/blitzstars/tankAverages'; +import { client } from '../LEGACY_core/discord/client'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; +import markdownTable from '../LEGACY_core/discord/markdownTable'; +import getClientId from '../LEGACY_core/node/getClientId'; import { CommandRegistry } from '../events/interactionCreate'; const executionStart = new Date().getTime(); diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts index 71f424e6c..201101888 100644 --- a/src/commands/eligible.ts +++ b/src/commands/eligible.ts @@ -1,17 +1,19 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import calculateWN8 from '../_core/statistics/calculateWN8'; -import sumStats from '../core/blitz/sumStats'; -import { tankopedia } from '../core/blitz/tankopedia'; -import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats'; -import getPeriodNow from '../core/blitzstars/getPeriodNow'; -import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo'; -import { tankAverages } from '../core/blitzstars/tankAverages'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import embedNegative from '../core/discord/embedNegative'; -import embedPositive from '../core/discord/embedPositive'; -import markdownTable, { TableInput } from '../core/discord/markdownTable'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +import sumStats from '../LEGACY_core/blitz/sumStats'; +import { tankopedia } from '../LEGACY_core/blitz/tankopedia'; +import getDiffedTankStats from '../LEGACY_core/blitzstars/getDiffedTankStats'; +import getPeriodNow from '../LEGACY_core/blitzstars/getPeriodNow'; +import getTimeDaysAgo from '../LEGACY_core/blitzstars/getTimeDaysAgo'; +import { tankAverages } from '../LEGACY_core/blitzstars/tankAverages'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import embedNegative from '../LEGACY_core/discord/embedNegative'; +import embedPositive from '../LEGACY_core/discord/embedPositive'; +import markdownTable, { + TableInput, +} from '../LEGACY_core/discord/markdownTable'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import calculateWN8 from '../core/statistics/calculateWN8'; import { CommandRegistry } from '../events/interactionCreate'; import { PossiblyPromise } from '../types/possiblyPromise'; diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx index c389bb632..6be79726b 100644 --- a/src/commands/evolution.tsx +++ b/src/commands/evolution.tsx @@ -2,33 +2,33 @@ import { SlashCommandBuilder, SlashCommandSubcommandGroupBuilder, } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import { emblemIdToURL } from '../_core/blitzkrieg/emblemIdToURL'; +import resolveTankId from '../LEGACY_core/blitz/resolveTankId'; +import { getBlitzStarsLinkButton } from '../LEGACY_core/blitzstars/getBlitzStarsLinkButton'; +import getPlayerHistories from '../LEGACY_core/blitzstars/getPlayerHistories'; +import getTankHistories from '../LEGACY_core/blitzstars/getTankHistories'; +import addPeriodSubCommands from '../LEGACY_core/discord/addPeriodSubCommands'; +import addTankChoices from '../LEGACY_core/discord/addTankChoices'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams'; +import interactionToURL from '../LEGACY_core/discord/interactionToURL'; +import primaryButton from '../LEGACY_core/discord/primaryButton'; +import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton'; +import resolvePeriodFromCommand, { + ResolvedPeriod, +} from '../LEGACY_core/discord/resolvePeriodFromCommand'; +import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton'; +import resolvePlayerFromCommand, { + ResolvedPlayer, +} from '../LEGACY_core/discord/resolvePlayerFromCommand'; import * as Graph from '../components/Graph'; import NoData, { NoDataType } from '../components/NoData'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; -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'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteTanks from '../core/discord/autocompleteTanks'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams'; -import interactionToURL from '../core/discord/interactionToURL'; -import primaryButton from '../core/discord/primaryButton'; -import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton'; -import resolvePeriodFromCommand, { - ResolvedPeriod, -} from '../core/discord/resolvePeriodFromCommand'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand, { - ResolvedPlayer, -} from '../core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL'; import { CommandRegistryRaw } from '../events/interactionCreate'; type EvolutionStatType = 'player' | 'tank'; diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx index dcefd2a01..1e46f16ea 100644 --- a/src/commands/fullStats.tsx +++ b/src/commands/fullStats.tsx @@ -1,34 +1,34 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import { emblemIdToURL } from '../_core/blitzkrieg/emblemIdToURL'; -import { StatFilters, filterStats } from '../_core/statistics/filterStats'; +import { filtersToDescription } from '../LEGACY_core/blitzkrieg/filtersToDescription'; +import { getTierWeights } from '../LEGACY_core/blitzkrieg/getTierWeights'; +import { getBlitzStarsLinkButton } from '../LEGACY_core/blitzstars/getBlitzStarsLinkButton'; +import getDiffedTankStats from '../LEGACY_core/blitzstars/getDiffedTankStats'; +import addStatTypeSubCommands from '../LEGACY_core/discord/addStatTypeSubCommands'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams'; +import { getFiltersFromButton } from '../LEGACY_core/discord/getFiltersFromButton'; +import { getFiltersFromCommand } from '../LEGACY_core/discord/getFiltersFromCommand'; +import interactionToURL from '../LEGACY_core/discord/interactionToURL'; +import { refreshButton } from '../LEGACY_core/discord/refreshButton'; +import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton'; +import resolvePeriodFromCommand, { + ResolvedPeriod, +} from '../LEGACY_core/discord/resolvePeriodFromCommand'; +import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton'; +import resolvePlayerFromCommand, { + ResolvedPlayer, +} from '../LEGACY_core/discord/resolvePlayerFromCommand'; import GenericAllStats from '../components/GenericAllStats'; import NoData, { NoDataType } from '../components/NoData'; import TierWeights from '../components/TierWeights'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; -import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription'; -import { getTierWeights } from '../core/blitzkrieg/getTierWeights'; -import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton'; -import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats'; -import addStatTypeSubCommands from '../core/discord/addStatTypeSubCommands'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteTanks from '../core/discord/autocompleteTanks'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams'; -import { getFiltersFromButton } from '../core/discord/getFiltersFromButton'; -import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand'; -import interactionToURL from '../core/discord/interactionToURL'; -import { refreshButton } from '../core/discord/refreshButton'; -import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton'; -import resolvePeriodFromCommand, { - ResolvedPeriod, -} from '../core/discord/resolvePeriodFromCommand'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand, { - ResolvedPlayer, -} from '../core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL'; +import { StatFilters, filterStats } from '../core/statistics/filterStats'; import { CommandRegistryRaw } from '../events/interactionCreate'; async function render( diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx index 91986bc2c..53974201e 100644 --- a/src/commands/inactive.tsx +++ b/src/commands/inactive.tsx @@ -1,13 +1,13 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanInfo } from '../_core/blitz/getClanInfo'; +import addClanChoices from '../LEGACY_core/discord/addClanChoices'; +import autocompleteClan from '../LEGACY_core/discord/autocompleteClan'; +import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand'; import GenericStats from '../components/GenericStats'; import NoData, { NoDataType } from '../components/NoData'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; -import addClanChoices from '../core/discord/addClanChoices'; -import autocompleteClan from '../core/discord/autocompleteClan'; -import resolveClanFromCommand from '../core/discord/resolveClanFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanInfo } from '../core/blitz/getClanInfo'; import { CommandRegistry } from '../events/interactionCreate'; const DEFAULT_THRESHOLD = 7; diff --git a/src/commands/link.tsx b/src/commands/link.tsx index 5dfb6f01b..bcf82df3a 100644 --- a/src/commands/link.tsx +++ b/src/commands/link.tsx @@ -6,15 +6,15 @@ import { } from 'discord.js'; import markdownEscape from 'markdown-escape'; import discord from '../../discord.json' assert { type: 'json' }; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; +import { linkBlitzAndDiscord } from '../LEGACY_core/cockroackdb/discordBlitz'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import embedNegative from '../LEGACY_core/discord/embedNegative'; import { Glow } from '../components/AllStatsOverview/components/WN8Display/components/Glow'; import Wrapper from '../components/Wrapper'; import { REGION_NAMES_SHORT, Region } from '../constants/regions'; -import { linkBlitzAndDiscord } from '../core/cockroackdb/discordBlitz'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import embedNegative from '../core/discord/embedNegative'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; import { CommandRegistry } from '../events/interactionCreate'; import { theme } from '../stitches.config'; diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx index b8a15792d..f10185ae5 100644 --- a/src/commands/ownedTanks.tsx +++ b/src/commands/ownedTanks.tsx @@ -1,25 +1,25 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import getTankStats from '../_core/blitz/getTankStats'; -import getTreeType from '../_core/blitz/getTreeType'; -import { emblemIdToURL } from '../_core/blitzkrieg/emblemIdToURL'; -import NoData, { NoDataType } from '../components/NoData'; -import * as Tanks from '../components/Tanks'; -import TitleBar from '../components/TitleBar'; -import Wrapper from '../components/Wrapper'; -import resolveTankName from '../core/blitz/resolveTankName'; +import resolveTankName from '../LEGACY_core/blitz/resolveTankName'; import { TIER_ROMAN_NUMERALS, TankopediaEntry, Tier, tankopedia, tankopediaInfo, -} from '../core/blitz/tankopedia'; -import addTierChoices from '../core/discord/addTierChoices'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +} from '../LEGACY_core/blitz/tankopedia'; +import addTierChoices from '../LEGACY_core/discord/addTierChoices'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import NoData, { NoDataType } from '../components/NoData'; +import * as Tanks from '../components/Tanks'; +import TitleBar from '../components/TitleBar'; +import Wrapper from '../components/Wrapper'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import getTankStats from '../core/blitz/getTankStats'; +import getTreeType from '../core/blitz/getTreeType'; +import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL'; import { CommandRegistry } from '../events/interactionCreate'; export const ownedTanksCommand: CommandRegistry = { diff --git a/src/commands/playerAchievements.ts b/src/commands/playerAchievements.ts index a080189d7..323930bcd 100644 --- a/src/commands/playerAchievements.ts +++ b/src/commands/playerAchievements.ts @@ -1,13 +1,15 @@ import { SlashCommandBuilder } from 'discord.js'; import { startCase } from 'lodash'; import markdownEscape from 'markdown-escape'; -import { getAccountAchievements } from '../_core/blitz/getAccountAchievements'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import embedInfo from '../core/discord/embedInfo'; -import markdownTable, { TableInputEntry } from '../core/discord/markdownTable'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; +import markdownTable, { + TableInputEntry, +} from '../LEGACY_core/discord/markdownTable'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import { getAccountAchievements } from '../core/blitz/getAccountAchievements'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; import { CommandRegistry } from '../events/interactionCreate'; type SortBy = 'name' | 'count'; diff --git a/src/commands/playerInfo.ts b/src/commands/playerInfo.ts index 36f748390..a0a8e445e 100644 --- a/src/commands/playerInfo.ts +++ b/src/commands/playerInfo.ts @@ -1,11 +1,11 @@ import { SlashCommandBuilder } from 'discord.js'; import markdownEscape from 'markdown-escape'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import embedInfo from '../core/discord/embedInfo'; -import markdownTable from '../core/discord/markdownTable'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; +import markdownTable from '../LEGACY_core/discord/markdownTable'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; import { CommandRegistry } from '../events/interactionCreate'; export const playerInfoCommand: CommandRegistry = { diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx index 305a0723e..a5354cd99 100644 --- a/src/commands/ratings.tsx +++ b/src/commands/ratings.tsx @@ -5,25 +5,25 @@ import { SlashCommandSubcommandGroupBuilder, } from 'discord.js'; import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import getRatingsInfo from '../_core/blitz/getRatingsInfo'; -import getArchivedRatingsInfo from '../_core/blitzkrieg/getArchivedRatingsInfo'; +import regionToRegionSubdomain from '../LEGACY_core/blitz/regionToRegionSubdomain'; +import getMidnightLeaderboard, { + DATABASE_REPO, +} from '../LEGACY_core/database/getMidnightLeaderboard'; +import addRegionChoices from '../LEGACY_core/discord/addRegionChoices'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import embedNegative from '../LEGACY_core/discord/embedNegative'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import { octokit } from '../LEGACY_core/github/octokit'; +import throwError from '../LEGACY_core/node/throwError'; import * as Leaderboard from '../components/Leaderboard'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; import { REGION_NAMES_SHORT, Region } from '../constants/regions'; -import regionToRegionSubdomain from '../core/blitz/regionToRegionSubdomain'; -import getMidnightLeaderboard, { - DATABASE_REPO, -} from '../core/database/getMidnightLeaderboard'; -import addRegionChoices from '../core/discord/addRegionChoices'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import embedNegative from '../core/discord/embedNegative'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; -import { octokit } from '../core/github/octokit'; -import throwError from '../core/node/throwError'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import getRatingsInfo from '../core/blitz/getRatingsInfo'; +import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo'; import { CommandRegistryRaw } from '../events/interactionCreate'; export interface RatingsPlayer { diff --git a/src/commands/searchClans.ts b/src/commands/searchClans.ts index dfe60053c..a3bb1f5b0 100644 --- a/src/commands/searchClans.ts +++ b/src/commands/searchClans.ts @@ -1,11 +1,11 @@ import { SlashCommandBuilder } from 'discord.js'; import markdownEscape from 'markdown-escape'; -import fetchBlitz from '../_core/blitz/fetchWargaming'; +import addClanChoices from '../LEGACY_core/discord/addClanChoices'; +import addRegionChoices from '../LEGACY_core/discord/addRegionChoices'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; import { REGION_NAMES, Region } from '../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID'; -import addClanChoices from '../core/discord/addClanChoices'; -import addRegionChoices from '../core/discord/addRegionChoices'; -import embedInfo from '../core/discord/embedInfo'; +import fetchBlitz from '../core/blitz/fetchWargaming'; import { CommandRegistry } from '../events/interactionCreate'; import { ClanList } from '../types/clanList'; diff --git a/src/commands/searchPlayers.ts b/src/commands/searchPlayers.ts index 8b2eacf8e..7673482ef 100644 --- a/src/commands/searchPlayers.ts +++ b/src/commands/searchPlayers.ts @@ -1,12 +1,12 @@ import { SlashCommandBuilder } from 'discord.js'; import markdownEscape from 'markdown-escape'; -import fetchBlitz from '../_core/blitz/fetchWargaming'; +import { AccountList, usernamePattern } from '../LEGACY_core/blitz/listPlayers'; +import addRegionChoices from '../LEGACY_core/discord/addRegionChoices'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; import { REGION_NAMES, Region } from '../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID'; -import { AccountList, usernamePattern } from '../core/blitz/listPlayers'; -import addRegionChoices from '../core/discord/addRegionChoices'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import embedInfo from '../core/discord/embedInfo'; +import fetchBlitz from '../core/blitz/fetchWargaming'; import { CommandRegistry } from '../events/interactionCreate'; export const searchPlayersCommand: CommandRegistry = { diff --git a/src/commands/searchTanks.ts b/src/commands/searchTanks.ts index 441443b92..5b4e3b445 100644 --- a/src/commands/searchTanks.ts +++ b/src/commands/searchTanks.ts @@ -1,9 +1,9 @@ import { SlashCommandBuilder } from 'discord.js'; import { go } from 'fuzzysort'; import markdownEscape from 'markdown-escape'; -import { TANK_NAMES_DIACRITICS } from '../core/blitz/tankopedia'; -import addTankChoices from '../core/discord/addTankChoices'; -import embedInfo from '../core/discord/embedInfo'; +import { TANK_NAMES_DIACRITICS } from '../LEGACY_core/blitz/tankopedia'; +import addTankChoices from '../LEGACY_core/discord/addTankChoices'; +import embedInfo from '../LEGACY_core/discord/embedInfo'; import { CommandRegistry } from '../events/interactionCreate'; export const searchTanksCommand: CommandRegistry = { diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx index 0b5b0aa61..42d721ddd 100644 --- a/src/commands/stats.tsx +++ b/src/commands/stats.tsx @@ -1,32 +1,32 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import { emblemIdToURL } from '../_core/blitzkrieg/emblemIdToURL'; -import { StatFilters, filterStats } from '../_core/statistics/filterStats'; +import { filtersToDescription } from '../LEGACY_core/blitzkrieg/filtersToDescription'; +import { getBlitzStarsLinkButton } from '../LEGACY_core/blitzstars/getBlitzStarsLinkButton'; +import getDiffedTankStats from '../LEGACY_core/blitzstars/getDiffedTankStats'; +import addStatTypeSubCommands from '../LEGACY_core/discord/addStatTypeSubCommands'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams'; +import { getFiltersFromButton } from '../LEGACY_core/discord/getFiltersFromButton'; +import { getFiltersFromCommand } from '../LEGACY_core/discord/getFiltersFromCommand'; +import interactionToURL from '../LEGACY_core/discord/interactionToURL'; +import { refreshButton } from '../LEGACY_core/discord/refreshButton'; +import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton'; +import resolvePeriodFromCommand, { + ResolvedPeriod, +} from '../LEGACY_core/discord/resolvePeriodFromCommand'; +import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton'; +import resolvePlayerFromCommand, { + ResolvedPlayer, +} from '../LEGACY_core/discord/resolvePlayerFromCommand'; import AllStatsOverview from '../components/AllStatsOverview'; import NoData, { NoDataType } from '../components/NoData'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; -import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription'; -import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton'; -import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats'; -import addStatTypeSubCommands from '../core/discord/addStatTypeSubCommands'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteTanks from '../core/discord/autocompleteTanks'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams'; -import { getFiltersFromButton } from '../core/discord/getFiltersFromButton'; -import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand'; -import interactionToURL from '../core/discord/interactionToURL'; -import { refreshButton } from '../core/discord/refreshButton'; -import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton'; -import resolvePeriodFromCommand, { - ResolvedPeriod, -} from '../core/discord/resolvePeriodFromCommand'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand, { - ResolvedPlayer, -} from '../core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL'; +import { StatFilters, filterStats } from '../core/statistics/filterStats'; import { CommandRegistryRaw } from '../events/interactionCreate'; async function render( diff --git a/src/commands/today.tsx b/src/commands/today.tsx index a77c0dfb2..fb3979f60 100644 --- a/src/commands/today.tsx +++ b/src/commands/today.tsx @@ -1,12 +1,12 @@ import { SlashCommandBuilder } from 'discord.js'; -import { getAccountInfo } from '../_core/blitz/getAccountInfo'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; -import interactionToURL from '../core/discord/interactionToURL'; -import linkButton from '../core/discord/linkButton'; -import primaryButton from '../core/discord/primaryButton'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices'; +import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername'; +import interactionToURL from '../LEGACY_core/discord/interactionToURL'; +import linkButton from '../LEGACY_core/discord/linkButton'; +import primaryButton from '../LEGACY_core/discord/primaryButton'; +import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton'; +import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand'; +import { getAccountInfo } from '../core/blitz/getAccountInfo'; import { CommandRegistry } from '../events/interactionCreate'; import today from '../renderers/today'; diff --git a/src/components/AllStatsOverview/components/WN8Display/index.tsx b/src/components/AllStatsOverview/components/WN8Display/index.tsx index 513d1efdf..5af4f40b1 100644 --- a/src/components/AllStatsOverview/components/WN8Display/index.tsx +++ b/src/components/AllStatsOverview/components/WN8Display/index.tsx @@ -1,5 +1,5 @@ import { Percentile } from '../../../../constants/percentiles'; -import getWN8Percentile from '../../../../core/blitz/getWN8Percentile'; +import getWN8Percentile from '../../../../LEGACY_core/blitz/getWN8Percentile'; import { theme } from '../../../../stitches.config'; import { PERCENTILE_COLORS } from '../../../PercentileIndicator'; import { Glow } from './components/Glow'; diff --git a/src/components/AllStatsOverview/index.tsx b/src/components/AllStatsOverview/index.tsx index e78774e9d..5b3f4d0f3 100644 --- a/src/components/AllStatsOverview/index.tsx +++ b/src/components/AllStatsOverview/index.tsx @@ -1,4 +1,4 @@ -import { AllStats, SupplementaryStats } from '../../_core/blitz/getAccountInfo'; +import { AllStats, SupplementaryStats } from '../../core/blitz/getAccountInfo'; import { WN8Display } from './components/WN8Display'; import { WN8SurroundingStat, diff --git a/src/components/GenericAllStats/index.tsx b/src/components/GenericAllStats/index.tsx index fa75bfe4c..e664c8282 100644 --- a/src/components/GenericAllStats/index.tsx +++ b/src/components/GenericAllStats/index.tsx @@ -1,6 +1,6 @@ -import { AllStats, SupplementaryStats } from '../../_core/blitz/getAccountInfo'; -import getWN8Percentile from '../../core/blitz/getWN8Percentile'; -import isNumber from '../../core/node/isNumber'; +import { AllStats, SupplementaryStats } from '../../core/blitz/getAccountInfo'; +import getWN8Percentile from '../../LEGACY_core/blitz/getWN8Percentile'; +import isNumber from '../../LEGACY_core/node/isNumber'; import { Card } from './components/Card'; import { Root } from './components/Root'; import { Row } from './components/Row'; diff --git a/src/components/Tanks/components/Item.tsx b/src/components/Tanks/components/Item.tsx index ae680fc26..d08459b17 100644 --- a/src/components/Tanks/components/Item.tsx +++ b/src/components/Tanks/components/Item.tsx @@ -2,7 +2,7 @@ import { TANK_ICONS, TANK_ICONS_COLLECTOR, TANK_ICONS_PREMIUM, -} from '../../../core/blitz/tankopedia'; +} from '../../../LEGACY_core/blitz/tankopedia'; import { theme } from '../../../stitches.config'; export enum TreeTypeEnum { diff --git a/src/components/TierWeights.tsx b/src/components/TierWeights.tsx index db5ecb2cd..38613b7cf 100644 --- a/src/components/TierWeights.tsx +++ b/src/components/TierWeights.tsx @@ -1,4 +1,4 @@ -import { Tier } from '../core/blitz/tankopedia'; +import { Tier } from '../LEGACY_core/blitz/tankopedia'; import { theme } from '../stitches.config'; export type TierWeightsRecord = Partial>; diff --git a/src/_core/blitz/fetchWargaming.ts b/src/core/blitz/fetchWargaming.ts similarity index 90% rename from src/_core/blitz/fetchWargaming.ts rename to src/core/blitz/fetchWargaming.ts index ac8c2d1ba..0fd760a60 100644 --- a/src/_core/blitz/fetchWargaming.ts +++ b/src/core/blitz/fetchWargaming.ts @@ -1,4 +1,4 @@ -import throwError from '../../core/node/throwError'; +import throwError from '../../LEGACY_core/node/throwError'; export type BlitzResponse = | { diff --git a/src/_core/blitz/getAccountAchievements.ts b/src/core/blitz/getAccountAchievements.ts similarity index 100% rename from src/_core/blitz/getAccountAchievements.ts rename to src/core/blitz/getAccountAchievements.ts diff --git a/src/_core/blitz/getAccountInfo.ts b/src/core/blitz/getAccountInfo.ts similarity index 100% rename from src/_core/blitz/getAccountInfo.ts rename to src/core/blitz/getAccountInfo.ts diff --git a/src/_core/blitz/getClanAccountInfo.ts b/src/core/blitz/getClanAccountInfo.ts similarity index 100% rename from src/_core/blitz/getClanAccountInfo.ts rename to src/core/blitz/getClanAccountInfo.ts diff --git a/src/_core/blitz/getClanInfo.ts b/src/core/blitz/getClanInfo.ts similarity index 100% rename from src/_core/blitz/getClanInfo.ts rename to src/core/blitz/getClanInfo.ts diff --git a/src/_core/blitz/getRatingsInfo.ts b/src/core/blitz/getRatingsInfo.ts similarity index 81% rename from src/_core/blitz/getRatingsInfo.ts rename to src/core/blitz/getRatingsInfo.ts index 8c4c85aa5..ddb3c641a 100644 --- a/src/_core/blitz/getRatingsInfo.ts +++ b/src/core/blitz/getRatingsInfo.ts @@ -1,6 +1,6 @@ import { RatingsInfo } from '../../commands/ratings'; import { Region } from '../../constants/regions'; -import regionToRegionSubdomain from '../../core/blitz/regionToRegionSubdomain'; +import regionToRegionSubdomain from '../../LEGACY_core/blitz/regionToRegionSubdomain'; export default async function getRatingsInfo(region: Region) { const response = await fetch( diff --git a/src/_core/blitz/getTankStats.ts b/src/core/blitz/getTankStats.ts similarity index 92% rename from src/_core/blitz/getTankStats.ts rename to src/core/blitz/getTankStats.ts index bf1e3c60c..b2d29c8d6 100644 --- a/src/_core/blitz/getTankStats.ts +++ b/src/core/blitz/getTankStats.ts @@ -1,6 +1,6 @@ import { Region } from '../../constants/regions'; import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID'; -import throwError from '../../core/node/throwError'; +import throwError from '../../LEGACY_core/node/throwError'; import { TanksStats } from '../../types/tanksStats'; import fetchBlitz from './fetchWargaming'; diff --git a/src/_core/blitz/getTreeType.ts b/src/core/blitz/getTreeType.ts similarity index 82% rename from src/_core/blitz/getTreeType.ts rename to src/core/blitz/getTreeType.ts index ae43ca2fc..8f7a8ff32 100644 --- a/src/_core/blitz/getTreeType.ts +++ b/src/core/blitz/getTreeType.ts @@ -1,5 +1,5 @@ import { TreeTypeEnum } from '../../components/Tanks'; -import { tankopedia } from '../../core/blitz/tankopedia'; +import { tankopedia } from '../../LEGACY_core/blitz/tankopedia'; export default async function getTreeType(id: number) { const entry = (await tankopedia)[id]; diff --git a/src/_core/blitz/normalizeExtra.ts b/src/core/blitz/normalizeExtra.ts similarity index 100% rename from src/_core/blitz/normalizeExtra.ts rename to src/core/blitz/normalizeExtra.ts diff --git a/src/_core/blitz/normalizeIds.ts b/src/core/blitz/normalizeIds.ts similarity index 100% rename from src/_core/blitz/normalizeIds.ts rename to src/core/blitz/normalizeIds.ts diff --git a/src/_core/blitzkrieg/emblemIdToURL.ts b/src/core/blitzkrieg/emblemIdToURL.ts similarity index 100% rename from src/_core/blitzkrieg/emblemIdToURL.ts rename to src/core/blitzkrieg/emblemIdToURL.ts diff --git a/src/_core/blitzkrieg/getArchivedRatingsInfo.ts b/src/core/blitzkrieg/getArchivedRatingsInfo.ts similarity index 82% rename from src/_core/blitzkrieg/getArchivedRatingsInfo.ts rename to src/core/blitzkrieg/getArchivedRatingsInfo.ts index 42a47b489..7141cb93d 100644 --- a/src/_core/blitzkrieg/getArchivedRatingsInfo.ts +++ b/src/core/blitzkrieg/getArchivedRatingsInfo.ts @@ -1,8 +1,8 @@ import { RatingsInfo } from '../../commands/ratings'; import { Region } from '../../constants/regions'; -import { DATABASE_REPO } from '../../core/database/getMidnightLeaderboard'; -import { octokit } from '../../core/github/octokit'; -import throwError from '../../core/node/throwError'; +import { DATABASE_REPO } from '../../LEGACY_core/database/getMidnightLeaderboard'; +import { octokit } from '../../LEGACY_core/github/octokit'; +import throwError from '../../LEGACY_core/node/throwError'; const ARCHIVED_RATINGS_CACHE: Record< Region, diff --git a/src/_core/blitzstars/getPlayerStats.ts b/src/core/blitzstars/getPlayerStats.ts similarity index 100% rename from src/_core/blitzstars/getPlayerStats.ts rename to src/core/blitzstars/getPlayerStats.ts diff --git a/src/_core/statistics/calculateWN8.ts b/src/core/statistics/calculateWN8.ts similarity index 100% rename from src/_core/statistics/calculateWN8.ts rename to src/core/statistics/calculateWN8.ts diff --git a/src/_core/statistics/deltaTankStats.ts b/src/core/statistics/deltaTankStats.ts similarity index 100% rename from src/_core/statistics/deltaTankStats.ts rename to src/core/statistics/deltaTankStats.ts diff --git a/src/_core/statistics/filterStats.ts b/src/core/statistics/filterStats.ts similarity index 89% rename from src/_core/statistics/filterStats.ts rename to src/core/statistics/filterStats.ts index d7dcbf628..78413ee2d 100644 --- a/src/_core/statistics/filterStats.ts +++ b/src/core/statistics/filterStats.ts @@ -1,8 +1,8 @@ import { TreeTypeString } from '../../components/Tanks'; -import sumStats from '../../core/blitz/sumStats'; -import { tankopedia } from '../../core/blitz/tankopedia'; -import { DiffedTankStats } from '../../core/blitzstars/getDiffedTankStats'; -import { tankAverages } from '../../core/blitzstars/tankAverages'; +import sumStats from '../../LEGACY_core/blitz/sumStats'; +import { tankopedia } from '../../LEGACY_core/blitz/tankopedia'; +import { DiffedTankStats } from '../../LEGACY_core/blitzstars/getDiffedTankStats'; +import { tankAverages } from '../../LEGACY_core/blitzstars/tankAverages'; import calculateWN8 from './calculateWN8'; export interface StatFilters { diff --git a/src/events/interactionCreate/handlers/button.tsx b/src/events/interactionCreate/handlers/button.tsx index 40c6d7a98..d819a6927 100644 --- a/src/events/interactionCreate/handlers/button.tsx +++ b/src/events/interactionCreate/handlers/button.tsx @@ -1,7 +1,7 @@ import { ButtonInteraction, CacheType } from 'discord.js'; import { commands } from '..'; -import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable'; -import throwError from '../../../core/node/throwError'; +import normalizeInteractionReturnable from '../../../LEGACY_core/discord/normalizeInteractionReturnable'; +import throwError from '../../../LEGACY_core/node/throwError'; export default async function handleButton( interaction: ButtonInteraction, diff --git a/src/events/interactionCreate/handlers/chatInputCommand.ts b/src/events/interactionCreate/handlers/chatInputCommand.ts index 605a82567..577e92e72 100644 --- a/src/events/interactionCreate/handlers/chatInputCommand.ts +++ b/src/events/interactionCreate/handlers/chatInputCommand.ts @@ -7,10 +7,10 @@ import { } from 'discord.js'; import { commands } from '..'; import discord from '../../../../discord.json' assert { type: 'json' }; -import embedNegative from '../../../core/discord/embedNegative'; -import embedWarning from '../../../core/discord/embedWarning'; -import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable'; -import { psa } from '../../../core/discord/psa'; +import embedNegative from '../../../LEGACY_core/discord/embedNegative'; +import embedWarning from '../../../LEGACY_core/discord/embedWarning'; +import normalizeInteractionReturnable from '../../../LEGACY_core/discord/normalizeInteractionReturnable'; +import { psa } from '../../../LEGACY_core/discord/psa'; export default async function handleChatInputCommand( interaction: ChatInputCommandInteraction, diff --git a/src/events/interactionCreate/index.ts b/src/events/interactionCreate/index.ts index a461732ab..6f988c149 100644 --- a/src/events/interactionCreate/index.ts +++ b/src/events/interactionCreate/index.ts @@ -14,6 +14,9 @@ import { SlashCommandSubcommandsOnlyBuilder, } from 'discord.js'; import discord from '../../../discord.json' assert { type: 'json' }; +import getClientId from '../../LEGACY_core/node/getClientId'; +import isDev from '../../LEGACY_core/node/isDev'; +import { secrets } from '../../LEGACY_core/node/secrets'; import { aboutCommand } from '../../commands/about'; import { debugCommand } from '../../commands/debug'; import { eligibleCommand } from '../../commands/eligible'; @@ -31,9 +34,6 @@ import { searchPlayersCommand } from '../../commands/searchPlayers'; import { searchTanksCommand } from '../../commands/searchTanks'; import { statsCommand } from '../../commands/stats'; import { todayCommand } from '../../commands/today'; -import getClientId from '../../core/node/getClientId'; -import isDev from '../../core/node/isDev'; -import { secrets } from '../../core/node/secrets'; import handleAutocomplete from './handlers/autocomplete'; import handleButton from './handlers/button'; import handleChatInputCommand from './handlers/chatInputCommand'; diff --git a/src/events/ready.ts b/src/events/ready.ts index cf6996d04..9307a98fa 100644 --- a/src/events/ready.ts +++ b/src/events/ready.ts @@ -1,5 +1,5 @@ import { Client } from 'discord.js'; -import isDev from '../core/node/isDev'; +import isDev from '../LEGACY_core/node/isDev'; export default function ready(client: Client) { console.log( diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx index 2496fefb6..a337945e6 100644 --- a/src/renderers/today.tsx +++ b/src/renderers/today.tsx @@ -1,21 +1,21 @@ -import { AllStats, getAccountInfo } from '../_core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../_core/blitz/getClanAccountInfo'; -import getTankStats from '../_core/blitz/getTankStats'; -import getTreeType from '../_core/blitz/getTreeType'; -import calculateWN8 from '../_core/statistics/calculateWN8'; +import getWN8Percentile from '../LEGACY_core/blitz/getWN8Percentile'; +import resolveTankName from '../LEGACY_core/blitz/resolveTankName'; +import sumStats from '../LEGACY_core/blitz/sumStats'; +import { tankopedia } from '../LEGACY_core/blitz/tankopedia'; +import getDiffedTankStats from '../LEGACY_core/blitzstars/getDiffedTankStats'; +import getPeriodNow from '../LEGACY_core/blitzstars/getPeriodNow'; +import getTimeDaysAgo from '../LEGACY_core/blitzstars/getTimeDaysAgo'; +import { tankAverages } from '../LEGACY_core/blitzstars/tankAverages'; +import { ResolvedPlayer } from '../LEGACY_core/discord/resolvePlayerFromCommand'; import * as Breakdown from '../components/Breakdown'; import NoData, { NoDataType } from '../components/NoData'; import TitleBar from '../components/TitleBar'; import Wrapper from '../components/Wrapper'; -import getWN8Percentile from '../core/blitz/getWN8Percentile'; -import resolveTankName from '../core/blitz/resolveTankName'; -import sumStats from '../core/blitz/sumStats'; -import { tankopedia } from '../core/blitz/tankopedia'; -import getDiffedTankStats from '../core/blitzstars/getDiffedTankStats'; -import getPeriodNow from '../core/blitzstars/getPeriodNow'; -import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo'; -import { tankAverages } from '../core/blitzstars/tankAverages'; -import { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand'; +import { AllStats, getAccountInfo } from '../core/blitz/getAccountInfo'; +import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo'; +import getTankStats from '../core/blitz/getTankStats'; +import getTreeType from '../core/blitz/getTreeType'; +import calculateWN8 from '../core/statistics/calculateWN8'; import { PossiblyPromise } from '../types/possiblyPromise'; export default async function today( diff --git a/src/types/histories.ts b/src/types/histories.ts index 05332c32f..59c2f8ab4 100644 --- a/src/types/histories.ts +++ b/src/types/histories.ts @@ -1,6 +1,6 @@ // a cleaner simplification of Blitz Stars' histories because it's a mess there -import { AllStats } from '../_core/blitz/getAccountInfo'; +import { AllStats } from '../core/blitz/getAccountInfo'; export interface History { all: AllStats; diff --git a/src/types/tanksStats.ts b/src/types/tanksStats.ts index 4849ffd1c..70aa4986d 100644 --- a/src/types/tanksStats.ts +++ b/src/types/tanksStats.ts @@ -1,4 +1,4 @@ -import { AllStats } from '../_core/blitz/getAccountInfo'; +import { AllStats } from '../core/blitz/getAccountInfo'; export interface IndividualTankStats { all: AllStats;