From 6a04f3f79814478348a399400253c53923e885ad Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Wed, 30 Aug 2023 15:20:39 +1200 Subject: [PATCH] fixing tests --- d2m/converters/message-to-event.test.js | 4 ++++ m2d/converters/event-to-message.js | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/d2m/converters/message-to-event.test.js b/d2m/converters/message-to-event.test.js index 062ee0b..117cdac 100644 --- a/d2m/converters/message-to-event.test.js +++ b/d2m/converters/message-to-event.test.js @@ -94,6 +94,7 @@ test("message2event: attachment with no content", async t => { url: "mxc://cadence.moe/qXoZktDqNtEGuOCZEADAMvhM", body: "image.png", external_url: "https://cdn.discordapp.com/attachments/497161332244742154/1124628646431297546/image.png", + filename: "image.png", info: { mimetype: "image/png", w: 466, @@ -117,6 +118,7 @@ test("message2event: stickers", async t => { url: "mxc://cadence.moe/ZDCNYnkPszxGKgObUIFmvjus", body: "image.png", external_url: "https://cdn.discordapp.com/attachments/122155380120748034/1106366167486038016/image.png", + filename: "image.png", info: { mimetype: "image/png", w: 333, @@ -155,6 +157,7 @@ test("message2event: skull webp attachment with content", async t => { size: 74290 }, external_url: "https://cdn.discordapp.com/attachments/112760669178241024/1128084747910918195/skull.webp", + filename: "skull.webp", url: "mxc://cadence.moe/sDxWmDErBhYBxtDcJQgBETes" }]) }) @@ -188,6 +191,7 @@ test("message2event: reply to skull webp attachment with content", async t => { size: 85906 }, external_url: "https://cdn.discordapp.com/attachments/112760669178241024/1128084851023675515/RDT_20230704_0936184915846675925224905.jpg", + filename: "RDT_20230704_0936184915846675925224905.jpg", url: "mxc://cadence.moe/WlAbFSiNRIHPDEwKdyPeGywa" }]) }) diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js index 3e77560..deb7b9f 100644 --- a/m2d/converters/event-to-message.js +++ b/m2d/converters/event-to-message.js @@ -31,7 +31,7 @@ const turndownService = new TurndownService({ turndownService.remove("mx-reply") turndownService.addRule("strikethrough", { - filter: ["del", "s", "strike"], + filter: ["del", "s"], replacement: function (content) { return "~~" + content + "~~" } @@ -65,11 +65,11 @@ turndownService.addRule("spoiler", { turndownService.addRule("inlineLink", { filter: function (node, options) { - return ( + return ( options.linkStyle === "inlined" && node.nodeName === "A" && node.getAttribute("href") - ) + ) }, replacement: function (content, node) {