Merge remote-tracking branch 'origin/main' into ellie-fix-reacts

Co-authored-by: Cadence Ember <cadence@disroot.org>

src/discord/register-interactions.js

@@ -91,6 +91,15 @@ function registerInteractions() {
 async function dispatchInteraction(interaction) {
 	const interactionId = interaction.data?.["custom_id"] || interaction.data?.["name"]
 	try {
+		if (interaction.type === DiscordTypes.InteractionType.MessageComponent || interaction.type === DiscordTypes.InteractionType.ModalSubmit) {
+			// All we get is custom_id, don't know which context the button was clicked in.
+			// So we namespace these ourselves in the custom_id. Currently the only existing namespace is POLL_.
+			if (interaction.data.custom_id.startsWith("POLL_")) {
+				await poll.interact(interaction)
+			} else {
+				throw new Error(`Unknown message component ${interaction.data.custom_id}`)
+			}
+		} else {
 			if (interactionId === "Matrix info") {
 				await matrixInfo.interact(interaction)
 			} else if (interactionId === "invite") {
@@ -113,11 +122,10 @@ async function dispatchInteraction(interaction) {
 				await ping.interact(interaction)
 			} else if (interactionId === "privacy") {
 				await privacy.interact(interaction)
-		} else if (interactionId.startsWith("POLL_")) {
-			await poll.interact(interaction)
 			} else {
 				throw new Error(`Unknown interaction ${interactionId}`)
 			}
+		}
 	} catch (e) {
 		let stackLines = null
 		if (e.stack) {