From ffdf2eb04c07c6d26fe79832a0e363cf3b7b5937 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 12 Oct 2024 20:51:22 +0100
Subject: [PATCH 1/3] Fix Trade command not giving a card if they don't already
 have it in their inventory

---
 src/buttonEvents/Trade.ts              | 12 ++++++------
 src/database/entities/app/Inventory.ts |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts
index d0d7b38..ef0d1c5 100644
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@@ -72,8 +72,8 @@ export default class Trade extends ButtonEvent {
             return;
         }
 
-        user1UserInventory1.SetQuantity(user1UserInventory1.Quantity - 1);
-        user2UserInventory1.SetQuantity(user2UserInventory1.Quantity - 1);
+        user1UserInventory1.RemoveQuantity(1);
+        user2UserInventory1.RemoveQuantity(1);
 
         await user1UserInventory1.Save(Inventory, user1UserInventory1);
         await user2UserInventory1.Save(Inventory, user2UserInventory1);
@@ -82,15 +82,15 @@ export default class Trade extends ButtonEvent {
         let user2UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user1CardNumber);
 
         if (!user1UserInventory2) {
-            user1UserInventory2 = new Inventory(user1UserId, user1CardNumber, 1);
+            user1UserInventory2 = new Inventory(user1UserId, user2CardNumber, 1);
         } else {
-            user1UserInventory2.SetQuantity(user1UserInventory2.Quantity + 1);
+            user1UserInventory2.AddQuantity(1);
         }
 
         if (!user2UserInventory2) {
-            user2UserInventory2 = new Inventory(user2UserId, user2CardNumber, 1);
+            user2UserInventory2 = new Inventory(user2UserId, user1CardNumber, 1);
         } else {
-            user2UserInventory2.SetQuantity(user2UserInventory2.Quantity + 1);
+            user2UserInventory2.AddQuantity(1);
         }
 
         await user1UserInventory2.Save(Inventory, user1UserInventory2);
diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts
index 7d659fe..469cbdc 100644
--- a/src/database/entities/app/Inventory.ts
+++ b/src/database/entities/app/Inventory.ts
@@ -29,6 +29,10 @@ export default class Inventory extends AppBaseEntity {
         this.Quantity = quantity;
     }
 
+    public AddQuantity(amount: number) {
+        this.Quantity += amount;
+    }
+
     public RemoveQuantity(amount: number) {
         if (this.Quantity < amount) return;
 

From 2b3649eb395e84c4f7b80bb2177959d2600a9579 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 12 Oct 2024 20:52:24 +0100
Subject: [PATCH 2/3] 0.8.2

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 8f1bfc6..4515de6 100644
--- a/.env.example
+++ b/.env.example
@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.8.1
+BOT_VER=0.8.2
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060

From f812467f5e6e27dd2322fe9b213c7367ecffc43a Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 12 Oct 2024 20:53:05 +0100
Subject: [PATCH 3/3] v0.8.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 292f0c6..69f3158 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {