Merge pull request #4523 from MaciejKus/develop

added support for apostrophe emojis

packages/rocketchat-emoji/emojiParser.js

@@ -9,6 +9,9 @@ RocketChat.callbacks.add('renderMessage', (message) => {
 	}
 
 	if (_.trim(message.html)) {
+		//' to apostrophe (') for emojis such as :')
+		message.html = message.html.replace(/'/g, '\'');
+
 		Object.keys(RocketChat.emoji.packages).forEach((emojiPackage) => {
 			message.html = RocketChat.emoji.packages[emojiPackage].render(message.html);
 		});
@@ -36,6 +39,9 @@ RocketChat.callbacks.add('renderMessage', (message) => {
 		if (emojiOnly) {
 			message.html = checkEmojiOnly.unwrap().html();
 		}
+
+		//apostrophe (') back to '
+		message.html = message.html.replace(/\'/g, ''');
 	}
 
 	return message;