upgrade deps

4 files changed, 110 insertions, 116 deletions

diff --git a/package.json b/package.json
index c1882bc..e858ae6 100644
--- a/package.json
+++ b/package.json
@@ -66,9 +66,9 @@
 		"@notenoughupdates/humanize-duration": "^4.0.1",
 		"@notenoughupdates/simplify-number": "^1.0.1",
 		"@notenoughupdates/wolfram-alpha-api": "^1.0.2",
-		"@sentry/integrations": "^7.5.1",
-		"@sentry/node": "^7.5.1",
-		"@sentry/tracing": "^7.5.1",
+		"@sentry/integrations": "^7.7.0",
+		"@sentry/node": "^7.7.0",
+		"@sentry/tracing": "^7.7.0",
 		"canvas": "^2.9.3",
 		"chalk": "^5.0.1",
 		"deep-lock": "^1.0.0",
@@ -88,18 +88,18 @@
 		"prettier": "^2.7.1",
 		"pretty-bytes": "^6.0.0",
 		"rimraf": "^3.0.2",
-		"sequelize": "6.21.2",
+		"sequelize": "6.21.3",
 		"tinycolor2": "^1.4.2",
 		"typescript": "^4.7.4",
 		"vm2": "^3.9.10"
 	},
 	"devDependencies": {
 		"@sapphire/snowflake": "^3.2.2",
-		"@sentry/types": "^7.5.1",
+		"@sentry/types": "^7.7.0",
 		"@types/eslint": "^8.4.5",
 		"@types/express": "^4.17.13",
 		"@types/lodash": "^4.14.182",
-		"@types/node": "^18.0.3",
+		"@types/node": "^18.0.4",
 		"@types/numeral": "^2.0.2",
 		"@types/pg": "^8.6.5",
 		"@types/prettier": "^2.6.3",
@@ -112,9 +112,9 @@
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-deprecation": "^1.3.2",
 		"eslint-plugin-import": "^2.26.0",
-		"node-fetch": "^3.2.6",
+		"node-fetch": "^3.2.8",
 		"ts-essentials": "^9.2.0",
-		"vitest": "^0.17.1"
+		"vitest": "^0.18.0"
 	},
 	"packageManager": "yarn@3.2.1"
 }
diff --git a/src/bot.ts b/src/bot.ts
index 640f2ab..038fbbb 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,29 +1,23 @@
-// import { init } from './lib/utils/BushLogger.js';
-// // creates proxies on console.log and console.warn
-// // also starts a REPL session
-// init();
+import { init } from './lib/utils/BushLogger.js';
+// creates proxies on console.log and console.warn
+// also starts a REPL session
+init();
 
-// eslint-disable-next-line no-constant-condition
-if (false) {
-	// const { dirname } = await import('path');
-	// const { fileURLToPath } = await import('url');
-	// const { default: config } = await import('../config/options.js');
-	// const { Sentry } = await import('./lib/common/Sentry.js');
-	// const { BushClient } = await import('./lib/index.js');
-	//
-	// const isDry = process.argv.includes('dry');
-	// if (!isDry && config.credentials.sentryDsn !== null)
-	// 	new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
-	// BushClient.extendStructures();
-	// const client = new BushClient(config);
-	// if (!isDry) await client.dbPreInit();
-	// await client.init();
-	// if (isDry) {
-	// 	await client.destroy();
-	// 	process.exit(0);
-	// } else {
-	// 	await client.start();
-	// }
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { default as config } from '../config/options.js';
+import { Sentry } from './lib/common/Sentry.js';
+import { BushClient } from './lib/index.js';
+
+const isDry = process.argv.includes('dry');
+if (!isDry && config.credentials.sentryDsn !== null) new Sentry(dirname(fileURLToPath(import.meta.url)) || process.cwd(), config);
+BushClient.extendStructures();
+const client = new BushClient(config);
+if (!isDry) await client.dbPreInit();
+await client.init();
+if (isDry) {
+	await client.destroy();
+	process.exit(0);
 } else {
-	import('./lib/common/util/Minecraft.js');
+	await client.start();
 }
diff --git a/tsconfig.json b/tsconfig.json
index ed3f116..565346b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,23 +18,23 @@
 		"forceConsistentCasingInFileNames": true,
 		"allowSyntheticDefaultImports": true,
 		"preserveValueImports": true,
-		"removeComments": true
-		// "paths": {
-		// 	"#lib": ["./src/lib/index.ts"],
-		// 	"#constants": ["./src/lib/utils/BushConstants.ts"],
-		// 	"#args": ["./src/arguments/index.ts"],
-		// 	"#commands": ["./src/commands/index.ts"],
-		// 	"#tags": ["./src/lib/common/tags.js"]
-		// }
+		"removeComments": true,
+		"paths": {
+			"#lib": ["./src/lib/index.ts"],
+			"#constants": ["./src/lib/utils/BushConstants.ts"],
+			"#args": ["./src/arguments/index.ts"],
+			"#commands": ["./src/commands/index.ts"],
+			"#tags": ["./src/lib/common/tags.js"]
+		}
 	},
 	"include": [
-		// "src/**/*.ts",
-		// "src/**/*d.ts",
-		// "lib/**/*.ts",
-		// "ecosystem.config.cjs",
-		// ".eslintrc.cjs",
-		// "config/**/*.ts",
-		// "tests/**/*.ts",
+		"src/**/*.ts",
+		"src/**/*d.ts",
+		"lib/**/*.ts",
+		"ecosystem.config.cjs",
+		".eslintrc.cjs",
+		"config/**/*.ts",
+		"tests/**/*.ts",
 		"vite.config.ts",
 		"src/bot.ts",
 		"src/lib/common/util/Minecraft.ts"
diff --git a/yarn.lock b/yarn.lock
index f2c1f57..63b0c6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -255,83 +255,83 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/core@npm:7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/core@npm:7.5.1"
+"@sentry/core@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/core@npm:7.7.0"
   dependencies:
-    "@sentry/hub": 7.5.1
-    "@sentry/types": 7.5.1
-    "@sentry/utils": 7.5.1
+    "@sentry/hub": 7.7.0
+    "@sentry/types": 7.7.0
+    "@sentry/utils": 7.7.0
     tslib: ^1.9.3
-  checksum: 90613800c95bd17075b33ed8f76a2cf18a2fd03e9c1b244ee7a846f0e0b738b84a199bc7c085d62c8e9043913024169e45cb925a03b36cf77d064caf8e7e05fd
+  checksum: d3b9b5a92a9182bae7f39eef01502dd542d5be7365632ea9e26aa5247c90fd72e620856b20a393f4d3eeadb27f3b744bf25be93b1fdc4f7457a894e290c41fb0
   languageName: node
   linkType: hard
 
-"@sentry/hub@npm:7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/hub@npm:7.5.1"
+"@sentry/hub@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/hub@npm:7.7.0"
   dependencies:
-    "@sentry/types": 7.5.1
-    "@sentry/utils": 7.5.1
+    "@sentry/types": 7.7.0
+    "@sentry/utils": 7.7.0
     tslib: ^1.9.3
-  checksum: 6b00f2ef5fb12f94d5844f3abef9a84ec79d4f19d8347e8e8b8c06719c2d84d06963bb94e09305deb76640231ca1ed34dd4b2c63ff447fdb8fa16c22ac022484
+  checksum: 0683ae6da7d961e6bbb90ad1fded3b33cd9fc76dc54a080902a83bd7769991294ce8017277f5e0d145fcf9f2ad53ae89d3b0c7619fa0586c8513f4b585f14f6d
   languageName: node
   linkType: hard
 
-"@sentry/integrations@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/integrations@npm:7.5.1"
+"@sentry/integrations@npm:^7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/integrations@npm:7.7.0"
   dependencies:
-    "@sentry/types": 7.5.1
-    "@sentry/utils": 7.5.1
+    "@sentry/types": 7.7.0
+    "@sentry/utils": 7.7.0
     localforage: ^1.8.1
     tslib: ^1.9.3
-  checksum: 13b4cb068e09f5208fbb750aa569453956a7f5cc4093e4e3485a92bac74b0c77a056c39b51395a2bc307cbb02cbde3b989bb985aaa849d87eed6ee853bfd33b6
+  checksum: cd24f34301c55069e8487adc6d9b3c61e9f4f7284a01d4e9954324695f15b74806303cf53bd2e88db325289c057d2b33546986ed240b022f6d170cada94a0cab
   languageName: node
   linkType: hard
 
-"@sentry/node@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/node@npm:7.5.1"
+"@sentry/node@npm:^7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/node@npm:7.7.0"
   dependencies:
-    "@sentry/core": 7.5.1
-    "@sentry/hub": 7.5.1
-    "@sentry/types": 7.5.1
-    "@sentry/utils": 7.5.1
+    "@sentry/core": 7.7.0
+    "@sentry/hub": 7.7.0
+    "@sentry/types": 7.7.0
+    "@sentry/utils": 7.7.0
     cookie: ^0.4.1
     https-proxy-agent: ^5.0.0
     lru_map: ^0.3.3
     tslib: ^1.9.3
-  checksum: a8caa39edb923952a551a9609afb933c1753e5e6cf1a8eccb9b1f4adb6567356d3077d3319b266e502a3183f1cf402847ade0967217522a408f9c1640a220f02
+  checksum: 554f4165f7cee16c70eca1e4e42d354330bcfcbf157bfbcdf4a17e89393f0c39f042cfaa07ba51ebb8391bbf2091d8dc6108a81650a60d39632d3b6a1edafe6f
   languageName: node
   linkType: hard
 
-"@sentry/tracing@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/tracing@npm:7.5.1"
+"@sentry/tracing@npm:^7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/tracing@npm:7.7.0"
   dependencies:
-    "@sentry/hub": 7.5.1
-    "@sentry/types": 7.5.1
-    "@sentry/utils": 7.5.1
+    "@sentry/hub": 7.7.0
+    "@sentry/types": 7.7.0
+    "@sentry/utils": 7.7.0
     tslib: ^1.9.3
-  checksum: cf70120946a1d4a337e05b2035ab7a2b00755f638006250d003dbf6badf1fba066f0abfc19689b60d4e6143e99616f4ada0d564376aec2d48a5171c6b9c871c8
+  checksum: c3884c297e87284ab73f103338dfb2f8dc2d2fcf641981650ad72009f1d7a41292ded048a7283b57a66f730d8d7cb8932bb6ee64e8b512b33de08da8867a58fe
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:7.5.1, @sentry/types@npm:^7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/types@npm:7.5.1"
-  checksum: 2ff669f0e6c6ea5020c117a15012ec55147033faebbc0708c1a772aabf9cf6e283d69556903a9213e96b188b0a5f7030ded7006ad8805b2a89a6442d36202b21
+"@sentry/types@npm:7.7.0, @sentry/types@npm:^7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/types@npm:7.7.0"
+  checksum: 1f26c23617e9370cf32269ea5d5aa0f75fe86c34aede4fc07ae3bdae08803a788d628d0bba6f2e22c03d0430dcf63cc19453468ae086406448da07e13f36da70
   languageName: node
   linkType: hard
 
-"@sentry/utils@npm:7.5.1":
-  version: 7.5.1
-  resolution: "@sentry/utils@npm:7.5.1"
+"@sentry/utils@npm:7.7.0":
+  version: 7.7.0
+  resolution: "@sentry/utils@npm:7.7.0"
   dependencies:
-    "@sentry/types": 7.5.1
+    "@sentry/types": 7.7.0
     tslib: ^1.9.3
-  checksum: 567fdba09fdbfc62b0e50f5099d82b075f4e5ebd7dace67c4379a9f65c12e7191aad526fbc955ee681da757c8332807bda74a50880c4576c4c39d97c2c49e91d
+  checksum: 990224e0542015952a4f1fa83dd69c82a3a85894576457f10bc3c0c60620c675969424bdbfde9872a19a5db2b682dd1d51c67ec99f0c57acfc993e6f7c970aaf
   languageName: node
   linkType: hard
 
@@ -536,10 +536,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.0.3":
-  version: 18.0.3
-  resolution: "@types/node@npm:18.0.3"
-  checksum: 5dec59fbbc1186c808b53df1ca717dad034dbd6a901c75f5b052c845618b531b05f27217122c6254db99529a68618e4cfc534ae3dbf4e88754e9e572df80defa
+"@types/node@npm:^18.0.4":
+  version: 18.0.4
+  resolution: "@types/node@npm:18.0.4"
+  checksum: 981284fd57941f233f0e77038087c122f56e3c2b4fc4e090dfc7f0a93abfc526d5ccdd59eb3ef551d713245cf3943e37c7b957f12ba699209341a447c39fab59
   languageName: node
   linkType: hard
 
@@ -1136,14 +1136,14 @@ __metadata:
     "@notenoughupdates/simplify-number": ^1.0.1
     "@notenoughupdates/wolfram-alpha-api": ^1.0.2
     "@sapphire/snowflake": ^3.2.2
-    "@sentry/integrations": ^7.5.1
-    "@sentry/node": ^7.5.1
-    "@sentry/tracing": ^7.5.1
-    "@sentry/types": ^7.5.1
+    "@sentry/integrations": ^7.7.0
+    "@sentry/node": ^7.7.0
+    "@sentry/tracing": ^7.7.0
+    "@sentry/types": ^7.7.0
     "@types/eslint": ^8.4.5
     "@types/express": ^4.17.13
     "@types/lodash": ^4.14.182
-    "@types/node": ^18.0.3
+    "@types/node": ^18.0.4
     "@types/numeral": ^2.0.2
     "@types/pg": ^8.6.5
     "@types/prettier": ^2.6.3
@@ -1169,18 +1169,18 @@ __metadata:
     lodash: ^4.17.21
     mathjs: ^10.6.4
     nanoid: ^4.0.0
-    node-fetch: ^3.2.6
+    node-fetch: ^3.2.8
     numeral: ^2.0.6
     pg: ^8.7.3
     pg-hstore: ^2.3.4
     prettier: ^2.7.1
     pretty-bytes: ^6.0.0
     rimraf: ^3.0.2
-    sequelize: 6.21.2
+    sequelize: 6.21.3
     tinycolor2: ^1.4.2
     ts-essentials: ^9.2.0
     typescript: ^4.7.4
-    vitest: ^0.17.1
+    vitest: ^0.18.0
     vm2: ^3.9.10
   languageName: unknown
   linkType: soft
@@ -3679,14 +3679,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^3.2.6":
-  version: 3.2.6
-  resolution: "node-fetch@npm:3.2.6"
+"node-fetch@npm:^3.2.8":
+  version: 3.2.8
+  resolution: "node-fetch@npm:3.2.8"
   dependencies:
     data-uri-to-buffer: ^4.0.0
     fetch-blob: ^3.1.4
     formdata-polyfill: ^4.0.10
-  checksum: ece307ace3a3ff28638ccb0fa0545bb5c0cfd673a9d06fc314d937a73ae6a55917d5bacd7f080f9a9f1449ca20a5c01b1281d0e616acb20315e5ac315971da46
+  checksum: 2f7fc3e59fbede43a273e988d2f2a3dd68160618114e32ad537477db253808b65221f1dbfd666b8fb33ff07bf1de9d6448035b0f8ada5ef876c5afec93b27318
   languageName: node
   linkType: hard
 
@@ -4444,9 +4444,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sequelize@npm:6.21.2":
-  version: 6.21.2
-  resolution: "sequelize@npm:6.21.2"
+"sequelize@npm:6.21.3":
+  version: 6.21.3
+  resolution: "sequelize@npm:6.21.3"
   dependencies:
     "@types/debug": ^4.1.7
     "@types/validator": ^13.7.1
@@ -4481,7 +4481,7 @@ __metadata:
       optional: true
     tedious:
       optional: true
-  checksum: 5486ec15e80cf51e49d819c2495a05a17b5a0102866ca0af054dbc4a625d2dc6200e36189261e50234625fcf4da5cbc973eb9900591a5b9e9f63c67955196f56
+  checksum: 85a57cdde00edc5e1634585aacda874eeab9cc0d6d296e5ae90be3d861cba682bacde427009600d331fec82396520621a16a27d1958c689dd197d9d88051cf7e
   languageName: node
   linkType: hard
 
@@ -5060,9 +5060,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vitest@npm:^0.17.1":
-  version: 0.17.1
-  resolution: "vitest@npm:0.17.1"
+"vitest@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "vitest@npm:0.18.0"
   dependencies:
     "@types/chai": ^4.3.1
     "@types/chai-subset": ^1.3.3
@@ -5092,7 +5092,7 @@ __metadata:
       optional: true
   bin:
     vitest: vitest.mjs
-  checksum: eae2d024d97a46ba08f3cc7e0703a330c92dc0a6f4c7a9bc20ec8a5129bf787d8ebabd14bf31ae810897c1813e29178af59f63ec8b24b5944cfa62e225cd207c
+  checksum: 20e76b0de9f02dd09a412b11e5898d1ec7c5c9f9287da40a79fde98f6bd100db6f777fb5f1370496a2c153277cc5eb6738e176435101332fce1c87a565e62d5f
   languageName: node
   linkType: hard