feat: cleaned up tankopedia

src/commands/debug.ts

@@ -1,7 +1,7 @@
 import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
 import { ACCENT_COLOR } from '../constants/colors.js';
-import { tankopedia } from '../core/blitzstars/tankopedia.js';
+import { tankopedia } from '../core/blitz/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
 import getClientId from '../core/process/getClientId.js';
 import { CommandRegistry } from '../events/interactionCreate.js';

src/commands/ownedtanks.ts

@@ -3,7 +3,8 @@ import markdownEscape from 'markdown-escape';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import { TANK_TYPE_EMOJIS, tankopedia } from '../core/blitzstars/tankopedia.js';
+import resolveTankName from '../core/blitz/resolveTankName.js';
+import { TANK_TYPE_EMOJIS, tankopedia } from '../core/blitz/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
 import infoEmbed from '../core/interaction/infoEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
@@ -11,7 +12,6 @@ import { args } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { TanksStats } from '../types/tanksStats.js';
-import resolveTankName from '../utilities/resolveTankName.js';
 
 const COMP_TANKS = [
   // light tanks

src/commands/searchtanks.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import { tankNames } from '../core/blitzstars/tankopedia.js';
+import { TANK_NAMES } from '../core/blitz/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
 import infoEmbed from '../core/interaction/infoEmbed.js';
 import addTankChoices from '../core/options/addTankChoices.js';
@@ -27,7 +27,7 @@ export default {
   async execute(interaction) {
     const tank = interaction.options.getString('tank')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
-    const results = go(tank, tankNames, { limit }).map(
+    const results = go(tank, TANK_NAMES, { limit }).map(
       (result) => result.target,
     );
 

src/commands/stats.tsx

@@ -9,8 +9,6 @@ import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
-import fullBlitzStarsStats from '../core/actions/fullBlitzStarsStats.js';
-import { supportBlitzStars } from '../core/actions/supportBlitzStars.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
@@ -19,6 +17,8 @@ import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
 import getPeriodicStart from '../core/blitzstars/getPeriodStart.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import cmdName from '../core/interaction/cmdName.js';
+import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
+import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
 import addStatPeriodChoices, {
   StatPeriod,
   statPeriodNames,

src/commands/tankstats.tsx

@@ -9,20 +9,21 @@ import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
-import fullBlitzStarsStats from '../core/actions/fullBlitzStarsStats.js';
-import { supportBlitzStars } from '../core/actions/supportBlitzStars.js';
 import tanksAutocomplete from '../core/autocomplete/tanks.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import resolveTankId from '../core/blitz/resolveTankId.js';
+import resolveTankName from '../core/blitz/resolveTankName.js';
+import { tankopedia } from '../core/blitz/tankopedia.js';
 import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
 import getPeriodicStart from '../core/blitzstars/getPeriodStart.js';
 import getTankStatsOverTime, {
   emptyAllStats,
 } from '../core/blitzstars/getTankStatsOverTime.js';
-import { tankopedia } from '../core/blitzstars/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
+import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
+import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
 import addStatPeriodChoices, {
   StatPeriod,
   statPeriodNames,
@@ -34,7 +35,6 @@ import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { TanksStats } from '../types/tanksStats.js';
-import resolveTankName from '../utilities/resolveTankName.js';
 
 export default {
   inProduction: true,

src/commands/today.tsx

@@ -9,16 +9,17 @@ import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
-import fullBlitzStarsStats from '../core/actions/fullBlitzStarsStats.js';
-import { supportBlitzStars } from '../core/actions/supportBlitzStars.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import resolveTankName from '../core/blitz/resolveTankName.js';
 import sumStats from '../core/blitz/sumStats.js';
+import { tankopedia } from '../core/blitz/tankopedia.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import last5AM from '../core/blitzstars/last5AM.js';
-import { tankopedia } from '../core/blitzstars/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
+import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
+import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { args } from '../core/process/args.js';
 import render from '../core/ui/render.js';
@@ -26,7 +27,6 @@ import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
 import { TanksStats } from '../types/tanksStats.js';
-import resolveTankName from '../utilities/resolveTankName.js';
 
 export default {
   inProduction: true,