cadence/out-of-your-element
cadence/out-of-your-element
2
6
Fork 1
Code Issues 12 Pull requests Releases 12 Activity

Regression: Embeds belong in quotes

Browse source
This commit is contained in:
Cadence Ember 2023-10-02 22:26:00 +13:00
parent 53baeb5df7
commit 49a135485c
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
d2m/converters/message-to-event.embeds.test.js
View file

@ -35,14 +35,14 @@ test("message2event embeds: nothing but a field", async t => {
$type: "m.room.message", $type: "m.room.message",
"m.mentions": {}, "m.mentions": {},
msgtype: "m.notice", msgtype: "m.notice",
body: "**Amanda 🎵#2192 :online:" body: "> **Amanda 🎵#2192 :online:"
+ "\nwillow tree, branch 0**" + "\n> willow tree, branch 0**"
+ "\n**❯ Uptime:**\n3m 55s\n**❯ Memory:**\n64.45MB", + "\n> **❯ Uptime:**\n> 3m 55s\n> **❯ Memory:**\n> 64.45MB",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: '<strong>Amanda 🎵#2192 <img data-mx-emoticon height=\"32\" src=\"mxc://cadence.moe/LCEqjStXCxvRQccEkuslXEyZ\" title=\":online:\" alt=\":online:\">' formatted_body: '<blockquote><strong>Amanda 🎵#2192 <img data-mx-emoticon height=\"32\" src=\"mxc://cadence.moe/LCEqjStXCxvRQccEkuslXEyZ\" title=\":online:\" alt=\":online:\">'
+ '<br>willow tree, branch 0</strong>' + '<br>willow tree, branch 0</strong>'
+ '<br><strong>❯ Uptime:</strong><br>3m 55s' + '<br><strong>❯ Uptime:</strong><br>3m 55s'
+ '<br><strong>❯ Memory:</strong><br>64.45MB' + '<br><strong>❯ Memory:</strong><br>64.45MB</blockquote>'
}]) }])
}) })
@ -52,19 +52,19 @@ test("message2event embeds: reply with just an embed", async t => {
$type: "m.room.message", $type: "m.room.message",
msgtype: "m.notice", msgtype: "m.notice",
"m.mentions": {}, "m.mentions": {},
body: "[**⏺️ dynastic (@dynastic)**](https://twitter.com/i/user/719631291747078145)" body: "> [**⏺️ dynastic (@dynastic)**](https://twitter.com/i/user/719631291747078145)"
+ "\n\n**https://twitter.com/i/status/1707484191963648161**" + "\n> \n> **https://twitter.com/i/status/1707484191963648161**"
+ "\n\ndoes anyone know where to find that one video of the really mysterious yam-like object being held up to a bunch of random objects, like clocks, and they have unexplained impossible reactions to it?" + "\n> \n> does anyone know where to find that one video of the really mysterious yam-like object being held up to a bunch of random objects, like clocks, and they have unexplained impossible reactions to it?"
+ "\n\n**Retweets**" + "\n> \n> **Retweets**"
+ "\n119" + "\n> 119"
+ "\n\n**Likes**" + "\n> \n> **Likes**"
+ "\n5581" + "\n> 5581"
+ "\n\n— Twitter", + "\n> \n> — Twitter",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: '<a href="https://twitter.com/i/user/719631291747078145"><strong>⏺️ dynastic (@dynastic)</strong></a>' formatted_body: '<blockquote><a href="https://twitter.com/i/user/719631291747078145"><strong>⏺️ dynastic (@dynastic)</strong></a>'
+ '<br><br><strong><a href="https://twitter.com/i/status/1707484191963648161">https://twitter.com/i/status/1707484191963648161</a></strong>' + '<br><br><strong><a href="https://twitter.com/i/status/1707484191963648161">https://twitter.com/i/status/1707484191963648161</a></strong>'
+ '<br><br>does anyone know where to find that one video of the really mysterious yam-like object being held up to a bunch of random objects, like clocks, and they have unexplained impossible reactions to it?' + '<br><br>does anyone know where to find that one video of the really mysterious yam-like object being held up to a bunch of random objects, like clocks, and they have unexplained impossible reactions to it?'
+ '<br><br><strong>Retweets</strong><br>119<br><br><strong>Likes</strong><br>5581<br><br>— Twitter' + '<br><br><strong>Retweets</strong><br>119<br><br><strong>Likes</strong><br>5581<br><br>— Twitter</blockquote>'
}]) }])
}) })

3
d2m/converters/message-to-event.js
View file

@ -390,9 +390,10 @@ async function messageToEvent(message, guild, options = {}, di) {
} }
if (embed.footer?.text) repParagraphs.push(`— ${embed.footer.text}`) if (embed.footer?.text) repParagraphs.push(`— ${embed.footer.text}`)
const repContent = repParagraphs.join("\n\n") const repContent = repParagraphs.join("\n\n")
const repContentQuoted = repContent.split("\n").map(l => "> " + l).join("\n")
// Send as m.notice to apply the usual automated/subtle appearance, showing this wasn't actually typed by the person // Send as m.notice to apply the usual automated/subtle appearance, showing this wasn't actually typed by the person
await addTextEvent(repContent, "m.notice", {scanMentions: false}) await addTextEvent(repContentQuoted, "m.notice", {scanMentions: false})
} }
// Then stickers // Then stickers