From 1e3de327c31f73c5df0164d764adf2369af4cb52 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Mon, 17 Feb 2020 22:16:59 +0200
Subject: [PATCH] Wrap outbound HTML mention links in span

This is Mastodon specific, but what can we do than copy the
biggest for greater compatibility.
---
 federation/entities/mixins.py                          | 2 +-
 federation/tests/entities/activitypub/test_entities.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/federation/entities/mixins.py b/federation/entities/mixins.py
index 4a00ba4..6a3113e 100644
--- a/federation/entities/mixins.py
+++ b/federation/entities/mixins.py
@@ -218,7 +218,7 @@ class RawContentMixin(BaseEntity):
                         display_name = mention
                     rendered = rendered.replace(
                         "@{%s}" % mention,
-                        f'@<a href="{mention}" class="mention">{display_name}</a>',
+                        f'@<a href="{mention}" class="mention"><span>{display_name}</span></a>',
                     )
             # Finally linkify remaining URL's that are not links
             rendered = process_text_links(rendered)
diff --git a/federation/tests/entities/activitypub/test_entities.py b/federation/tests/entities/activitypub/test_entities.py
index a8dcf76..a0bb803 100644
--- a/federation/tests/entities/activitypub/test_entities.py
+++ b/federation/tests/entities/activitypub/test_entities.py
@@ -181,7 +181,7 @@ class TestEntitiesConvertToAS2:
                 'attributedTo': 'http://127.0.0.1:8000/profile/123456/',
                 'content': '<h1>raw_content</h1>\n<p>@{someone@localhost.local} @<a class="mention" '
                            'href="http://localhost.local/someone" rel="nofollow" target="_blank">'
-                           'Bob Bobértson</a></p>',
+                           '<span>Bob Bobértson</span></a></p>',
                 'published': '2019-04-27T00:00:00',
                 'inReplyTo': None,
                 'sensitive': False,