fix regex that matched https://x/users/y/z when it shouldn't match z

2019-09-21 15:07:09 +10:00 · 2019-09-21 15:07:09 +10:00 · ec087b5136
parent 798b5a484b
commit ec087b5136
1 changed files with 2 additions and 2 deletions
--- a/app/functions.py
+++ b/app/functions.py
@ -29,8 +29,8 @@ def extract_post(post):
 		link.decompose()

 	text = soup.get_text()
-	text = re.sub("https://([^/]+)/(@[^ ]+)", r"\2@\1", text) # put mastodon-style mentions back in
-	text = re.sub("https://([^/]+)/users/([^ ]+)", r"@\2@\1", text) # put pleroma-style mentions back in
+	text = re.sub("https://([^/]+)/(@[^\s]+)", r"\2@\1", text) # put mastodon-style mentions back in
+	text = re.sub("https://([^/]+)/users/([^\s/]+)", r"@\2@\1", text) # put pleroma-style mentions back in
 	text = text.rstrip("\n") # remove trailing newline(s)
 	return text