From 5b04b5d71231b89f2320f97f05fc0968ca28ba29 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Thu, 19 Mar 2026 13:33:50 +1300
Subject: [PATCH] Reformat /plu/ral emulated replies

---
 src/d2m/converters/message-to-event.js  | 27 ++++++++++++++++---------
 src/db/migrations/0035-role-default.sql |  2 +-
 src/discord/utils.js                    |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/d2m/converters/message-to-event.js b/src/d2m/converters/message-to-event.js
index adc56e6..3f598f2 100644
--- a/src/d2m/converters/message-to-event.js
+++ b/src/d2m/converters/message-to-event.js
@@ -35,10 +35,10 @@ function getDiscordParseCallbacks(message, guild, useHTML, spoilers = []) {
 		/** @param {{id: string, type: "discordUser"}} node */
 		user: node => {
 			const mxid = select("sim", "mxid", {user_id: node.id}).pluck().get()
-			const interaction = message.interaction_metadata || message.interaction
+			const interactionMetadata = message.interaction_metadata
 			const username = message.mentions?.find(ment => ment.id === node.id)?.username
 				|| message.referenced_message?.mentions?.find(ment => ment.id === node.id)?.username
-				|| (interaction?.user.id === node.id ? interaction.user.username : null)
+				|| (interactionMetadata?.user.id === node.id ? interactionMetadata.user.username : null)
 				|| (message.author?.id === node.id ? message.author.username : null)
 				|| "unknown-user"
 			if (mxid && useHTML) {
@@ -357,9 +357,8 @@ async function messageToEvent(message, guild, options = {}, di) {
 		}]
 	}
 
-	const interaction = message.interaction_metadata || message.interaction
-	const isInteraction = message.type === DiscordTypes.MessageType.ChatInputCommand && !!interaction && "name" in interaction
-	const isThinkingInteraction = isInteraction && !!((message.flags || 0) & DiscordTypes.MessageFlags.Loading)
+	let isInteraction = (message.type === DiscordTypes.MessageType.ChatInputCommand || message.type === DiscordTypes.MessageType.ContextMenuCommand) && message.interaction && "name" in message.interaction
+	let isThinkingInteraction = isInteraction && !!((message.flags || 0) & DiscordTypes.MessageFlags.Loading)
 
 	/**
 	   @type {{room?: boolean, user_ids?: string[]}}
@@ -400,6 +399,16 @@ async function messageToEvent(message, guild, options = {}, di) {
 		} else if (message.referenced_message) {
 			repliedToUnknownEvent = true
 		}
+	} else if (message.type === DiscordTypes.MessageType.ContextMenuCommand && message.interaction && message.message_reference?.message_id) {
+		// It could be a /plu/ral emulated reply
+		if (message.interaction.name.startsWith("Reply ") && message.content.startsWith("-# [↪](")) {
+			const row = await getHistoricalEventRow(message.message_reference?.message_id)
+			if (row && "event_id" in row) {
+				repliedToEventRow = Object.assign(row, {channel_id: row.reference_channel_id})
+				message.content = message.content.replace(/^.*\n/, "")
+				isInteraction = false // declutter
+			}
+		}
 	} else if (dUtils.isWebhookMessage(message) && message.embeds[0]?.author?.name?.endsWith("↩️")) {
 		// It could be a PluralKit emulated reply, let's see if it has a message link
 		const isEmulatedReplyToText = message.embeds[0].description?.startsWith("**[Reply to:]")
@@ -685,8 +694,8 @@ async function messageToEvent(message, guild, options = {}, di) {
 			}
 		}
 
-		if (isInteraction && !isThinkingInteraction && events.length === 0) {
-			const formattedInteraction = getFormattedInteraction(interaction, false)
+		if (isInteraction && !isThinkingInteraction && message.interaction && events.length === 0) {
+			const formattedInteraction = getFormattedInteraction(message.interaction, false)
 			body = `${formattedInteraction.body}\n${body}`
 			html = `${formattedInteraction.html}${html}`
 		}
@@ -782,8 +791,8 @@ async function messageToEvent(message, guild, options = {}, di) {
 		events.push(...forwardedEvents)
 	}
 
-	if (isThinkingInteraction) {
-		const formattedInteraction = getFormattedInteraction(interaction, true)
+	if (isInteraction && isThinkingInteraction && message.interaction) {
+		const formattedInteraction = getFormattedInteraction(message.interaction, true)
 		await addTextEvent(formattedInteraction.body, formattedInteraction.html, "m.notice")
 	}
 
diff --git a/src/db/migrations/0035-role-default.sql b/src/db/migrations/0035-role-default.sql
index 6c44e7e..a5ce62d 100644
--- a/src/db/migrations/0035-role-default.sql
+++ b/src/db/migrations/0035-role-default.sql
@@ -4,6 +4,6 @@ CREATE TABLE "role_default" (
 	"guild_id"	TEXT NOT NULL,
 	"role_id"	TEXT NOT NULL,
 	PRIMARY KEY ("guild_id", "role_id")
-);
+) WITHOUT ROWID;
 
 COMMIT;
diff --git a/src/discord/utils.js b/src/discord/utils.js
index 2431246..aed7068 100644
--- a/src/discord/utils.js
+++ b/src/discord/utils.js
@@ -114,7 +114,7 @@ function hasAllPermissions(resolvedPermissions, permissionsToCheckFor) {
  * @param {DiscordTypes.APIMessage} message
  */
 function isWebhookMessage(message) {
-	return message.webhook_id && message.type !== DiscordTypes.MessageType.ChatInputCommand
+	return message.webhook_id && message.type !== DiscordTypes.MessageType.ChatInputCommand && message.type !== DiscordTypes.MessageType.ContextMenuCommand
 }
 
 /**