Merge branch 'master' of https://github.com/fosscord/fosscord-server

1 files changed, 9 insertions, 6 deletions

diff --git a/api/src/util/Instance.ts b/api/src/util/Instance.ts

index a7b3205a..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
@@ -8,11 +8,14 @@ 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({});
-
-		// @ts-ignore
-		await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });
+		if (guild) {
+			// @ts-ignore
+			await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });
+		}
 	}
+
+	// TODO: do no clear sessions for instance cluster
+	await Session.delete({});
 }