Skip to content

Commit 5e8a588

Browse files
use string instead of request object for foreign apis
1 parent d20c6b3 commit 5e8a588

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

src/commands/utils/liveFlights.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ApplicationCommandType, Colors } from 'discord.js';
2-
import { Request } from 'node-fetch';
32
import { ZodError } from 'zod';
43
import { slashCommand, slashCommandStructure, makeEmbed, Logger, fetchForeignAPI, TelexCountSchema } from '../../lib';
54

@@ -16,7 +15,7 @@ export default slashCommand(data, async ({ interaction }) => {
1615
await interaction.deferReply();
1716

1817
try {
19-
const flights = await fetchForeignAPI(new Request(`${FBW_API_BASE_URL}/txcxn/_count`), TelexCountSchema);
18+
const flights = await fetchForeignAPI(`${FBW_API_BASE_URL}/txcxn/_count`, TelexCountSchema);
2019
const flightsEmbed = makeEmbed({
2120
title: 'Live Flights',
2221
description: `There are currently **${flights}** active flights with TELEX enabled.`,

src/commands/utils/simbriefData.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { ApplicationCommandOptionType, ApplicationCommandType, Colors } from 'discord.js';
22
import moment from 'moment';
3-
import { Request } from 'node-fetch';
43
import { ZodError } from 'zod';
5-
import { slashCommand, makeEmbed, makeLines, slashCommandStructure, SimbriefFlightPlan, fetchForeignAPI, SimbriefFlightPlanSchema } from '../../lib';
4+
import { fetchForeignAPI, makeEmbed, makeLines, SimbriefFlightPlan, SimbriefFlightPlanSchema, slashCommand, slashCommandStructure } from '../../lib';
65

76
const data = slashCommandStructure({
87
name: 'simbrief-data',
@@ -81,7 +80,7 @@ export default slashCommand(data, async ({ interaction }) => {
8180

8281
let flightplan: SimbriefFlightPlan;
8382
try {
84-
flightplan = await fetchForeignAPI<SimbriefFlightPlan>(new Request(`https://www.simbrief.com/api/xml.fetcher.php?json=1&userid=${simbriefId}&username=${simbriefId}`), SimbriefFlightPlanSchema);
83+
flightplan = await fetchForeignAPI<SimbriefFlightPlan>(`https://www.simbrief.com/api/xml.fetcher.php?json=1&userid=${simbriefId}&username=${simbriefId}`, SimbriefFlightPlanSchema);
8584
} catch (e) {
8685
if (e instanceof ZodError) {
8786
return interaction.editReply({ embeds: [errorEmbed('The API returned unknown data.')] });

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ChatInputCommandInteraction, Colors, EmbedField } from 'discord.js';
2-
import { Request } from 'node-fetch';
32
import { Logger, VatsimEvents, VatsimEventsSchema, fetchForeignAPI, makeEmbed } from '../../../../lib';
43

54
const BASE_VATSIM_URL = 'https://my.vatsim.net';
@@ -17,7 +16,7 @@ const handleLocaleDateString = (date: Date) => date.toLocaleDateString('en-US',
1716

1817
export async function handleVatsimEvents(interaction: ChatInputCommandInteraction<'cached'>) {
1918
try {
20-
const response = await fetchForeignAPI<VatsimEvents>(new Request(`${BASE_VATSIM_URL}/api/v1/events/all`), VatsimEventsSchema);
19+
const response = await fetchForeignAPI<VatsimEvents>(`${BASE_VATSIM_URL}/api/v1/events/all`, VatsimEventsSchema);
2120

2221
const filteredEvents = response.data.filter((event) => event.type === 'Event');
2322
const finalList = filteredEvents.slice(0, 5);

src/commands/utils/vatsim/vatsim.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ApplicationCommandOptionType, ApplicationCommandType, Colors } from 'discord.js';
2-
import { Request } from 'node-fetch';
32
import { ZodError } from 'zod';
43
import { Logger, VatsimData, VatsimDataSchema, fetchForeignAPI, makeEmbed, slashCommand, slashCommandStructure } from '../../../lib';
54
import { handleVatsimControllers } from './functions/vatsimControllers';
@@ -92,7 +91,7 @@ export default slashCommand(data, async ({ interaction }) => {
9291
// Fetch VATSIM data
9392
let vatsimData: VatsimData;
9493
try {
95-
vatsimData = await fetchForeignAPI<VatsimData>(new Request('https://data.vatsim.net/v3/vatsim-data.json'), VatsimDataSchema);
94+
vatsimData = await fetchForeignAPI<VatsimData>('https://data.vatsim.net/v3/vatsim-data.json', VatsimDataSchema);
9695
} catch (e) {
9796
if (e instanceof ZodError) {
9897
e.issues.forEach((issue) => Logger.error(`[zod Issue VATSIM Data] Code: ${issue.code}, Path: ${issue.path.join('.')}, Message: ${issue.message}`));

src/commands/utils/wolframAlpha.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { ApplicationCommandOptionType, ApplicationCommandType, Colors } from 'discord.js';
2-
import { Request } from 'node-fetch';
32
import { z, ZodError } from 'zod';
43
import { fetchForeignAPI, Logger, makeEmbed, makeLines, slashCommand, slashCommandStructure, WolframAlphaData, WolframAlphaDataSchema, WolframAlphaPodSchema, WolframAlphaSubpodSchema } from '../../lib';
54

@@ -62,7 +61,7 @@ export default slashCommand(data, async ({ interaction }) => {
6261

6362
let response: WolframAlphaData;
6463
try {
65-
response = await fetchForeignAPI<WolframAlphaData>(new Request(`${WOLFRAMALPHA_API_URL}${searchParams.toString()}`), WolframAlphaDataSchema);
64+
response = await fetchForeignAPI<WolframAlphaData>(`${WOLFRAMALPHA_API_URL}${searchParams.toString()}`, WolframAlphaDataSchema);
6665
} catch (e) {
6766
if (e instanceof ZodError) {
6867
return interaction.editReply({ embeds: [errorEmbed('Wolfram Alpha returned unknown data.')] });

0 commit comments

Comments
 (0)