From e4a4759e971387675d127990b53dfd8b3a443d82 Mon Sep 17 00:00:00 2001
From: Diego Magdaleno <diegomagdaleno@protonmail.com>
Date: Sat, 22 May 2021 15:55:45 -0500
Subject: Fix merge issues, update to reflect config changes and package.json

---
 src/Server.ts | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/Server.ts')

diff --git a/src/Server.ts b/src/Server.ts
index 941807be..ca1d1c1c 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -37,13 +37,17 @@ export class FosscordServer extends Server {
 	}
 
 	async setupSchema() {
-		await db.collection("users").createIndex({ id: 1 }, { unique: true });
-		await db.collection("messages").createIndex({ id: 1 }, { unique: true });
-		await db.collection("channels").createIndex({ id: 1 }, { unique: true });
-		await db.collection("guilds").createIndex({ id: 1 }, { unique: true });
-		await db.collection("members").createIndex({ id: 1, guild_id: 1 }, { unique: true });
-		await db.collection("roles").createIndex({ id: 1 }, { unique: true });
-		await db.collection("emojis").createIndex({ id: 1 }, { unique: true });
+		return Promise.all([
+			db.collection("users").createIndex({ id: 1 }, { unique: true }),
+			db.collection("messages").createIndex({ id: 1 }, { unique: true }),
+			db.collection("channels").createIndex({ id: 1 }, { unique: true }),
+			db.collection("guilds").createIndex({ id: 1 }, { unique: true }),
+			db.collection("members").createIndex({ id: 1, guild_id: 1 }, { unique: true }),
+			db.collection("roles").createIndex({ id: 1 }, { unique: true }),
+			db.collection("emojis").createIndex({ id: 1 }, { unique: true }),
+			db.collection("invites").createIndex({ code: 1 }, { unique: true }),
+			db.collection("invites").createIndex({ expires_at: 1 }, { expireAfterSeconds: 0 }) // after 0 seconds of expires_at the invite will get delete
+		]);
 	}
 
 	async start() {
@@ -70,9 +74,9 @@ export class FosscordServer extends Server {
 				fallbackLng: "en",
 				ns,
 				backend: {
-					loadPath: __dirname + "/../locales/{{lng}}/{{ns}}.json",
+					loadPath: __dirname + "/../locales/{{lng}}/{{ns}}.json"
 				},
-				load: "all",
+				load: "all"
 			});
 		this.app.use(i18nextMiddleware.handle(i18next, {}));
 
@@ -92,8 +96,8 @@ export class FosscordServer extends Server {
 			const response = await fetch(`https://discord.com/assets/${req.params.file}`, {
 				// @ts-ignore
 				headers: {
-					...req.headers,
-				},
+					...req.headers
+				}
 			});
 			const buffer = await response.buffer();
 
@@ -107,7 +111,7 @@ export class FosscordServer extends Server {
 						"transfer-encoding",
 						"expect-ct",
 						"access-control-allow-origin",
-						"content-encoding",
+						"content-encoding"
 					].includes(name.toLowerCase())
 				) {
 					return;
-- 
cgit 1.5.1