From e625fae13d835fb18dad8594c5b9e85c1dc3da7b Mon Sep 17 00:00:00 2001
From: Humberto Rocha <humrochagf@gmail.com>
Date: Sun, 19 Feb 2023 22:35:54 -0500
Subject: [PATCH] Fix hashtag being handled as common link in the preview card
 (#515)

---
 core/html.py                         |  4 ++--
 tests/activities/models/test_post.py | 20 ++++++++++++++++++++
 tests/core/test_html.py              |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/core/html.py b/core/html.py
index d876475..cf85fbe 100644
--- a/core/html.py
+++ b/core/html.py
@@ -200,9 +200,9 @@ class FediverseHtmlParser(HTMLParser):
         hashtag = hashtag.lstrip("#")
         self.hashtags.add(hashtag.lower())
         if self.uri_domain:
-            return f'<a href="https://{self.uri_domain}/tags/{hashtag.lower()}/">#{hashtag}</a>'
+            return f'<a href="https://{self.uri_domain}/tags/{hashtag.lower()}/" rel="tag">#{hashtag}</a>'
         else:
-            return f'<a href="/tags/{hashtag.lower()}/">#{hashtag}</a>'
+            return f'<a href="/tags/{hashtag.lower()}/" rel="tag">#{hashtag}</a>'
 
     def create_emoji(self, shortcode) -> str:
         """
diff --git a/tests/activities/models/test_post.py b/tests/activities/models/test_post.py
index aec40d9..d44b963 100644
--- a/tests/activities/models/test_post.py
+++ b/tests/activities/models/test_post.py
@@ -429,3 +429,23 @@ def test_inbound_posts(
     # Run stator and ensure that deleted the post
     stator.run_single_cycle_sync()
     assert not Post.objects.filter(object_uri="https://remote.test/test-post").exists()
+
+
+@pytest.mark.django_db
+def test_post_hashtag_to_ap(identity: Identity, config_system):
+    """
+    Tests post hashtags conversion to AP format.
+    """
+    post = Post.create_local(author=identity, content="Hello #world")
+    assert post.hashtags == ["world"]
+
+    ap = post.to_create_ap()
+    assert ap["object"]["tag"] == [
+        {
+            "href": "https://example.com/tags/world/",
+            "name": "#world",
+            "type": "Hashtag",
+        }
+    ]
+    assert "#world" in ap["object"]["content"]
+    assert 'rel="tag"' in ap["object"]["content"]
diff --git a/tests/core/test_html.py b/tests/core/test_html.py
index c076592..9df6aa3 100644
--- a/tests/core/test_html.py
+++ b/tests/core/test_html.py
@@ -102,7 +102,7 @@ def test_parser(identity):
     )
     assert (
         parser.html
-        == '<a href="http://example.com#notahashtag" rel="nofollow">something</a> <a href="/tags/hashtag/">#hashtag</a> <a href="/tags/hashtagtwo/">#hashtagtwo</a>'
+        == '<a href="http://example.com#notahashtag" rel="nofollow">something</a> <a href="/tags/hashtag/" rel="tag">#hashtag</a> <a href="/tags/hashtagtwo/" rel="tag">#hashtagtwo</a>'
     )
     assert parser.plain_text == "http://example.com#notahashtag #hashtag #hashtagtwo"
     assert parser.hashtags == {"hashtag", "hashtagtwo"}