From d0193ffa25f84f5be1bd10918eb19969151bd38f Mon Sep 17 00:00:00 2001
From: GC <30398469+gc@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:52:47 +1000
Subject: [PATCH] Fix docker (#5987)

---
 .github/workflows/integration_tests.yml | 2 +-
 package.json                            | 2 +-
 tests/integration/redis.test.ts         | 8 ++++----
 yarn.lock                               | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 165927f7c5..5442864076 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -20,4 +20,4 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Run Integration Tests
-        run: docker-compose up --build --abort-on-container-exit
+        run: docker compose up --build --abort-on-container-exit --remove-orphans && docker compose down --volumes --remove-orphans
diff --git a/package.json b/package.json
index 69c6554519..0e160aa765 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
 	},
 	"dependencies": {
 		"@napi-rs/canvas": "^0.1.53",
-		"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0",
+		"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed",
 		"@prisma/client": "^5.17.0",
 		"@sapphire/ratelimits": "^2.4.9",
 		"@sapphire/snowflake": "^3.5.3",
diff --git a/tests/integration/redis.test.ts b/tests/integration/redis.test.ts
index 7584d1bd67..1407d57583 100644
--- a/tests/integration/redis.test.ts
+++ b/tests/integration/redis.test.ts
@@ -15,7 +15,7 @@ test('Should add patron badge', async () => {
 	const user = await createTestUser();
 	expect(user.user.badges).not.includes(BadgesEnum.Patron);
 	const _redis = makeSender();
-	_redis.publish({
+	await _redis.publish({
 		type: 'patron_tier_change',
 		discord_ids: [user.id],
 		new_tier: 1,
@@ -31,7 +31,7 @@ test('Should remove patron badge', async () => {
 	const user = await createTestUser(undefined, { badges: [BadgesEnum.Patron] });
 	expect(user.user.badges).includes(BadgesEnum.Patron);
 	const _redis = makeSender();
-	_redis.publish({
+	await _redis.publish({
 		type: 'patron_tier_change',
 		discord_ids: [user.id],
 		new_tier: 0,
@@ -52,7 +52,7 @@ test('Should add to cache', async () => {
 		}))
 	});
 	const _redis = makeSender();
-	_redis.publish({
+	await _redis.publish({
 		type: 'patron_tier_change',
 		discord_ids: users.map(u => u.id),
 		new_tier: 5,
@@ -76,7 +76,7 @@ test('Should remove from cache', async () => {
 		}))
 	});
 	const _redis = makeSender();
-	_redis.publish({
+	await _redis.publish({
 		type: 'patron_tier_change',
 		discord_ids: users.map(u => u.id),
 		new_tier: 0,
diff --git a/yarn.lock b/yarn.lock
index 5a427b1ee5..5dfb8015f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -646,9 +646,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oldschoolgg/toolkit@git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0":
+"@oldschoolgg/toolkit@git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed":
   version: 0.0.24
-  resolution: "@oldschoolgg/toolkit@https://github.com/oldschoolgg/toolkit.git#commit=2813f25327093fcf2cb12bee7d4c85ce629069a0"
+  resolution: "@oldschoolgg/toolkit@https://github.com/oldschoolgg/toolkit.git#commit=cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed"
   dependencies:
     decimal.js: "npm:^10.4.3"
     deep-object-diff: "npm:^1.1.9"
@@ -664,7 +664,7 @@ __metadata:
   peerDependencies:
     discord.js: ^14.15.3
     oldschooljs: ^2.5.9
-  checksum: 10c0/c83f2188e18ac1e7d79edd9ab06b7ab0f96f8774a404a26fd766d22606bd65a8def0c0a74d0f681c5bde0d7b5b5bbb16f829e751b4e75f6821a1baf5c62b2580
+  checksum: 10c0/42eaec1c99c671adab7b56ca7e11d37bf5a0e07d0f0da0a892cdf477a78c061ea131a43b1c578d09f1c6b02e05d1ce47db9586ad9a8de62679cc492c847c3fca
   languageName: node
   linkType: hard
 
@@ -4122,7 +4122,7 @@ __metadata:
   dependencies:
     "@biomejs/biome": "npm:^1.8.3"
     "@napi-rs/canvas": "npm:^0.1.53"
-    "@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0"
+    "@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed"
     "@prisma/client": "npm:^5.17.0"
     "@sapphire/ratelimits": "npm:^2.4.9"
     "@sapphire/snowflake": "npm:^3.5.3"