From 81300f8030deea98b8f97be153739913be8e3aa9 Mon Sep 17 00:00:00 2001
From: Alain St-Denis <alain@zenfolie.org>
Date: Thu, 21 Apr 2022 13:23:05 +0000
Subject: [PATCH] fix html string literals in tests and mixins.py for bleach
 5.0.0

---
 federation/entities/mixins.py                        |  7 ++++---
 .../tests/entities/activitypub/test_entities.py      |  3 +++
 .../tests/entities/activitypub/test_mappers.py       |  8 ++++----
 federation/tests/fixtures/payloads/activitypub.py    | 12 ++++++------
 federation/tests/utils/test_text.py                  |  4 ++--
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/federation/entities/mixins.py b/federation/entities/mixins.py
index 1a778d0..e37ef62 100644
--- a/federation/entities/mixins.py
+++ b/federation/entities/mixins.py
@@ -235,8 +235,9 @@ class RawContentMixin(BaseEntity):
             config = get_configuration()
             if config["tags_path"]:
                 def linkifier(tag: str) -> str:
-                    return f'<a href="{config["base_url"]}{config["tags_path"].replace(":tag:", tag.lower())}" ' \
-                           f'class="mention hashtag" rel="noopener noreferrer">' \
+                    return f'<a class="mention hashtag" ' \
+                           f' href="{config["base_url"]}{config["tags_path"].replace(":tag:", tag.lower())}" ' \
+                           f'rel="noopener noreferrer">' \
                            f'#<span>{tag}</span></a>'
             else:
                 linkifier = None
@@ -261,7 +262,7 @@ class RawContentMixin(BaseEntity):
                         display_name = mention
                     rendered = rendered.replace(
                         "@{%s}" % mention,
-                        f'@<a href="{mention}" class="mention"><span>{display_name}</span></a>',
+                        f'@<a class="mention" href="{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 d215548..2d5ba6a 100644
--- a/federation/tests/entities/activitypub/test_entities.py
+++ b/federation/tests/entities/activitypub/test_entities.py
@@ -1,4 +1,5 @@
 from unittest.mock import patch
+from pprint import pprint
 
 # noinspection PyPackageRequirements
 from Crypto.PublicKey.RSA import RsaKey
@@ -165,6 +166,8 @@ class TestEntitiesConvertToAS2:
     def test_post_to_as2__with_mentions(self, activitypubpost_mentions):
         activitypubpost_mentions.pre_send()
         result = activitypubpost_mentions.to_as2()
+        with open('/tmp/test.out','w') as f:
+            pprint(result, stream=f)
         assert result == {
             '@context': [
                 'https://www.w3.org/ns/activitystreams',
diff --git a/federation/tests/entities/activitypub/test_mappers.py b/federation/tests/entities/activitypub/test_mappers.py
index fa981b9..e7749cb 100644
--- a/federation/tests/entities/activitypub/test_mappers.py
+++ b/federation/tests/entities/activitypub/test_mappers.py
@@ -70,8 +70,8 @@ class TestActivitypubEntityMappersReceive:
         assert post.raw_content == '<p><span class="h-card"><a class="u-url mention" ' \
                                    'href="https://dev.jasonrobinson.me/u/jaywink/">' \
                                    '@<span>jaywink</span></a></span> boom</p>'
-        assert post.rendered_content == '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" ' \
-                                        'class="u-url mention">@<span>jaywink</span></a></span> boom</p>'
+        assert post.rendered_content == '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">' \
+                                        '@<span>jaywink</span></a></span> boom</p>'
         assert post.id == "https://diaspodon.fr/users/jaywink/statuses/102356911717767237"
         assert post.actor_id == "https://diaspodon.fr/users/jaywink"
         assert post.public is True
@@ -101,8 +101,8 @@ class TestActivitypubEntityMappersReceive:
         post = entities[0]
         assert isinstance(post, ActivitypubPost)
         assert isinstance(post, Post)
-        assert post.rendered_content == '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" ' \
-                                        'class="u-url mention">@<span>jaywink</span></a></span> boom</p>'
+        assert post.rendered_content == '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">' \
+                                        '@<span>jaywink</span></a></span> boom</p>'
         assert post.raw_content == '<p><span class="h-card"><a class="u-url mention" ' \
                                    'href="https://dev.jasonrobinson.me/u/jaywink/">' \
                                    '@<span>jaywink</span></a></span> boom</p>'
diff --git a/federation/tests/fixtures/payloads/activitypub.py b/federation/tests/fixtures/payloads/activitypub.py
index e666654..7a1d9d3 100644
--- a/federation/tests/fixtures/payloads/activitypub.py
+++ b/federation/tests/fixtures/payloads/activitypub.py
@@ -31,8 +31,8 @@ ACTIVITYPUB_COMMENT = {
   'atomUri': 'https://diaspodon.fr/users/jaywink/statuses/102356911717767237',
   'inReplyToAtomUri': 'https://dev.jasonrobinson.me/content/653bad70-41b3-42c9-89cb-c4ee587e68e4/',
   'conversation': 'tag:diaspodon.fr,2019-06-28:objectId=2347687:objectType=Conversation',
-  'content': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>',
-  'contentMap': {'en': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>'},
+  'content': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>',
+  'contentMap': {'en': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>'},
   'attachment': [],
   'tag': [{'type': 'Mention',
     'href': 'https://dev.jasonrobinson.me/p/d4574854-a5d7-42be-bfac-f70c16fcaa97/',
@@ -328,8 +328,8 @@ ACTIVITYPUB_POST = {
   'atomUri': 'https://diaspodon.fr/users/jaywink/statuses/102356911717767237',
   'inReplyToAtomUri': None,
   'conversation': 'tag:diaspodon.fr,2019-06-28:objectId=2347687:objectType=Conversation',
-  'content': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>',
-  'contentMap': {'en': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>'},
+  'content': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>',
+  'contentMap': {'en': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>'},
   'attachment': [],
   'tag': [{'type': 'Mention',
     'href': 'https://dev.jasonrobinson.me/p/d4574854-a5d7-42be-bfac-f70c16fcaa97/',
@@ -525,12 +525,12 @@ ACTIVITYPUB_POST_WITH_SOURCE_BBCODE = {
   'atomUri': 'https://diaspodon.fr/users/jaywink/statuses/102356911717767237',
   'inReplyToAtomUri': None,
   'conversation': 'tag:diaspodon.fr,2019-06-28:objectId=2347687:objectType=Conversation',
-  'content': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>',
+  'content': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>',
   'source': {
       'content': "[url=https://example.com]jaywink[/url] boom",
       'mediaType': "text/bbcode",
   },
-  'contentMap': {'en': '<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" class="u-url mention">@<span>jaywink</span></a></span> boom</p>'},
+  'contentMap': {'en': '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">@<span>jaywink</span></a></span> boom</p>'},
   'attachment': [],
   'tag': [{'type': 'Mention',
     'href': 'https://dev.jasonrobinson.me/p/d4574854-a5d7-42be-bfac-f70c16fcaa97/',
diff --git a/federation/tests/utils/test_text.py b/federation/tests/utils/test_text.py
index fa69b6b..5d0a8df 100644
--- a/federation/tests/utils/test_text.py
+++ b/federation/tests/utils/test_text.py
@@ -115,8 +115,8 @@ class TestProcessTextLinks:
                '<a href="/streams/tag/foobar">#foobar</a>'
 
     def test_does_not_remove_mention_classes(self):
-        assert process_text_links('<p><span class="h-card"><a href="https://dev.jasonrobinson.me/u/jaywink/" '
-                                  'class="u-url mention">@<span>jaywink</span></a></span> boom</p>') == \
+        assert process_text_links('<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/">'
+                                  '@<span>jaywink</span></a></span> boom</p>') == \
            '<p><span class="h-card"><a class="u-url mention" href="https://dev.jasonrobinson.me/u/jaywink/" ' \
            'rel="nofollow" target="_blank">@<span>jaywink</span></a></span> boom</p>'