From 4e6ffcbc4f47392ee8119c18e8f1af625d7f97af 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 5cc5ea3f046e061c338d5c990020ea4de5484d11 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