Handle missing emojis

RocketChat · May 27, 2019 · a487ac0 · a487ac0
1 parent d1ec2a1
commit a487ac0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/app/emoji/client/emojiPicker.js b/app/emoji/client/emojiPicker.js
@@ -9,7 +9,7 @@ import { emoji } from '../lib/rocketchat';
 
 const emojiListByCategory = new ReactiveDict('emojiList');
 
-const getEmojiElement = (emoji, image) => `<li class="emoji-${ emoji } emoji-picker-item" data-emoji="${ emoji }" title="${ emoji }">${ image }</li>`;
+const getEmojiElement = (emoji, image) => image && `<li class="emoji-${ emoji } emoji-picker-item" data-emoji="${ emoji }" title="${ emoji }">${ image }</li>`;
 
 const createEmojiList = (category, actualTone) => {
 	const html = Object.values(emoji.packages).map((emojiPackage) => {

diff --git a/app/emoji/client/lib/EmojiPicker.js b/app/emoji/client/lib/EmojiPicker.js
@@ -134,6 +134,14 @@ export const EmojiPicker = {
 		emoji.packages.base.emojisByCategory.recent = this.recent;
 		this.updateRecent('recent');
 	},
+	removeFromRecent(_emoji) {
+		const pos = this.recent.indexOf(_emoji);
+		if (pos === -1) {
+			return;
+		}
+		this.recent.splice(pos, 1);
+		window.localStorage.setItem('emoji.recent', this.recent);
+	},
 	updateRecent(category) {
 		updateRecentEmoji(category);
 	},

diff --git a/app/emoji/lib/rocketchat.js b/app/emoji/lib/rocketchat.js
@@ -1,5 +1,18 @@
+import { Meteor } from 'meteor/meteor';
+
 import { emojioneRender } from '../../emoji-emojione/lib/emojioneRender';
 
+let EmojiPicker;
+const removeFromRecent = (emoji) => {
+	if (!Meteor.isClient) {
+		return;
+	}
+	if (!EmojiPicker) {
+		({ EmojiPicker } = require('../client/lib/EmojiPicker'));
+	}
+	EmojiPicker.removeFromRecent(emoji.replace(/(^:|:$)/g, ''));
+};
+
 export const emoji = {
 	packages: {
 		base: {
@@ -11,6 +24,10 @@ export const emoji = {
 			toneList: {},
 			render: emojioneRender,
 			renderPicker(emojiToRender) {
+				if (!emoji.list[emojiToRender]) {
+					removeFromRecent(emojiToRender);
+					return;
+				}
 				const correctPackage = emoji.list[emojiToRender].emojiPackage;
 				return emoji.packages[correctPackage].renderPicker(emojiToRender);
 			},