From a3e94a215a76e646e906400c8d62a82b8a99851f Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sun, 12 Jan 2025 13:05:16 +1300
Subject: [PATCH 1/2] Hide error if sendTyping request fails

---
 src/d2m/actions/send-message.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/d2m/actions/send-message.js b/src/d2m/actions/send-message.js
index 6d100d4..be785bb 100644
--- a/src/d2m/actions/send-message.js
+++ b/src/d2m/actions/send-message.js
@@ -48,7 +48,7 @@ async function sendMessage(message, channel, guild, row) {
 	const eventIDs = []
 	if (events.length) {
 		db.prepare("REPLACE INTO message_channel (message_id, channel_id) VALUES (?, ?)").run(message.id, message.channel_id)
-		if (senderMxid) api.sendTyping(roomID, false, senderMxid)
+		if (senderMxid) api.sendTyping(roomID, false, senderMxid).catch(() => {})
 	}
 	for (const event of events) {
 		const part = event === events[0] ? 0 : 1

From 85269ea1530a0cc8af0e0ccd0c9507ff6ff31b7c Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sun, 12 Jan 2025 13:11:51 +1300
Subject: [PATCH 2/2] Hopefully prevent checkMissed errors from crashing

---
 src/d2m/actions/create-space.js |  2 +-
 src/d2m/discord-packets.js      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/d2m/actions/create-space.js b/src/d2m/actions/create-space.js
index edd3ba3..ce86789 100644
--- a/src/d2m/actions/create-space.js
+++ b/src/d2m/actions/create-space.js
@@ -232,7 +232,7 @@ async function syncSpaceExpressions(data, checkBeforeSync) {
 			}
 			if (isDeepStrictEqual(existing, content)) return
 		}
-		api.sendState(spaceID, "im.ponies.room_emotes", eventKey, content)
+		await api.sendState(spaceID, "im.ponies.room_emotes", eventKey, content)
 	}
 
 	await update(spaceID, "emojis", "moe.cadence.ooye.pack.emojis", expression.emojisToState)
diff --git a/src/d2m/discord-packets.js b/src/d2m/discord-packets.js
index 5956ac5..2e97671 100644
--- a/src/d2m/discord-packets.js
+++ b/src/d2m/discord-packets.js
@@ -51,9 +51,14 @@ const utils = {
 			}
 
 			if (listen === "full") {
-				eventDispatcher.checkMissedExpressions(message.d)
-				eventDispatcher.checkMissedPins(client, message.d)
-				eventDispatcher.checkMissedMessages(client, message.d)
+				try {
+					await eventDispatcher.checkMissedExpressions(message.d)
+					await eventDispatcher.checkMissedPins(client, message.d)
+					await eventDispatcher.checkMissedMessages(client, message.d)
+				} catch (e) {
+					console.error("Failed to sync missed events. To retry, please fix this error and restart OOYE:")
+					console.error(e)
+				}
 			}
 
 		} else if (message.t === "GUILD_UPDATE") {