diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-18 22:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 22:05:11 +0100 |
| commit | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (patch) | |
| tree | dfeaba762dfa49844cc5cf6140deb30874734a46 /app/javascript/flavours/glitch/features/emoji | |
| parent | 2be88d1930433f55e5ae17174f3711cefb3d5158 (diff) | |
| parent | ea9a1d79df60749eb21fb592c608dcaa4c935c75 (diff) | |
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/emoji')
| -rw-r--r-- | app/javascript/flavours/glitch/features/emoji/emoji_utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js index 571907a50..be793526d 100644 --- a/app/javascript/flavours/glitch/features/emoji/emoji_utils.js +++ b/app/javascript/flavours/glitch/features/emoji/emoji_utils.js @@ -73,7 +73,7 @@ const stringFromCodePoint = _String.fromCodePoint || function () { const _JSON = JSON; -const COLONS_REGEX = /^(?:\:([^\:]+)\:)(?:\:skin-tone-(\d)\:)?$/; +const COLONS_REGEX = /^(?::([^:]+):)(?::skin-tone-(\d):)?$/; const SKINS = [ '1F3FA', '1F3FB', '1F3FC', '1F3FD', '1F3FE', '1F3FF', |