From e7c34ca50e8613e6cf937637e5801b6f5477b3e3 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 15 Sep 2024 15:14:34 +0100
Subject: [PATCH] Update null checks

---
 src/buttonEvents/Trade.ts | 8 ++++----
 src/commands/trade.ts     | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts
index a301a3b..fb8449d 100644
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@@ -28,8 +28,8 @@ export default class Trade extends ButtonEvent {
         const user2CardNumber = interaction.customId.split(" ")[5];
         const expiry = interaction.customId.split(" ")[6];
         const timeoutId = interaction.customId.split(" ")[7];
-        const user1Quantity = Number(interaction.customId.split(" ")[8]) ?? 1;
-        const user2Quantity = Number(interaction.customId.split(" ")[9]) ?? 1;
+        const user1Quantity = Number(interaction.customId.split(" ")[8]) || 1;
+        const user2Quantity = Number(interaction.customId.split(" ")[9]) || 1;
 
         AppLogger.LogSilly("Button/Trade/AcceptTrade", `Parameters: user1UserId=${user1UserId}, user2UserId=${user2UserId}, user1CardNumber=${user1CardNumber}, user2CardNumber=${user2CardNumber}, expiry=${expiry}, timeoutId=${timeoutId} user1Quantity=${user1Quantity} user2Quantity=${user2Quantity}`);
 
@@ -146,8 +146,8 @@ export default class Trade extends ButtonEvent {
         const user2CardNumber = interaction.customId.split(" ")[5];
         // No need to get expiry date
         const timeoutId = interaction.customId.split(" ")[7];
-        const user1Quantity = Number(interaction.customId.split(" ")[8]) ?? 1;
-        const user2Quantity = Number(interaction.customId.split(" ")[9]) ?? 1;
+        const user1Quantity = Number(interaction.customId.split(" ")[8]) || 1;
+        const user2Quantity = Number(interaction.customId.split(" ")[9]) || 1;
 
         AppLogger.LogSilly("Button/Trade/DeclineTrade", `Parameters: user1UserId=${user1UserId}, user2UserId=${user2UserId}, user1CardNumber=${user1CardNumber}, user2CardNumber=${user2CardNumber}, timeoutId=${timeoutId}`);
 
diff --git a/src/commands/trade.ts b/src/commands/trade.ts
index 34f7aef..fcd312a 100644
--- a/src/commands/trade.ts
+++ b/src/commands/trade.ts
@@ -41,8 +41,11 @@ export default class Trade extends Command {
         const user = interaction.options.get("user", true).user!;
         const give = interaction.options.get("give", true);
         const receive = interaction.options.get("receive", true);
-        const givequantity = interaction.options.get("givequantity")?.value as number ?? 1;
-        const receivequantity = interaction.options.get("receivequantity")?.value as number ?? 1;
+        const givequantityInput = interaction.options.get("givequantity")?.value ?? 1;
+        const receivequantityInput = interaction.options.get("receivequantity")?.value ?? 1;
+        
+        const givequantity = Number(givequantityInput) || 1;
+        const receivequantity = Number(receivequantityInput) || 1;
 
         AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);