feat: username suggestions

src/core/autocomplete/tanks.ts

@@ -10,11 +10,12 @@ import { tanks } from '../blitzstars/tankopedia.js';
 export default async function tanksAutocomplete(
   interaction: AutocompleteInteraction<CacheType>,
 ) {
-  const focusedValue = interaction.options.getFocused();
+  const focusedOption = interaction.options.getFocused(true);
+  if (focusedOption.name !== 'tank') return;
 
   await interaction.respond(
-    focusedValue
-      ? go(focusedValue, tanks, { keys: ['name'], limit: 10 }).map(
+    focusedOption.value
+      ? go(focusedOption.value, tanks, { keys: ['name'], limit: 10 }).map(
           (item) =>
             ({
               name: item.obj.name ? item.obj.name : resolveTankName(item.obj),
@@ -23,4 +24,6 @@ export default async function tanksAutocomplete(
         )
       : [],
   );
+
+  console.log(`Tanks autocomplete for ${focusedOption.value}`);
 }

src/core/autocomplete/username.ts

@@ -0,0 +1,39 @@
+import {
+  ApplicationCommandOptionChoiceData,
+  AutocompleteInteraction,
+  CacheType,
+} from 'discord.js';
+import { BlitzServer } from '../../constants/servers.js';
+import { AccountList } from '../../types/players.js';
+import getWargamingResponse from '../blitz/getWargamingResponse.js';
+import { args } from '../process/args.js';
+
+export default async function usernameAutocomplete(
+  interaction: AutocompleteInteraction<CacheType>,
+) {
+  const focusedOption = interaction.options.getFocused(true);
+  if (focusedOption.name !== 'username') return;
+  const server = interaction.options.getString('server') as BlitzServer;
+
+  const players = await getWargamingResponse<AccountList>(
+    `https://api.wotblitz.${
+      server ?? 'com'
+    }/wotb/account/list/?application_id=${
+      args['wargaming-application-id']
+    }&search=${focusedOption.value}&limit=10`,
+  );
+
+  await interaction.respond(
+    players
+      ? players.map(
+          (player) =>
+            ({
+              name: player.nickname,
+              value: `${player.account_id}`,
+            } satisfies ApplicationCommandOptionChoiceData<string>),
+        )
+      : [],
+  );
+
+  console.log(`Username autocomplete for ${focusedOption.value}`);
+}

src/core/blitz/getBlitzAccount.ts

@@ -1,54 +0,0 @@
-import {
-  CacheType,
-  ChatInputCommandInteraction,
-  EmbedBuilder,
-} from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { NEGATIVE_COLOR } from '../../constants/colors.js';
-import { BLITZ_SERVERS, BlitzServer } from '../../constants/servers.js';
-import { Players } from '../../types/players.js';
-import { args } from '../process/args.js';
-import getWargamingResponse from './getWargamingResponse.js';
-
-export default async function getBlitzAccount(
-  interaction: ChatInputCommandInteraction<CacheType>,
-  name: string,
-  server: BlitzServer,
-) {
-  const serverName = BLITZ_SERVERS[server];
-
-  const players = await getWargamingResponse<Players>(
-    `https://api.wotblitz.${server}/wotb/account/list/?application_id=${args['wargaming-application-id']}&search=${name}`,
-  );
-
-  if (
-    players.length > 0 &&
-    players[0].nickname.toLowerCase() === name.toLowerCase()
-  ) {
-    return players[0];
-  } else {
-    // no exact match
-    await interaction.editReply({
-      embeds: [
-        new EmbedBuilder()
-          .setColor(NEGATIVE_COLOR)
-          .setTitle(`Account not found`)
-          .setDescription(
-            `I couldn't find "${markdownEscape(
-              name,
-            )}" in the ${serverName} server. I found ${
-              players ? (players.length < 100 ? players.length : 'over 100') : 0
-            } similarly spelled account${players?.length !== 1 ? 's' : ''}. ${
-              players && players.length > 0
-                ? `Did you mean "${markdownEscape(players[0].nickname)}"? `
-                : ''
-            }Use the \`/verify\` command to fix any issues or re-run the command and don't make typos.`,
-          ),
-      ],
-    });
-
-    console.log(`Account not found for ${name} in ${serverName} server.`);
-
-    return null;
-  }
-}

src/core/blitz/validateUsername.ts

@@ -0,0 +1,65 @@
+import { CacheType, ChatInputCommandInteraction } from 'discord.js';
+import { BLITZ_SERVERS, BlitzServer } from '../../constants/servers.js';
+import { AccountInfo } from '../../types/accountInfo.js';
+import { Account, AccountList } from '../../types/players.js';
+import errorEmbed from '../interaction/errorEmbed.js';
+import { args } from '../process/args.js';
+import getWargamingResponse from './getWargamingResponse.js';
+
+export default async function validateUsername(
+  interaction: ChatInputCommandInteraction<CacheType>,
+  username: string,
+  server: BlitzServer,
+) {
+  const serverName = BLITZ_SERVERS[server];
+
+  if (Number.isNaN(Number(username))) {
+    // string like "tresabhi"
+    const accountList = await getWargamingResponse<AccountList>(
+      `https://api.wotblitz.${server}/wotb/account/list/?application_id=${args['wargaming-application-id']}&limit=1&search=${username}`,
+    );
+
+    if (
+      accountList?.[0]?.nickname.toLowerCase().trim() ===
+      username.toLowerCase().trim()
+    ) {
+      return accountList[0];
+    }
+
+    await interaction.editReply({
+      embeds: [
+        errorEmbed(
+          'Could not find user',
+          `I couldn't find user "${username}" in the ${serverName} server. Did you select a username from the search result?`,
+        ),
+      ],
+    });
+
+    return null;
+  } else {
+    // number like 1041988373
+    const accountInfo = await getWargamingResponse<AccountInfo>(
+      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${args['wargaming-application-id']}&account_id=${username}`,
+    );
+
+    if (accountInfo) {
+      const account = accountInfo[username as unknown as number];
+
+      return {
+        account_id: account.account_id,
+        nickname: account.nickname,
+      } satisfies Account;
+    }
+
+    await interaction.editReply({
+      embeds: [
+        errorEmbed(
+          'Could not find user',
+          `I couldn't find the user by id \`${username}\` in the ${serverName} server. Did you select a username from the search result?`,
+        ),
+      ],
+    });
+
+    return null;
+  }
+}

src/core/options/addUsernameOption.ts

@@ -1,8 +1,9 @@
 import { SlashCommandStringOption } from 'discord.js';
 
-export default function addIGNOption(option: SlashCommandStringOption) {
+export default function addUsernameOption(option: SlashCommandStringOption) {
   return option
-    .setName('name')
+    .setName('username')
     .setDescription('The username you use in Blitz')
+    .setAutocomplete(true)
     .setRequired(true);
 }