From b403f35674a9f8492f0dea29aeb08dd3b7e06cd9 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Tue, 19 Sep 2023 19:10:02 +1200 Subject: [PATCH 1/2] fix bugs from orm migration --- d2m/actions/add-reaction.js | 2 +- d2m/event-dispatcher.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/d2m/actions/add-reaction.js b/d2m/actions/add-reaction.js index b8fb38e..a08d584 100644 --- a/d2m/actions/add-reaction.js +++ b/d2m/actions/add-reaction.js @@ -17,7 +17,7 @@ const createRoom = sync.require("../actions/create-room") async function addReaction(data) { const user = data.member?.user assert.ok(user && user.username) - const parentID = select("event_message", "event_id", "WHERE message = ? AND part = 0").pluck().get(data.message_id) // 0 = primary + const parentID = select("event_message", "event_id", "WHERE message_id = ? AND part = 0").pluck().get(data.message_id) // 0 = primary if (!parentID) return // Nothing can be done if the parent message was never bridged. assert.equal(typeof parentID, "string") const roomID = await createRoom.ensureRoom(data.channel_id) diff --git a/d2m/event-dispatcher.js b/d2m/event-dispatcher.js index f7ff6a3..93f7468 100644 --- a/d2m/event-dispatcher.js +++ b/d2m/event-dispatcher.js @@ -181,7 +181,7 @@ module.exports = { */ async onMessageUpdate(client, data) { if (data.webhook_id) { - const row = select("webhook", "1", "WHERE webhook_id = ?").pluck().get(message.webhook_id) + const row = select("webhook", "webhook_id", "WHERE webhook_id = ?").pluck().get(data.webhook_id) if (row) { // The update was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it. return From e44918b4c791505c2facc3a6749dea9990c34353 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Tue, 19 Sep 2023 19:59:58 +1200 Subject: [PATCH 2/2] m->d bridge known emojis in messages --- db/ooye-test-data.sql | 6 ++- m2d/converters/event-to-message.js | 22 +++++++++++ m2d/converters/event-to-message.test.js | 52 +++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/db/ooye-test-data.sql b/db/ooye-test-data.sql index d37f7a1..1f5f4a6 100644 --- a/db/ooye-test-data.sql +++ b/db/ooye-test-data.sql @@ -67,10 +67,12 @@ INSERT INTO file (discord_url, mxc_url) VALUES ('https://cdn.discordapp.com/guilds/112760669178241024/users/134826546694193153/avatars/38dd359aa12bcd52dd3164126c587f8c.png?size=1024', 'mxc://cadence.moe/rfemHmAtcprjLEiPiEuzPhpl'), ('https://cdn.discordapp.com/icons/112760669178241024/a_f83622e09ead74f0c5c527fe241f8f8c.png?size=1024', 'mxc://cadence.moe/zKXGZhmImMHuGQZWJEFKJbsF'), ('https://cdn.discordapp.com/avatars/113340068197859328/b48302623a12bc7c59a71328f72ccb39.png?size=1024', 'mxc://cadence.moe/UpAeIqeclhKfeiZNdIWNcXXL'), -('https://cdn.discordapp.com/emojis/230201364309868544.png', 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'); +('https://cdn.discordapp.com/emojis/230201364309868544.png', 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'), +('https://cdn.discordapp.com/emojis/393635038903926784.gif', 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc'); INSERT INTO emoji (emoji_id, animated, mxc_url) VALUES -('230201364309868544', 0, 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'); +('230201364309868544', 0, 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'), +('393635038903926784', 1, 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc'); INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES ('!kLRqKKUQXcibIMtOpl:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', NULL), diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js index c9b0133..accaee5 100644 --- a/m2d/converters/event-to-message.js +++ b/m2d/converters/event-to-message.js @@ -117,6 +117,28 @@ turndownService.addRule("inlineLink", { } }) +turndownService.addRule("emoji", { + filter: function (node, options) { + if (node.nodeName !== "IMG" || !node.hasAttribute("data-mx-emoticon") || !node.getAttribute("src")) return false + const row = select("emoji", ["emoji_id", "animated"], "WHERE mxc_url = ?").get(node.getAttribute("src")) + if (!row) return false + node.setAttribute("data-emoji-id", row.emoji_id) + node.setAttribute("data-emoji-animated-char", row.animated ? "a" : "") + return true + }, + + replacement: function (content, node) { + /** @type {string} */ + const id = node.getAttribute("data-emoji-id") + /** @type {string} */ + const animatedChar = node.getAttribute("data-emoji-animated-char") + /** @type {string} */ + const title = node.getAttribute("title") || "__" + const name = title.replace(/^:|:$/g, "") + return `<${animatedChar}:${name}:${id}>` + } +}) + turndownService.addRule("fencedCodeBlock", { filter: function (node, options) { return ( diff --git a/m2d/converters/event-to-message.test.js b/m2d/converters/event-to-message.test.js index 3b40f90..3ec8dac 100644 --- a/m2d/converters/event-to-message.test.js +++ b/m2d/converters/event-to-message.test.js @@ -1692,3 +1692,55 @@ test("event2message: stickers work", async t => { } ) }) + +test("event2message: static emojis work", async t => { + t.deepEqual( + await eventToMessage({ + type: "m.room.message", + sender: "@cadence:cadence.moe", + content: { + msgtype: "m.text", + body: ":hippo:", + format: "org.matrix.custom.html", + formatted_body: '\":hippo:\"' + }, + event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU", + room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe" + }), + { + messagesToDelete: [], + messagesToEdit: [], + messagesToSend: [{ + username: "cadence [they]", + content: "<:hippo:230201364309868544>", + avatar_url: undefined + }] + } + ) +}) + +test("event2message: animated emojis work", async t => { + t.deepEqual( + await eventToMessage({ + type: "m.room.message", + sender: "@cadence:cadence.moe", + content: { + msgtype: "m.text", + body: ":hippo:", + format: "org.matrix.custom.html", + formatted_body: '\":hipposcope:\"' + }, + event_id: "$g07oYSZFWBkxohNEfywldwgcWj1hbhDzQ1sBAKvqOOU", + room_id: "!kLRqKKUQXcibIMtOpl:cadence.moe" + }), + { + messagesToDelete: [], + messagesToEdit: [], + messagesToSend: [{ + username: "cadence [they]", + content: "", + avatar_url: undefined + }] + } + ) +})