diff --git a/api/src/util/Instance.ts b/api/src/util/Instance.ts
index a7b3205a..7dcd126e 100644
--- a/api/src/util/Instance.ts
+++ b/api/src/util/Instance.ts
@@ -8,11 +8,11 @@ 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] } } });
+ }
}
}
diff --git a/util/src/migrations/migrate_db_engine.js b/util/src/migrations/migrate_db_engine.js
index eab30bc4..79e9d86f 100644
--- a/util/src/migrations/migrate_db_engine.js
+++ b/util/src/migrations/migrate_db_engine.js
@@ -8,6 +8,7 @@ const {
Attachment,
Ban,
Channel,
+ ConfigEntity,
ConnectedAccount,
Emoji,
Guild,
@@ -32,6 +33,7 @@ async function main() {
// manually arrange them because of foreign keys
const entities = [
+ ConfigEntity,
User,
Guild,
Channel,
@@ -61,12 +63,13 @@ async function main() {
const isSqlite = type.includes("sqlite");
// @ts-ignore
- const oldDB = await createConnection({
+ const newDB = await createConnection({
type,
url: isSqlite ? undefined : process.env.TO,
database: isSqlite ? process.env.TO : undefined,
entities,
- name: "old",
+ name: "new",
+ synchronize: true,
});
let i = 0;
|
