Merge pull request #299 from auscompgeek/links

Fix Markdown link substitution

changelog.d/299.bugfix

@@ -0,0 +1 @@
+Fix Markdown link replacements deleting link text, links, and text between links.

src/substitutions.ts

@@ -104,15 +104,15 @@ class Substitutions {
             return null;
         }
 
-        // Replace markdown urls with plain urls to make them match.
-        body = body.replace(/!?\[.*\]\((.+)\)/gm, "$1");
-
         if (isAttachment) {
             // If it's an attachment, we can allow the body.
             body = typeof(body) === "string" ? body : "";
         }
         body = this.htmlEscape(body);
 
+        // Convert markdown links to slack mrkdwn links
+        body = body.replace(/!?\[(.*?)\]\((.+?)\)/gm, "<$2|$1>");
+
         // emotes in slack are just italicised
         if (msgType === "m.emote") {
             body = `_${body}_`;

src/tests/unit/substitutionsTest.ts

@@ -258,7 +258,20 @@ describe("Substitutions", () => {
             }, fakeMain, "footeam");
             expect(res).to.deep.equal({
                 link_names: true,
-                text: "This bridge is built on the https://matrix.org protocol.",
+                text: "This bridge is built on the <https://matrix.org|Matrix> protocol.",
+                username: "@alice:localhost",
+            });
+        });
+        it ("should replace multiple matrix links with slack links", async () => {
+            const res = await subsitutions.matrixToSlack({
+                content: {
+                    body: "[a](http://example.com) b [c](http://example.net)",
+                },
+                sender: "@alice:localhost",
+            }, fakeMain, "footeam");
+            expect(res).to.deep.equal({
+                link_names: true,
+                text: "<http://example.com|a> b <http://example.net|c>",
                 username: "@alice:localhost",
             });
         });