fix emails in chat (#10912)

* additional regex checks to ignore the <tag attribute="content">

* extract highlightUsers method - add test

* refactor highlight regex

* refactor the regex without `lookbehind`

* remove unneeded regex
This commit is contained in:
negue
2019-02-07 17:55:36 +01:00
committed by Matteo Pagliazzi
parent 63f5773172
commit 92f2079b76
3 changed files with 52 additions and 18 deletions

View File

@@ -0,0 +1,18 @@
export function highlightUsers (text, userName, displayName) {
const findAnyMentionRegex = '@[\\w-]+(?:\\b)';
const atRegex = new RegExp(`${findAnyMentionRegex}`, 'gi');
const currentUser = [`@${userName}`, `@${displayName}`];
if (atRegex.test(text)) {
text = text.replace(atRegex, match => {
if (currentUser.includes(match)) {
return `<span class="at-highlight at-text">${match}</span>`;
}
return `<span class="at-text">${match}</span>`;
});
}
return text;
}