Drift/delete-your-element
1
1
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix link escaping breaking with suppressed links

Browse Source
This commit is contained in:
Cadence Ember
2026-02-12 16:01:48 +13:00
parent 0d574c1370
commit 8ea29d6c27
2 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/m2d/converters/event-to-message.js
View File

@@ -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) {

63
src/m2d/converters/event-to-message.test.js
View File

@@ -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({