, etc.) - // and replacing valid shortnames like :smile: and :wink: that _aren't_ within - // tags with an
`;
- });
-};
-
-const shortnameToImage = str => {
- // This walks through the string from end to start, ignoring any tags (,
, etc.)
- // and replacing valid shortnames like :smile: and :wink: that _aren't_ within
- // tags with an version.
- // The goal is to be the same as an emojione.regShortNames replacement, but faster.
- // The reason we go backwards is because then we can replace substrings as we go.
- let i = str.length;
+function emojify(str) {
+ // This walks through the string from start to end, ignoring any tags (
,
, etc.)
+ // and replacing valid shortnames like :smile: and :wink: as well as unicode strings
+ // that _aren't_ within tags with an version.
+ // The goal is to be the same as an emojione.regShortNames/regUnicode replacement, but faster.
+ let i = -1;
let insideTag = false;
let insideShortname = false;
- let shortnameEndIndex = -1;
- while (i--) {
+ let shortnameStartIndex = -1;
+ let match;
+ while (++i < str.length) {
const char = str.charAt(i);
if (insideShortname && char === ':') {
- const shortname = str.substring(i, shortnameEndIndex + 1);
+ const shortname = str.substring(shortnameStartIndex, i + 1);
if (shortname in emojione.emojioneList) {
const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
const alt = emojione.convert(unicode.toUpperCase());
const replacement = `
`;
- str = str.substring(0, i) + replacement + str.substring(shortnameEndIndex + 1);
+ str = str.substring(0, shortnameStartIndex) + replacement + str.substring(i + 1);
+ i += (replacement.length - shortname.length - 1); // jump ahead the length we've added to the string
} else {
- i++; // stray colon, try again
+ i--; // stray colon, try again
}
insideShortname = false;
- } else if (insideTag && char === '<') {
+ } else if (insideTag && char === '>') {
insideTag = false;
- } else if (char === '>') {
+ } else if (char === '<') {
insideTag = true;
insideShortname = false;
} else if (!insideTag && char === ':') {
insideShortname = true;
- shortnameEndIndex = i;
+ shortnameStartIndex = i;
+ } else if (!insideTag && (match = trie.search(str.substring(i)))) {
+ const unicodeStr = match;
+ if (unicodeStr in emojione.jsEscapeMap) {
+ const unicode = emojione.jsEscapeMap[unicodeStr];
+ const short = mappedUnicode[unicode];
+ const filename = emojione.emojioneList[short].fname;
+ const alt = emojione.convert(unicode.toUpperCase());
+ const replacement = ``;
+ str = str.substring(0, i) + replacement + str.substring(i + unicodeStr.length);
+ i += (replacement.length - unicodeStr.length); // jump ahead the length we've added to the string
+ }
}
}
return str;
-};
+}
-export default function emojify(text) {
- return toImage(text);
-};
+export default emojify;
diff --git a/package.json b/package.json
index 7fa80a0c2f..d5c05dae3b 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
"sass-loader": "^6.0.6",
"stringz": "^0.2.2",
"style-loader": "^0.18.2",
+ "substring-trie": "^1.0.0",
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"uuid": "^3.1.0",
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
index 7a496623e5..3e8b25af93 100644
--- a/spec/javascript/components/emojify.test.js
+++ b/spec/javascript/components/emojify.test.js
@@ -46,4 +46,38 @@ describe('emojify', () => {
expect(emojify(':smile')).to.equal(':smile');
});
+ it('does two emoji next to each other', () => {
+ expect(emojify(':smile::wink:')).to.equal(
+ '
');
+ });
+
+ it('does unicode', () => {
+ expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
+ '
');
+ expect(emojify('\uD83D\uDC68\uD83D\uDC69\uD83D\uDC67\uD83D\uDC67')).to.equal(
+ '
');
+ expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('
');
+ expect(emojify('\u2757')).to.equal(
+ '
');
+ });
+
+ it('does multiple unicode', () => {
+ expect(emojify('\u2757 #\uFE0F\u20E3')).to.equal(
+ ' 
');
+ expect(emojify('\u2757#\uFE0F\u20E3')).to.equal(
+ '');
+ expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).to.equal(
+ ' ');
+ expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).to.equal(
+ 'foo bar');
+ });
+
+ it('does mixed unicode and shortnames', () => {
+ expect(emojify(':smile:#\uFE0F\u20E3:wink:\u2757')).to.equal('');
+ });
+
+ it('ignores unicode inside of tags', () => {
+ expect(emojify('