Repository navigation
fix: migrate deprecated emojione to emoji-toolkit #38252
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
mddanishh18
wants to merge
2
commits into
RocketChat:develop
from
mddanishh18:fix/migrate-emojione-to-emoji-toolkit
Closed
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,281 +1,36 @@ | ||
| import emojione from 'emojione'; | ||
| import mem from 'mem'; | ||
| /** | ||
| * Emoji Configuration using emoji-toolkit (JoyPixels) | ||
| * | ||
| * This file replaces the deprecated emojione library with emoji-toolkit. | ||
| * The legacy patches for missing emojis (lines 6-165 of the old file) have been removed | ||
| * as emoji-toolkit v7+ includes complete Unicode 13-16 support. | ||
| * | ||
| * Fixes: https://github.com/RocketChat/Rocket.Chat/issues/38247 | ||
| */ | ||
| import joypixels from 'emoji-toolkit'; | ||
|
|
||
| import { emojisByCategory, emojiCategories, toneList } from './emojiPicker'; | ||
|
|
||
| // TODO remove fix below when issue is solved: https://github.com/joypixels/emojione/issues/617 | ||
| // Configure emoji-toolkit for sprite mode (matches Rocket.Chat's existing behavior) | ||
| joypixels.sprites = true; | ||
| joypixels.spriteSize = '32'; | ||
| joypixels.ascii = true; | ||
|
|
||
| // add missing emojis not provided by JS object, but included on emoji.json | ||
| emojione.shortnames += | ||
| '|:tm:|:copyright:|:registered:|:digit_zero:|:digit_one:|:digit_two:|:digit_three:|:digit_four:|:digit_five:|:digit_six:|:digit_seven:|:digit_eight:|:digit_nine:|:pound_symbol:|:asterisk_symbol:'; | ||
| emojione.regShortNames = new RegExp( | ||
| `<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(${emojione.shortnames})`, | ||
| 'gi', | ||
| ); | ||
| // For backwards compatibility, we expose the library under the old name | ||
| // This allows existing code that references `emojione` to continue working | ||
| const emojione = joypixels; | ||
|
|
||
| emojione.emojioneList[':tm:'] = { | ||
| uc_base: '2122', | ||
| uc_output: '2122-fe0f', | ||
| uc_match: '2122-fe0f', | ||
| uc_greedy: '2122-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':copyright:'] = { | ||
| uc_base: '00a9', | ||
| uc_output: '00a9-f0ef', | ||
| uc_match: '00a9-fe0f', | ||
| uc_greedy: '00a9-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':registered:'] = { | ||
| uc_base: '00ae', | ||
| uc_output: '00ae-fe0f', | ||
| uc_match: '00ae-fe0f', | ||
| uc_greedy: '00ae-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_zero:'] = { | ||
| uc_base: '0030', | ||
| uc_output: '0030-fe0f', | ||
| uc_match: '0030-fe0f', | ||
| uc_greedy: '0030-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_one:'] = { | ||
| uc_base: '0031', | ||
| uc_output: '0031-fe0f', | ||
| uc_match: '0031-fe0f', | ||
| uc_greedy: '0031-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_two:'] = { | ||
| uc_base: '0032', | ||
| uc_output: '0032-fe0f', | ||
| uc_match: '0032-fe0f', | ||
| uc_greedy: '0032-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_three:'] = { | ||
| uc_base: '0033', | ||
| uc_output: '0033-fe0f', | ||
| uc_match: '0033-fe0f', | ||
| uc_greedy: '0033-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_four:'] = { | ||
| uc_base: '0034', | ||
| uc_output: '0034-fe0f', | ||
| uc_match: '0034-fe0f', | ||
| uc_greedy: '0034-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_five:'] = { | ||
| uc_base: '0035', | ||
| uc_output: '0035-fe0f', | ||
| uc_match: '0035-fe0f', | ||
| uc_greedy: '0035-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_six:'] = { | ||
| uc_base: '0036', | ||
| uc_output: '0036-fe0f', | ||
| uc_match: '0036-fe0f', | ||
| uc_greedy: '0036-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_seven:'] = { | ||
| uc_base: '0037', | ||
| uc_output: '0037-fe0f', | ||
| uc_match: '0037-fe0f', | ||
| uc_greedy: '0037-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_eight:'] = { | ||
| uc_base: '0038', | ||
| uc_output: '0038-fe0f', | ||
| uc_match: '0038-fe0f', | ||
| uc_greedy: '0038-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':digit_nine:'] = { | ||
| uc_base: '0039', | ||
| uc_output: '0039-fe0f', | ||
| uc_match: '0039-fe0f', | ||
| uc_greedy: '0039-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':pound_symbol:'] = { | ||
| uc_base: '0023', | ||
| uc_output: '0023-fe0f', | ||
| uc_match: '0023-fe0f', | ||
| uc_greedy: '0023-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
|
|
||
| emojione.emojioneList[':asterisk_symbol:'] = { | ||
| uc_base: '002a', | ||
| uc_output: '002a-fe0f', | ||
| uc_match: '002a-fe0f', | ||
| uc_greedy: '002a-fe0f', | ||
| shortnames: [], | ||
| category: 'symbols', | ||
| emojiPackage: 'emojione', | ||
| }; | ||
| // end fix | ||
|
|
||
| // fix for :+1: - had to replace all function that does its conversion: https://github.com/joypixels/emojione/blob/4.5.0/lib/js/emojione.js#L249 | ||
|
|
||
| emojione.shortnameConversionMap = mem(emojione.shortnameConversionMap, { maxAge: 1000 }); | ||
|
|
||
| emojione.unicodeCharRegex = mem(emojione.unicodeCharRegex, { maxAge: 1000 }); | ||
|
|
||
| const convertShortName = mem( | ||
| (shortname) => { | ||
| // the fix is basically adding this .replace(/[+]/g, '\\$&') | ||
| if (typeof shortname === 'undefined' || shortname === '' || emojione.shortnames.indexOf(shortname.replace(/[+]/g, '\\$&')) === -1) { | ||
| // if the shortname doesnt exist just return the entire match | ||
| return shortname; | ||
| } | ||
|
|
||
| // map shortname to parent | ||
| if (!emojione.emojioneList[shortname]) { | ||
| for (const emoji in emojione.emojioneList) { | ||
| if (!emojione.emojioneList.hasOwnProperty(emoji) || emoji === '') { | ||
| continue; | ||
| } | ||
| if (emojione.emojioneList[emoji].shortnames.indexOf(shortname) === -1) { | ||
| continue; | ||
| } | ||
| shortname = emoji; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| const unicode = emojione.emojioneList[shortname].uc_output; | ||
| const fname = emojione.emojioneList[shortname].uc_base; | ||
| const category = fname.indexOf('-1f3f') >= 0 ? 'diversity' : emojione.emojioneList[shortname].category; | ||
| const title = emojione.imageTitleTag ? `title="${shortname}"` : ''; | ||
| // const size = ns.spriteSize === '32' || ns.spriteSize === '64' ? ns.spriteSize : '32'; | ||
| // if the emoji path has been set, we'll use the provided path, otherwise we'll use the default path | ||
| const ePath = | ||
| emojione.defaultPathPNG !== emojione.imagePathPNG ? emojione.imagePathPNG : `${emojione.defaultPathPNG + emojione.emojiSize}/`; | ||
|
|
||
| // depending on the settings, we'll either add the native unicode as the alt tag, otherwise the shortname | ||
| const alt = emojione.unicodeAlt ? emojione.convert(unicode.toUpperCase()) : shortname; | ||
|
|
||
| if (emojione.sprites) { | ||
| return `<span class="emojione emojione-${category} _${fname}" ${title}>${alt}</span>`; | ||
| } | ||
| return `<img class="emojione" alt="${alt}" ${title} src="${ePath}${fname}${emojione.fileExtension}"/>`; | ||
| }, | ||
| { maxAge: 1000 }, | ||
| ); | ||
|
|
||
| const convertUnicode = mem( | ||
| (entire, _m1, m2, m3) => { | ||
| const mappedUnicode = emojione.mapUnicodeToShort(); | ||
|
|
||
| if (typeof m3 === 'undefined' || m3 === '' || !(emojione.unescapeHTML(m3) in emojione.asciiList)) { | ||
| // if the ascii doesnt exist just return the entire match | ||
| return entire; | ||
| } | ||
|
|
||
| m3 = emojione.unescapeHTML(m3); | ||
| const unicode = emojione.asciiList[m3]; | ||
| const shortname = mappedUnicode[unicode]; | ||
| const category = unicode.indexOf('-1f3f') >= 0 ? 'diversity' : emojione.emojioneList[shortname].category; | ||
| const title = emojione.imageTitleTag ? `title="${emojione.escapeHTML(m3)}"` : ''; | ||
| // const size = ns.spriteSize === '32' || ns.spriteSize === '64' ? ns.spriteSize : '32'; | ||
| // if the emoji path has been set, we'll use the provided path, otherwise we'll use the default path | ||
| const ePath = | ||
| emojione.defaultPathPNG !== emojione.imagePathPNG ? emojione.imagePathPNG : `${emojione.defaultPathPNG + emojione.emojiSize}/`; | ||
|
|
||
| // depending on the settings, we'll either add the native unicode as the alt tag, otherwise the shortname | ||
| const alt = emojione.unicodeAlt ? emojione.convert(unicode.toUpperCase()) : emojione.escapeHTML(m3); | ||
|
|
||
| if (emojione.sprites) { | ||
| return `${m2}<span class="emojione emojione-${category} _${unicode}" ${title}>${alt}</span>`; | ||
| } | ||
| return `${m2}<img class="emojione" alt="${alt}" ${title} src="${ePath}${unicode}${emojione.fileExtension}"/>`; | ||
| }, | ||
| { maxAge: 1000, cacheKey: JSON.stringify }, | ||
| ); | ||
|
|
||
| emojione.shortnameToImage = (str) => { | ||
| // replace regular shortnames first | ||
| str = str.replace(emojione.regShortNames, convertShortName); | ||
|
|
||
| // if ascii smileys are turned on, then we'll replace them! | ||
| if (emojione.ascii) { | ||
| const asciiRX = emojione.riskyMatchAscii ? emojione.regAsciiRisky : emojione.regAscii; | ||
|
|
||
| return str.replace(asciiRX, convertUnicode); | ||
| } | ||
|
|
||
| return str; | ||
| }; | ||
|
|
||
| const isEmojiSupported = (str: string) => { | ||
| str = str.replace(emojione.regShortNames, convertShortName); | ||
|
|
||
| // if ascii smileys are turned on, then we'll replace them! | ||
| if (emojione.ascii) { | ||
| const asciiRX = emojione.riskyMatchAscii ? emojione.regAsciiRisky : emojione.regAscii; | ||
|
|
||
| return str.replace(asciiRX, convertUnicode); | ||
| } | ||
|
|
||
| return str; | ||
| const isEmojiSupported = (str: string): string => { | ||
| return joypixels.shortnameToImage(str); | ||
| }; | ||
|
|
||
| export const getEmojiConfig = () => ({ | ||
| emojione, | ||
| emojisByCategory, | ||
| emojiCategories, | ||
| toneList, | ||
| render: emojione.toImage, | ||
| renderPicker: emojione.shortnameToImage, | ||
| render: joypixels.toImage, | ||
| renderPicker: joypixels.shortnameToImage, | ||
| sprites: true, | ||
| isEmojiSupported, | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
apps/meteor/client/views/navigation/lib/normalizeNavigationMessage.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: emoji-toolkit defaults to JoyPixels class names; without configuring a compatibility class/prefix, the generated sprite markup will use
joypixelsclasses that don’t match Rocket.Chat’s existing.emojionesprite CSS, so emoji sprites may not render.Prompt for AI agents