migrate vatsim observer to zod

src/commands/utils/vatsim/functions/vatsimControllers.ts

@@ -36,9 +36,9 @@ const controllersListEmbedFields = (callsign: string, frequency: string, logon:
         });
     }
 
-    if (atis) {
+    if (atis && atis.text_atis) {
         fields.push({
-            name: `ATIS - Code: ${atis.atis_code}`,
+            name: `ATIS - ${atis.atis_code ? atis.atis_code : 'N/A'}`,
             value: atis.text_atis.join('\n'),
             inline: false,
         });
@@ -59,13 +59,13 @@ export async function handleVatsimControllers(interaction: ChatInputCommandInter
     const controllers = vatsimData.controllers.filter((controller) => controller.facility > 0 && controller.callsign.includes(callsignSearch));
     controllers.sort((a, b) => b.facility - a.facility);
 
-    const fields: EmbedField[] = controllers.map((controller) => {
+    const fields = controllers.map((controller) => {
         const { callsign, frequency, logon_time } = controller;
         const rating = vatsimData.ratings.find((rating) => rating.id === controller.rating);
         const atis = vatsimData.atis.find((atis) => atis.cid === controller.cid);
 
         return controllersListEmbedFields(callsign, frequency, handleLocaleDateTimeString(new Date(logon_time)), rating, atis);
-    }).splice(0, 5).flat();
+    }).splice(0, 5);
 
-    return interaction.reply({ embeds: [listEmbed('Controllers & ATIS', fields, controllers.length, fields.length, callsignSearch)] });
+    return interaction.editReply({ embeds: [listEmbed('Controllers & ATIS', fields.flat(), controllers.length, fields.length, callsignSearch)] });
 }

src/commands/utils/vatsim/functions/vatsimObservers.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandInteraction, EmbedField } from 'discord.js';
-import { makeEmbed } from '../../../../lib';
+import { Rating, VatsimData, makeEmbed } from '../../../../lib';
 
 /* eslint-disable camelcase */
 
@@ -9,7 +9,7 @@ const listEmbed = (type: string, fields: EmbedField[], totalCount: number, shown
     fields,
 });
 
-const observersListEmbedFields = (callsign: string, logon: string, rating: string, atis: string): EmbedField[] => {
+const observersListEmbedFields = (callsign: string, logon: string, rating?: Rating): EmbedField[] => {
     const fields = [
         {
             name: 'Callsign',
@@ -21,18 +21,13 @@ const observersListEmbedFields = (callsign: string, logon: string, rating: strin
             value: `${logon}`,
             inline: true,
         },
-        {
-            name: 'Rating',
-            value: `${rating}`,
-            inline: true,
-        },
     ];
-    if (atis !== null) {
-        const atisTitle = 'Info';
+
+    if (rating) {
         fields.push({
-            name: atisTitle,
-            value: atis,
-            inline: false,
+            name: 'Rating',
+            value: `${rating.short} - ${rating.long}`,
+            inline: true,
         });
     }
 
@@ -47,28 +42,15 @@ const handleLocaleDateTimeString = (date: Date) => date.toLocaleDateString('en-U
     day: 'numeric',
 });
 
-export async function handleVatsimObservers(interaction: ChatInputCommandInteraction<'cached'>, vatsimData: any, callsignSearch: any) {
-    const vatsimAllObservers = vatsimData.controllers ? vatsimData.controllers.filter((controller: { facility: number; }) => controller.facility <= 0) : null;
-
-    const vatsimControllerRatings = vatsimData.ratings ? vatsimData.ratings : null;
-    const vatsimObservers = vatsimAllObservers ? vatsimAllObservers.filter((observer: { callsign: string | any[]; }) => observer.callsign.includes(callsignSearch)) : null;
-
-    const { keys }: ObjectConstructor = Object;
-
-    const fields: EmbedField[] = [...vatsimObservers.sort((a: { rating: number; }, b: { rating: number; }) => b.rating - a.rating)].map((vatsimObserver) => {
-        const { callsign, logon_time, text_atis, rating } = vatsimObserver;
-        const logonTime = new Date(logon_time);
-        const logonTimeString = handleLocaleDateTimeString(logonTime);
-        const ratingDetail = vatsimControllerRatings.filter((ratingInfo: { id: any; }) => ratingInfo.id === rating);
-        const { short, long } = ratingDetail[0];
-        const ratingText = `${short} - ${long}`;
-        const atisText = text_atis ? text_atis.join('\n') : null;
+export async function handleVatsimObservers(interaction: ChatInputCommandInteraction<'cached'>, vatsimData: VatsimData, callsignSearch: string) {
+    const observers = vatsimData.controllers.filter((controller) => controller.facility <= 0 && controller.callsign.includes(callsignSearch));
 
-        return observersListEmbedFields(callsign, logonTimeString, ratingText, atisText);
-    }).slice(0, 5).flat();
+    const fields = observers.map((observer) => {
+        const { callsign, logon_time } = observer;
+        const rating = vatsimData.ratings.find((rating) => rating.id === observer.rating);
 
-    const totalCount = keys(vatsimObservers).length;
-    const shownCount = totalCount < 5 ? totalCount : 5;
+        return observersListEmbedFields(callsign, handleLocaleDateTimeString(new Date(logon_time)), rating);
+    }).splice(0, 5);
 
-    return interaction.reply({ embeds: [listEmbed('Observers', fields, totalCount, shownCount, callsignSearch)] });
+    return interaction.editReply({ embeds: [listEmbed('Observers', fields.flat(), observers.length, fields.length, callsignSearch)] });
 }

src/commands/utils/vatsim/vatsim.ts

@@ -87,17 +87,19 @@ const fetchErrorEmbed = (error: any) => makeEmbed({
 });
 
 export default slashCommand(data, async ({ interaction }) => {
+    await interaction.deferReply();
+
     // Fetch VATSIM data
     let vatsimData: VatsimData;
     try {
         vatsimData = await fetchData<VatsimData>(new Request('https://data.vatsim.net/v3/vatsim-data.json'), VatsimDataSchema);
     } catch (e) {
         if (e instanceof ZodError) {
             e.issues.forEach((e) => Logger.error(`[zod Issue VATSIM Data] Code: ${e.code}, Path: ${e.path.join('.')}, Message: ${e.message}`));
-            return interaction.reply({ embeds: [fetchErrorEmbed('The VATSIM API returned unknown data.')] });
+            return interaction.editReply({ embeds: [fetchErrorEmbed('The VATSIM API returned unknown data.')] });
         }
 
-        return interaction.reply({ embeds: [fetchErrorEmbed(e)], ephemeral: true });
+        return interaction.editReply({ embeds: [fetchErrorEmbed(e)] });
     }
 
     // Grap the callsign from the interaction
@@ -111,7 +113,7 @@ export default slashCommand(data, async ({ interaction }) => {
         const regexMatches = callsign.match(regexCheck);
 
         if (!regexMatches || !regexMatches.groups || !regexMatches.groups.callsignSearch) {
-            return interaction.reply({ content: 'You need to provide a valid callsign or part of a callsign to search for', ephemeral: true });
+            return interaction.editReply({ content: 'You need to provide a valid callsign or part of a callsign to search for.' });
         }
 
         callsignSearch = regexMatches.groups.callsignSearch;
@@ -127,17 +129,20 @@ export default slashCommand(data, async ({ interaction }) => {
         break;
     case 'controllers':
         if (!callsignSearch) {
-            return interaction.reply({ content: 'You need to provide a valid callsign or part of a callsign to search for', ephemeral: true });
+            return interaction.editReply({ content: 'You need to provide a valid callsign or part of a callsign to search for.' });
         }
         return handleVatsimControllers(interaction, vatsimData, callsignSearch);
     case 'pilots':
         return handleVatsimPilots(interaction, vatsimData, callsignSearch);
     case 'observers':
+        if (!callsignSearch) {
+            return interaction.editReply({ content: 'You need to provide a valid callsign or part of a callsign to search for.' });
+        }
         return handleVatsimObservers(interaction, vatsimData, callsignSearch);
     case 'events':
         return handleVatsimEvents(interaction);
 
     default:
-        return interaction.reply({ content: 'Unknown subcommand', ephemeral: true });
+        return interaction.editReply({ content: 'Unknown subcommand' });
     }
 });

src/lib/apis/zodSchemas/vatsimData.ts

@@ -72,7 +72,7 @@ const AtisSchema = z.object({
     server: z.string(),
     visual_range: z.number(),
     atis_code: z.nullable(z.string()),
-    text_atis: z.array(z.string()),
+    text_atis: z.nullable(z.array(z.string())),
     last_updated: z.string(),
     logon_time: z.string(),
 });