Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Message_AllowedMaxSize fails for emoji sequences #10431

Merged
merged 17 commits into from
Jun 12, 2018
Merged

[FIX] Message_AllowedMaxSize fails for emoji sequences #10431

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d458112
treats emojis as single characters for determining message size
c0dzilla Apr 11, 2018
e2c5d13
handles emoji unicodes while checking message size
c0dzilla Apr 17, 2018
1f0e634
Merge branch 'develop' into max-msg-size-emoji
c0dzilla May 22, 2018
160e45c
uses underscore to calculate message length
c0dzilla May 22, 2018
40e0372
uses grapheme-splitter module
c0dzilla May 23, 2018
c576a9f
committing package lock
c0dzilla May 23, 2018
f7d4348
Merge branch 'develop' into max-msg-size-emoji
c0dzilla May 30, 2018
57c9f10
Merge branch 'max-msg-size-emoji' of github.com:c0dzilla/Rocket.Chat …
c0dzilla May 30, 2018
ba74537
added tests
c0dzilla May 30, 2018
67b68ca
Merge branch 'develop' into max-msg-size-emoji
c0dzilla May 31, 2018
1f3bd47
Merge branch 'develop' into max-msg-size-emoji
c0dzilla Jun 5, 2018
0719032
Merge branch 'develop' into max-msg-size-emoji
c0dzilla Jun 6, 2018
1030c69
Merge branch 'develop' into max-msg-size-emoji
c0dzilla Jun 11, 2018
3f7c1d2
Merge branch 'develop' into max-msg-size-emoji
ggazzo Jun 12, 2018
5d79284
adds replace emoji shortnames to message properties
c0dzilla Jun 12, 2018
ebf8b09
Merge branch 'max-msg-size-emoji' of github.com:c0dzilla/Rocket.Chat …
c0dzilla Jun 12, 2018
2053ec1
type fix
c0dzilla Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions packages/rocketchat-lib/server/methods/sendMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* globals emojione */
import _ from 'underscore';
import moment from 'moment';

Meteor.methods({
Expand Down Expand Up @@ -29,10 +31,22 @@ 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) {
// converting emoji unicodes to shortnames if present
let adjustedMessage = emojione.toShort(message.msg);

adjustedMessage = adjustedMessage.replace(/:\w+:/gm, (match) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this part still needed? 🤔

if (RocketChat.emoji.list[match] !== undefined) {
return ' ';
}
return match;
});

if (_.toArray(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(), {
Expand Down
15 changes: 13 additions & 2 deletions packages/rocketchat-ui/client/lib/chatMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* globals MsgTyping */
/* globals MsgTyping, emojione */
import _ from 'underscore';
import s from 'underscore.string';
import moment from 'moment';
import toastr from 'toastr';
Expand Down Expand Up @@ -554,7 +555,17 @@ this.ChatMessages = class ChatMessages {
}

isMessageTooLong(message) {
return message && message.length > this.messageMaxSize;
// 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 ' ';
}
return match;
});

return message && _.toArray(adjustedMessage).length > this.messageMaxSize;
}

isEmpty() {
Expand Down