feat: better typing

src/commands/eligible.ts

@@ -11,6 +11,8 @@ import getBlitzAccount from '../utilities/getBlitzAccount.js';
 import getBlitzStarsAccount from '../utilities/getBlitzStarsAccount.js';
 import poweredByBlitzStars from '../utilities/poweredByBlitzStars.js';
 
+export const inDev = true;
+
 export const CLANS = {
   sklld: {
     name: 'Skilled',

src/commands/inactive.ts

@@ -6,14 +6,14 @@ import {
 } from 'discord.js';
 import fetch from 'node-fetch';
 import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
-import { AccountInfo } from '../types/accountInfo.js';
+import { ClanDetails } from '../types/clanDetails.js';
-import { ClanInfo } from '../types/clanInfo.js';
+import { PlayerPersonalData } from '../types/playerPersonalData.js';
 import { CLANS } from './eligible.js';
 
-const DEFAULT_THRESHOLD = 7;
-
 export const inDev = true;
 
+const DEFAULT_THRESHOLD = 7;
+
 export async function execute(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {
@@ -25,7 +25,7 @@ export async function execute(
     await fetch(
       `https://api.wotblitz.com/wotb/clans/info/?application_id=${process.env.WARGAMING_APPLICATION_ID}&clan_id=${CLANS[clanName].id}`,
     )
-  ).json()) as ClanInfo;
+  ).json()) as ClanDetails;
   const clan = clanData.data[CLANS[clanName].id];
   const memberIds = clan.members_ids;
   const accountInfo = (await (
@@ -34,7 +34,7 @@ export async function execute(
         process.env.WARGAMING_APPLICATION_ID
       }&account_id=${memberIds.join(',')}`,
     )
-  ).json()) as AccountInfo;
+  ).json()) as PlayerPersonalData;
 
   const inactiveInfo = memberIds
     .map((memberId) => {

src/commands/stats.ts

@@ -11,6 +11,8 @@ import getBlitzAccount from '../utilities/getBlitzAccount.js';
 import getBlitzStarsAccount from '../utilities/getBlitzStarsAccount.js';
 import poweredByBlitzStars from '../utilities/poweredByBlitzStars.js';
 
+export const inDev = true;
+
 export async function execute(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {

src/commands/verify.ts

@@ -10,6 +10,8 @@ import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import { SERVERS } from '../constants/servers.js';
 import getBlitzAccount from '../utilities/getBlitzAccount.js';
 
+export const inDev = true;
+
 export async function execute(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {

src/types/accountList.ts

@@ -1,12 +0,0 @@
-export interface Account {
-  nickname: string;
-  account_id: number;
-}
-
-type AccountList =
-  | {
-      data?: Account[];
-    }
-  | undefined;
-
-export default AccountList;

src/types/clanDetails.ts

@@ -1,4 +1,6 @@
-export interface ClanInfo {
+import { WargamingResponse } from './wargamingResponse.js';
+
+export interface ClanDetails extends WargamingResponse {
   data: {
     [key: number]: {
       recruiting_options: {

src/types/playerPersonalData.ts

@@ -1,4 +1,6 @@
-export interface AccountInfo {
+import { WargamingResponse } from './wargamingResponse.js';
+
+export interface PlayerPersonalData extends WargamingResponse {
   data: {
     [key: number]: {
       statistics: {

src/types/players.ts

@@ -0,0 +1,10 @@
+import { WargamingResponse } from './wargamingResponse.js';
+
+export interface Player {
+  nickname: string;
+  account_id: number;
+}
+
+export interface Players extends WargamingResponse {
+  data: Player[];
+}

src/types/wargamingResponse.ts

@@ -0,0 +1,3 @@
+export interface WargamingResponse {
+  status: string;
+}

src/utilities/getBlitzAccount.ts

@@ -6,20 +6,24 @@ import {
 import fetch from 'node-fetch';
 import { NEGATIVE_COLOR } from '../constants/colors.js';
 import { SERVERS } from '../constants/servers.js';
-import AccountList, { Account } from '../types/accountList.js';
+import { Player, Players } from '../types/players.js';
 
 export default async function getBlitzAccount(
   interaction: ChatInputCommandInteraction<CacheType>,
   ign: string,
   server: keyof typeof SERVERS,
-  callback: (account: Account) => void,
+  callback: (account: Player) => void,
 ) {
   const serverName = SERVERS[server];
   const players = (await fetch(
     `https://api.wotblitz.${server}/wotb/account/list/?application_id=${process.env.WARGAMING_APPLICATION_ID}&search=${ign}`,
-  ).then((response) => response.json())) as AccountList;
+  ).then((response) => response.json())) as Players;
 
-  if (players?.data && players.data[0]?.nickname === ign) {
+  if (
+    players.status === 'ok' &&
+    players.data.length > 0 &&
+    players.data[0].nickname === ign
+  ) {
     callback(players.data[0]);
   } else {
     // no exact match