treats emojis as single characters for determining message size

RocketChat · Apr 11, 2018 · d458112 · d458112
1 parent eb12969
commit d458112
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/packages/rocketchat-lib/server/methods/sendMessage.js b/packages/rocketchat-lib/server/methods/sendMessage.js
@@ -25,10 +25,19 @@ Meteor.methods({
 			message.ts = new Date();
 		}
 
-		if (message.msg && message.msg.length > RocketChat.settings.get('Message_MaxAllowedSize')) {
-			throw new Meteor.Error('error-message-size-exceeded', 'Message size exceeds Message_MaxAllowedSize', {
-				method: 'sendMessage'
+		if (message.msg) {
+			const adjustedMessage = message.msg.replace(/:\w+:/gm, (match) => {
+				if (RocketChat.emoji.list[match] !== undefined) {
+					return ' ';
+				}
+				return match;
 			});
+
+			if (adjustedMessage.length > RocketChat.settings.get('Message_MaxAllowedSize')) {
+				throw new Meteor.Error('error-message-size-exceeded', 'Message size exceeds Message_MaxAllowedSize', {
+					method: 'sendMessage'
+				});
+			}
 		}
 
 		const user = RocketChat.models.Users.findOneById(Meteor.userId(), {

diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -541,7 +541,14 @@ this.ChatMessages = class ChatMessages {
 	}
 
 	isMessageTooLong(message) {
-		return message && message.length > this.messageMaxSize;
+		const adjustedMessage = message.replace(/:\w+:/gm, (match) => {
+			if (RocketChat.emoji.list[match] !== undefined) {
+				return ' ';
+			}
+			return match;
+		});
+
+		return message && adjustedMessage.length > this.messageMaxSize;
 	}
 
 	isEmpty() {