Fix processing mentions to domains with non-ascii TLDs (#16689)

Fixes #16602
This commit is contained in:
Claire 2021-09-01 22:06:40 +02:00 committed by Eugen Rochko
parent 2688f18d06
commit 5899fe70b6
2 changed files with 20 additions and 2 deletions

View file

@ -58,8 +58,8 @@ class Account < ApplicationRecord
hub_url
)
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i
include AccountAssociations
include AccountAvatar