diff options
| -rw-r--r-- | gateway/src/opcodes/Identify.ts | 4 | ||||
| -rw-r--r-- | util/src/migrations/migrate_db_engine.ts | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts index 4470857f..673dde9d 100644 --- a/gateway/src/opcodes/Identify.ts +++ b/gateway/src/opcodes/Identify.ts @@ -94,9 +94,7 @@ export async function onIdentify(this: WebSocket, data: Payload) { // @ts-ignore x.channel.recipients = x.channel.recipients?.map((x) => x.user); //TODO is this needed? check if users in group dm that are not friends are sent in the READY event - users = users.concat( - x.channel.recipients?.map((x) => x.user) as User[] - ); + users = users.concat(x.channel.recipients as unknown as User[]); if (x.channel.isDm()) { x.channel.recipients = x.channel.recipients!.filter( (x) => x.id !== this.user_id diff --git a/util/src/migrations/migrate_db_engine.ts b/util/src/migrations/migrate_db_engine.ts index cd578fb2..886a16a0 100644 --- a/util/src/migrations/migrate_db_engine.ts +++ b/util/src/migrations/migrate_db_engine.ts @@ -58,10 +58,14 @@ async function main() { const oldDB = await initDatabase(); + const type = process.env.TO.includes("://") ? process.env.TO.split(":")[0]?.replace("+srv", "") : "sqlite"; + const isSqlite = type.includes("sqlite"); + // @ts-ignore - const newDB = await createConnection({ - type: process.env.TO.split(":")[0]?.replace("+srv", ""), - url: process.env.TO, + const oldDB = await createConnection({ + type, + url: isSqlite ? undefined : process.env.TO, + database: isSqlite ? process.env.TO : undefined, entities, name: "old", }); @@ -71,7 +75,8 @@ async function main() { for (const e of entities) { const entity = e as EntityTarget<any>; const entries = await oldDB.manager.find(entity); - //@ts-ignore + + // @ts-ignore console.log("migrating " + entries.length + " " + entity.name + " ..."); for (const entry of entries) { @@ -115,7 +120,7 @@ async function main() { } // @ts-ignore - console.log("migrating " + entries.length + " " + entity.name + " ..."); + console.log("migrated " + entries.length + " " + entity.name); } } catch (error) { console.error((error as any).message); |