mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-11 01:35:28 +00:00
Code Issues Projects Releases Wiki Activity

html format links and mentions

Browse source
This commit is contained in:
Mouse Reeve 2020-12-19 20:03:33 -08:00
parent ef696782ab
commit ffa354be7c
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bookwyrm/outgoing.py
View file

@ -216,9 +216,11 @@ def handle_status(user, form):
status.save() status.save()
# inspect the text for user tags # inspect the text for user tags
text = status.content matches = []
for match in re.finditer(regex.username, text): for match in re.finditer(regex.username, status.content):
username = match.group().strip().split('@')[1:] username = match.group().strip().split('@')[1:]
print(match.group())
print(len(username))
if len(username) == 1: if len(username) == 1:
# this looks like a local user (@user), fill in the domain # this looks like a local user (@user), fill in the domain
username.append(DOMAIN) username.append(DOMAIN)
@ -228,6 +230,7 @@ def handle_status(user, form):
if not mention_user: if not mention_user:
# we can ignore users we don't know about # we can ignore users we don't know about
continue continue
matches.append((match.group(), mention_user.remote_id))
# add them to status mentions fk # add them to status mentions fk
status.mention_users.add(mention_user) status.mention_users.add(mention_user)
# create notification if the mentioned user is local # create notification if the mentioned user is local
@ -238,7 +241,20 @@ def handle_status(user, form):
related_user=user, related_user=user,
related_status=status related_status=status
) )
# add links
content = status.content
content = re.sub(
r'([^(href=")])(https?:\/\/([A-Za-z\.\-_\/]+' \
r'\.[A-Za-z]{2,}[A-Za-z\.\-_\/]+))',
r'\g<1><a href="\g<2>">\g<3></a>',
content)
for (username, url) in matches:
content = re.sub(
r'%s([^@])' % username,
r'<a href="%s">%s</a>\g<1>' % (url, username),
content)
status.content = content
status.save() status.save()
# notify reply parent or tagged users # notify reply parent or tagged users