Set up emojis in-process if needed

scripts/setup.js

@@ -48,6 +48,8 @@ passthrough.select = orm.select
 let registration = require("../src/matrix/read-registration")
 let {reg, getTemplateRegistration, writeRegistration, readRegistration, checkRegistration, registrationFilePath} = registration
 
+const {setupEmojis} = require("../src/m2d/actions/setup-emojis")
+
 function die(message) {
 	console.error(message)
 	process.exit(1)
@@ -347,18 +349,7 @@ function defineEchoHandler() {
 	console.log("✅ Matrix appservice login works...")
 
 	// upload the L1 L2 emojis to user emojis
-	const emojis = await discord.snow.assets.getAppEmojis(client.id)
+	await setupEmojis()
-	for (const name of ["L1", "L2"]) {
-		const existing = emojis.items.find(e => e.name === name)
-		if (existing) {
-			db.prepare("REPLACE INTO auto_emoji (name, emoji_id) VALUES (?, ?)").run(existing.name, existing.id)
-		} else {
-			const filename = join(__dirname, "../docs/img", `${name}.png`)
-			const data = fs.readFileSync(filename, null)
-			const uploaded = await discord.snow.assets.createAppEmoji(client.id, {name, image: "data:image/png;base64," + data.toString("base64")})
-			db.prepare("REPLACE INTO auto_emoji (name, emoji_id) VALUES (?, ?)").run(uploaded.name, uploaded.id)
-		}
-	}
 	console.log("✅ Emojis are ready...")
 
 	// set profile data on discord...

src/m2d/actions/setup-emojis.js

@@ -0,0 +1,26 @@
+// @ts-check
+
+const fs = require("fs")
+const {join} = require("path")
+
+const passthrough = require("../../passthrough")
+
+const {id} = require("../../../addbot")
+
+async function setupEmojis() {
+	const {discord, db} = passthrough
+	const emojis = await discord.snow.assets.getAppEmojis(id)
+	for (const name of ["L1", "L2"]) {
+		const existing = emojis.items.find(e => e.name === name)
+		if (existing) {
+			db.prepare("REPLACE INTO auto_emoji (name, emoji_id) VALUES (?, ?)").run(existing.name, existing.id)
+		} else {
+			const filename = join(__dirname, "../docs/img", `${name}.png`)
+			const data = fs.readFileSync(filename, null)
+			const uploaded = await discord.snow.assets.createAppEmoji(id, {name, image: "data:image/png;base64," + data.toString("base64")})
+			db.prepare("REPLACE INTO auto_emoji (name, emoji_id) VALUES (?, ?)").run(uploaded.name, uploaded.id)
+		}
+	}
+}
+
+module.exports.setupEmojis = setupEmojis

src/m2d/converters/event-to-message.js

@@ -19,6 +19,8 @@ const dUtils = sync.require("../../discord/utils")
 const file = sync.require("../../matrix/file")
 /** @type {import("./emoji-sheet")} */
 const emojiSheet = sync.require("./emoji-sheet")
+/** @type {import("../actions/setup-emojis")} */
+const setupEmojis = sync.require("../actions/setup-emojis")
 
 /** @type {[RegExp, string][]} */
 const markdownEscapes = [
@@ -479,6 +481,23 @@ const attachmentEmojis = new Map([
 	["m.file", "📄"]
 ])
 
+async function getL1L2ReplyLine(called = false) {
+	// @ts-ignore
+	const autoEmoji = new Map(select("auto_emoji", ["name", "emoji_id"], {}, "WHERE name = 'L1' OR name = 'L2'").raw().all())
+	if (autoEmoji.size === 2) {
+		return `<:L1:${autoEmoji.get("L1")}><:L2:${autoEmoji.get("L2")}>`
+	}
+	/* c8 ignore start */
+	if (called) {
+		// Don't know how this could happen, but just making sure we don't enter an infinite loop.
+		console.warn("Warning: OOYE is missing data to format replies. To fix this: `npm run setup`")
+		return ""
+	}
+	await setupEmojis.setupEmojis()
+	return getL1L2ReplyLine(true)
+	/* c8 ignore stop */
+}
+
 /**
  * @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File | Ty.Event.Outer_M_Sticker | Ty.Event.Outer_M_Room_Message_Encrypted_File} event
  * @param {import("discord-api-types/v10").APIGuild} guild
@@ -628,9 +647,7 @@ async function eventToMessage(event, guild, di) {
 				return
 			}
 
-			// @ts-ignore
+			replyLine = await getL1L2ReplyLine()
-			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 += `https://discord.com/channels/${guild.id}/${row.channel_id}/${row.message_id} `