From 119fc6310f0ea21a2dfe9030b51a262af456a4bd Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Tue, 27 Feb 2024 18:42:29 +0000
Subject: [PATCH 1/2] Fix not being able to decline your own trade

---
 src/buttonEvents/Trade.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts
index 28b08ee..ee7223c 100644
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@@ -140,7 +140,7 @@ export default class Trade extends ButtonEvent {
         // No need to get expiry date
         const timeoutId = interaction.customId.split(" ")[7];
 
-        if (interaction.user.id !== receiveUserId || interaction.user.id !== giveUserId) {
+        if (interaction.user.id != receiveUserId && interaction.user.id !==giveUserId) {
             await interaction.reply("You are not the user who the trade is intended for");
             return;
         }
-- 
2.43.4


From ed9a4760315574a4d02ec06a5c5ae269326e882f Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Tue, 27 Feb 2024 18:49:36 +0000
Subject: [PATCH 2/2] Add I Receive you Receieve labels

---
 src/buttonEvents/Trade.ts | 16 ++++++++--------
 src/commands/trade.ts     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts
index ee7223c..d272d9f 100644
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@@ -100,13 +100,13 @@ export default class Trade extends ButtonEvent {
             .setImage("https://i.imgur.com/9w5f1ls.gif")
             .addFields([
                 {
-                    name: `${receiveUser.username} is giving`,
-                    value: `${giveItem.id}: ${giveItem.name}`,
+                    name: "I receieve",
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                     inline: true,
                 },
                 {
-                    name: `${giveUser.username} is giving`,
-                    value: `${receiveItem.id}: ${receiveItem.name}`,
+                    name: "You receieve",
+                    value: `${giveItem.id}: ${giveItem.name}`,
                     inline: true,
                 },
                 {
@@ -170,13 +170,13 @@ export default class Trade extends ButtonEvent {
             .setImage("https://i.imgur.com/9w5f1ls.gif")
             .addFields([
                 {
-                    name: `${receiveUser.username} is giving`,
-                    value: `${giveItem.id}: ${giveItem.name}`,
+                    name: "I Receive",
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                     inline: true,
                 },
                 {
-                    name: `${giveUser.username} is giving`,
-                    value: `${receiveItem.id}: ${receiveItem.name}`,
+                    name: "You Receive",
+                    value: `${giveItem.id}: ${giveItem.name}`,
                     inline: true,
                 },
                 {
diff --git a/src/commands/trade.ts b/src/commands/trade.ts
index 60e78d8..8414ae9 100644
--- a/src/commands/trade.ts
+++ b/src/commands/trade.ts
@@ -63,19 +63,19 @@ export default class Trade extends Command {
         const expiry = now.setMinutes(now.getMinutes() + 15);
 
         const tradeEmbed = new EmbedBuilder()
-            .setTitle("Trade Offer")
+            .setTitle("⚠️ Trade Offer ⚠️")
             .setDescription(`Trade initiated between ${interaction.user.username} and ${user.username}`)
             .setColor(EmbedColours.Grey)
             .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
             .addFields([
                 {
-                    name: `${interaction.user.username} is giving`,
-                    value: `${giveItem.id}: ${giveItem.name}`,
+                    name: "I Receive",
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                     inline: true,
                 },
                 {
-                    name: `${user.username} is giving`,
-                    value: `${receiveItem.id}: ${receiveItem.name}`,
+                    name: "You Receive",
+                    value: `${giveItem.id}: ${giveItem.name}`,
                     inline: true,
                 },
                 {
@@ -109,13 +109,13 @@ export default class Trade extends Command {
             .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
             .addFields([
                 {
-                    name: `${receiveUsername} is giving`,
-                    value: `${giveCardNumber}: ${giveCardName}`,
+                    name: "I Receive",
+                    value: `${receiveCardNumber}: ${receiveCardName}`,
                     inline: true,
                 },
                 {
-                    name: `${giveUsername} is giving`,
-                    value: `${receiveCardNumber}: ${receiveCardName}`,
+                    name: "You Receive",
+                    value: `${giveCardNumber}: ${giveCardName}`,
                     inline: true,
                 },
                 {
-- 
2.43.4