From 52f8508b38aa0a0aed67c3ac1fab72b35bbfe3bb Mon Sep 17 00:00:00 2001
From: Samuel <34555296+Flam3rboy@users.noreply.github.com>
Date: Sat, 18 Mar 2023 04:12:16 +0100
Subject: fix: missing id in select query

---
 src/api/routes/guilds/#guild_id/templates.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/api/routes')

diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts
index 284bbccf..7c4a6961 100644
--- a/src/api/routes/guilds/#guild_id/templates.ts
+++ b/src/api/routes/guilds/#guild_id/templates.ts
@@ -39,6 +39,7 @@ const TemplateGuildProjection: (keyof Guild)[] = [
 	"system_channel_id",
 	"system_channel_flags",
 	"icon",
+	"id",
 ];
 
 router.get("/", route({}), async (req: Request, res: Response) => {
-- 
cgit 1.5.1


From 7b00e9905327c826b82fc47cfa22e37b9c5161a9 Mon Sep 17 00:00:00 2001
From: Samuel <34555296+Flam3rboy@users.noreply.github.com>
Date: Sat, 18 Mar 2023 04:13:04 +0100
Subject: fix: use entity.save() instead of insert (needed for caching)

---
 src/api/routes/users/@me/notes.ts | 6 +++---
 src/api/util/handlers/Message.ts  | 2 +-
 src/util/util/Database.ts         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/api/routes')

diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts
index 64730c1a..f82c3ca1 100644
--- a/src/api/routes/users/@me/notes.ts
+++ b/src/api/routes/users/@me/notes.ts
@@ -52,17 +52,17 @@ router.put("/:id", route({}), async (req: Request, res: Response) => {
 				where: { owner: { id: owner.id }, target: { id: target.id } },
 			})
 		) {
-			Note.update(
+			await Note.update(
 				{ owner: { id: owner.id }, target: { id: target.id } },
 				{ owner, target, content: note },
 			);
 		} else {
-			Note.insert({
+			await Note.create({
 				id: Snowflake.generate(),
 				owner,
 				target,
 				content: note,
-			});
+			}).save();
 		}
 	} else {
 		await Note.delete({
diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index e514d400..8fbbf4bf 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -274,7 +274,7 @@ export async function sendMessage(opts: MessageOptions) {
 	const message = await handleMessage({ ...opts, timestamp: new Date() });
 
 	await Promise.all([
-		Message.insert(message),
+		message.save(),
 		emitEvent({
 			event: "MESSAGE_CREATE",
 			channel_id: opts.channel_id,
diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts
index 5c5c8b4c..5d48ac03 100644
--- a/src/util/util/Database.ts
+++ b/src/util/util/Database.ts
@@ -127,10 +127,10 @@ export async function initDatabase(): Promise<DataSource> {
 		// Manually insert every current migration to prevent this:
 		await Promise.all(
 			dbConnection.migrations.map((migration) =>
-				Migration.insert({
+				Migration.create({
 					name: migration.name,
 					timestamp: Date.now(),
-				}),
+				}).save(),
 			),
 		);
 	} else {
-- 
cgit 1.5.1