Handle % in links

aderiushev · Aug 11, 2018 · eed418d · eed418d
1 parent f4aafea
commit eed418d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/common/src/main/base/RawHtml.scala b/modules/common/src/main/base/RawHtml.scala
@@ -34,8 +34,8 @@ final object RawHtml {
     """(?i)\b[a-z](?>""" + // pull out first char for perf.
     """ttp(?<=http)s?://(\w[-\w.~!$&';=:@]{0,100})|""" + // http(s) links
     """(?<![/@.-].)(?:\w{1,15}+\.){1,3}(?>com|org|edu))""" + // "lichess.org", etc
-    """([/?#][-–—\w/.~!$&'()*+,;=:#?@]{0,300}+)?""" + // path, params
-    """(?![\w/~$&*+=#@])""" // neg lookahead
+    """([/?#][-–—\w/.~!$&'()*+,;=:#?@%]{0,300}+)?""" + // path, params
+    """(?![\w/~$&*+=#@%])""" // neg lookahead
   ).r.pattern
 
   private[this] val USER_LINK = """/@/([\w-]{2,30}+)?""".r

diff --git a/modules/common/src/test/RawHtmlTest.scala b/modules/common/src/test/RawHtmlTest.scala
@@ -64,6 +64,10 @@ class RawHtmlTest extends Specification {
       addLinks("@foo") must_== """<a href="/@/foo">@foo</a>"""
     }
 
+    "handle weird characters" in {
+      addLinks("lichess.org/-–%20") must_== """<a href="/-–%20">lichess.org/-–%20</a>"""
+    }
+
     "handle trailing punctuation" in {
       addLinks("lichess.org.") must_== """<a href="/">lichess.org</a>."""
       addLinks("lichess.org)") must_== """<a href="/">lichess.org</a>)"""