From 8257e2631ae5c4237d08b48b365ce7f367de74c6 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Thu, 14 Oct 2021 00:32:15 +0200
Subject: :bug: fix migration + autojoin

---
 api/src/util/Instance.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'api/src/util/Instance.ts')

diff --git a/api/src/util/Instance.ts b/api/src/util/Instance.ts
index a7b3205a..d1d9e1ab 100644
--- a/api/src/util/Instance.ts
+++ b/api/src/util/Instance.ts
@@ -8,7 +8,7 @@ export async function initInstance() {
 	// TODO: check if any current user is not part of autoJoinGuilds
 	const { autoJoin } = Config.get().guild;
 
-	if (autoJoin.enabled && autoJoin.guilds?.length) {
+	if (autoJoin.enabled && !autoJoin.guilds?.length) {
 		let guild = await Guild.findOne({});
 		if (!guild) guild = await Guild.createGuild({});
 
-- 
cgit 1.5.1


From d4b6840faefed2c73b9939dafc4aff9d3665c6d5 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Thu, 14 Oct 2021 21:25:17 +0200
Subject: :art: do not automatically create default guild

---
 api/src/util/Instance.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'api/src/util/Instance.ts')

diff --git a/api/src/util/Instance.ts b/api/src/util/Instance.ts
index d1d9e1ab..7dcd126e 100644
--- a/api/src/util/Instance.ts
+++ b/api/src/util/Instance.ts
@@ -10,9 +10,9 @@ export async function initInstance() {
 
 	if (autoJoin.enabled && !autoJoin.guilds?.length) {
 		let guild = await Guild.findOne({});
-		if (!guild) guild = await Guild.createGuild({});
-
-		// @ts-ignore
-		await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });
+		if (guild) {
+			// @ts-ignore
+			await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });
+		}
 	}
 }
-- 
cgit 1.5.1


From 841f1d6d2a83d0cdd19dbd92a77e9229acb17610 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 17 Oct 2021 00:41:21 +0200
Subject: :art: clean up instances on start

---
 api/src/util/Instance.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'api/src/util/Instance.ts')

diff --git a/api/src/util/Instance.ts b/api/src/util/Instance.ts
index 7dcd126e..6bddfa98 100644
--- a/api/src/util/Instance.ts
+++ b/api/src/util/Instance.ts
@@ -1,4 +1,4 @@
-import { Config, Guild } from "@fosscord/util";
+import { Config, Guild, Session } from "@fosscord/util";
 
 export async function initInstance() {
 	// TODO: clean up database and delete tombstone data
@@ -15,4 +15,7 @@ export async function initInstance() {
 			await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });
 		}
 	}
+
+	// TODO: do no clear sessions for instance cluster
+	await Session.delete({});
 }
-- 
cgit 1.5.1