diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-05-02 21:06:10 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-05-02 21:06:10 +0000 |
| commit | d0a2708f912b1ceaa0f40161d874fb5c72a72f4e (patch) | |
| tree | 650324da99261d7910504dfbcaa0683c5b2121dc /packages/frontend/src/scripts | |
| parent | merge: save and restore UI language together with other prefs - fixes #443 (!... (diff) | |
| parent | teach ReactionService about non-ASCII emoji names (diff) | |
| download | sharkey-d0a2708f912b1ceaa0f40161d874fb5c72a72f4e.tar.gz sharkey-d0a2708f912b1ceaa0f40161d874fb5c72a72f4e.tar.bz2 sharkey-d0a2708f912b1ceaa0f40161d874fb5c72a72f4e.zip | |
merge: handle non-ASCII emoji names (!464)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/autocomplete.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/scripts/autocomplete.ts b/packages/frontend/src/scripts/autocomplete.ts index 9fc8f7843e..d942402ffc 100644 --- a/packages/frontend/src/scripts/autocomplete.ts +++ b/packages/frontend/src/scripts/autocomplete.ts @@ -99,7 +99,7 @@ export class Autocomplete { const isHashtag = hashtagIndex !== -1; const isMfmParam = mfmParamIndex !== -1 && afterLastMfmParam?.includes('.') && !afterLastMfmParam?.includes(' '); const isMfmTag = mfmTagIndex !== -1 && !isMfmParam; - const isEmoji = emojiIndex !== -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(':'); + const isEmoji = emojiIndex !== -1 && text.split(/:[\p{Letter}\p{Number}\p{Mark}_+-]+:/u).pop()!.includes(':'); let opened = false; @@ -125,7 +125,7 @@ export class Autocomplete { if (isEmoji && !opened && this.onlyType.includes('emoji')) { const emoji = text.substring(emojiIndex + 1); if (!emoji.includes(' ')) { - this.open('emoji', emoji); + this.open('emoji', emoji.normalize('NFC')); opened = true; } } |