mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-26 18:10:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #505 from mouse-reeve/link-regex-parens

Browse source 
Work around parens in the url regex
This commit is contained in:
Mouse Reeve 2021-01-10 09:22:19 -08:00 committed by GitHub
commit 9a575beb0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/outgoing.py
View file

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

3
bookwyrm/tests/test_outgoing.py
View file

@ -497,6 +497,9 @@ class Outgoing(TestCase):
self.assertEqual(
outgoing.format_links(url),
'<a href="%s">www.fish.com/</a>' % url)
self.assertEqual(
outgoing.format_links('(%s)' % url),
'(<a href="%s">www.fish.com/</a>)' % url)
url = 'https://archive.org/details/dli.granth.72113/page/n25/mode/2up'
self.assertEqual(
outgoing.format_links(url),