dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recognize zwj in regex matches #1593

This commit is contained in:
DianaXWiki 2024-08-23 17:27:34 +03:00
parent 1c96a24967
commit baea7343cd
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
www/common/inner/common-mediatag.js
View File

@ -124,15 +124,25 @@ define([
return ANIMALS[seed % ANIMALS.length] || '';
};
const emojiRegex = /\p{Extended_Pictographic}/gu; // 'g' flag for global match
const emojiWithZWJRegex = /(?:\p{Emoji_Presentation}|\p{Emoji_Modifier_Base}|\p{Emoji_Modifier}|\p{Emoji_Component})(?:\u200D(?:\p{Emoji_Presentation}|\p{Emoji_Modifier_Base}|\p{Emoji_Modifier}|\p{Emoji_Component}))*\p{Emoji_Presentation}?|\p{Emoji_Presentation}/gu;
const ZWJ = '\u200D';
var getPrettyInitials = MT.getPrettyInitials = function (name) {
const match = name.match(emojiRegex);
//if the emoji is the first character, it will become the avatar
if (match && name.startsWith(match[0])) {
return match[0];
let matches = name.match(emojiWithZWJRegex);
console.log(matches)
if (matches) {
// Check if any of the matched sequences include ZWJ
let zwjInMatches = matches.some(match => match.includes(ZWJ));
console.log(zwjInMatches)
if (zwjInMatches) {
// Combine the matched emojis using ZWJ
return matches.join(ZWJ);
}
else if(name.startsWith(matches[0])) {
return matches[0];
}
}
else {
name = name.replace(emojiRegex, '');
name = name.replace(emojiWithZWJRegex, '');
name = name.trim();
}
var parts = name.split(/\s+/);