From 1bb16b76ac61c20c09b60e6641c2c292e5be4c81 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Mon, 18 Jul 2022 18:46:45 +0200
Subject: [PATCH] Update local state, fix a few more errors

---
 api/package.json                |   2 +-
 gateway/package.json            |   2 +-
 gateway/src/opcodes/Identify.ts |   2 +-
 package-lock.json               | Bin 825084 -> 825110 bytes
 util/package.json               |   2 +-
 util/src/entities/Member.ts     |   4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/package.json b/api/package.json
index b46e5f3d6..b34f1b309 100644
--- a/api/package.json
+++ b/api/package.json
@@ -93,7 +93,7 @@
 		"picocolors": "^1.0.0",
 		"proxy-agent": "^5.0.0",
 		"supertest": "^6.1.6",
-		"typeorm": "^0.2.37"
+		"typeorm": "^0.2.45"
 	},
 	"jest": {
 		"setupFiles": [
diff --git a/gateway/package.json b/gateway/package.json
index 0524cc400..a062ac9b7 100644
--- a/gateway/package.json
+++ b/gateway/package.json
@@ -34,7 +34,7 @@
 		"missing-native-js-functions": "^1.2.18",
 		"node-fetch": "^2.6.2",
 		"proxy-agent": "^5.0.0",
-		"typeorm": "^0.2.37",
+		"typeorm": "^0.2.45",
 		"ws": "^7.4.2"
 	},
 	"optionalDependencies": {
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 31d2ae33a..2559624e0 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -41,7 +41,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 
 	try {
 		const { jwtSecret } = Config.get().security;
-		let { decoded } = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
+		var { decoded } = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
 	} catch (error) {
 		console.error("invalid token", error);
 		return this.close(CLOSECODES.Authentication_failed);
diff --git a/package-lock.json b/package-lock.json
index 9aacf440a5c5dc6b16b8076ce59065ad530dbe62..11edcc9cb64bfb6f04a96c2d21d5ed12f7b26014 100644
GIT binary patch
delta 192
zcmeyf)@a%~qYW~wOeUt2>$%k?PxvM{{hu#K%;Xz_YMZaK9_0o~On)ECA=SJ?uziOh
zBM>tIF*6Xe05R+K9fEAqhd_!rLOAT&g|Dz}7rw&IS<h{hmZ)T<pcH4MXE2@bGMn4v
zoh%{KD-$@lr{C*g<C}gUn8OXIYdcWaNluXEH-u!je~9JS!~`>II?yc9=?*iwM5jMk
Z!N$@qkjMeVoIuP4#N68j5_#U30sw~RKso>b

delta 160
zcmbQX&gjotqYW~wOvdJu>$%k?PxvM{{hu#K%;Xz_YMZaK9_0o~G|v-kpC`x&#7scU
z48$xz%({J^Ae-qSCS!}~`w}>UC--vOO)lUGo~|Fmq1*oK3fuN)SJ=(!rq@Mqh)?$o
u=C}+r2&B+%dqN0DHz$-Qxt%SJV;d9DkanOP5OV@C7Z7uA-<QA>VFm!AI65)_

diff --git a/util/package.json b/util/package.json
index 587e8a14f..246ec6b68 100644
--- a/util/package.json
+++ b/util/package.json
@@ -50,7 +50,7 @@
 		"picocolors": "^1.0.0",
 		"proxy-agent": "^5.0.0",
 		"reflect-metadata": "^0.1.13",
-		"typeorm": "^0.2.38",
+		"typeorm": "^0.2.45",
 		"typescript": "^4.4.2",
 		"typescript-json-schema": "^0.50.1"
 	},
diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts
index fe2d5590a..0194c9a9b 100644
--- a/util/src/entities/Member.ts
+++ b/util/src/entities/Member.ts
@@ -155,7 +155,7 @@ export class Member extends BaseClassWithoutId {
 			Member.findOneOrFail({
 				where: { id: user_id, guild_id },
 				relations: ["user", "roles"], // we don't want to load  the role objects just the ids
-				select: ["index", "roles.id"],
+				select: ["index"],
 			}),
 			Role.findOneOrFail({ where: { id: role_id, guild_id }, select: ["id"] }),
 		]);
@@ -181,7 +181,7 @@ export class Member extends BaseClassWithoutId {
 			Member.findOneOrFail({
 				where: { id: user_id, guild_id },
 				relations: ["user", "roles"], // we don't want to load  the role objects just the ids
-				select: ["roles.id", "index"],
+				select: ["index"],
 			}),
 			await Role.findOneOrFail({ id: role_id, guild_id }),
 		]);