From ac0d3ec46fd82a52d5b7c18e037e75c5fb2676bb Mon Sep 17 00:00:00 2001
From: Michal Orlik <sogehige@gmail.com>
Date: Fri, 8 Nov 2024 23:48:46 +0100
Subject: [PATCH 1/3] chore: dependencies fix

---
 package.json                 |  2 +-
 patches/typeorm#0.3.20.patch | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 patches/typeorm#0.3.20.patch

diff --git a/package.json b/package.json
index 6757186b4ef..927d36126c8 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "async-mutex": "^0.4.0",
     "axios": "1.6.2",
     "basic-auth": "2.0.1",
-    "better-sqlite3": "^11.5.0",
+    "better-sqlite3": "^9.6.0",
     "blocked-at": "1.2.0",
     "chalk": "5.3.0",
     "cors": "2.8.5",
diff --git a/patches/typeorm#0.3.20.patch b/patches/typeorm#0.3.20.patch
deleted file mode 100644
index 8d103a0dc52..00000000000
--- a/patches/typeorm#0.3.20.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: \typeorm\package.json
-===================================================================
---- \typeorm\package.json
-+++ \typeorm\package.json
-@@ -149,9 +149,9 @@
-   },
-   "peerDependencies": {
-     "@google-cloud/spanner": "^5.18.0",
-     "@sap/hana-client": "^2.12.25",
--    "better-sqlite3": "^7.1.2 || ^8.0.0 || ^9.0.0",
-+    "better-sqlite3": "^7.1.2 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
-     "hdb-pool": "^0.1.6",
-     "ioredis": "^5.0.4",
-     "mongodb": "^5.8.0",
-     "mssql": "^9.1.1 || ^10.0.1",
-@@ -272,9 +272,5 @@
-       "src/**"
-     ],
-     "reporter": "json"
-   }
--
--,"_resolved": ""
--,"_integrity": ""
--,"_from": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz"
--}
-\ No newline at end of file
-+}

From f2c0232eae31f92fb8ed697e523576d2d6698c19 Mon Sep 17 00:00:00 2001
From: Michal Orlik <sogehige@gmail.com>
Date: Sat, 9 Nov 2024 00:07:57 +0100
Subject: [PATCH 2/3] tests: fix heist test

---
 test/tests/games/heist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tests/games/heist.js b/test/tests/games/heist.js
index b6681769803..2e1377f0f2a 100644
--- a/test/tests/games/heist.js
+++ b/test/tests/games/heist.js
@@ -194,7 +194,7 @@ describe('Heist - !bankheist - @func2', () => {
       }
     });
     it('Heist should be finished - userslist', async () => {
-      await message.sentMessageContain('The heist payouts are: ');
+      await message.sentMessageContain('The heist payees are: ');
       await message.sentMessageContain('more...');
     });
   });

From 3f5018e363538d8c13edced86dfa1598b932c952 Mon Sep 17 00:00:00 2001
From: Michal Orlik <sogehige@gmail.com>
Date: Sat, 9 Nov 2024 00:12:54 +0100
Subject: [PATCH 3/3] fix: change ytdl-core to fix youtube search

---
 package.json         | 2 +-
 src/systems/songs.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 927d36126c8..ec870eef361 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "ws": "8.15.0",
     "xregexp": "5.1.1",
     "yargs": "17.7.2",
-    "ytdl-core": "4.11.5",
+    "@distube/ytdl-core": "latest",
     "ytpl": "2.3.0",
     "ytsr": "3.8.4",
     "zod": "^3.22.4"
diff --git a/src/systems/songs.ts b/src/systems/songs.ts
index 1456ebf875f..7c5e82fa2bd 100644
--- a/src/systems/songs.ts
+++ b/src/systems/songs.ts
@@ -10,7 +10,7 @@ import io from 'socket.io';
 import {
   Brackets, In, Like,
 } from 'typeorm';
-import ytdl from 'ytdl-core';
+import ytdl from '@distube/ytdl-core';
 import ytpl from 'ytpl';
 import ytsr from 'ytsr';
 import { z } from 'zod';