Bridge the shortcode as part of reactions

d2m/actions/add-reaction.js

@@ -50,7 +50,8 @@ async function addReaction(data) {
 			rel_type: "m.annotation",
 			event_id: parentID,
 			key
-		}
+		},
+		shortcode: `:${data.emoji.name}:`
 	}, senderMxid)
 	return eventID
 }

m2d/actions/add-reaction.js

@@ -21,16 +21,19 @@ async function addReaction(event) {
 	let discordPreferredEncoding
 	if (emoji.startsWith("mxc://")) {
 		// Custom emoji
-		const row = select("emoji", ["id", "name"], "WHERE mxc_url = ?").get(emoji)
+		let row = select("emoji", ["id", "name"], "WHERE mxc_url = ?").get(emoji)
-		if (row) {
+		if (!row && event.content.shortcode) {
-			// Great, we know exactly what this emoji is!
+			// Use the name to try to find a known emoji with the same name.
-			discordPreferredEncoding = encodeURIComponent(`${row.name}:${row.id}`)
+			const name = event.content.shortcode.replace(/^:|:$/g, "")
-		} else {
+			row = select("emoji", ["id", "name"], "WHERE name = ?").get(name)
+		}
+		if (!row) {
 			// We don't have this emoji and there's no realistic way to just-in-time upload a new emoji somewhere.
-			// We can't try using a known emoji with the same name because we don't even know what the name is. We only have the mxc url.
 			// Sucks!
 			return
 		}
+		// Cool, we got an exact or a candidate emoji.
+		discordPreferredEncoding = encodeURIComponent(`${row.name}:${row.id}`)
 	} else {
 		// Default emoji
 		// https://github.com/discord/discord-api-docs/issues/2723#issuecomment-807022205 ????????????

types.d.ts

@@ -171,7 +171,8 @@ export namespace Event {
 			rel_type: "m.annotation"
 			event_id: string // the event that was reacted to
 			key: string // the unicode emoji, mxc uri, or reaction text
-		}
+		},
+		"shortcode"?: string // starts and ends with colons
 	}
 
 	export type Outer_M_Room_Redaction = Outer<{