From fab38276970021af3c0b0a45fb18753bbad257f8 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Sat, 29 Jun 2024 08:41:21 +0100
Subject: [PATCH] core: fix markdown for trailing / and ) characters in the
 links (#4357)

---
 src/Simplex/Chat/Markdown.hs | 8 ++++++--
 tests/MarkdownTests.hs       | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Simplex/Chat/Markdown.hs b/src/Simplex/Chat/Markdown.hs
index 688ffa6b1d..8e82bfe727 100644
--- a/src/Simplex/Chat/Markdown.hs
+++ b/src/Simplex/Chat/Markdown.hs
@@ -222,11 +222,15 @@ markdownP = mconcat <$> A.many' fragmentP
     wordMD s
       | T.null s = unmarked s
       | isUri s =
-          let t = T.takeWhileEnd isPunctuation s
-              uri = uriMarkdown $ T.dropWhileEnd isPunctuation s
+          let t = T.takeWhileEnd isPunctuation' s
+              uri = uriMarkdown $ T.dropWhileEnd isPunctuation' s
            in if T.null t then uri else uri :|: unmarked t
       | isEmail s = markdown Email s
       | otherwise = unmarked s
+    isPunctuation' = \case
+      '/' -> False
+      ')' -> False
+      c -> isPunctuation c
     uriMarkdown s = case strDecode $ encodeUtf8 s of
       Right cReq -> markdown (simplexUriFormat cReq) s
       _ -> markdown Uri s
diff --git a/tests/MarkdownTests.hs b/tests/MarkdownTests.hs
index a279201bea..615edc02c4 100644
--- a/tests/MarkdownTests.hs
+++ b/tests/MarkdownTests.hs
@@ -149,6 +149,11 @@ textWithUri = describe "text with Uri" do
     parseMarkdown "http://simplex.chat" `shouldBe` uri "http://simplex.chat"
     parseMarkdown "this is https://simplex.chat" `shouldBe` "this is " <> uri "https://simplex.chat"
     parseMarkdown "https://simplex.chat site" `shouldBe` uri "https://simplex.chat" <> " site"
+    parseMarkdown "SimpleX on GitHub: https://github.com/simplex-chat/" `shouldBe` "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat/"
+    parseMarkdown "SimpleX on GitHub: https://github.com/simplex-chat." `shouldBe` "SimpleX on GitHub: " <> uri "https://github.com/simplex-chat" <> "."
+    parseMarkdown "https://github.com/simplex-chat/ - SimpleX on GitHub" `shouldBe` uri "https://github.com/simplex-chat/" <> " - SimpleX on GitHub"
+    -- parseMarkdown "SimpleX on GitHub (https://github.com/simplex-chat/)" `shouldBe` "SimpleX on GitHub (" <> uri "https://github.com/simplex-chat/" <> ")"
+    parseMarkdown "https://en.m.wikipedia.org/wiki/Servo_(software)" `shouldBe` uri "https://en.m.wikipedia.org/wiki/Servo_(software)"
   it "ignored as markdown" do
     parseMarkdown "_https://simplex.chat" `shouldBe` "_https://simplex.chat"
     parseMarkdown "this is _https://simplex.chat" `shouldBe` "this is _https://simplex.chat"