Prevent dropping ellipsis URL (#585)

core/html.py

@@ -169,7 +169,7 @@ class FediverseHtmlParser(HTMLParser):
         if looks_like_link:
             content = content.split("://", 1)[1]
         if (looks_like_link and len(content) > 30) or has_ellipsis:
-            return f'<a href="{html.escape(href)}" rel="nofollow" class="ellipsis" title="{html.escape(content)}">{html.escape(content[:30])}</a>'
+            return f'<a href="{html.escape(href)}" rel="nofollow" class="ellipsis" title="{html.escape(content)}"><span class="ellipsis">{html.escape(content[:30])}</span><span class="invisible">{html.escape(content[30:])}</span></a>'
         else:
             return f'<a href="{html.escape(href)}" rel="nofollow">{html.escape(content)}</a>'
 

static/css/style.css

@@ -394,7 +394,7 @@ img.emoji {
     vertical-align: baseline;
 }
 
-.ellipsis::after {
+span.ellipsis::after {
     content: "…";
 }
 
@@ -1485,6 +1485,10 @@ form .post {
     margin: 12px 0 4px 0;
 }
 
+.post .content p a .invisible {
+    display: none;
+}
+
 .post .attachments {
     padding-top: 4px;
     display: grid;

tests/api/test_statuses.py

@@ -155,3 +155,23 @@ def test_question_format(api_client, remote_identity):
         ],
         "emojis": [],
     }
+
+
+@pytest.mark.django_db
+def test_content_link(api_client, identity, remote_identity):
+    """
+    Ensures mentions work, and only have one link around them.
+    """
+    # Make a local post and check it
+    response = api_client.post(
+        "/api/v1/statuses",
+        data={
+            "status": "Takahē - return to the wild - https://www.youtube.com/watch?v=IG423K3pmQI",
+        },
+    ).json()
+
+    # temp fix
+    assert (
+        response["content"]
+        == '<p>Takahē - return to the wild - <a href="https://www.youtube.com/watch?v=IG423K3pmQI" rel="nofollow" class="ellipsis" title="www.youtube.com/watch?v=IG423K3pmQI"><span class="ellipsis">www.youtube.com/watch?v=IG423K</span><span class="invisible">3pmQI</span></a></p>'
+    )

tests/core/test_html.py

@@ -54,7 +54,7 @@ def test_parser(identity):
     parser = FediverseHtmlParser(f"<p>{full_url}</p>")
     assert (
         parser.html
-        == f'<p><a href="{full_url}" rel="nofollow" class="ellipsis" title="{full_url.removeprefix("https://")}">social.example.com/a-long/path</a></p>'
+        == f'<p><a href="{full_url}" rel="nofollow" class="ellipsis" title="{full_url.removeprefix("https://")}"><span class="ellipsis">social.example.com/a-long/path</span><span class="invisible">/that-should-be-shortened</span></a></p>'
     )
     assert (
         parser.plain_text