handles emoji unicodes while checking message size

RocketChat · Apr 17, 2018 · e2c5d13 · e2c5d13
1 parent d458112
commit e2c5d13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/rocketchat-lib/server/methods/sendMessage.js b/packages/rocketchat-lib/server/methods/sendMessage.js
@@ -1,3 +1,4 @@
+/* globals emojione */
 import moment from 'moment';
 
 Meteor.methods({
@@ -26,7 +27,10 @@ Meteor.methods({
 		}
 
 		if (message.msg) {
-			const adjustedMessage = message.msg.replace(/:\w+:/gm, (match) => {
+			// converting emoji unicodes to shortnames if present
+			let adjustedMessage = emojione.toShort(message.msg);
+
+			adjustedMessage = adjustedMessage.replace(/:\w+:/gm, (match) => {
 				if (RocketChat.emoji.list[match] !== undefined) {
 					return ' ';
 				}

diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -1,4 +1,4 @@
-/* globals MsgTyping */
+/* globals MsgTyping, emojione */
 import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
@@ -541,7 +541,10 @@ this.ChatMessages = class ChatMessages {
 	}
 
 	isMessageTooLong(message) {
-		const adjustedMessage = message.replace(/:\w+:/gm, (match) => {
+		// converting emoji unicodes to shortnames if present
+		let adjustedMessage = emojione.toShort(message);
+
+		adjustedMessage = adjustedMessage.replace(/:\w+:/gm, (match) => {
 			if (RocketChat.emoji.list[match] !== undefined) {
 				return ' ';
 			}