From 365abc36dd3b41680527bcf613013bb4999b613d Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Sun, 7 Aug 2022 02:52:09 +0200 Subject: Switch to migrations fully --- api/src/util/handlers/Instance.ts | 3 ++- api/src/util/handlers/Message.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'api/src/util/handlers') diff --git a/api/src/util/handlers/Instance.ts b/api/src/util/handlers/Instance.ts index 6bddfa98..7c337270 100644 --- a/api/src/util/handlers/Instance.ts +++ b/api/src/util/handlers/Instance.ts @@ -1,4 +1,5 @@ import { Config, Guild, Session } from "@fosscord/util"; +import { createQueryBuilder } from "typeorm"; export async function initInstance() { // TODO: clean up database and delete tombstone data @@ -9,7 +10,7 @@ export async function initInstance() { const { autoJoin } = Config.get().guild; if (autoJoin.enabled && !autoJoin.guilds?.length) { - let guild = await Guild.findOne({}); + let guild = await Guild.findOne({where: {}, order: {id: "ASC"}}); if (guild) { // @ts-ignore await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } }); diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index 80012260..7035bc5c 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -201,9 +201,10 @@ export async function postHandleMessage(message: Message) { export async function sendMessage(opts: MessageOptions) { const message = await handleMessage({ ...opts, timestamp: new Date() }); + //TODO: check this, removed toJSON call await Promise.all([ Message.insert(message), - emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data: message.toJSON() } as MessageCreateEvent) + emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data: message } as MessageCreateEvent) ]); postHandleMessage(message).catch((e) => {}); // no await as it should catch error non-blockingly -- cgit 1.5.1