feat: 1.12.5

src/commands/inactive.tsx

@@ -3,10 +3,10 @@ import GenericStats from '../components/GenericStats';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
-import getBlitzClan from '../core/blitz/getBlitzClan';
 import getWargamingResponse from '../core/blitz/getWargamingResponse';
 import addClanChoices from '../core/discord/addClanChoices';
 import autocompleteClan from '../core/discord/autocompleteClan';
+import resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
 import { secrets } from '../core/node/secrets';
 import { CommandRegistry } from '../events/interactionCreate';
 import { AccountInfo } from '../types/accountInfo';
@@ -33,19 +33,18 @@ export const inactiveCommand: CommandRegistry = {
     ),
 
   async handler(interaction) {
-    const clanName = interaction.options.getString('clan')!;
-    const { server, id } = await getBlitzClan(clanName);
+    const { region, id } = await resolveClanFromCommand(interaction);
     const threshold =
       interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
     const time = new Date().getTime() / 1000;
     const clanData = (
       await getWargamingResponse<ClanInfo>(
-        `https://api.wotblitz.${server}/wotb/clans/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&clan_id=${id}`,
+        `https://api.wotblitz.${region}/wotb/clans/info/?application_id=${secrets.WARGAMING_APPLICATION_ID}&clan_id=${id}`,
       )
     )[id];
     const memberIds = clanData.members_ids;
     const accounts = await getWargamingResponse<AccountInfo>(
-      `https://api.wotblitz.${server}/wotb/account/info/?application_id=${
+      `https://api.wotblitz.${region}/wotb/account/info/?application_id=${
         secrets.WARGAMING_APPLICATION_ID
       }&account_id=${memberIds.join(',')}`,
     );