feat: organize files

src/core/blitz/encyclopediaInfo.ts

@@ -1,15 +0,0 @@
-import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchBlitz';
-
-export interface EncyclopediaInfo {
-  achievement_sections: Record<string, { name: string; order: number }>;
-  tanks_updated_at: number;
-  languages: Record<string, string>;
-  vehicle_types: Record<string, string>;
-  vehicle_nations: Record<string, string>;
-  game_version: string;
-}
-
-export const encyclopediaInfo = fetchBlitz<EncyclopediaInfo>(
-  `https://api.wotblitz.com/wotb/encyclopedia/info/?application_id=${WARGAMING_APPLICATION_ID}`,
-);

src/core/blitz/extractArmor.ts

@@ -6,13 +6,9 @@ import { VertexAttribute } from '../streams/scpg';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
-} from './extractModel';
+} from './extractModel/constants';
 import { readDVPLFile } from './readDVPLFile';
 
-Buffer.prototype.toJSON = function () {
-  return [...(this as Buffer)].map((int) => int.toString(16)).join('');
-};
-
 export async function extractArmor(data: string, fileName: string) {
   const sc2Path = `${data}/3d/Tanks/CollisionMeshes/${fileName}.sc2.dvpl`;
   const scgPath = `${data}/3d/Tanks/CollisionMeshes/${fileName}.scg.dvpl`;

src/core/blitz/extractModel/constants.ts

@@ -0,0 +1,19 @@
+import { vertexAttributeVectorSizes } from '../../streams/scg';
+import { VertexAttribute } from '../../streams/scpg';
+
+export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
+  {
+    [VertexAttribute.VERTEX]: 'POSITION',
+    [VertexAttribute.NORMAL]: 'NORMAL',
+    [VertexAttribute.TEXCOORD0]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD1]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD2]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD3]: 'TEXCOORD_0',
+    [VertexAttribute.TANGENT]: 'TANGENT',
+    [VertexAttribute.JOINTINDEX]: 'JOINT_0',
+    [VertexAttribute.JOINTWEIGHT]: 'WEIGHT_0',
+  };
+export const vertexAttributeGltfVectorSizes = {
+  ...vertexAttributeVectorSizes,
+  [VertexAttribute.TANGENT]: 4,
+} as const;

src/core/blitz/extractModel/index.ts

@@ -8,33 +8,18 @@ import {
   Vector3Tuple,
   Vector4Tuple,
 } from 'three';
-import { TextureMutation, readTexture } from '../blitzkrieg/readTexture';
-import { Hierarchy, Sc2ReadStream, Textures } from '../streams/sc2';
-import { ScgReadStream, vertexAttributeVectorSizes } from '../streams/scg';
-import { VertexAttribute } from '../streams/scpg';
-import { readDVPLFile } from './readDVPLFile';
+import { readTexture } from '../../blitzkrieg/readTexture';
+import { TextureMutation } from '../../blitzkrieg/readTexture/constants';
+import { Hierarchy, Sc2ReadStream, Textures } from '../../streams/sc2';
+import { ScgReadStream } from '../../streams/scg';
+import { VertexAttribute } from '../../streams/scpg';
+import { readDVPLFile } from '../readDVPLFile';
+import {
+  vertexAttributeGLTFName,
+  vertexAttributeGltfVectorSizes,
+} from './constants';
 
 const ERROR_ON_UNKNOWN_COMPONENT = false;
-const MAX_FLOAT32 = 2 ** 127 * (2 - 2 ** -23);
-
-export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
-  {
-    [VertexAttribute.VERTEX]: 'POSITION',
-    [VertexAttribute.NORMAL]: 'NORMAL',
-    [VertexAttribute.TEXCOORD0]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD1]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD2]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD3]: 'TEXCOORD_0',
-    [VertexAttribute.TANGENT]: 'TANGENT',
-    [VertexAttribute.JOINTINDEX]: 'JOINT_0',
-    [VertexAttribute.JOINTWEIGHT]: 'WEIGHT_0',
-  };
-
-export const vertexAttributeGltfVectorSizes = {
-  ...vertexAttributeVectorSizes,
-
-  [VertexAttribute.TANGENT]: 4,
-} as const;
 
 const omitMeshNames = {
   start: ['chassis_chassis_', 'chassis_track_crash_', 'HP_'],

src/core/blitz/fetchBlitz.ts

@@ -1,4 +1,4 @@
-export type BlitzResponse<Data extends object> =
+type BlitzResponse<Data extends object> =
   | {
       status: 'error';
       error: { field: string; message: string; code: 402; value: null };

src/core/blitz/getClanAccountInfo.ts

@@ -4,7 +4,7 @@ import fetchBlitz from './fetchBlitz';
 import { normalizeExtra } from './normalizeExtra';
 import { normalizeIds } from './normalizeIds';
 
-export type IndividualClanAccountInfo = {
+type IndividualClanAccountInfo = {
   account_id: number;
   joined_at: number;
   clan_id: number;
@@ -21,7 +21,7 @@ export type IndividualClanAccountInfo = {
   };
 } | null;
 
-export interface ClanAccountInfo {
+interface ClanAccountInfo {
   [accountId: number]: IndividualClanAccountInfo;
 }
 

src/core/blitz/getClanInfo.ts

@@ -3,7 +3,7 @@ import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID
 import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 
-export interface IndividualClanInfo {
+interface IndividualClanInfo {
   recruiting_options: {
     vehicles_level: number;
     wins_ratio: number;
@@ -32,7 +32,7 @@ export interface IndividualClanInfo {
   description: string;
 }
 
-export interface ClanInfo {
+interface ClanInfo {
   [clanId: number]: IndividualClanInfo;
 }
 

src/core/blitz/searchClansAcrossRegions.ts

@@ -1,12 +1,8 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import { Clan, ClanList } from '../../types/clanList';
+import { ClanList } from '../../types/clanList';
 import fetchBlitz from './fetchBlitz';
 
-export type ClanListWithRegion = (Clan & {
-  region: 'com' | 'eu' | 'asia';
-})[];
-
 export default async function searchClansAcrossRegions(
   search: string,
   limit = 25,

src/core/blitz/searchPlayersAcrossRegions/constants.ts

@@ -0,0 +1,2 @@
+export const usernamePattern = /^[a-zA-Z0-9_]{3,24}$/;
+export const usernamePatternWithoutPosition = /[a-zA-Z0-9_]{3,24}/;

src/core/blitz/searchPlayersAcrossRegions/index.ts

@@ -1,6 +1,7 @@
-import { Region } from '../../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchBlitz';
+import { Region } from '../../../constants/regions';
+import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
+import fetchBlitz from '../fetchBlitz';
+import { usernamePattern } from './constants';
 
 export interface AccountListItem {
   nickname: string;
@@ -11,9 +12,6 @@ export type AccountListWithServer = (AccountListItem & {
   region: Region;
 })[];
 
-export const usernamePattern = /^[a-zA-Z0-9_]{3,24}$/;
-export const usernamePatternWithoutPosition = /[a-zA-Z0-9_]{3,24}/;
-
 export default async function searchPlayersAcrossRegions(
   search: string,
   limit = 25,

src/core/blitzkrieg/assignDuelMember.ts

@@ -1,9 +1,6 @@
 import { degToRad } from 'three/src/math/MathUtils';
-import {
-  DuelMember,
-  genericDefaultEquipmentMatrix,
-  mutateDuel,
-} from '../../stores/duel';
+import { DuelMember, mutateDuel } from '../../stores/duel';
+import { genericDefaultEquipmentMatrix } from '../../stores/duel/constants';
 import { availableProvisions } from './availableProvisions';
 import { modelDefinitions } from './modelDefinitions';
 import { provisionDefinitions } from './provisionDefinitions';

src/core/blitzkrieg/discordBlitz.ts

@@ -1,7 +1,5 @@
-import { PrismaClient } from '@prisma/client';
 import { Region } from '../../constants/regions';
-
-export const discordBlitzDB = new PrismaClient();
+import { discordBlitzDB } from './discordBlitzDB';
 
 export function linkBlitzAndDiscord(
   discord: number,

src/core/blitzkrieg/discordBlitzDB.ts

@@ -0,0 +1,3 @@
+import { PrismaClient } from '@prisma/client';
+
+export const discordBlitzDB = new PrismaClient();

src/core/blitzkrieg/filtersToDescription.ts

@@ -1,7 +1,8 @@
 import { Locale } from 'discord.js';
 import { translator } from '../localization/translator';
 import { StatFilters } from '../statistics/filterStats';
-import { TIER_ROMAN_NUMERALS, Tier, tankDefinitions } from './tankDefinitions';
+import { Tier, tankDefinitions } from './tankDefinitions';
+import { TIER_ROMAN_NUMERALS } from './tankDefinitions/constants';
 
 export async function filtersToDescription(
   { nation, tier, tankType, treeType, tank }: StatFilters,

src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts

@@ -1,8 +1,6 @@
 import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
 import { Region } from '../../constants/regions';
 
-export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-assets' };
-
 const MIDNIGHT_LEADERBOARD_CACHE: Record<
   Region,
   Record<number, BlitzkriegRatingsLeaderboard>

src/core/blitzkrieg/getTankHistories.ts

@@ -7,7 +7,7 @@ import {
   getHistoriesDefaultOptions,
 } from '../../types/histories';
 import getTankStats from '../blitz/getTankStats';
-import { emptyAllStats } from '../blitzstars/getStatsInPeriod';
+import { emptyAllStats } from '../blitzstars/getStatsInPeriod/constants';
 
 export interface TankHistory extends History {
   tank_id: number;
@@ -27,7 +27,7 @@ export interface GetTankHistoriesOptions extends GetHistoriesOptions {
   tankId?: number;
 }
 
-export const getTankHistoriesDefaultOptions: GetTankHistoriesOptions = {
+const getTankHistoriesDefaultOptions: GetTankHistoriesOptions = {
   ...getHistoriesDefaultOptions,
   tankId: undefined,
 };

src/core/blitzkrieg/getTimeDaysAgo.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 
-export const TIME_ZONE_MAPPINGS: Record<Region, number> = {
+const TIME_ZONE_MAPPINGS: Record<Region, number> = {
   com: -5, // Central North American Time
   eu: +1, // Central European Time
   asia: +7, // Central Asia Standard Time

src/core/blitzkrieg/processes.ts

@@ -1,5 +1,5 @@
 import { client } from '../discord/client';
-import { discordBlitzDB } from './discordBlitz';
+import { discordBlitzDB } from './discordBlitzDB';
 
 const EXIT_EVENTS = [
   'beforeExit',

src/core/blitzkrieg/readTexture/constants.ts

@@ -0,0 +1,6 @@
+export enum TextureMutation {
+  Normal,
+  RoughnessMetallicness,
+  BaseColor,
+  Miscellaneous,
+}

src/core/blitzkrieg/readTexture/index.ts

@@ -1,16 +1,10 @@
 import { existsSync } from 'fs';
 import sharp from 'sharp';
 import { Vector3Tuple } from 'three';
-import { readDVPLFile } from '../blitz/readDVPLFile';
-import { DdsReadStream } from '../streams/dds';
-import { PvrReadStream } from '../streams/pvr';
-
-export enum TextureMutation {
-  Normal,
-  RoughnessMetallicness,
-  BaseColor,
-  Miscellaneous,
-}
+import { readDVPLFile } from '../../blitz/readDVPLFile';
+import { DdsReadStream } from '../../streams/dds';
+import { PvrReadStream } from '../../streams/pvr';
+import { TextureMutation } from './constants';
 
 type ReadTextureOptions =
   | {

src/core/blitzkrieg/resetSession.ts

@@ -0,0 +1,8 @@
+import { useSession } from '../../stores/session';
+import { setSession } from './setSession';
+
+export function resetSession() {
+  const session = useSession.getState();
+  if (!session.isTracking) return;
+  setSession(session.region, session.id, session.nickname);
+}

src/core/blitzkrieg/secrets.ts

@@ -2,7 +2,7 @@ import { config } from 'dotenv';
 
 config();
 
-export const SECRET_KEYS = [
+const SECRET_KEYS = [
   'DISCORD_TOKEN',
   'GH_TOKEN',
   'DISCORD_BLITZ_DB',

src/core/blitzkrieg/setSession.ts

@@ -0,0 +1,30 @@
+import { Region } from '../../constants/regions';
+import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
+import { useSession } from '../../stores/session';
+import { NormalizedTankStats, TanksStats } from '../../types/tanksStats';
+import fetchBlitz from '../blitz/fetchBlitz';
+
+export async function setSession(region: Region, id: number, nickname: string) {
+  // TODO: generalize this function and also check for more of these kind
+  const rawTankStats = (
+    await fetchBlitz<TanksStats>(
+      `https://api.wotblitz.${region}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+    )
+  )[id];
+  const tankStats = rawTankStats.reduce<NormalizedTankStats>(
+    (accumulator, tank) => ({
+      ...accumulator,
+      [tank.tank_id]: tank,
+    }),
+    {},
+  );
+
+  useSession.setState({
+    isTracking: true,
+    id,
+    region,
+    nickname,
+    tankStats,
+    time: Date.now(),
+  });
+}

src/core/blitzkrieg/tankDefinitions/constants.ts

@@ -0,0 +1,52 @@
+import { CrewMember, GunDefinition, ShellType, Tier } from '.';
+import { TankClass } from '../../../components/Tanks';
+
+export const SHELL_NAMES: Record<ShellType, string> = {
+  ap: 'AP',
+  ap_cr: 'APCR',
+  hc: 'HEAT',
+  he: 'HE',
+};
+export const CREW_MEMBER_NAMES: Record<CrewMember, string> = {
+  commander: 'Commander',
+  radioman: 'Radioman',
+  gunner: 'Gunner',
+  driver: 'Driver',
+  loader: 'Loader',
+};
+export const GUN_TYPE_NAMES: Record<GunDefinition['type'], string> = {
+  regular: 'Regular',
+  autoLoader: 'Auto loader',
+  autoReloader: 'Auto reloader',
+};
+export const TANK_ICONS: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
+  lightTank: 'https://i.imgur.com/CSNha5V.png',
+  mediumTank: 'https://i.imgur.com/wvf3ltm.png',
+  heavyTank: 'https://i.imgur.com/ECeqlZa.png',
+};
+export const TANK_ICONS_PREMIUM: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
+  lightTank: 'https://i.imgur.com/zdkpTRb.png',
+  mediumTank: 'https://i.imgur.com/3z7eHX6.png',
+  heavyTank: 'https://i.imgur.com/P3vbmyA.png',
+};
+export const TANK_ICONS_COLLECTOR: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
+  lightTank: 'https://i.imgur.com/EwhtKkU.png',
+  mediumTank: 'https://i.imgur.com/u8YDMBh.png',
+  heavyTank: 'https://i.imgur.com/8xRf3nc.png',
+};
+export const TIERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const;
+export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {
+  1: 'I',
+  2: 'II',
+  3: 'III',
+  4: 'IV',
+  5: 'V',
+  6: 'VI',
+  7: 'VII',
+  8: 'VIII',
+  9: 'IX',
+  10: 'X',
+};

src/core/blitzkrieg/tankDefinitions/index.ts

@@ -1,18 +1,12 @@
 import { deburr } from 'lodash';
 import { Vector2Tuple } from 'three';
-import { TankClass, TreeType } from '../../components/Tanks';
-import { asset } from './asset';
-import { fetchCdonLz4 } from './fetchCdonLz4';
+import { TankClass, TreeType } from '../../../components/Tanks';
+import { asset } from '../asset';
+import { fetchCdonLz4 } from '../fetchCdonLz4';
+import { TIERS } from './constants';
 
 export type ShellType = 'ap' | 'ap_cr' | 'hc' | 'he';
 
-export const SHELL_NAMES: Record<ShellType, string> = {
-  ap: 'AP',
-  ap_cr: 'APCR',
-  hc: 'HEAT',
-  he: 'HE',
-};
-
 export type CrewMember =
   | 'commander'
   | 'radioman'
@@ -20,13 +14,6 @@ export type CrewMember =
   | 'driver'
   | 'loader';
 export type TankDefinitions = Record<number, TankDefinition>;
-export const CREW_MEMBER_NAMES: Record<CrewMember, string> = {
-  commander: 'Commander',
-  radioman: 'Radioman',
-  gunner: 'Gunner',
-  driver: 'Driver',
-  loader: 'Loader',
-};
 export interface Crew {
   type: CrewMember;
   count?: number;
@@ -148,12 +135,6 @@ export type ShellDefinition = {
   explosionRadius?: number;
 };
 
-export const GUN_TYPE_NAMES: Record<GunDefinition['type'], string> = {
-  regular: 'Regular',
-  autoLoader: 'Auto loader',
-  autoReloader: 'Auto reloader',
-};
-
 export const tankDefinitions = fetchCdonLz4<TankDefinitions>(
   asset('definitions/tanks.cdon.lz4'),
 );
@@ -180,44 +161,8 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
   ),
 );
 
-export const TANK_ICONS: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
-  lightTank: 'https://i.imgur.com/CSNha5V.png',
-  mediumTank: 'https://i.imgur.com/wvf3ltm.png',
-  heavyTank: 'https://i.imgur.com/ECeqlZa.png',
-};
-
-export const TANK_ICONS_PREMIUM: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
-  lightTank: 'https://i.imgur.com/zdkpTRb.png',
-  mediumTank: 'https://i.imgur.com/3z7eHX6.png',
-  heavyTank: 'https://i.imgur.com/P3vbmyA.png',
-};
-
-export const TANK_ICONS_COLLECTOR: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
-  lightTank: 'https://i.imgur.com/EwhtKkU.png',
-  mediumTank: 'https://i.imgur.com/u8YDMBh.png',
-  heavyTank: 'https://i.imgur.com/8xRf3nc.png',
-};
-
-export const TIERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const;
-
 export type Tier = (typeof TIERS)[number];
 
-export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {
-  1: 'I',
-  2: 'II',
-  3: 'III',
-  4: 'IV',
-  5: 'V',
-  6: 'VI',
-  7: 'VII',
-  8: 'VIII',
-  9: 'IX',
-  10: 'X',
-};
-
 export const NATIONS = tanksDefinitionsArray.then((tanks) => {
   const nations = Array.from(
     new Set<string>(Object.values(tanks).map((tank) => tank.nation)),

src/core/blitzstars/getPlayerHistories.ts

@@ -7,7 +7,7 @@ import {
 } from '../../types/histories';
 import { getAccountInfo } from '../blitz/getAccountInfo';
 import { PlayerStats } from './getPlayerStats';
-import { emptyAllStats } from './getStatsInPeriod';
+import { emptyAllStats } from './getStatsInPeriod/constants';
 
 export default async function getPlayerHistories(
   server: Region,

src/core/blitzstars/getPlayerStats.ts

@@ -1,7 +1,7 @@
 import { Region } from '../../constants/regions';
 import { AllStats } from '../blitz/getAccountInfo';
 
-export interface IndividualPlayerStats {
+interface IndividualPlayerStats {
   clan: { clan_id: number; name: string; tag: string };
   statistics: {
     all: AllStats;

src/core/blitzstars/getStatsInPeriod/constants.ts

@@ -0,0 +1,21 @@
+import { AllStats } from '../../blitz/getAccountInfo';
+
+export const emptyAllStats: AllStats = {
+  battles: 0,
+  capture_points: 0,
+  damage_dealt: 0,
+  damage_received: 0,
+  dropped_capture_points: 0,
+  frags: 0,
+  frags8p: 0,
+  hits: 0,
+  losses: 0,
+  max_frags: 0,
+  max_xp: 0,
+  shots: 0,
+  spotted: 0,
+  survived_battles: 0,
+  xp: 0,
+  win_and_survived: 0,
+  wins: 0,
+};

src/core/blitzstars/getStatsInPeriod/index.ts

@@ -1,32 +1,13 @@
 import { Locale } from 'discord.js';
-import { Region } from '../../constants/regions';
-import { AllStats } from '../blitz/getAccountInfo';
+import { Region } from '../../../constants/regions';
+import { AllStats } from '../../blitz/getAccountInfo';
 import getTankHistories, {
   TankHistories,
   TankHistoryRaw,
-} from '../blitzkrieg/getTankHistories';
+} from '../../blitzkrieg/getTankHistories';
+import { emptyAllStats } from './constants';
 
-export const emptyAllStats: AllStats = {
-  battles: 0,
-  capture_points: 0,
-  damage_dealt: 0,
-  damage_received: 0,
-  dropped_capture_points: 0,
-  frags: 0,
-  frags8p: 0,
-  hits: 0,
-  losses: 0,
-  max_frags: 0,
-  max_xp: 0,
-  shots: 0,
-  spotted: 0,
-  survived_battles: 0,
-  xp: 0,
-  win_and_survived: 0,
-  wins: 0,
-};
-
-export const emptyTankHistoryNode: TankHistoryRaw = {
+const emptyTankHistoryNode: TankHistoryRaw = {
   account_id: 0,
   battle_life_time: 0,
   last_battle_time: 0,

src/core/blitzstars/tankAverages.ts

@@ -2,7 +2,7 @@ import { AllStats } from '../blitz/getAccountInfo';
 import { context } from '../blitzkrieg/context';
 import { tankDefinitions } from '../blitzkrieg/tankDefinitions';
 
-export interface SpecialStats {
+interface SpecialStats {
   winrate: number;
   damageRatio: number;
   kdr: number;

src/core/discord/addFilterOptions.ts

@@ -4,7 +4,10 @@ import {
   SlashCommandBuilder,
   SlashCommandSubcommandBuilder,
 } from 'discord.js';
-import { TANK_CLASSES, TREE_TYPES } from '../../components/Tanks';
+import {
+  TANK_CLASSES,
+  TREE_TYPES,
+} from '../../components/Tanks/components/Item/constants';
 import { translator } from '../localization/translator';
 import addTankChoices from './addTankChoices';
 import addTierChoices from './addTierChoices';

src/core/discord/autocompleteClan/constants.ts

@@ -0,0 +1,2 @@
+export const DISCORD_CHOICES_MAX_NAME_SIZE = 25;
+export const OVERFLOW_SUFFIX = '…';

src/core/discord/autocompleteClan/index.ts

@@ -3,11 +3,9 @@ import {
   AutocompleteInteraction,
   CacheType,
 } from 'discord.js';
-import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
-import { translator } from '../localization/translator';
-
-export const DISCORD_CHOICES_MAX_NAME_SIZE = 25;
-export const OVERFLOW_SUFFIX = '…';
+import searchClansAcrossRegions from '../../blitz/searchClansAcrossRegions';
+import { translator } from '../../localization/translator';
+import { DISCORD_CHOICES_MAX_NAME_SIZE, OVERFLOW_SUFFIX } from './constants';
 
 export default async function autocompleteClan(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/autocompleteTanks.ts

@@ -8,7 +8,7 @@ import { tankNames } from '../blitzkrieg/tankDefinitions';
 import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
-} from './autocompleteClan';
+} from './autocompleteClan/constants';
 
 export default async function autocompleteTanks(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/autocompleteUsername.ts

@@ -8,7 +8,7 @@ import { translator } from '../localization/translator';
 import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
-} from './autocompleteClan';
+} from './autocompleteClan/constants';
 
 export default async function autocompleteUsername(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/getPeriodOptionName.ts

@@ -0,0 +1,10 @@
+import { Locale } from 'discord.js';
+import { translator } from '../localization/translator';
+import { PeriodSize } from './addPeriodSubCommands';
+
+export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
+  const { translate } = translator(locale);
+  if (period === 'career') return translate('bot.common.periods.career');
+  if (period === 'today') return translate('bot.common.periods.today');
+  return translate('bot.common.periods.days', [period]);
+}

src/core/discord/localizationObject.ts

@@ -1,5 +1,5 @@
 import { Locale } from 'discord.js';
-import { SUPPORTED_LOCALES } from '../localization/strings';
+import { SUPPORTED_LOCALES } from '../localization/strings/constants';
 import { translator } from '../localization/translator';
 
 export function localizationObject(path: string, literals?: string[]) {

src/core/discord/resolveClanFromCommand.ts

@@ -4,7 +4,7 @@ import { Region } from '../../constants/regions';
 import { UserError } from '../../hooks/userError';
 import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
 import { translator } from '../localization/translator';
-import { serverAndIdPattern } from './resolvePlayerFromCommand';
+import { serverAndIdPattern } from './resolvePlayerFromCommand/constants';
 
 export default async function resolveClanFromCommand(
   interaction: ChatInputCommandInteraction,

src/core/discord/resolvePeriodFromButton.ts

@@ -4,10 +4,8 @@ import getPeriodNow from '../blitzkrieg/getPeriodNow';
 import getPeriodStart from '../blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
 import { PeriodType } from './addPeriodSubCommands';
-import {
-  ResolvedPeriod,
-  getPeriodOptionName,
-} from './resolvePeriodFromCommand';
+import { getPeriodOptionName } from './getPeriodOptionName';
+import { ResolvedPeriod } from './resolvePeriodFromCommand';
 
 export default function resolvePeriodFromButton(
   region: Region,

src/core/discord/resolvePeriodFromCommand.ts

@@ -1,17 +1,11 @@
-import { CacheType, ChatInputCommandInteraction, Locale } from 'discord.js';
+import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import { Region } from '../../constants/regions';
 import getPeriodNow from '../blitzkrieg/getPeriodNow';
 import getPeriodStart from '../blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
 import { translator } from '../localization/translator';
-import { PeriodSize, PeriodType } from './addPeriodSubCommands';
-
-export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
-  const { translate } = translator(locale);
-  if (period === 'career') return translate('bot.common.periods.career');
-  if (period === 'today') return translate('bot.common.periods.today');
-  return translate('bot.common.periods.days', [period]);
-}
+import { PeriodType } from './addPeriodSubCommands';
+import { getPeriodOptionName } from './getPeriodOptionName';
 
 export interface ResolvedPeriod {
   name: string;

src/core/discord/resolvePlayerFromCommand/constants.ts

@@ -0,0 +1 @@
+export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;

src/core/discord/resolvePlayerFromCommand/index.ts

@@ -1,12 +1,11 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { Region } from '../../constants/regions';
-import { UserError } from '../../hooks/userError';
-import searchPlayersAcrossRegions from '../blitz/searchPlayersAcrossRegions';
-import { getBlitzFromDiscord } from '../blitzkrieg/discordBlitz';
-import { translator } from '../localization/translator';
-
-export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
+import { Region } from '../../../constants/regions';
+import { UserError } from '../../../hooks/userError';
+import searchPlayersAcrossRegions from '../../blitz/searchPlayersAcrossRegions';
+import { getBlitzFromDiscord } from '../../blitzkrieg/discordBlitz';
+import { translator } from '../../localization/translator';
+import { serverAndIdPattern } from './constants';
 
 export interface ResolvedPlayer {
   region: Region;

src/core/localization/strings/constants.ts

@@ -0,0 +1,3 @@
+import { Locale } from 'discord.js';
+
+export const SUPPORTED_LOCALES: Locale[] = [Locale.EnglishUS, Locale.SpanishES];

src/core/localization/strings/index.ts

@@ -1,6 +1,5 @@
 import { Locale } from 'discord.js';
-
-export const SUPPORTED_LOCALES: Locale[] = [Locale.EnglishUS, Locale.SpanishES];
+import { SUPPORTED_LOCALES } from './constants';
 
 export type TranslationFragmentTree = {
   [key: string]: TranslationFragment;

src/core/localization/translator.ts

@@ -1,5 +1,6 @@
 import { Locale } from 'discord.js';
-import { SUPPORTED_LOCALES, translations } from './strings';
+import { translations } from './strings';
+import { SUPPORTED_LOCALES } from './strings/constants';
 
 export function translator(localeRaw: Locale) {
   const locale = SUPPORTED_LOCALES.includes(localeRaw)

src/core/statistics/getWN8Percentile.ts

@@ -1,6 +1,6 @@
 import { Percentile } from '../../constants/percentiles';
 
-export const WN8_PERCENTILES: [number, Percentile][] = [
+const WN8_PERCENTILES: [number, Percentile][] = [
   [0, Percentile.VeryBad],
   [300, Percentile.Bad],
   [450, Percentile.BelowAverage],

src/core/statistics/sumStats.ts

@@ -1,5 +1,5 @@
 import { AllStats } from '../blitz/getAccountInfo';
-import { emptyAllStats } from '../blitzstars/getStatsInPeriod';
+import { emptyAllStats } from '../blitzstars/getStatsInPeriod/constants';
 
 export default function sumStats(allStatsCollection: AllStats[]) {
   return allStatsCollection.reduce((accumulated, current) => {