From af274ede53a7a3b401138ddfb27e1b67e47e3e6f Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sun, 8 Oct 2023 00:00:34 +1300
Subject: [PATCH] Use the proper L1 and L2 emojis

---
 db/orm-defs.d.ts                   | 1 +
 m2d/converters/event-to-message.js | 7 ++++---
 test/ooye-test-data.sql            | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/db/orm-defs.d.ts b/db/orm-defs.d.ts
index ffb9728..292a445 100644
--- a/db/orm-defs.d.ts
+++ b/db/orm-defs.d.ts
@@ -86,6 +86,7 @@ export type Models = {
 export type Prepared<Row> = {
 	pluck: () => Prepared<Row[keyof Row]>
 	safeIntegers: () => Prepared<{[K in keyof Row]: Row[K] extends number ? BigInt : Row[K]}>
+	raw: () => Prepared<Row[keyof Row][]>
 	all: (..._: any[]) => Row[]
 	get: (..._: any[]) => Row | null
 }
diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js
index 8a68656..fcf0bf8 100644
--- a/m2d/converters/event-to-message.js
+++ b/m2d/converters/event-to-message.js
@@ -316,11 +316,12 @@ async function eventToMessage(event, guild, di) {
 			if (!repliedToEventId) return
 			let repliedToEvent = await di.api.getEvent(event.room_id, repliedToEventId)
 			if (!repliedToEvent) return
+			// @ts-ignore
+			const autoEmoji = new Map(select("auto_emoji", ["name", "emoji_id"], {}, "WHERE name = 'L1' OR name = 'L2'").raw().all())
+			replyLine = `<:L1:${autoEmoji.get("L1")}><:L2:${autoEmoji.get("L2")}>`
 			const row = from("event_message").join("message_channel", "message_id").select("channel_id", "message_id").where({event_id: repliedToEventId}).and("ORDER BY part").get()
 			if (row) {
-				replyLine = `<:L1:1144820033948762203><:L2:1144820084079087647>https://discord.com/channels/${guild.id}/${row.channel_id}/${row.message_id} `
-			} else {
-				replyLine = `<:L1:1144820033948762203><:L2:1144820084079087647>`
+				replyLine += `https://discord.com/channels/${guild.id}/${row.channel_id}/${row.message_id} `
 			}
 			const sender = repliedToEvent.sender
 			const senderName = sender.match(/@([^:]*)/)?.[1] || sender
diff --git a/test/ooye-test-data.sql b/test/ooye-test-data.sql
index 4ad318c..68932dd 100644
--- a/test/ooye-test-data.sql
+++ b/test/ooye-test-data.sql
@@ -89,4 +89,9 @@ INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES
 ('!BnKuBPCvyfOkhcUjEu:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', 'mxc://cadence.moe/azCAhThKTojXSZJRoWwZmhvU'),
 ('!maggESguZBqGBZtSnr:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', 'mxc://cadence.moe/azCAhThKTojXSZJRoWwZmhvU');
 
+INSERT INTO "auto_emoji" ("name","emoji_id","guild_id") VALUES
+('L1','1144820033948762203','529176156398682115'),
+('L2','1144820084079087647','529176156398682115'),
+('_','_','529176156398682115');
+
 COMMIT;