Merge pull request #491 from mouse-reeve/url-regex

Handles query params in urls

bookwyrm/outgoing.py

@@ -296,7 +296,8 @@ def find_mentions(content):
 def format_links(content):
     ''' detect and format links '''
     return re.sub(
-        r'([^(href=")]|^)(https?:\/\/(%s([\w\.\-_\/])*))' % regex.domain,
+        r'([^(href=")]|^)(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % \
+                regex.domain,
         r'\g<1><a href="\g<2>">\g<3></a>',
         content)
 

bookwyrm/tests/test_outgoing.py

@@ -503,3 +503,9 @@ class Outgoing(TestCase):
             '<a href="%s">' \
                 'archive.org/details/dli.granth.72113/page/n25/mode/2up</a>' \
                 % url)
+        url = 'https://openlibrary.org/search' \
+               '?q=arkady+strugatsky&mode=everything'
+        self.assertEqual(
+            outgoing.format_links(url),
+            '<a href="%s">openlibrary.org/search' \
+                '?q=arkady+strugatsky&mode=everything</a>' % url)