N0VA/out-of-your-element
0
1
Fork 0
Code Issues Pull Requests Releases Activity

Change emoji for forwards/crossposts

Browse Source
This commit is contained in:
Cadence Ember
2026-05-21 19:09:02 +12:00
parent dec216c0c2
commit d76936b157
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d2m/converters/message-to-event.js
+8 -8
View File
@@ -640,8 +640,8 @@ async function messageToEvent(message, guild, options = {}, di) {
const flags = message.flags || 0 const flags = message.flags || 0
if (flags & DiscordTypes.MessageFlags.IsCrosspost) { if (flags & DiscordTypes.MessageFlags.IsCrosspost) {
body = `[🔀 ${message.author.username}]\n` + body body = `[↷ ${message.author.username}]\n` + body
html = `🔀 <strong>${message.author.username}</strong><br>` + html html = `↷ <strong>${message.author.username}</strong><br>` + html
} }
// Fallback body/formatted_body for replies // Fallback body/formatted_body for replies
@@ -768,20 +768,20 @@ async function messageToEvent(message, guild, options = {}, di) {
if (row && "event_id" in row) { if (row && "event_id" in row) {
const via = await getViaServersMemo(row.room_id) const via = await getViaServersMemo(row.room_id)
forwardedNotice.addLine( forwardedNotice.addLine(
`[🔀 Forwarded from #${roomName}]`, `[↷ Forwarded from #${roomName}]`,
tag`🔀 <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}/${row.event_id}?${via}">[jump to event]</a></em>` tag`↷ <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}/${row.event_id}?${via}">[jump to event]</a></em>`
) )
} else { } else {
const via = await getViaServersMemo(room.room_id) const via = await getViaServersMemo(room.room_id)
forwardedNotice.addLine( forwardedNotice.addLine(
`[🔀 Forwarded from #${roomName}]`, `[↷ Forwarded from #${roomName}]`,
tag`🔀 <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}?${via}">[jump to room]</a></em>` tag`↷ <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}?${via}">[jump to room]</a></em>`
) )
} }
} else { } else {
forwardedNotice.addLine( forwardedNotice.addLine(
`[🔀 Forwarded message]`, `[↷ Forwarded message]`,
tag`🔀 <em>Forwarded message</em>` tag`↷ <em>Forwarded message</em>`
) )
} }
src/d2m/converters/message-to-event.test.embeds.js
+2 -2
View File
@@ -209,9 +209,9 @@ test("message2event embeds: 4 images", async t => {
t.deepEqual(events, [{ t.deepEqual(events, [{
$type: "m.room.message", $type: "m.room.message",
msgtype: "m.text", msgtype: "m.text",
body: "[🔀 Forwarded message]\n» https://fixupx.com/i/status/2032003668787020046", body: "[↷ Forwarded message]\n» https://fixupx.com/i/status/2032003668787020046",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: "🔀 <em>Forwarded message</em><br><blockquote><a href=\"https://fixupx.com/i/status/2032003668787020046\">https://fixupx.com/i/status/2032003668787020046</a></blockquote>", formatted_body: "↷ <em>Forwarded message</em><br><blockquote><a href=\"https://fixupx.com/i/status/2032003668787020046\">https://fixupx.com/i/status/2032003668787020046</a></blockquote>",
"m.mentions": {} "m.mentions": {}
}, { }, {
$type: "m.room.message", $type: "m.room.message",
src/d2m/converters/message-to-event.test.js
+12 -12
View File
@@ -1273,9 +1273,9 @@ test("message2event: crossposted announcements say where they are crossposted fr
$type: "m.room.message", $type: "m.room.message",
"m.mentions": {}, "m.mentions": {},
msgtype: "m.text", msgtype: "m.text",
body: "[🔀 Chewey Bot Official Server #announcements]\nAll text based commands are now inactive on Chewey Bot\nTo continue using commands you'll need to use them as slash commands", body: "[↷ Chewey Bot Official Server #announcements]\nAll text based commands are now inactive on Chewey Bot\nTo continue using commands you'll need to use them as slash commands",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: "🔀 <strong>Chewey Bot Official Server #announcements</strong><br>All text based commands are now inactive on Chewey Bot<br>To continue using commands you'll need to use them as slash commands" formatted_body: "↷ <strong>Chewey Bot Official Server #announcements</strong><br>All text based commands are now inactive on Chewey Bot<br>To continue using commands you'll need to use them as slash commands"
}]) }])
}) })
@@ -1344,9 +1344,9 @@ test("message2event: forwarded image", async t => {
t.deepEqual(events, [ t.deepEqual(events, [
{ {
$type: "m.room.message", $type: "m.room.message",
body: "[🔀 Forwarded message]", body: "[↷ Forwarded message]",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: "🔀 <em>Forwarded message</em>", formatted_body: "↷ <em>Forwarded message</em>",
"m.mentions": {}, "m.mentions": {},
msgtype: "m.notice", msgtype: "m.notice",
}, },
@@ -1385,10 +1385,10 @@ test("message2event: constructed forwarded message", async t => {
t.deepEqual(events, [ t.deepEqual(events, [
{ {
$type: "m.room.message", $type: "m.room.message",
body: "[🔀 Forwarded from #wonderland]" body: "[↷ Forwarded from #wonderland]"
+ "\n» What's cooking, good looking? :hipposcope:", + "\n» What's cooking, good looking? :hipposcope:",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: `🔀 <em>Forwarded from wonderland <a href="https://matrix.to/#/!qzDBLKlildpzrrOnFZ:cadence.moe/$tBIT8mO7XTTCgIINyiAIy6M2MSoPAdJenRl_RLyYuaE?via=cadence.moe&amp;via=matrix.org">[jump to event]</a></em>` formatted_body: `↷ <em>Forwarded from wonderland <a href="https://matrix.to/#/!qzDBLKlildpzrrOnFZ:cadence.moe/$tBIT8mO7XTTCgIINyiAIy6M2MSoPAdJenRl_RLyYuaE?via=cadence.moe&amp;via=matrix.org">[jump to event]</a></em>`
+ `<br><blockquote>What's cooking, good looking? <img data-mx-emoticon height="32" src="mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc" title=":hipposcope:" alt=":hipposcope:"></blockquote>`, + `<br><blockquote>What's cooking, good looking? <img data-mx-emoticon height="32" src="mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc" title=":hipposcope:" alt=":hipposcope:"></blockquote>`,
"m.mentions": {}, "m.mentions": {},
msgtype: "m.text", msgtype: "m.text",
@@ -1444,10 +1444,10 @@ test("message2event: constructed forwarded text", async t => {
t.deepEqual(events, [ t.deepEqual(events, [
{ {
$type: "m.room.message", $type: "m.room.message",
body: "[🔀 Forwarded from #amanda-spam]" body: "[↷ Forwarded from #amanda-spam]"
+ "\n» What's cooking, good looking?", + "\n» What's cooking, good looking?",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: `🔀 <em>Forwarded from amanda-spam <a href="https://matrix.to/#/!CzvdIdUQXgUjDVKxeU:cadence.moe?via=cadence.moe&amp;via=matrix.org">[jump to room]</a></em>` formatted_body: `↷ <em>Forwarded from amanda-spam <a href="https://matrix.to/#/!CzvdIdUQXgUjDVKxeU:cadence.moe?via=cadence.moe&amp;via=matrix.org">[jump to room]</a></em>`
+ `<br><blockquote>What's cooking, good looking?</blockquote>`, + `<br><blockquote>What's cooking, good looking?</blockquote>`,
"m.mentions": {}, "m.mentions": {},
msgtype: "m.text", msgtype: "m.text",
@@ -1467,10 +1467,10 @@ test("message2event: don't scan forwarded messages for mentions", async t => {
t.deepEqual(events, [ t.deepEqual(events, [
{ {
$type: "m.room.message", $type: "m.room.message",
body: "[🔀 Forwarded message]" body: "[↷ Forwarded message]"
+ "\n» If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile https://social.luca.run/@luca/113950834185678114", + "\n» If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile https://social.luca.run/@luca/113950834185678114",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: `🔀 <em>Forwarded message</em>` formatted_body: `↷ <em>Forwarded message</em>`
+ `<br><blockquote>If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile <a href="https://social.luca.run/@luca/113950834185678114">https://social.luca.run/@luca/113950834185678114</a></blockquote>`, + `<br><blockquote>If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile <a href="https://social.luca.run/@luca/113950834185678114">https://social.luca.run/@luca/113950834185678114</a></blockquote>`,
"m.mentions": {}, "m.mentions": {},
msgtype: "m.text" msgtype: "m.text"
@@ -1820,9 +1820,9 @@ test("message2event: forwarded message with unreferenced mention", async t => {
t.deepEqual(events, [{ t.deepEqual(events, [{
$type: "m.room.message", $type: "m.room.message",
msgtype: "m.text", msgtype: "m.text",
body: "[🔀 Forwarded message]\n» @unknown-user:\n» 🎞️ Uploaded file: https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4 (51 MB)", body: "[↷ Forwarded message]\n» @unknown-user:\n» 🎞️ Uploaded file: https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4 (51 MB)",
format: "org.matrix.custom.html", format: "org.matrix.custom.html",
formatted_body: "🔀 <em>Forwarded message</em><br><blockquote>@unknown-user:<br>🎞️ Uploaded file: <a href=\"https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4\">2022-10-18_16-49-46.mp4</a> (51 MB)</blockquote>", formatted_body: "↷ <em>Forwarded message</em><br><blockquote>@unknown-user:<br>🎞️ Uploaded file: <a href=\"https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4\">2022-10-18_16-49-46.mp4</a> (51 MB)</blockquote>",
"m.mentions": {} "m.mentions": {}
}]) }])
}) })