node
const replacementCode = doc.createElement("code")
@@ -913,6 +932,7 @@ async function eventToMessage(event, guild, channel, di) {
}
}
await forEachNode(event, root)
+ if (perMessageProfile?.has_fallback) root.querySelectorAll("[data-mx-profile-fallback]").forEach(x => x.remove())
// SPRITE SHEET EMOJIS FEATURE: Emojis at the end of the message that we don't know about will be reuploaded as a sprite sheet.
// First we need to determine which emojis are at the end.
@@ -944,6 +964,10 @@ async function eventToMessage(event, guild, channel, di) {
} else {
// Looks like we're using the plaintext body!
content = event.content.body
+ if (perMessageProfile?.has_fallback && perMessageProfile.displayname && content.startsWith(perMessageProfile.displayname + ": ")) {
+ // Strip the display name prefix fallback added for clients that don't support per-message profiles
+ content = content.slice(perMessageProfile.displayname.length + 2)
+ }
if (event.content.msgtype === "m.emote") {
content = `* ${displayName} ${content}`
diff --git a/src/m2d/converters/event-to-message.test.js b/src/m2d/converters/event-to-message.test.js
index 1c263b4..68d519a 100644
--- a/src/m2d/converters/event-to-message.test.js
+++ b/src/m2d/converters/event-to-message.test.js
@@ -1155,6 +1155,38 @@ test("event2message: code blocks are uploaded as attachments instead if they con
)
})
+test("event2message: code blocks are uploaded as attachments instead if they contain incompatible backticks (use txt extension if discord does not recognise the language)", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "wrong body",
+ format: "org.matrix.custom.html",
+ formatted_body: 'So if you run code like thisSystem.out.println("```");
it should print a markdown formatted code block'
+ },
+ event_id: "$pGkWQuGVmrPNByrFELxhzI6MCBgJecr5I2J3z88Gc2s",
+ room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "cadence [they]",
+ content: "So if you run code like this `[inline_code.txt]` it should print a markdown formatted code block",
+ attachments: [{id: "0", filename: "inline_code.txt"}],
+ pendingFiles: [{name: "inline_code.txt", buffer: Buffer.from('System.out.println("```");')}],
+ avatar_url: undefined,
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
test("event2message: code blocks are uploaded as attachments instead if they contain incompatible backticks (default to txt file extension)", async t => {
t.deepEqual(
await eventToMessage({
@@ -5526,6 +5558,141 @@ test("event2message: known and unknown emojis in the end are used for sprite she
)
})
+test("event2message: com.beeper.per_message_profile overrides displayname and avatar_url", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "hello from unstable profile",
+ "com.beeper.per_message_profile": {
+ id: "custom-id",
+ displayname: "Unstable Name",
+ avatar_url: "mxc://maunium.net/hgXsKqlmRfpKvCZdUoWDkFQo"
+ }
+ },
+ event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+ room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "Unstable Name",
+ content: "hello from unstable profile",
+ avatar_url: "https://bridge.example.org/download/matrix/maunium.net/hgXsKqlmRfpKvCZdUoWDkFQo",
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
+test("event2message: com.beeper.per_message_profile empty avatar_url clears avatar", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "hello with cleared avatar",
+ "com.beeper.per_message_profile": {
+ id: "no-avatar",
+ displayname: "No Avatar User",
+ avatar_url: ""
+ }
+ },
+ event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+ room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "No Avatar User",
+ content: "hello with cleared avatar",
+ avatar_url: undefined,
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
+test("event2message: data-mx-profile-fallback element is stripped from formatted_body when per-message profile is present", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "Tidus Herboren: one more test",
+ format: "org.matrix.custom.html",
+ formatted_body: "Tidus Herboren: one more test",
+ "com.beeper.per_message_profile": {
+ id: "tidus",
+ displayname: "Tidus Herboren",
+ avatar_url: "mxc://maunium.net/hgXsKqlmRfpKvCZdUoWDkFQo",
+ has_fallback: true
+ }
+ },
+ event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+ room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "Tidus Herboren",
+ content: "one more test",
+ avatar_url: "https://bridge.example.org/download/matrix/maunium.net/hgXsKqlmRfpKvCZdUoWDkFQo",
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
+test("event2message: displayname prefix is stripped from plain body when per-message profile has_fallback", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "Tidus Herboren: one more test",
+ "com.beeper.per_message_profile": {
+ id: "tidus",
+ displayname: "Tidus Herboren",
+ has_fallback: true
+ }
+ },
+ event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU",
+ room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "Tidus Herboren",
+ content: "one more test",
+ avatar_url: undefined,
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
test("event2message: all unknown chess emojis are used for sprite sheet", async t => {
t.deepEqual(
await eventToMessage({
diff --git a/src/matrix/read-registration.js b/src/matrix/read-registration.js
index 114bf75..d1243a7 100644
--- a/src/matrix/read-registration.js
+++ b/src/matrix/read-registration.js
@@ -78,6 +78,15 @@ function readRegistration() {
/** @type {import("../types").AppServiceRegistrationConfig} */ // @ts-ignore
let reg = readRegistration()
+if (reg) {
+ fs.watch(registrationFilePath, {persistent: false}, () => {
+ let newReg = readRegistration()
+ if (newReg) {
+ Object.assign(reg, newReg)
+ }
+ })
+}
+
module.exports.registrationFilePath = registrationFilePath
module.exports.readRegistration = readRegistration
module.exports.getTemplateRegistration = getTemplateRegistration
diff --git a/src/stdin.js b/src/stdin.js
index fea5fad..2548d42 100644
--- a/src/stdin.js
+++ b/src/stdin.js
@@ -23,10 +23,26 @@ const setPresence = sync.require("./d2m/actions/set-presence")
const channelWebhook = sync.require("./m2d/actions/channel-webhook")
const guildID = "112760669178241024"
+async function ping() {
+ const result = await api.ping().catch(e => ({ok: false, status: "net", root: e.message}))
+ if (result.ok) {
+ return "Ping OK. The homeserver and OOYE are talking to each other fine."
+ } else {
+ if (typeof result.root === "string") {
+ var msg = `Cannot reach homeserver: ${result.root}`
+ } else if (result.root.error) {
+ var msg = `Homeserver said: [${result.status}] ${result.root.error}`
+ } else {
+ var msg = `Homeserver said: [${result.status}] ${JSON.stringify(result.root)}`
+ }
+ return msg + "\nMatrix->Discord won't work until you fix this.\nIf your installation has recently changed, consider `npm run setup` again."
+ }
+}
+
if (process.stdin.isTTY) {
setImmediate(() => {
if (!passthrough.repl) {
- const cli = repl.start({ prompt: "", eval: customEval, writer: s => s })
+ const cli = repl.start({prompt: "", eval: customEval, writer: s => s})
Object.assign(cli.context, passthrough)
passthrough.repl = cli
}
diff --git a/test/data.js b/test/data.js
index 45e0388..f3092bc 100644
--- a/test/data.js
+++ b/test/data.js
@@ -19,6 +19,26 @@ module.exports = {
default_thread_rate_limit_per_user: 0,
guild_id: "112760669178241024"
},
+ voice: {
+ voice_background_display: null,
+ version: 1774469910848,
+ user_limit: 0,
+ type: 2,
+ theme_color: null,
+ status: null,
+ rtc_region: null,
+ rate_limit_per_user: 0,
+ position: 0,
+ permission_overwrites: [],
+ parent_id: "805261291908104252",
+ nsfw: false,
+ name: "πδΈ¨[8user] Piece",
+ last_message_id: "1459912691098325137",
+ id: "1036840786093953084",
+ flags: 0,
+ bitrate: 256000,
+ guild_id: "112760669178241024"
+ },
updates: {
type: 0,
topic: "Updates and release announcements for Out Of Your Element.",
@@ -2015,6 +2035,80 @@ module.exports = {
tts: false
}
},
+ reply_to_member_join: {
+ type: 19,
+ content: "when the broke friend who we pay to bring food shows up at the medieval lord party",
+ mentions: [],
+ mention_roles: [],
+ attachments: [],
+ embeds: [],
+ timestamp: "2026-03-30T12:11:04.443000+00:00",
+ edited_timestamp: null,
+ flags: 0,
+ components: [],
+ id: "1488148556962332692",
+ channel_id: "475599038536744962",
+ author: {
+ id: "576945009408999426",
+ username: "randomllama121",
+ avatar: "08510a70f957106dad1580323c40cd7a",
+ discriminator: "0",
+ public_flags: 128,
+ flags: 128,
+ banner: null,
+ accent_color: null,
+ global_name: "random :3",
+ avatar_decoration_data: null,
+ collectibles: null,
+ display_name_styles: null,
+ banner_color: null,
+ clan: null,
+ primary_guild: null
+ },
+ pinned: false,
+ mention_everyone: false,
+ tts: false,
+ message_reference: {
+ type: 0,
+ channel_id: "475599038536744962",
+ message_id: "1488146734352826478",
+ guild_id: "475599038536744960"
+ },
+ referenced_message: {
+ type: 7,
+ content: "",
+ mentions: [],
+ mention_roles: [],
+ attachments: [],
+ embeds: [],
+ timestamp: "2026-03-30T12:03:49.899000+00:00",
+ edited_timestamp: null,
+ flags: 0,
+ components: [],
+ id: "1488146734352826478",
+ channel_id: "475599038536744962",
+ author: {
+ id: "1461677775554478161",
+ username: "peasant321_76775",
+ avatar: null,
+ discriminator: "0",
+ public_flags: 0,
+ flags: 0,
+ banner: null,
+ accent_color: null,
+ global_name: "PEASANT!!",
+ avatar_decoration_data: null,
+ collectibles: null,
+ display_name_styles: null,
+ banner_color: null,
+ clan: null,
+ primary_guild: null
+ },
+ pinned: false,
+ mention_everyone: false,
+ tts: false
+ }
+ },
attachment_no_content: {
id: "1124628646670389348",
type: 0,
@@ -6170,6 +6264,37 @@ module.exports = {
components: [],
position: 12
},
+ channel_follow_add: {
+ type: 12,
+ content: "PluralKit #downtime",
+ attachments: [],
+ embeds: [],
+ timestamp: "2026-03-24T23:16:04.097Z",
+ edited_timestamp: null,
+ flags: 0,
+ components: [],
+ id: "1486141581047369888",
+ channel_id: "1451125453082591314",
+ author: {
+ id: "154058479798059009",
+ username: "exaptations",
+ discriminator: "0",
+ avatar: "57b5cfe09a48a5902f2eb8fa65bb1b80",
+ bot: false,
+ flags: 0,
+ globalName: "Exa",
+ },
+ pinned: false,
+ mentions: [],
+ mention_roles: [],
+ mention_everyone: false,
+ tts: false,
+ message_reference: {
+ type: 0,
+ channel_id: "1015204661701124206",
+ guild_id: "466707357099884544"
+ }
+ },
updated_to_start_thread_from_here: {
t: "MESSAGE_UPDATE",
s: 19,