update deps

6 files changed, 84 insertions, 66 deletions

diff --git a/.gitignore b/.gitignore
index 207c3c0..e3672cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,22 +16,14 @@ dist
 
 .idea
 
-# Cache file creation bug
-.yarn/cache/*
-.yarn/sdks/eslint/*
-.yarn/sdks/prettier/*
-.yarn/install-state.gz
-.yarn/build-state.url
-.yarn/releases.gz
-
 # yarn 
 .pnp.*
 .yarn/*
-!.yarn/releases
+!.yarn/patches
 !.yarn/plugins
+!.yarn/releases
 !.yarn/sdks
 !.yarn/versions
-!.yarn/cache
 
 # Options and credentials for the bot
 src/config/options.ts
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 5722024..2b70e67 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,14 +1,14 @@
 {
-	"recommendations": [
-		"aaron-bond.better-comments",
-		"arcanis.vscode-zipfs",
-		"dbaeumer.vscode-eslint",
-		"eamodio.gitlens",
-		"esbenp.prettier-vscode",
-		"streetsidesoftware.code-spell-checker",
-		"github.vscode-pull-request-github",
-		"ckolkman.vscode-postgres",
-		"tobias-faller.vt100-syntax-highlighting",
-		"pkief.material-icon-theme"
-	]
+  "recommendations": [
+    "aaron-bond.better-comments",
+    "arcanis.vscode-zipfs",
+    "dbaeumer.vscode-eslint",
+    "eamodio.gitlens",
+    "esbenp.prettier-vscode",
+    "streetsidesoftware.code-spell-checker",
+    "github.vscode-pull-request-github",
+    "ckolkman.vscode-postgres",
+    "tobias-faller.vt100-syntax-highlighting",
+    "pkief.material-icon-theme"
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b41dbcf..086fe81 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -92,5 +92,9 @@
 			"italic": false
 		}
 	],
-	"javascript.preferences.importModuleSpecifierEnding": "js"
+	"javascript.preferences.importModuleSpecifierEnding": "js",
+	"discord.removeDetails": false,
+	"discord.removeLowerDetails": false,
+	"discord.removeRemoteRepository": false,
+	"discord.removeTimestamp": false
 }
diff --git a/.yarnrc.yml b/.yarnrc.yml
index d5c5c56..ad81b11 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,4 +1,7 @@
 nodeLinker: node-modules
+pnpEnableEsmLoader: true
+pnpMode: loose
+enableTelemetry: false
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
diff --git a/package.json b/package.json
index 7af0e11..93e2231 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
 		"deploy:all": "yarn beta && pm2 deploy ecosystem.config.cjs production && pm2 deploy ecosystem.config.cjs beta"
 	},
 	"dependencies": {
+		"@discordjs/rest": "npm:@notenoughupdates/rest@dev",
 		"@notenoughupdates/discord.js-minesweeper": "^1.0.10",
 		"@notenoughupdates/events-intercept": "^3.0.1",
 		"@notenoughupdates/humanize-duration": "^4.0.1",
@@ -78,15 +79,16 @@
 		"rimraf": "^3.0.2",
 		"sequelize": "6.13.0",
 		"tinycolor2": "^1.4.2",
-		"tslib": "^2.3.1",
 		"typescript": "^4.5.5",
 		"vm2": "^3.9.5"
 	},
 	"devDependencies": {
+		"@sapphire/snowflake": "^3.1.0",
+		"@sentry/types": "^6.17.4",
 		"@types/eslint": "^8.4.1",
 		"@types/express": "^4.17.13",
 		"@types/lodash": "^4.14.178",
-		"@types/node": "^17.0.14",
+		"@types/node": "^17.0.15",
 		"@types/node-os-utils": "^1.2.0",
 		"@types/numeral": "^2.0.2",
 		"@types/pg": "^8.6.4",
diff --git a/yarn.lock b/yarn.lock
index a5842be..20abb5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,45 +14,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@discordjs/builders@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "@discordjs/builders@npm:0.12.0"
+"@discordjs/builders@npm:^0.13.0-dev":
+  version: 0.13.0-dev.1644067366.5f4b44d
+  resolution: "@discordjs/builders@npm:0.13.0-dev.1644067366.5f4b44d"
   dependencies:
-    "@sindresorhus/is": ^4.3.0
+    "@sindresorhus/is": ^4.4.0
     discord-api-types: ^0.26.1
     ts-mixer: ^6.0.0
     tslib: ^2.3.1
     zod: ^3.11.6
-  checksum: 3c4ef256371121938d5d75571e19f0697b1575dd9fb31a7ca47337d00a1ec45b2c1ce19a1261650a5f6393ac4116f8ed9e82120ce5de534be562dde919a2a6d7
-  languageName: node
-  linkType: hard
-
-"@discordjs/collection@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@discordjs/collection@npm:0.4.0"
-  checksum: fa8fc4246921f3230eb6c5d6d4dc0caf9dd659fcc903175944edf4fb0a9ed9913fdf164733d3f1e644ef469bc79b0d38a526ee620b92169cb40e79b40b0c716b
+  checksum: fc4dda961d4df92e3c85601c1cf0eb7ff0df7e33a858a2cf55393b4bbcde6434968a4625ef369fcfc835675543506bde035845181d2d6eb5d4127d9be55dc62c
   languageName: node
   linkType: hard
 
-"@discordjs/collection@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@discordjs/collection@npm:0.5.0"
-  checksum: a228979bb5f955cf095ce47441c55d0196cd99ff8484b57d26a45e58506c6646d776a98a9e11b822aab4e15fb2ac1aecfdebc63cde8ab7d04d3d74b716e80144
+"@discordjs/collection@npm:^0.6.0-dev":
+  version: 0.6.0-dev.1644067357.5f4b44d
+  resolution: "@discordjs/collection@npm:0.6.0-dev.1644067357.5f4b44d"
+  checksum: 419c84a767cc3abaa30c9248c16c4725867bd5779df56bb389ec87728eb20dd74460cd1d491768ded43511c220c829ea987d9ec8774c6ed78e7ab4623b26f417
   languageName: node
   linkType: hard
 
-"@discordjs/rest@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@discordjs/rest@npm:0.3.0"
+"@discordjs/rest@npm:@notenoughupdates/rest@dev":
+  version: 0.3.0-dev.1644086576.90b011b
+  resolution: "@notenoughupdates/rest@npm:0.3.0-dev.1644086576.90b011b"
   dependencies:
-    "@discordjs/collection": ^0.4.0
-    "@sapphire/async-queue": ^1.1.9
-    "@sapphire/snowflake": ^3.0.1
+    "@discordjs/collection": ^0.6.0-dev
+    "@sapphire/async-queue": ^1.2.0
+    "@sapphire/snowflake": ^3.1.0
+    "@types/node-fetch": ^2.5.12
     discord-api-types: ^0.26.1
     form-data: ^4.0.0
-    node-fetch: ^2.6.5
+    node-fetch: ^2.6.7
     tslib: ^2.3.1
-  checksum: 0e5724156e0375b2181036d25d8847c5b7d8ab46a3409a19dad57ec9b3301d9127917a52558d3daa7e2b513804d4de9fcd5f6d56e056cc48dd567ebf26548c6d
+  checksum: 011c317c7155205e1280c6d543730db5a5f19282103804212c31248e0e0e5e752fc73dd4d67c91b4040ddb5e2c95941ff67a552b0b5a1837146b845f78be4fab
   languageName: node
   linkType: hard
 
@@ -199,14 +193,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sapphire/async-queue@npm:^1.1.9":
+"@sapphire/async-queue@npm:^1.2.0":
   version: 1.2.0
   resolution: "@sapphire/async-queue@npm:1.2.0"
   checksum: 9959c91fe031e9350134740b68e64798eff1f72f1417f312a4f7bebbd875035a406ba5ae1e71640c3819dec10d0f86a0588b494088f353f85701f2f1196e4560
   languageName: node
   linkType: hard
 
-"@sapphire/snowflake@npm:^3.0.1":
+"@sapphire/snowflake@npm:^3.1.0":
   version: 3.1.0
   resolution: "@sapphire/snowflake@npm:3.1.0"
   checksum: 979d41f531983b992e65f79a75016e92bb4f3984148bd7e2164059b4e8e18df0206c36c5a1a02f32c39c425b268f2e7871d9eef1eb5f1690f8837e451cc00812
@@ -290,7 +284,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:6.17.4":
+"@sentry/types@npm:6.17.4, @sentry/types@npm:^6.17.4":
   version: 6.17.4
   resolution: "@sentry/types@npm:6.17.4"
   checksum: e2c514b42cb27143150bcbea3438e65b96deebf5804ffbe6d889c5997cd448ec61ed486a4b903fd57d7297cfcc9cb33d2dd0b3a394830a66fe3b99c0fee05aab
@@ -307,7 +301,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^4.2.0, @sindresorhus/is@npm:^4.3.0":
+"@sindresorhus/is@npm:^4.2.0, @sindresorhus/is@npm:^4.4.0":
   version: 4.4.0
   resolution: "@sindresorhus/is@npm:4.4.0"
   checksum: 1d2471a75e03ce2182c3a3d014d027addeaeae1a7a2adfdb03c91cce17900b207e493db012e35ffa21808c563ce3b8e2e7c24646b3d5c27467e08bef8b0e16f0
@@ -471,6 +465,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node-fetch@npm:^2.5.12":
+  version: 2.5.12
+  resolution: "@types/node-fetch@npm:2.5.12"
+  dependencies:
+    "@types/node": "*"
+    form-data: ^3.0.0
+  checksum: ad63c85ba6a9477b8e057ec8682257738130d98e8ece4e31141789bd99df9d9147985cc8bc0cb5c8983ed5aa6bb95d46df23d1e055f4ad5cf8b82fc69cf626c7
+  languageName: node
+  linkType: hard
+
 "@types/node-os-utils@npm:^1.2.0":
   version: 1.2.0
   resolution: "@types/node-os-utils@npm:1.2.0"
@@ -478,10 +482,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^17.0.14":
-  version: 17.0.14
-  resolution: "@types/node@npm:17.0.14"
-  checksum: cc059ce29686bad5890685f45741826a1a7d1d27382464f6d5fa00b72ba239f6f5b8245a7fa5a56c23ce928030dc76b165a4ab0b86dc078f05b44597d8fe1a46
+"@types/node@npm:*, @types/node@npm:^17.0.15":
+  version: 17.0.15
+  resolution: "@types/node@npm:17.0.15"
+  checksum: aa64ecf4fbcf9888e794dcdc20e98c49cdcb102b17e57c44ca56943904732d6cc250e766f8448a3cd71d6a40a4b597bd83c565e5bd9b982733fa3f9813d5c291
   languageName: node
   linkType: hard
 
@@ -862,18 +866,21 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "bush-bot@workspace:."
   dependencies:
+    "@discordjs/rest": "npm:@notenoughupdates/rest@dev"
     "@notenoughupdates/discord.js-minesweeper": ^1.0.10
     "@notenoughupdates/events-intercept": ^3.0.1
     "@notenoughupdates/humanize-duration": ^4.0.1
     "@notenoughupdates/simplify-number": ^1.0.1
     "@notenoughupdates/wolfram-alpha-api": ^1.0.1
+    "@sapphire/snowflake": ^3.1.0
     "@sentry/integrations": ^6.17.4
     "@sentry/node": ^6.17.4
     "@sentry/tracing": ^6.17.4
+    "@sentry/types": ^6.17.4
     "@types/eslint": ^8.4.1
     "@types/express": ^4.17.13
     "@types/lodash": ^4.14.178
-    "@types/node": ^17.0.14
+    "@types/node": ^17.0.15
     "@types/node-os-utils": ^1.2.0
     "@types/numeral": ^2.0.2
     "@types/pg": ^8.6.4
@@ -907,7 +914,6 @@ __metadata:
     rimraf: ^3.0.2
     sequelize: 6.13.0
     tinycolor2: ^1.4.2
-    tslib: ^2.3.1
     typescript: ^4.5.5
     vm2: ^3.9.5
   languageName: unknown
@@ -1212,18 +1218,18 @@ __metadata:
   linkType: hard
 
 "discord.js@npm:@notenoughupdates/discord.js@dev":
-  version: 14.0.0-dev.1643976443.d5ed9fc
-  resolution: "@notenoughupdates/discord.js@npm:14.0.0-dev.1643976443.d5ed9fc"
+  version: 14.0.0-dev.1644086580.90b011b
+  resolution: "@notenoughupdates/discord.js@npm:14.0.0-dev.1644086580.90b011b"
   dependencies:
-    "@discordjs/builders": ^0.12.0
-    "@discordjs/collection": ^0.5.0
-    "@discordjs/rest": ^0.3.0
-    "@sapphire/snowflake": ^3.0.1
+    "@discordjs/builders": ^0.13.0-dev
+    "@discordjs/collection": ^0.6.0-dev
+    "@discordjs/rest": "npm:@notenoughupdates/rest@dev"
+    "@sapphire/snowflake": ^3.1.0
     "@types/ws": ^8.2.2
     discord-api-types: ^0.26.1
     node-fetch: ^2.6.7
     ws: ^8.4.2
-  checksum: 30287c7b181ab35ad9f2a3a54ad4ff76483f2638e5b4a190dd2ca883d9e1cf0e1e58fd9cd0b2eb092d8ca3dc5641c27cea11e56f733529e015f7230848f9d4ab
+  checksum: d0b0e5fa11d32a3ffc16d860fe5d400059619afeab33cce60ba873089453a11c90ca9285033abf936743d6bb6cab5de32c9c052bf95235a452919a12bb018110
   languageName: node
   linkType: hard
 
@@ -1556,6 +1562,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "form-data@npm:3.0.1"
+  dependencies:
+    asynckit: ^0.4.0
+    combined-stream: ^1.0.8
+    mime-types: ^2.1.12
+  checksum: b019e8d35c8afc14a2bd8a7a92fa4f525a4726b6d5a9740e8d2623c30e308fbb58dc8469f90415a856698933c8479b01646a9dff33c87cc4e76d72aedbbf860d
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^4.0.0":
   version: 4.0.0
   resolution: "form-data@npm:4.0.0"