From 8ea29d6c2779da761bf1d091965bdd55928b311e Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Thu, 12 Feb 2026 16:01:48 +1300
Subject: [PATCH] Fix link escaping breaking with suppressed links

---
 src/m2d/converters/event-to-message.js      |  2 +-
 src/m2d/converters/event-to-message.test.js | 63 +++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/m2d/converters/event-to-message.js b/src/m2d/converters/event-to-message.js
index f6baf55..9460ebb 100644
--- a/src/m2d/converters/event-to-message.js
+++ b/src/m2d/converters/event-to-message.js
@@ -69,7 +69,7 @@ turndownService.escape = function (string) {
 	return string.replace(/\s+|\S+/g, part => { // match chunks of spaces or non-spaces
 		if (part.match(/\s/)) return part // don't process spaces
 
-		if (part.match(/^https?:\/\//)) {
+		if (part.match(/^<?https?:\/\//)) {
 			return part
 		} else {
 			return markdownEscapes.reduce(function (accumulator, escape) {
diff --git a/src/m2d/converters/event-to-message.test.js b/src/m2d/converters/event-to-message.test.js
index f667d70..629f2b8 100644
--- a/src/m2d/converters/event-to-message.test.js
+++ b/src/m2d/converters/event-to-message.test.js
@@ -273,6 +273,69 @@ test("event2message: markdown in link text does not attempt to be escaped becaus
 	)
 })
 
+test("event2message: markdown in link url does not attempt to be escaped (plaintext body, not suppressed)", async t => {
+	t.deepEqual(
+		await eventToMessage({
+			content: {
+				msgtype: "m.text",
+				body: "the wikimedia commons freaks are gonna love this one https://commons.wikimedia.org/wiki/File:Car_covered_in_traffic_cones.jpg"
+			},
+			event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+			room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe",
+			sender: "@cadence:cadence.moe",
+			type: "m.room.message"
+		}),
+		{
+			ensureJoined: [],
+			messagesToDelete: [],
+			messagesToEdit: [],
+			messagesToSend: [{
+				username: "cadence [they]",
+				content: "the wikimedia commons freaks are gonna love this one https://commons.wikimedia.org/wiki/File:Car_covered_in_traffic_cones.jpg",
+				avatar_url: undefined,
+				allowed_mentions: {
+					parse: ["users", "roles"]
+				}
+			}]
+		}
+	)
+})
+
+test("event2message: markdown in link url does not attempt to be escaped (plaintext body, link suppressed)", async t => {
+	t.deepEqual(
+		await eventToMessage({
+			content: {
+				msgtype: "m.text",
+				body: "the wikimedia commons freaks are gonna love this one https://commons.wikimedia.org/wiki/File:Car_covered_in_traffic_cones.jpg"
+			},
+			event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+			room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe",
+			sender: "@cadence:cadence.moe",
+			type: "m.room.message"
+		}, {
+			id: "123",
+			roles: [{
+				id: "123",
+				name: "@everyone",
+				permissions: DiscordTypes.PermissionFlagsBits.SendMessages
+			}]
+		}, {}),
+		{
+			ensureJoined: [],
+			messagesToDelete: [],
+			messagesToEdit: [],
+			messagesToSend: [{
+				username: "cadence [they]",
+				content: "the wikimedia commons freaks are gonna love this one <https://commons.wikimedia.org/wiki/File:Car_covered_in_traffic_cones.jpg>",
+				avatar_url: undefined,
+				allowed_mentions: {
+					parse: ["users", "roles"]
+				}
+			}]
+		}
+	)
+})
+
 test("event2message: embeds are suppressed if the guild does not have embed links permission (formatted body)", async t => {
 	t.deepEqual(
 		await eventToMessage({