[IMPROVE] Upgrade EmojiOne to JoyPixels 4.5.0

.meteor/packages

@@ -84,7 +84,6 @@ accounts-base
 accounts-oauth
 autoupdate
 babel-compiler
-emojione:emojione@2.2.6
 google-oauth
 htmljs
 less

.meteor/versions

@@ -41,7 +41,6 @@ ecmascript-runtime-server@0.7.1
 edgee:slingshot@0.7.1
 ejson@1.1.0
 email@1.2.3
-emojione:emojione@2.2.6
 es5-shim@4.8.0
 facebook-oauth@1.5.0
 fastclick@1.0.13

README.md

@@ -450,9 +450,9 @@ Thanks to our core team
 [Sing Li](https://github.com/Sing-Li),
 and to hundreds of awesome [contributors](https://github.com/RocketChat/Rocket.Chat/graphs/contributors).
 
-![Emoji One](https://cloud.githubusercontent.com/assets/1986378/24772858/47290a70-1ae9-11e7-9a5a-2913d0002c94.png)
+![JoyPixels](https://i.imgur.com/OrhYvLe.png)
 
-Emoji provided free by [Emoji One](http://emojione.com)
+Emoji provided graciously by [JoyPixels](https://www.joypixels.com/)
 
 ![BrowserStack](https://cloud.githubusercontent.com/assets/1986378/24772879/57d57b88-1ae9-11e7-98b4-4af824b47933.png)
 

app/emoji-custom/client/lib/emojiCustom.js

@@ -45,7 +45,7 @@ export const deleteEmojiCustom = function(emojiData) {
 			}
 		}
 	}
-	EmojiPicker.updateRecent();
+	EmojiPicker.updateRecent('rocket');
 };
 
 export const updateEmojiCustom = function(emojiData) {
@@ -121,41 +121,45 @@ export const updateEmojiCustom = function(emojiData) {
 		}
 	}
 
-	EmojiPicker.updateRecent();
+	EmojiPicker.updateRecent('rocket');
 };
 
-emoji.packages.emojiCustom = {
-	emojiCategories: { rocket: 'Custom' },
-	toneList: {},
-	list: [],
-	_regexpSignature: null,
-	_regexp: null,
+const customRender = (html) => {
+	const emojisMatchGroup = emoji.packages.emojiCustom.list.map(RegExp.escape).join('|');
+	if (emojisMatchGroup !== emoji.packages.emojiCustom._regexpSignature) {
+		emoji.packages.emojiCustom._regexpSignature = emojisMatchGroup;
+		emoji.packages.emojiCustom._regexp = new RegExp(`<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(${ emojisMatchGroup })`, 'gi');
+	}
 
-	render(html) {
-		const emojisMatchGroup = emoji.packages.emojiCustom.list.map(RegExp.escape).join('|');
-		if (emojisMatchGroup !== emoji.packages.emojiCustom._regexpSignature) {
-			emoji.packages.emojiCustom._regexpSignature = emojisMatchGroup;
-			emoji.packages.emojiCustom._regexp = new RegExp(`<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(${ emojisMatchGroup })`, 'gi');
+	html = html.replace(emoji.packages.emojiCustom._regexp, (shortname) => {
+		if ((typeof shortname === 'undefined') || (shortname === '') || (emoji.packages.emojiCustom.list.indexOf(shortname) === -1)) {
+			return shortname;
 		}
 
-		html = html.replace(emoji.packages.emojiCustom._regexp, (shortname) => {
-			if ((typeof shortname === 'undefined') || (shortname === '') || (emoji.packages.emojiCustom.list.indexOf(shortname) === -1)) {
-				return shortname;
-			}
+		let emojiAlias = shortname.replace(/:/g, '');
+
+		let dataCheck = emoji.list[shortname];
+		if (dataCheck.hasOwnProperty('aliasOf')) {
+			emojiAlias = dataCheck.aliasOf;
+			dataCheck = emoji.list[`:${ emojiAlias }:`];
+		}
 
-			let emojiAlias = shortname.replace(/:/g, '');
+		return `<span class="emoji" style="background-image:url(${ getEmojiUrlFromName(emojiAlias, dataCheck.extension) });" data-emoji="${ emojiAlias }" title="${ shortname }">${ shortname }</span>`;
+	});
 
-			let dataCheck = emoji.list[shortname];
-			if (dataCheck.hasOwnProperty('aliasOf')) {
-				emojiAlias = dataCheck.aliasOf;
-				dataCheck = emoji.list[`:${ emojiAlias }:`];
-			}
+	return html;
+};
 
-			return `<span class="emoji" style="background-image:url(${ getEmojiUrlFromName(emojiAlias, dataCheck.extension) });" data-emoji="${ emojiAlias }" title="${ shortname }">${ shortname }</span>`;
-		});
+emoji.packages.emojiCustom = {
+	emojiCategories: [{ key: 'rocket', i18n: 'Custom' }],
+	categoryIndex: 1,
+	toneList: {},
+	list: [],
+	_regexpSignature: null,
+	_regexp: null,
 
-		return html;
-	},
+	render: customRender,
+	renderPicker: customRender,
 };
 
 Meteor.startup(() =>

app/emoji-emojione/README.md

@@ -1,15 +1,11 @@
 # Updating emojione
 
 ## Generate new category map variable for emojipicker
-Create a file called `emoji.json` on this directory with the content of the file https://github.com/Ranks/emojione/blob/master/emoji.json
-
-After that, run:
+Run
 ```
-node generateEmojiIndex.js
+node --experimental-modules generateEmojiIndex.mjs
 ```
 
-Grab the result and update the file `emojiPicker.js`.
-
 ## Generate new percentage sprite
 Clone the repository https://github.com/Ranks/emojione/ and replace the file `assets/sprites/emojione.sprites.mustache` with the content 
 of [emojione.sprites.mustache](emojione.sprites.mustache), then run at `emojione` folder: