FreakU
/
takahe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten mention names when linkified 

Fixes #121
This commit is contained in:
Andrew Godwin 2022-12-05 20:26:21 -07:00
parent 9fe2e6676c
commit 5b82c76def
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activities/models/post.py
View File

@ -279,8 +279,12 @@ class Post(StatorModel):
def replacer(match): def replacer(match):
precursor = match.group(1) precursor = match.group(1)
handle = match.group(2).lower() handle = match.group(2).lower()
if "@" in handle:
short_handle = handle.split("@", 1)[0]
else:
short_handle = handle
if handle in possible_matches: if handle in possible_matches:
return f'{precursor}<a href="{possible_matches[handle]}">@{handle}</a>' return f'{precursor}<a href="{possible_matches[handle]}">@{short_handle}</a>'
else: else:
return match.group() return match.group()

9
tests/activities/models/test_post.py
View File

@ -56,7 +56,7 @@ def test_linkify_mentions_remote(identity, remote_identity):
post.mentions.add(identity) post.mentions.add(identity)
assert ( assert (
post.safe_content_remote() post.safe_content_remote()
== '<p><a href="https://example.com/@test/">@test@example.com</a>, welcome!</p>' == '<p><a href="https://example.com/@test/">@test</a>, welcome!</p>'
) )
# Test that they don't get touched without a mention # Test that they don't get touched without a mention
post = Post.objects.create( post = Post.objects.create(
@ -103,7 +103,7 @@ def test_linkify_mentions_local(identity, remote_identity):
post.mentions.add(identity) post.mentions.add(identity)
assert ( assert (
post.safe_content_local() post.safe_content_local()
== '<p><a href="/@test@example.com/">@test@example.com</a>, welcome!</p>' == '<p><a href="/@test@example.com/">@test</a>, welcome!</p>'
) )
# Test a full username (remote) with no <p> # Test a full username (remote) with no <p>
post = Post.objects.create( post = Post.objects.create(
@ -112,10 +112,7 @@ def test_linkify_mentions_local(identity, remote_identity):
local=True, local=True,
) )
post.mentions.add(remote_identity) post.mentions.add(remote_identity)
assert ( assert post.safe_content_local() == '<a href="/@test@remote.test/">@test</a> hello!'
post.safe_content_local()
== '<a href="/@test@remote.test/">@test@remote.test</a> hello!'
)
# Test that they don't get touched without a mention # Test that they don't get touched without a mention
post = Post.objects.create( post = Post.objects.create(
content="<p>@test@example.com, welcome!</p>", content="<p>@test@example.com, welcome!</p>",