feat: core chunk 7

src/commands/debug.ts

@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import markdownTable from '../LEGACY_core/discord/markdownTable';
-import getClientId from '../LEGACY_core/node/getClientId';
+import getClientId from '../core/blitzkrieg/getClientId';
 import { tankAverages } from '../core/blitzstars/tankAverages';
 import { tankopedia } from '../core/blitzstars/tankopedia';
 import { client } from '../core/discord/client';
 import embedInfo from '../core/discord/embedInfo';
+import markdownTable from '../core/discord/markdownTable';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const executionStart = new Date().getTime();

src/commands/eligible.ts

@@ -1,8 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import markdownTable, {
-  TableInput,
-} from '../LEGACY_core/discord/markdownTable';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
 import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
@@ -12,6 +8,8 @@ import { tankopedia } from '../core/blitzstars/tankopedia';
 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 calculateWN8 from '../core/statistics/calculateWN8';
 import sumStats from '../core/statistics/sumStats';
 import { CommandRegistry } from '../events/interactionCreate';

src/commands/evolution.tsx

@@ -2,15 +2,6 @@ import {
   SlashCommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-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';
@@ -27,8 +18,17 @@ 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 buttonPrimary from '../core/discord/buttonPrimary';
 import commandToURL from '../core/discord/commandToURL';
 import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+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 { CommandRegistryRaw } from '../events/interactionCreate';
 
 type EvolutionStatType = 'player' | 'tank';
@@ -162,7 +162,7 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
 
         return [
           await render(player, period, commandGroup, tankId),
-          primaryButton(path, 'Refresh'),
+          buttonPrimary(path, 'Refresh'),
           await getBlitzStarsLinkButton(
             player.region,
             player.id,

src/commands/fullStats.tsx

@@ -1,13 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-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';
@@ -23,10 +14,19 @@ import addFilterOptions from '../core/discord/addFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
 import commandToURL from '../core/discord/commandToURL';
 import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
 import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
 import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
+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 { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { getTierWeights } from '../core/statistics/getTierWeights';
 import { CommandRegistryRaw } from '../events/interactionCreate';
@@ -91,7 +91,7 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
 
         return Promise.all([
           render(player, period, filters),
-          refreshButton(interaction, path),
+          buttonRefresh(interaction, path),
           getBlitzStarsLinkButton(player.region, player.id),
         ]);
       },

src/commands/inactive.tsx

@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand';
 import GenericStats from '../components/GenericStats';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
@@ -8,6 +7,7 @@ import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanInfo } from '../core/blitz/getClanInfo';
 import addClanChoices from '../core/discord/addClanChoices';
 import autocompleteClan from '../core/discord/autocompleteClan';
+import resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const DEFAULT_THRESHOLD = 7;

src/commands/ownedTanks.tsx

@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import NoData, { NoDataType } from '../components/NoData';
 import * as Tanks from '../components/Tanks';
 import TitleBar from '../components/TitleBar';
@@ -20,6 +19,7 @@ import {
 import addTierChoices from '../core/discord/addTierChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const ownedTanksCommand: CommandRegistry = {

src/commands/playerAchievements.ts

@@ -1,15 +1,13 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-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 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 { CommandRegistry } from '../events/interactionCreate';
 
 type SortBy = 'name' | 'count';

src/commands/playerInfo.ts

@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import markdownTable from '../LEGACY_core/discord/markdownTable';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 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 { CommandRegistry } from '../events/interactionCreate';
 
 export const playerInfoCommand: CommandRegistry = {

src/commands/ratings.tsx

@@ -5,8 +5,6 @@ import {
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
 import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
-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';
@@ -20,10 +18,12 @@ import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
 import getMidnightLeaderboard, {
   DATABASE_REPO,
 } from '../core/blitzkrieg/getMidnightLeaderboard';
+import { octokit } from '../core/blitzkrieg/octokit';
 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 { CommandRegistryRaw } from '../events/interactionCreate';
 
 export interface RatingsPlayer {

src/commands/stats.tsx

@@ -1,13 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-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';
@@ -22,10 +13,19 @@ import addFilterOptions from '../core/discord/addFilterOptions';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteTanks from '../core/discord/autocompleteTanks';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import { buttonRefresh } from '../core/discord/buttonRefresh';
 import commandToURL from '../core/discord/commandToURL';
 import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
 import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
 import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
+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 { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
@@ -83,7 +83,7 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
 
       return Promise.all([
         render(player, period, filters),
-        refreshButton(interaction, path),
+        buttonRefresh(interaction, path),
         getBlitzStarsLinkButton(player.region, player.id),
       ]);
     },

src/commands/today.tsx

@@ -1,12 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
-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 addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import buttonLink from '../core/discord/buttonLink';
+import buttonPrimary from '../core/discord/buttonPrimary';
 import commandToURL from '../core/discord/commandToURL';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 import today from '../renderers/today';
 
@@ -58,9 +58,9 @@ export const todayCommand: CommandRegistry = {
 
     return [
       await today(player, cutoff, maximized, showTotal, false),
-      primaryButton(path, 'Refresh'),
+      buttonPrimary(path, 'Refresh'),
       // linkButton(`https://example.com/${path}`, 'Embed'),
-      linkButton(
+      buttonLink(
         `https://www.blitzstars.com/player/${player.region}/${nickname}`,
         'BlitzStars',
       ),