ignore mastodon / matrix handles

src/core/markdown.py

@@ -35,7 +35,7 @@ class PageLink(SpanToken):
 
 
 class ProfileLink(SpanToken):
-    pattern = re.compile(r'(?<!\S)@([-a-zA-Z0-9_]+)')
+    pattern = re.compile(r'(?<!\S)@([-a-zA-Z0-9_]+)(?=\s|$)')
     parse_inner = False
 
     def __init__(self, match):

src/core/tests/markdown.py

@@ -90,6 +90,10 @@ class MarkdownTest(TestCase):
         self.assertEqual(render_markdown(conf, '@nonexisting_user'), '<p><a href="/en/user/nonexisting_user/" class="internal">@nonexisting_user</a></p>\n')
         self.assertEqual(render_markdown(conf, 'foo@bar'), '<p>foo@bar</p>\n')
         self.assertEqual(render_markdown(conf, '@"'), '<p>@"</p>\n')
+        # ignores element handles
+        self.assertEqual(render_markdown(conf, '@foo:bar.org'), '<p>@foo:bar.org</p>\n')
+        # ignores mastodon handles
+        self.assertEqual(render_markdown(conf, '@test@chaos.social'), '<p>@test@chaos.social</p>\n')
 
         self.assertEqual(render_markdown_ex(conf, '@existing_user').linked_user_slugs, {'existing_user'})
         self.assertEqual(render_markdown_ex(conf, '@nonexisting_user').linked_user_slugs, {'nonexisting_user'})