More consistently generate embeds for Matrix

src/d2m/actions/edit-message.js

@@ -10,6 +10,8 @@ const editToChanges = sync.require("../converters/edit-to-changes")
 const registerPkUser = sync.require("./register-pk-user")
 /** @type {import("../../matrix/api")} */
 const api = sync.require("../../matrix/api")
+/** @type {import("../../matrix/mreq")} */
+const mreq = sync.require("../../matrix/mreq")
 
 /**
  * @param {import("discord-api-types/v10").GatewayMessageCreateDispatchData} message
@@ -70,8 +72,17 @@ async function editMessage(message, guild, row) {
 
 		const part = sendNewEventParts.has("part") && eventsToSend[0] === content ? 0 : 1
 		const reactionPart = sendNewEventParts.has("reaction_part") && eventsToSend[eventsToSend.length - 1] === content ? 0 : 1
-		const eventID = await api.sendEvent(roomID, eventType, contentWithoutType, senderMxid)
-		db.prepare("INSERT INTO event_message (event_id, event_type, event_subtype, message_id, part, reaction_part, source) VALUES (?, ?, ?, ?, ?, ?, 1)").run(eventID, eventType, content.msgtype || null, message.id, part, reactionPart) // source 1 = discord
+
+		try {
+			const eventID = await api.sendEvent(roomID, eventType, contentWithoutType, senderMxid)
+			db.prepare("INSERT INTO event_message (event_id, event_type, event_subtype, message_id, part, reaction_part, source) VALUES (?, ?, ?, ?, ?, ?, 1)").run(eventID, eventType, content.msgtype || null, message.id, part, reactionPart) // source 1 = discord
+		} catch (e) {
+			if (e instanceof mreq.MatrixServerError && e.errcode === "M_FORBIDDEN") {
+				// sending user doesn't have permission to update message, e.g. because Discord generated an embed in a read-only room
+			} else {
+				throw e
+			}
+		}
 	}
 }
 

src/d2m/converters/edit-to-changes.js

@@ -32,17 +32,21 @@ function eventIsText(ev) {
  * @param {import("../../matrix/api")} api simple-as-nails dependency injection for the matrix API
  */
 async function editToChanges(message, guild, api) {
-	// If it is a user edit, allow deleting old messages (e.g. they might have removed text from an image).
-	// If it is the system adding a generated embed to a message, don't delete old messages since the system only sends partial data.
-	// Since an update in August 2024, the system always provides the full data of message updates. I'll leave in the old code since it won't cause problems.
-
-	const isGeneratedEmbed = !("content" in message)
-
 	// Figure out what events we will be replacing
 
 	const roomID = select("channel_room", "room_id", {channel_id: message.channel_id}).pluck().get()
 	assert(roomID)
-	const oldEventRows = select("event_message", ["event_id", "event_type", "event_subtype", "part", "reaction_part"], {message_id: message.id}).all()
+	const oldEventRows = select("event_message", ["event_id", "event_type", "event_subtype", "part", "reaction_part", "source"], {message_id: message.id}).all()
+
+	// If it is a user edit, allow deleting old messages (e.g. they might have removed text from an image).
+	// If it is the system adding a generated embed to a message, don't delete old messages since the system only sends partial data.
+	// Since an update in August 2024, the system always provides the full data of message updates.
+	// Now, this code path is only used by generated embeds for messages that were originally sent from Matrix.
+
+	const originallyFromMatrix = oldEventRows.find(r => r.part === 0)?.source === 0
+	const isGeneratedEmbed = !("content" in message) || originallyFromMatrix
+
+	// Figure out who to send as
 
 	/** @type {string?} Null if we don't have a sender in the room, which will happen if it's a webhook's message. The bridge bot will do the edit instead. */
 	let senderMxid = null
@@ -117,6 +121,8 @@ async function editToChanges(message, guild, api) {
 	if (isGeneratedEmbed) {
 		unchangedEvents.push(...eventsToRedact.filter(e => e.old.event_subtype !== "m.notice")) // Move them from eventsToRedact to unchangedEvents.
 		eventsToRedact = eventsToRedact.filter(e => e.old.event_subtype === "m.notice")
+		unchangedEvents.push(...eventsToReplace.filter(e => e.old.event_subtype !== "m.notice")) // Move them from eventsToReplace to unchangedEvents.
+		eventsToReplace = eventsToReplace.filter(e => e.old.event_subtype === "m.notice")
 	}
 
 	// Now, everything in eventsToSend and eventsToRedact is a real change, but everything in eventsToReplace might not have actually changed!

src/d2m/event-dispatcher.js

@@ -272,11 +272,6 @@ module.exports = {
 		// Otherwise, if there are embeds, then the system generated URL preview embeds.
 		if (!(typeof data.content === "string" || "embeds" in data)) return
 
-		if (data.webhook_id) {
-			const row = select("webhook", "webhook_id", {webhook_id: data.webhook_id}).pluck().get()
-			if (row) return // The message was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it.
-		}
-
 		if (dUtils.isEphemeralMessage(data)) return // Ephemeral messages are for the eyes of the receiver only!
 
 		// Edits need to go through the speedbump as well. If the message is delayed but the edit isn't, we don't have anything to edit from.