mirrors/takahe
1
1
Fork 0
mirror of https://github.com/jointakahe/takahe.git synced 2024-11-25 00:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent dropping ellipsis URL (#585)

Browse source
This commit is contained in:
TAKAHASHI Shuuji 2023-05-25 02:41:56 +09:00 committed by GitHub
parent 68dc2dc9ed
commit 2040124147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/html.py
View file

@ -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>'

6
static/css/style.css
View file

@ -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;

20
tests/api/test_statuses.py
View file

@ -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>'
)

2
tests/core/test_html.py
View file

@ -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