rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Work around parens in the url regex

Browse source
This commit is contained in:
Mouse Reeve 2021-01-10 08:39:30 -08:00
parent a1e8d5c7c2
commit 1e42622b8e
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): def format_links(content):
''' detect and format links ''' ''' detect and format links '''
return re.sub( return re.sub(
r'([^(href=")]|^)(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % \ r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % \
regex.domain, regex.domain,
r'\g<1><a href="\g<2>">\g<3></a>', r'\g<1><a href="\g<2>">\g<3></a>',
content) content)

3
bookwyrm/tests/test_outgoing.py
View file

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