feat: cleaned up directories

src/commands/debug.ts

@@ -2,17 +2,16 @@ import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { SKILLED_COLOR } from '../constants/colors.js';
+import { tankopedia } from '../core/blitzstars/tankopedia.js';
+import cmdName from '../core/interaction/cmdName.js';
+import getClientId from '../core/process/getClientId.js';
 import { client } from '../index.js';
-import cmdName from '../utilities/cmdName.js';
-import getClientId from '../utilities/getClientId.js';
-import { tankAverages } from '../utilities/tankAverages.js';
-import { tankopedia } from '../utilities/tankopedia.js';
 
 const executionStart = new Date().getTime();
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -37,8 +36,6 @@ export default {
               uptime % 1000,
             )}ms\n**Tankopedia**: ${
               tankopedia ? 'cached' : 'not cached'
-            }\n**Tank averages**: ${
-              tankAverages ? 'cached' : 'not cached'
             }\n**Client ID**: ${getClientId()}\n**Tag**: ${
               interaction.client.user.tag
             }`,

src/commands/eligible.ts

@@ -3,13 +3,13 @@ import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import { BlitzServer } from '../constants/servers.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import blitzLinks from '../utilities/blitzLinks.js';
-import cmdName from '../utilities/cmdName.js';
-import getBlitzAccount from '../utilities/getBlitzAccount.js';
-import getBlitzStarsAccount from '../utilities/getBlitzStarsAccount.js';
-import poweredByBlitzStars from '../utilities/poweredByBlitzStars.js';
+import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
+import blitzStarsLinks from '../core/blitzstars/blitzStarsLinks.js';
+import getBlitzStarsAccount from '../core/blitzstars/getBlitzStarsAccount.js';
+import poweredByBlitzStars from '../core/blitzstars/poweredByBlitzStars.js';
+import cmdName from '../core/interaction/cmdName.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
 
 const CLANS = {
   sklld: { id: 71559, name: 'Skilled' },
@@ -18,7 +18,7 @@ const CLANS = {
 
 export default {
   inProduction: false,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: false,
 
   command: new SlashCommandBuilder()
@@ -133,7 +133,7 @@ export default {
                     )}'s shortcomings for ${CLANS[clan].name} (${
                       clan === 'sklld' ? '30 days stats' : 'career stats'
                     }):\n\n${issues.join('\n')}`
-              }\n\n${blitzLinks(server, blitzAccount.nickname)}`,
+              }\n\n${blitzStarsLinks(server, blitzAccount.nickname)}`,
             ),
         ),
       ],

src/commands/help.ts

@@ -6,12 +6,12 @@ import {
   publicCommands,
 } from '../behaviors/interactionCreate.js';
 import { SKILLED_COLOR } from '../constants/colors.js';
+import cmdName from '../core/interaction/cmdName.js';
 import { client } from '../index.js';
-import cmdName from '../utilities/cmdName.js';
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/inactive.ts

@@ -3,26 +3,26 @@ import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import { BlitzServer } from '../constants/servers.js';
+import getClan from '../core/blitz/getClan.js';
+import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import cmdName from '../core/interaction/cmdName.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import { args } from '../core/process/args.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { ClanInfo } from '../types/clanInfo.js';
 import { Clan } from '../types/clanList.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import { args } from '../utilities/args.js';
-import cmdName from '../utilities/cmdName.js';
-import getClan from '../utilities/getClan.js';
-import getWargamingResponse from '../utilities/getWargamingResponse.js';
 
 const DEFAULT_THRESHOLD = 7;
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
     .setName(cmdName('inactive'))
     .setDescription('Lists all inactive players')
-    .addStringOption((option) => addServerChoices(option).setRequired(true))
+    .addStringOption(addServerChoices)
     .addStringOption((option) =>
       option
         .setName('name')
@@ -48,19 +48,17 @@ export default {
     const threshold =
       interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
     const time = new Date().getTime() / 1000;
-
     const clanInfo = await getWargamingResponse<ClanInfo>(
       `https://api.wotblitz.${server}/wotb/clans/info/?application_id=${args['wargaming-application-id']}&clan_id=${clan.clan_id}`,
     );
-
+    if (!clanInfo) return;
     const memberIds = clanInfo[clan.clan_id].members_ids;
-
     const accountInfo = await getWargamingResponse<AccountInfo>(
       `https://api.wotblitz.${server}/wotb/account/info/?application_id=${
         args['wargaming-application-id']
       }&account_id=${memberIds.join(',')}`,
     );
-
+    if (!accountInfo) return;
     const inactiveInfo = memberIds
       .map((memberId) => {
         const member = accountInfo[memberId];

src/commands/searchplayers.ts

@@ -2,15 +2,15 @@ import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { SKILLED_COLOR } from '../constants/colors.js';
+import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import cmdName from '../core/interaction/cmdName.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import { args } from '../core/process/args.js';
 import { Players } from '../types/players.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import { args } from '../utilities/args.js';
-import cmdName from '../utilities/cmdName.js';
-import getWargamingResponse from '../utilities/getWargamingResponse.js';
 
 export default {
-  inDevelopment: false,
+  inDevelopment: true,
   inProduction: true,
   inPublic: true,
 
@@ -31,10 +31,10 @@ export default {
     const server = interaction.options.getString('server')!;
     const name = interaction.options.getString('name')!;
     const limit = interaction.options.getInteger('limit') ?? 25;
-
     const players = await getWargamingResponse<Players>(
       `https://api.wotblitz.${server}/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${name}&limit=${limit}`,
     );
+    if (!players) return;
 
     await interaction.editReply({
       embeds: [

src/commands/stats.ts

@@ -3,18 +3,18 @@ import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { SKILLED_COLOR } from '../constants/colors.js';
 import { BlitzServer } from '../constants/servers.js';
+import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
+import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import blitzStarsLinks from '../core/blitzstars/blitzStarsLinks.js';
+import getBlitzStarsAccount from '../core/blitzstars/getBlitzStarsAccount.js';
+import poweredByBlitzStars from '../core/blitzstars/poweredByBlitzStars.js';
+import cleanTable from '../core/interaction/cleanTable.js';
+import cmdName from '../core/interaction/cmdName.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import { args } from '../core/process/args.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { BlitzStartsComputedPeriodicStatistics } from '../types/statistics.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import { args } from '../utilities/args.js';
-import blitzLinks from '../utilities/blitzLinks.js';
-import cleanTable from '../utilities/cleanTable.js';
-import cmdName from '../utilities/cmdName.js';
-import getBlitzAccount from '../utilities/getBlitzAccount.js';
-import getBlitzStarsAccount from '../utilities/getBlitzStarsAccount.js';
-import getWargamingResponse from '../utilities/getWargamingResponse.js';
-import poweredByBlitzStars from '../utilities/poweredByBlitzStars.js';
 
 type Period = 'today' | '30' | '90' | 'career';
 
@@ -27,7 +27,7 @@ const daysInPeriod: Record<Period, number> = {
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -201,7 +201,7 @@ export default {
                         (stats.all.battles - stats.all.survived_battles)
                       ).toFixed(2),
                     ],
-                  ])}\n\n${blitzLinks(server, blitzAccount.nickname)}`
+                  ])}\n\n${blitzStarsLinks(server, blitzAccount.nickname)}`
                 : 'No battles played in this period.',
             ),
         ),

src/commands/tanks.ts

@@ -3,14 +3,15 @@ import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { SKILLED_COLOR } from '../constants/colors.js';
 import { BlitzServer } from '../constants/servers.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 cmdName from '../core/interaction/cmdName.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import { args } from '../core/process/args.js';
 import { TanksStats } from '../types/tanksStats.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import { args } from '../utilities/args.js';
-import cmdName from '../utilities/cmdName.js';
-import getBlitzAccount from '../utilities/getBlitzAccount.js';
-import getWargamingResponse from '../utilities/getWargamingResponse.js';
-import { TANK_TYPE_EMOJIS, tankopedia } from '../utilities/tankopedia.js';
+import resolveTankName from '../utilities/resolveTankName.js';
 
 const COMP_TANKS = [
   // light tanks
@@ -35,7 +36,7 @@ const COMP_TANKS = [
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -57,12 +58,11 @@ export default {
     const name = interaction.options.getString('name')!;
     const server = interaction.options.getString('server') as BlitzServer;
     const account = await getBlitzAccount(interaction, name, server);
-
     if (!account) return;
-
     const tankStats = await getWargamingResponse<TanksStats>(
       `https://api.wotblitz.${server}/wotb/tanks/stats/?application_id=${args['wargaming-application-id']}&account_id=${account.account_id}`,
     );
+    if (!tankStats) return;
     const tanks = tankStats[account.account_id]
       .map((tankData) => tankopedia.data[tankData.tank_id])
       .filter((tank) => tank.tier === tier);
@@ -82,8 +82,8 @@ export default {
                 : tanks
                     .map(
                       (tank) =>
-                        `${TANK_TYPE_EMOJIS[tank.type]} ${markdownEscape(
-                          tank.name,
+                        `${TANK_TYPE_EMOJIS[tank.type]} ${resolveTankName(
+                          tank,
                         )} ${tank.is_premium ? '⭐' : ''}${
                           COMP_TANKS.includes(tank.tank_id) ? '🏆' : ''
                         }`,

src/commands/tankstats.ts

@@ -3,24 +3,25 @@ import markdownEscape from 'markdown-escape';
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { BlitzServer } from '../constants/servers.js';
 import tanksAutocomplete from '../core/autocomplete/tanks.js';
+import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
+import { tankopedia } from '../core/blitzstars/tankopedia.js';
 import getPeriodicStats, {
   Period,
 } from '../core/blitztankstats/getPeriodicStats.js';
-import errorEmbed from '../core/embeds/errorEmbed.js';
-import sklldEmbed from '../core/embeds/sklldEmbed.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import addTankChoices from '../utilities/addTankChoices.js';
-import cleanTable from '../utilities/cleanTable.js';
-import cmdName from '../utilities/cmdName.js';
-import getBlitzAccount from '../utilities/getBlitzAccount.js';
-import { tankopedia } from '../utilities/tankopedia.js';
+import cleanTable from '../core/interaction/cleanTable.js';
+import cmdName from '../core/interaction/cmdName.js';
+import errorEmbed from '../core/interaction/errorEmbed.js';
+import sklldEmbed from '../core/interaction/sklldEmbed.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import addTankChoices from '../core/options/addTankChoices.js';
+import resolveTankName from '../utilities/resolveTankName.js';
 
 type Periods = '30' | '60' | '90';
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -76,9 +77,7 @@ export default {
           sklldEmbed(
             `${period} day stats for ${markdownEscape(
               blitzAccount.nickname,
-            )}'s ${
-              tank.name ? markdownEscape(tank.name) : `Unknown Tank ${tankId}`
-            }`,
+            )}'s ${resolveTankName(tank)}`,
             periodicStats.length > 0
               ? cleanTable([
                   [

src/commands/verify.ts

@@ -4,17 +4,17 @@ import discord from '../../discord.json' assert { type: 'json' };
 import { CommandRegistry } from '../behaviors/interactionCreate.js';
 import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import { BlitzServer } from '../constants/servers.js';
+import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
+import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import cmdName from '../core/interaction/cmdName.js';
+import addIGNOption from '../core/options/addIGNOption.js';
+import addServerChoices from '../core/options/addServerChoices.js';
+import { args } from '../core/process/args.js';
 import { PlayerClanData } from '../types/playerClanData.js';
-import addIGNOption from '../utilities/addIGNOption.js';
-import addServerChoices from '../utilities/addServerChoices.js';
-import { args } from '../utilities/args.js';
-import cmdName from '../utilities/cmdName.js';
-import getBlitzAccount from '../utilities/getBlitzAccount.js';
-import getWargamingResponse from '../utilities/getWargamingResponse.js';
 
 export default {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -24,17 +24,14 @@ export default {
     .addStringOption(addIGNOption),
 
   async execute(interaction) {
-    let name = interaction.options.getString('name')!;
+    const name = interaction.options.getString('name')!;
     const server = interaction.options.getString('server') as BlitzServer;
     const account = await getBlitzAccount(interaction, name, server);
-
     if (!account) return;
-
-    name = account.nickname;
-
     const clanData = await getWargamingResponse<PlayerClanData>(
       `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${args['wargaming-application-id']}&account_id=${account.account_id}&extra=clan`,
     );
+    if (!clanData) return;
     const clan = clanData[account.account_id]?.clan;
     const clanTag = clan ? ` [${clan!.tag}]` : '';
 
@@ -66,7 +63,7 @@ export default {
 
       if (member) {
         try {
-          await member.setNickname(`${name}${clanTag}`);
+          await member.setNickname(`${account.nickname}${clanTag}`);
 
           if (interaction.guildId === discord.guild_id) {
             if (
@@ -105,14 +102,14 @@ export default {
                 .setTitle(`${interaction.user.username} is verified`)
                 .setDescription(
                   `The user is now verified as ${markdownEscape(
-                    name,
+                    account.nickname,
                   )}${markdownEscape(clanTag)}`,
                 ),
             ],
           });
 
           console.log(
-            `${interaction.user.username} verified as ${name}${clanTag}`,
+            `${interaction.user.username} verified as ${account.nickname}${clanTag}`,
           );
         } catch (error) {
           await interaction.editReply({