zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Replace the domain part of the mention regex with twitter's validDomain

This commit is contained in:
Mischa Holz 2023-09-03 21:46:04 +02:00
parent 6230a3b82c
commit 84f8b36eae
No known key found for this signature in database
GPG Key ID: 15DCD33C0CAA67B2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/javascript/mastodon/features/compose/util/counter.js
View File

@ -1,9 +1,20 @@
import regexSupplant from 'twitter-text/dist/lib/regexSupplant';
import validDomain from 'twitter-text/dist/regexp/validDomain';
import { urlRegex } from './url_regex';
const urlPlaceholder = '$2xxxxxxxxxxxxxxxxxxxxxxx';
const validMention = regexSupplant(
'(^|[^/\\w])@(([a-z0-9_]+)@(#{validDomain}))',
{
validDomain,
},
'ig'
)
export function countableText(inputText) {
return inputText
.replace(urlRegex, urlPlaceholder)
.replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3');
.replace(validMention, '$1@$3');
}