From 14523cf8976fedbe000d629aeb668e55b2170cdc Mon Sep 17 00:00:00 2001
From: Paul Munteanu <luth@luthcode.net>
Date: Sun, 23 May 2021 05:33:48 +0300
Subject: [PATCH 01/11] Fix compilation with strictNullChecks: true

---
 src/events/Message.ts    | 1 +
 src/listener/listener.ts | 6 +++---
 src/util/Send.ts         | 2 +-
 tsconfig.json            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/events/Message.ts b/src/events/Message.ts
index 2c3305cb..51c5a294 100644
--- a/src/events/Message.ts
+++ b/src/events/Message.ts
@@ -21,6 +21,7 @@ export async function Message(this: WebSocket, buffer: Data) {
 
 	if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
 	else if (this.encoding === "json" && typeof buffer === "string") data = JSON.parse(buffer);
+	else return;
 
 	check.call(this, PayloadSchema, data);
 
diff --git a/src/listener/listener.ts b/src/listener/listener.ts
index 8183f70c..b8ee84fd 100644
--- a/src/listener/listener.ts
+++ b/src/listener/listener.ts
@@ -19,7 +19,7 @@ export interface DispatchOpts {
 
 function getPipeline(this: WebSocket, guilds: string[], channels: string[] = []) {
 	if (this.shard_count) {
-		guilds = guilds.filter((x) => (BigInt(x) >> 22n) % this.shard_count === this.shard_id);
+		guilds = guilds.filter((x) => (BigInt(x) >> 22n) % this.shard_count! === this.shard_id);
 	}
 
 	return [
@@ -37,7 +37,7 @@ function getPipeline(this: WebSocket, guilds: string[], channels: string[] = [])
 
 export async function setupListener(this: WebSocket) {
 	const user = await UserModel.findOne({ id: this.user_id }).lean().exec();
-	var guilds = user.guilds;
+	var guilds = user!.guilds;
 
 	const eventStream = new MongooseCache(db.collection("events"), getPipeline.call(this, guilds), {
 		onlyEvents: true,
@@ -60,7 +60,7 @@ export async function dispatch(this: WebSocket, document: Event, { eventStream,
 		guilds.push(document.data.id);
 		eventStream.changeStream(getPipeline.call(this, guilds));
 	} else if (document.event === "GUILD_DELETE") {
-		guilds.remove(document.guild_id);
+		guilds.remove(document.guild_id!);
 		eventStream.changeStream(getPipeline.call(this, guilds));
 	} else if (document.event === "CHANNEL_DELETE") channel_id = null;
 	if (document.guild_id && !this.intents.has("GUILDS")) return;
diff --git a/src/util/Send.ts b/src/util/Send.ts
index 09e947a5..be25ac4f 100644
--- a/src/util/Send.ts
+++ b/src/util/Send.ts
@@ -11,7 +11,7 @@ export async function Send(socket: WebSocket, data: Payload) {
 	if (socket.encoding === "etf") buffer = erlpack.pack(data);
 	// TODO: encode circular object
 	else if (socket.encoding === "json") buffer = JSON.stringify(data);
-
+	else return;
 	// TODO: compression
 	if (socket.deflate) {
 		socket.deflate.write(buffer);
diff --git a/tsconfig.json b/tsconfig.json
index 279cbbf1..fd2c21ea 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,7 +29,7 @@
 		/* Strict Type-Checking Options */
 		"strict": false /* Enable all strict type-checking options. */,
 		"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
-		// "strictNullChecks": true,              /* Enable strict null checks. */
+		"strictNullChecks": true,              /* Enable strict null checks. */
 		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
 		// "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
 		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,

From c93a47d9a0b573e8c100ba9f811dbcdc6c7ad292 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sat, 22 May 2021 22:23:46 -0500
Subject: [PATCH 02/11] Meta: Enable strictNullChecks

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 279cbbf1..fd2c21ea 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,7 +29,7 @@
 		/* Strict Type-Checking Options */
 		"strict": false /* Enable all strict type-checking options. */,
 		"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
-		// "strictNullChecks": true,              /* Enable strict null checks. */
+		"strictNullChecks": true,              /* Enable strict null checks. */
 		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
 		// "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
 		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,

From 7d795903ef9264d4febb89c62bf4abb269ab8851 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sat, 22 May 2021 22:30:36 -0500
Subject: [PATCH 03/11] Config: Implement new configuration options

---
 package-lock.json       | Bin 128223 -> 133722 bytes
 package.json            |   3 ++-
 src/Server.ts           |   2 --
 src/opcodes/Identify.ts |   4 +++-
 src/util/Config.ts      |  45 ++++++++++++++++++++++++++--------------
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9428dd1565d12f027c35e0771ecdc43f586fee6..5243808f5aa9f30a0c75ea53a178358290d8c60e 100644
GIT binary patch
delta 3465
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

delta 387
zcmcaLh2#E9_6ffj%{B`#nleonE@af7ep-f6W4cl$qs-(9!YpAPZi)IX5!xnEsg|i0
zS^6a*`d+DKi6us%u9fMI9wrsV9+8Qa`oaE5Zh_v;hW`25?xu;Jk!6Y52HEA6RsM!X
zIq8;$nFel7L7}c5rM_jE<$kFaj*|-&<)^pEGA^E8D93nek_qo*d3N^Ae^^`jHm8ei
z(cHYlk)L(*3wJ^8%`749Dw`KqRx@t4sHykceD(Az{>{vH8BMlp2r-s$(a*)x6<ryn
zryHm;vQO`pWt_7e=<a;J?IC)Mwkq3K1Tz-1Y-f*Tl;hg2oWkfWH+ga8*6D05jBB><
mZ)G%fWGtNQs3JP~_30hkSD#>H<K4dd8ski@?deQRpV<K`$%6#|

diff --git a/package.json b/package.json
index e98a04d3..89e96cb4 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.2.6",
+		"@fosscord/server-util": "^1.2.8",
+		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",
 		"lambert-server": "^1.1.7",
diff --git a/src/Server.ts b/src/Server.ts
index 46ff56a3..46130b29 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -4,7 +4,6 @@ dotenv.config();
 import { db } from "@fosscord/server-util";
 import { Server as WebSocketServer } from "ws";
 import { Connection } from "./events/Connection";
-import Config from "./util/Config";
 
 // TODO: only listen/start the server if everything got initalized
 // https://www.npmjs.com/package/ws use "External HTTP/S server" and listen manually at the end of listen()
@@ -38,7 +37,6 @@ export class Server {
 		await (db as Promise<Connection>);
 		await this.setupSchema();
 		console.log("[DB] connected");
-		await Config.init();
 		console.log(`[Gateway] online on 0.0.0.0:${port}`);
 	}
 }
diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index f31eebfe..be805eda 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -17,6 +17,7 @@ import { IdentifySchema } from "../schema/Identify";
 import { Send } from "../util/Send";
 import experiments from "./experiments.json";
 import { check } from "./instanceOf";
+import { DefaultOptions, gatewayConfig } from "../util/Config";
 
 // TODO: bot sharding
 // TODO: check priviliged intents
@@ -29,7 +30,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 	const identify: IdentifySchema = data.d;
 
 	try {
-		var decoded = await checkToken(identify.token); // will throw an error if invalid
+		const { jwtSecret } = (gatewayConfig.getAll() as DefaultOptions).security;
+		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/src/util/Config.ts b/src/util/Config.ts
index eee20e1d..138e1c2f 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -1,21 +1,36 @@
 import { Config } from "@fosscord/server-util";
-
-export default {
-	init() {
-		return Config.init({ gateway: DefaultOptions });
-	},
-	get() {
-		return Config.getAll().gateway;
-	},
-	set(val: any) {
-		return Config.setAll({ gateway: val });
-	},
-	getAll: Config.getAll,
-	setAll: Config.setAll,
-};
+import { getConfigPathForFile } from "@fosscord/server-util/dist/util/Config";
+import Ajv, { JSONSchemaType } from "ajv";
 
 export interface DefaultOptions {
 	endpoint?: string;
+	security: {
+		jwtSecret: string;
+	}
 }
 
-export const DefaultOptions: DefaultOptions = {};
+const schema: JSONSchemaType<DefaultOptions> = {
+	type: "object",
+	properties: {
+		endpoint: {
+			type: "string",
+			nullable: true
+		},
+		security: {
+			type: "object",
+			properties: {
+				jwtSecret: {
+					type: "string"
+				}
+			},
+			required: ["jwtSecret"]
+		},
+	},
+	required: ["security"]
+}
+
+const ajv = new Ajv();
+const validator = ajv.compile(schema);
+
+const configPath = getConfigPathForFile("fosscord", "gateway", ".json"); 
+export const gatewayConfig = new Config({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file

From 84b6c16c3b336ce31e5d231d5cbd5b32d97bd92e Mon Sep 17 00:00:00 2001
From: Paul Munteanu <luth@luthcode.net>
Date: Sun, 23 May 2021 16:06:23 +0300
Subject: [PATCH 04/11] Undo mistake in Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ade7c416..b2329233 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,12 @@
 FROM node:lts-alpine
 WORKDIR /usr/src/fosscord-gateway
-COPY . .
+COPY package.json .
 RUN apk --no-cache --virtual build-dependencies add \
     python \
     make \
     g++
 RUN npm install
 RUN apk del build-dependencies
+COPY . .
 EXPOSE 3002
 CMD ["npm", "start"]
\ No newline at end of file

From cae7ed6657412b0b93b17d442b7dfe0ac3dcf457 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sun, 23 May 2021 12:32:54 -0500
Subject: [PATCH 05/11] Update: update server-util to latest

---
 package-lock.json | Bin 133722 -> 133722 bytes
 package.json      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 5243808f5aa9f30a0c75ea53a178358290d8c60e..7315fbd619b5bbe2173ba3c75f4da9f93a27ee22 100644
GIT binary patch
delta 761
zcmcaLh2z!~jtM`Qjr9zs%gZq;Y?fx!V4D2V$#D8<8Ai3qLSL1_+?_%VBYYeKy(@Ey
z%+11*Otalxvm-t8vJ46Xva9r6Eb|@1f&)B*eLcgIB2)9tf;`h4gTnGs)6Lvcic-U!
zwZpy5L;aEq+>5lm+`J0PeA9wc{T(M4D#~wfk!9S@ILU-}vOGKc=0B_j(-|!$U+mYP
z&bypZ6v$l2E+1CxlI2zAX>J^z<?m-$mROLSRO#em?3iz<ALeHq;vE@jp&uAw=^Bt!
zY-Hq}=p0-WXj&AJZyFVqVq#Jf?qyt_W9*ibSL7C@?OhpK;^$$eZ5S002((>cvd(hH
z$sO|~8I30wEE3;5Z}}a@$-6nlr%zbIcyh8di|pk6T-=-IE|ij-{@^yF{&cxrj2hFI
z$TKR01%(+!6&U$O8YQMidYigyJLv}(6kFtkoBDY;R=Ju6I_D(01sIxUX$OSo255&^
z22|vDML7BU`{V~Zrlgm<l?9uW7$o`znUoczrub$jd8B0+<T*~hxL0NJ{;9H?kM6#j
zK#v%huIS1rJ>5W+k$ro&EMs0PM%ahaB<!a*hB3-aKfjnU8WQl6=PhU7?zx0<nJ9h2
LdHbGSjPv{fv-1J`

delta 768
zcmcaLh2z!~jtM`Qjr1(0%gZq;Y?fx!U;^<bU*y-Heny5-mC<POhPjHNiP`05US_V^
z5f#39+9{b%L4ipTc_x;DF4?Ze`Pu0ariHFW2BBG1L0O6A`l+s_+WwiTuKJahX_jRc
zVHr+=k&)Sc;ci7KK_y1Uflfg|u7Rb6p_3Km6}Gp?GHz#_WWqaHo}GR3AJ&5D(^o4p
z>Q8Q1CN}-MBBMfRcur=KZ)RzjVQ4^7YL=;2s<UsQtEI75P+F9JR8^s?d7f8Dd4Pp!
zL{*lfn@LenaB87ZlDl(~VRBYlzK4&$n}M0OM}?zHVt{*Lh(Wq>a8g)^;p75E#mPF$
z9Vd6plLY#(V3GLddCTuGPTtKaK7GOx#*>q^<;6C4FVvBozTSXQf4bZ*MvdughKw?k
zCkV5IdPJ2bg{7Ezrg;=6<rSp(x#@d4Ck8uKIfc508-`@2mK9`YMH-hlnRw-8Tlko3
z7kC*b=jR1fg_aom=INXHM^#vsR)x6udqf7fJ6h;FRz!L@`A=@tRGqwks_f>YyRRnD
zEe57L_Ats!H&A6{-`*|DnAeIL_F*&$`||0Eu8h*t&o5?-h6MfOdCS?idoE#ICW<Ar
Q!)OxP>D%}0Vw~p>0M%~-v;Y7A

diff --git a/package.json b/package.json
index 89e96cb4..f45b0008 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.2.8",
+		"@fosscord/server-util": "^1.3.0",
 		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",

From a2a22c9afa9231c86133ba043b8111520765763d Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sun, 23 May 2021 13:46:26 -0500
Subject: [PATCH 06/11] Fix: No more typecasting required

---
 package-lock.json       | Bin 133722 -> 133722 bytes
 package.json            |   2 +-
 src/opcodes/Identify.ts |   4 ++--
 src/util/Config.ts      |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7315fbd619b5bbe2173ba3c75f4da9f93a27ee22..b7bb7da6e9c211ee9090a21b5fe7a5876250bd0f 100644
GIT binary patch
delta 261
zcmcaLh2z!~jtRdQ4X4Y?F)D19X4GPud`Mk?`e_+Pjmbjw3ZZ_vMP3#j$x*rf9+jS<
zF24DJ+M#(_`Ki9Xnfe~VNq$BJ`mVkuh6Sm4AuhpAW#P##7LmcGxki3DS*0EZffd2I
z8KsU!l|Jdgt_5L+l__Ojx&EG$3ltT$x5zSXXPjihJ6WEcz4;I8_CKtQ3&c<?52K0Y
W<<k{i8KtKis4}u|@0Mje{{{d-=vYz!

delta 262
zcmcaLh2z!~jtRdQ4W`S>F)D19X4GPu{Mku=`e_+PjmaWk6~f$|LJcE)90R>8bBfH(
z!jeq0-CeUIJ@c{*3InpM^j$3T9m9eHJcE5b!;>OY^UZ=h(;S1s@>0{y+)|2C!=1Im
zz0E`Yk_+66w7uNC3d(%bf>Zq+Cl@NpZ*P%h+|D@3gm<z$JA3mV*6n{-85fAr!}jTl
Tu8h*t4OAJ~w|C1jo__-X!Le9F

diff --git a/package.json b/package.json
index f45b0008..78fd3939 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.3.0",
+		"@fosscord/server-util": "^1.3.1",
 		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",
diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index be805eda..0781afde 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -17,7 +17,7 @@ import { IdentifySchema } from "../schema/Identify";
 import { Send } from "../util/Send";
 import experiments from "./experiments.json";
 import { check } from "./instanceOf";
-import { DefaultOptions, gatewayConfig } from "../util/Config";
+import * as Config from "../util/Config";
 
 // TODO: bot sharding
 // TODO: check priviliged intents
@@ -30,7 +30,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 	const identify: IdentifySchema = data.d;
 
 	try {
-		const { jwtSecret } = (gatewayConfig.getAll() as DefaultOptions).security;
+		const { jwtSecret } = Config.gatewayConfig.getAll().security;
 		var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
 	} catch (error) {
 		console.error("invalid token", error);
diff --git a/src/util/Config.ts b/src/util/Config.ts
index 138e1c2f..8489888c 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -33,4 +33,4 @@ const ajv = new Ajv();
 const validator = ajv.compile(schema);
 
 const configPath = getConfigPathForFile("fosscord", "gateway", ".json"); 
-export const gatewayConfig = new Config({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file
+export const gatewayConfig = new Config<DefaultOptions>({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file

From e287d3e5bd3960fbf8f08d81779ea7ff303f0664 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Mon, 24 May 2021 20:46:07 +0200
Subject: [PATCH 07/11] :sparkles: use new config

---
 src/opcodes/Identify.ts |  4 ++--
 src/util/Config.ts      | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index 0781afde..0ddc58d1 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -11,13 +11,13 @@ import {
 	UserModel,
 	toObject,
 	EVENTEnum,
+	Config,
 } from "@fosscord/server-util";
 import { setupListener } from "../listener/listener";
 import { IdentifySchema } from "../schema/Identify";
 import { Send } from "../util/Send";
 import experiments from "./experiments.json";
 import { check } from "./instanceOf";
-import * as Config from "../util/Config";
 
 // TODO: bot sharding
 // TODO: check priviliged intents
@@ -30,7 +30,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 	const identify: IdentifySchema = data.d;
 
 	try {
-		const { jwtSecret } = Config.gatewayConfig.getAll().security;
+		const { jwtSecret } = Config.get().security;
 		var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
 	} catch (error) {
 		console.error("invalid token", error);
diff --git a/src/util/Config.ts b/src/util/Config.ts
index 8489888c..9ceb8cd5 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { Config } from "@fosscord/server-util";
 import { getConfigPathForFile } from "@fosscord/server-util/dist/util/Config";
 import Ajv, { JSONSchemaType } from "ajv";
@@ -6,7 +7,7 @@ export interface DefaultOptions {
 	endpoint?: string;
 	security: {
 		jwtSecret: string;
-	}
+	};
 }
 
 const schema: JSONSchemaType<DefaultOptions> = {
@@ -14,23 +15,27 @@ const schema: JSONSchemaType<DefaultOptions> = {
 	properties: {
 		endpoint: {
 			type: "string",
-			nullable: true
+			nullable: true,
 		},
 		security: {
 			type: "object",
 			properties: {
 				jwtSecret: {
-					type: "string"
-				}
+					type: "string",
+				},
 			},
-			required: ["jwtSecret"]
+			required: ["jwtSecret"],
 		},
 	},
-	required: ["security"]
-}
+	required: ["security"],
+};
 
 const ajv = new Ajv();
 const validator = ajv.compile(schema);
 
-const configPath = getConfigPathForFile("fosscord", "gateway", ".json"); 
-export const gatewayConfig = new Config<DefaultOptions>({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file
+const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
+export const gatewayConfig = new Config<DefaultOptions>({
+	path: configPath,
+	schemaValidator: validator,
+	schema: schema,
+});

From 094ec2449e70eda03434b724914900b5f8735d04 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Mon, 24 May 2021 20:48:37 +0200
Subject: [PATCH 08/11] npm i @fosscord/server-util@1.3.2

---
 package-lock.json | Bin 133722 -> 133722 bytes
 package.json      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index b7bb7da6e9c211ee9090a21b5fe7a5876250bd0f..6608281dedb190128f70b6a674bdc825817cced0 100644
GIT binary patch
delta 279
zcmcaLh2z!~jtRdQji$@XF)D19X4GPu{+XFcfBI<|Mvci#;R<2?#YMT{E@2*39;qqr
zzA1^t=Dr3-SpmN0l~n=S+P=m`IaRK~eqN3yrD=wi0eJ;xX6}W>hGl`4ImP;cUd6f2
z<~~)~mQ~4BuHnWJ0haFC{sslcj*|-&<+r!UGI}sFT1-DH$Cx+Cgm<z$JA3mV*6n{-
h85fAr#TC;PT^XgP8>lj}Z||06bOgF(JJ2n?uK}>%S)Tv^

delta 276
zcmcaLh2z!~jtRdQ4X4Y?F)D19X4GPud`Mk?`e_+Pjmbjw3ZZ_vMP3#j$x*rf9+jS<
zF24DJ+M#(_`Ki9Xnfe~VNq$BJ`mVkuh6Sm4AuhpAW#P##7LmcGxki3DS*0EZffd2I
z8KsU!l|Jdgt_5L+l__Ojx&EG$3ltT$x5zSjFfy7=KP$(WH_3!|vOGI`^B>mje^?n8
kh@rS4j3#a<pRVZ2C_UXkm63gWw=AP0&?(!2PU(FO04beY<NyEw

diff --git a/package.json b/package.json
index 78fd3939..97792782 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.3.1",
+		"@fosscord/server-util": "^1.3.2",
 		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",

From aa602fcace337297b557ca4b856fa79f5ab29985 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Tue, 25 May 2021 01:11:16 +0200
Subject: [PATCH 09/11] npm i @fosscord/server-util@1.3.3

---
 .env.example      |   4 ++++
 package-lock.json | Bin 133722 -> 133722 bytes
 package.json      |   2 +-
 src/Server.ts     |   3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..0224de64
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,4 @@
+MONGO_URL=mongodb://localhost/fosscord
+PORT=3002
+PRODUCTION=TRUE
+THREADS=# automatically use all available cores, only available if production = true
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 6608281dedb190128f70b6a674bdc825817cced0..32c7f62c2a758549bd07408d114f91f18dd07926 100644
GIT binary patch
delta 246
zcmcaLh2z!~jtRdQji<}YF)D19X4GPuesedY{`Au_j2e@jBoso^GF<}$EseANeIkNG
z0-gNB%>tZELo&>wJUk5Zt9%0t^TJa@vQqMLi;RuZ%_A(F!o9L{U3??L)4WTAi~{^h
z{fZ1y{k+^wvJ7*QGCT`Y(_9Ken*~|63$ieFOQ2d7Mia{%rz^TLN>4XXWn|ypEz5ZR
F4FLUyP;USL

delta 246
zcmcaLh2z!~jtRdQji$@XF)D19X4GPu{+XFcfBI<|Mvci#;R>Pt#YMT{E@2*39;qqr
zzA1^t=Dr3-SpmN0l~n=S+P=m`IaRK~eqN3yrD=wi0eJ;xX6}W>hGl`4ImP;cUd6f2
z<~~)~mQ~4BuHnWJ0haFC{sslc&4Mi31z8xoB~UF3qlsmX(-mDArKcOHGO};)mSsHu
F1^{n#PV@i(

diff --git a/package.json b/package.json
index 97792782..2d061bad 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.3.2",
+		"@fosscord/server-util": "^1.3.3",
 		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",
diff --git a/src/Server.ts b/src/Server.ts
index 46130b29..2f72cc00 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -1,7 +1,7 @@
 import "missing-native-js-functions";
 import dotenv from "dotenv";
 dotenv.config();
-import { db } from "@fosscord/server-util";
+import { Config, db } from "@fosscord/server-util";
 import { Server as WebSocketServer } from "ws";
 import { Connection } from "./events/Connection";
 
@@ -36,6 +36,7 @@ export class Server {
 		// @ts-ignore
 		await (db as Promise<Connection>);
 		await this.setupSchema();
+		await Config.init();
 		console.log("[DB] connected");
 		console.log(`[Gateway] online on 0.0.0.0:${port}`);
 	}

From 910dd9a22b7cb60fe83d023333c365c661e608e7 Mon Sep 17 00:00:00 2001
From: honeytequila <rafaelalibibi@gmail.com>
Date: Thu, 27 May 2021 09:28:19 -0300
Subject: [PATCH 10/11] =?UTF-8?q?=E2=9C=A8=20GUILD=5FMEMBER=5FLIST=5FUPDAT?=
 =?UTF-8?q?E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json          | Bin 133722 -> 60437 bytes
 package.json               |   2 +-
 src/opcodes/LazyRequest.ts | 163 ++++++++++++++++++-------------------
 3 files changed, 78 insertions(+), 87 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32c7f62c2a758549bd07408d114f91f18dd07926..c18abf3248f6669b86b48a8da0e006d29adf29dd 100644
GIT binary patch
delta 753
zcmYL_PfXKr9L4iRA`CTx1Wg2#En-LtwB2B|D&nBsx~;5ZTRYf+WdGWAgN|<Nwvu?@
ztcfJm{B9%!6r<6^cxVh4qcPENP!A@=gMq}0M-Cpm30^$CPu}I_eZD_zf3$yUJ$R8E
z?r^v&dEHPe`Ks&2K&@irhdZpJ?jEG|!Kj6I<7lrBhOAomfK)c*n8`#4v4S&!3`Z21
ztiQBCH#NULy@Crhg(8=jWxkZgWR=iJh7E)Tjx-F~x5_dSSHg@G5#&Sa@|>vq8Ph%Q
zW-?j>Ia%mM#2~cU_xi!Qf)4%wj%IH`Cvut4XRUX)X4twEk@A7^SdD8oREqazqD7DC
zQEO~HUduJ=^`&xAYBn?Gf?Q5FL*7!JS1Ji3oHJ$CS6%goG0sz7TAeo1GE11{0>O|<
zPMMr^bvPV%j}<sv)~oA>_S;F|2JPM~{FnmT`uYGz=XRjy7&qIlili2w2`h0!Th;KH
z`Gz7Sl}wZqlY%fV$ZRZY2+3f4S<iV%qNov7YFebjW7Gt#hNN^xS5~6YjL%yTCMtn3
zDz9U5fMq<h$af$5(U&cFXC1i+Yv6G^`m_yQR+@22q&Fey3k7a2mx{!wSVFDhl&U78
zCZ>g=Iw2Oq=CnUyWO-inM3Y&DUvMkFK;4@bN(65ziAaH!m59bh6j9^~MM+N>1?s=<
zvliN%1Iqff`T8{J866*WqqQfH0t($Z0P^2+bbAZVppT#75?b7XMfCgSF}>LV4s~sV
z6TN={7p#q)Hv8sNaJJaxXV3@s#&g&kvUYpU+aJEcRExd45BnXhCj-{nB+*$_<r+SM
zpTx*XiOAL#m#8#ztT5|yhcI6dlcnm6o{wk~38m?orBe~Qm{aL-+Cwjq!4Q>ARrNSk
r)mK8MP*St*c&LPt7)^<didn-I-aF5vB}`2DZ2l))zGj>4Er;+IqtE>E

delta 17281
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

diff --git a/package.json b/package.json
index 2d061bad..c5f3df24 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 	"author": "Fosscord",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/server-util": "^1.3.3",
+		"@fosscord/server-util": "^1.3.7",
 		"ajv": "^8.5.0",
 		"dotenv": "^8.2.0",
 		"jsonwebtoken": "^8.5.1",
diff --git a/src/opcodes/LazyRequest.ts b/src/opcodes/LazyRequest.ts
index 8b97e84a..bf7e7f8e 100644
--- a/src/opcodes/LazyRequest.ts
+++ b/src/opcodes/LazyRequest.ts
@@ -1,13 +1,5 @@
 // @ts-nocheck WIP
-import {
-	db,
-	getPermission,
-	MemberModel,
-	MongooseCache,
-	PublicUserProjection,
-	RoleModel,
-	toObject,
-} from "@fosscord/server-util";
+import { db, getPermission, MemberModel, MongooseCache, PublicUserProjection, RoleModel, toObject } from "@fosscord/server-util";
 import { LazyRequest } from "../schema/LazyRequest";
 import { OPCODES, Payload } from "../util/Constants";
 import { Send } from "../util/Send";
@@ -18,86 +10,85 @@ import { check } from "./instanceOf";
 // TODO: config: if want to list all members (even those who are offline) sorted by role, or just those who are online
 
 export async function onLazyRequest(this: WebSocket, { d }: Payload) {
-	// TODO: check data
-	check.call(this, LazyRequest, d);
-	const { guild_id, typing, channels, activities } = d as LazyRequest;
+    // TODO: check data
+    check.call(this, LazyRequest, d);
+    const { guild_id, typing, channels, activities } = d as LazyRequest;
 
-	const permissions = await getPermission(this.user_id, guild_id);
+    const permissions = await getPermission(this.user_id, guild_id);
 
-	// MongoDB query to retrieve all hoisted roles and join them with the members and users collection
-	const roles = toObject(
-		await db
-			.collection("roles")
-			.aggregate([
-				{
-					$match: {
-						guild_id,
-						// hoist: true // TODO: also match @everyone role
-					},
-				},
-				{ $sort: { position: 1 } },
-				{
-					$lookup: {
-						from: "members",
-						let: { id: "$id" },
-						pipeline: [
-							{ $match: { $expr: { $in: ["$$id", "$roles"] } } },
-							{ $limit: 100 },
-							{
-								$lookup: {
-									from: "users",
-									let: { user_id: "$id" },
-									pipeline: [
-										{ $match: { $expr: { $eq: ["$id", "$$user_id"] } } },
-										{ $project: PublicUserProjection },
-									],
-									as: "user",
-								},
-							},
-							{
-								$unwind: "$user",
-							},
-						],
-						as: "members",
-					},
-				},
-			])
-			.toArray()
-	);
+    // MongoDB query to retrieve all hoisted roles and join them with the members and users collection
+    const roles = toObject(
+        await db
+            .collection("roles")
+            .aggregate([
+                {
+                    $match: {
+                        guild_id
+                        // id: { $ne: guild_id }
+                        // hoist: true // TODO: also match @everyone role
+                    }
+                },
+                { $sort: { position: 1 } },
+                {
+                    $lookup: {
+                        from: "members",
+                        let: { id: "$id" },
+                        pipeline: [
+                            { $match: { $expr: { $in: ["$$id", "$roles"] } } },
+                            { $limit: 100 },
+                            {
+                                $lookup: {
+                                    from: "users",
+                                    let: { user_id: "$id" },
+                                    pipeline: [{ $match: { $expr: { $eq: ["$id", "$$user_id"] } } }, { $project: PublicUserProjection }],
+                                    as: "user"
+                                }
+                            },
+                            {
+                                $unwind: "$user"
+                            }
+                        ],
+                        as: "members"
+                    }
+                }
+            ])
+            .toArray()
+    );
 
-	const groups = roles.map((x) => ({ id: x.id === guild_id ? "online" : x.id, count: x.members.length }));
-	const member_count = roles.reduce((a, b) => b.members.length + a, 0);
-	const items = [];
+    const groups = roles.map((x) => ({ id: x.id === guild_id ? "online" : x.id, count: x.members.length }));
+    const member_count = roles.reduce((a, b) => b.members.length + a, 0);
+    const items = [];
 
-	for (const role of roles) {
-		items.push({
-			group: {
-				count: role.members.length,
-				id: role.id,
-			},
-		});
-		for (const member of role.members) {
-			items.push({ member });
-		}
-	}
+    for (const role of roles) {
+        items.push({
+            group: {
+                count: role.members.length,
+                id: role.id === guild_id ? "online" : role.name
+            }
+        });
+        for (const member of role.members) {
+            member.roles.remove(guild_id);
+            items.push({ member });
+        }
+    }
 
-	return Send(this, {
-		op: OPCODES.Dispatch,
-		s: this.sequence++,
-		t: "GUILD_MEMBER_LIST_UPDATE",
-		d: {
-			ops: [
-				{
-					range: [0, 99],
-					op: "SYNC",
-					items: items,
-				},
-			],
-			online_count: member_count, // TODO count online count
-			member_count,
-			id: "everyone",
-			guild_id,
-			groups,
-		},
-	});
+    return Send(this, {
+        op: OPCODES.Dispatch,
+        s: this.sequence++,
+        t: "GUILD_MEMBER_LIST_UPDATE",
+        d: {
+            ops: [
+                {
+                    range: [0, 99],
+                    op: "SYNC",
+                    items
+                }
+            ],
+            online_count: member_count, // TODO count online count
+            member_count,
+            id: "everyone",
+            guild_id,
+            groups
+        }
+    });
 }

From b5bbc35905db8df37ec15e137967ac2a1203ee52 Mon Sep 17 00:00:00 2001
From: notsapinho <52896767+9qz@users.noreply.github.com>
Date: Thu, 27 May 2021 09:56:28 -0300
Subject: [PATCH 11/11] Update LazyRequest.ts

---
 src/opcodes/LazyRequest.ts | 144 ++++++++++++++++++++-----------------
 1 file changed, 77 insertions(+), 67 deletions(-)

diff --git a/src/opcodes/LazyRequest.ts b/src/opcodes/LazyRequest.ts
index bf7e7f8e..8a7bb8c4 100644
--- a/src/opcodes/LazyRequest.ts
+++ b/src/opcodes/LazyRequest.ts
@@ -1,5 +1,13 @@
 // @ts-nocheck WIP
-import { db, getPermission, MemberModel, MongooseCache, PublicUserProjection, RoleModel, toObject } from "@fosscord/server-util";
+import {
+	db,
+	getPermission,
+	MemberModel,
+	MongooseCache,
+	PublicUserProjection,
+	RoleModel,
+	toObject,
+} from "@fosscord/server-util";
 import { LazyRequest } from "../schema/LazyRequest";
 import { OPCODES, Payload } from "../util/Constants";
 import { Send } from "../util/Send";
@@ -10,56 +18,58 @@ import { check } from "./instanceOf";
 // TODO: config: if want to list all members (even those who are offline) sorted by role, or just those who are online
 
 export async function onLazyRequest(this: WebSocket, { d }: Payload) {
-    // TODO: check data
-    check.call(this, LazyRequest, d);
-    const { guild_id, typing, channels, activities } = d as LazyRequest;
+	// TODO: check data
+	check.call(this, LazyRequest, d);
+	const { guild_id, typing, channels, activities } = d as LazyRequest;
 
-    const permissions = await getPermission(this.user_id, guild_id);
+	const permissions = await getPermission(this.user_id, guild_id);
 
-    // MongoDB query to retrieve all hoisted roles and join them with the members and users collection
-    const roles = toObject(
-        await db
-            .collection("roles")
-            .aggregate([
-                {
-                    $match: {
-                        guild_id
-                        // id: { $ne: guild_id }
-                        // hoist: true // TODO: also match @everyone role
-                    }
-                },
-                { $sort: { position: 1 } },
-                {
-                    $lookup: {
-                        from: "members",
-                        let: { id: "$id" },
-                        pipeline: [
-                            { $match: { $expr: { $in: ["$$id", "$roles"] } } },
-                            { $limit: 100 },
-                            {
-                                $lookup: {
-                                    from: "users",
-                                    let: { user_id: "$id" },
-                                    pipeline: [{ $match: { $expr: { $eq: ["$id", "$$user_id"] } } }, { $project: PublicUserProjection }],
-                                    as: "user"
-                                }
-                            },
-                            {
-                                $unwind: "$user"
-                            }
-                        ],
-                        as: "members"
-                    }
-                }
-            ])
-            .toArray()
-    );
+	// MongoDB query to retrieve all hoisted roles and join them with the members and users collection
+	const roles = toObject(
+		await db
+			.collection("roles")
+			.aggregate([
+				{
+					$match: {
+						guild_id,
+						// hoist: true // TODO: also match @everyone role
+					},
+				},
+				{ $sort: { position: 1 } },
+				{
+					$lookup: {
+						from: "members",
+						let: { id: "$id" },
+						pipeline: [
+							{ $match: { $expr: { $in: ["$$id", "$roles"] } } },
+							{ $limit: 100 },
+							{
+								$lookup: {
+									from: "users",
+									let: { user_id: "$id" },
+									pipeline: [
+										{ $match: { $expr: { $eq: ["$id", "$$user_id"] } } },
+										{ $project: PublicUserProjection },
+									],
+									as: "user",
+								},
+							},
+							{
+								$unwind: "$user",
+							},
+						],
+						as: "members",
+					},
+				},
+			])
+			.toArray()
+	);
 
-    const groups = roles.map((x) => ({ id: x.id === guild_id ? "online" : x.id, count: x.members.length }));
-    const member_count = roles.reduce((a, b) => b.members.length + a, 0);
-    const items = [];
+	const groups = roles.map((x) => ({ id: x.id === guild_id ? "online" : x.id, count: x.members.length }));
+	const member_count = roles.reduce((a, b) => b.members.length + a, 0);
+	const items = [];
 
-    for (const role of roles) {
+	for (const role of roles) {
         items.push({
             group: {
                 count: role.members.length,
@@ -70,25 +80,25 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
             member.roles.remove(guild_id);
             items.push({ member });
         }
-    }
+	}
 
-    return Send(this, {
-        op: OPCODES.Dispatch,
-        s: this.sequence++,
-        t: "GUILD_MEMBER_LIST_UPDATE",
-        d: {
-            ops: [
-                {
-                    range: [0, 99],
-                    op: "SYNC",
-                    items
-                }
-            ],
-            online_count: member_count, // TODO count online count
-            member_count,
-            id: "everyone",
-            guild_id,
-            groups
-        }
-    });
+	return Send(this, {
+		op: OPCODES.Dispatch,
+		s: this.sequence++,
+		t: "GUILD_MEMBER_LIST_UPDATE",
+		d: {
+			ops: [
+				{
+					range: [0, 99],
+					op: "SYNC",
+					items,
+				},
+			],
+			online_count: member_count, // TODO count online count
+			member_count,
+			id: "everyone",
+			guild_id,
+			groups,
+		},
+	});
 }