-
Notifications
You must be signed in to change notification settings - Fork 11.4k
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.
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
Changes from 14 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 e2c5d13
handles emoji unicodes while checking message size
c0dzilla 1f0e634
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 160e45c
uses underscore to calculate message length
c0dzilla 40e0372
uses grapheme-splitter module
c0dzilla c576a9f
committing package lock
c0dzilla f7d4348
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 57c9f10
Merge branch 'max-msg-size-emoji' of github.com:c0dzilla/Rocket.Chat …
c0dzilla ba74537
added tests
c0dzilla 67b68ca
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 1f3bd47
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 0719032
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 1030c69
Merge branch 'develop' into max-msg-size-emoji
c0dzilla 3f7c1d2
Merge branch 'develop' into max-msg-size-emoji
ggazzo 5d79284
adds replace emoji shortnames to message properties
c0dzilla ebf8b09
Merge branch 'max-msg-size-emoji' of github.com:c0dzilla/Rocket.Chat …
c0dzilla 2053ec1
type fix
c0dzilla File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import GraphemeSplitter from 'grapheme-splitter'; | ||
|
||
const splitter = new GraphemeSplitter(); | ||
|
||
export const messageProperties = ((message) => { | ||
return { | ||
length: splitter.countGraphemes(message) | ||
}; | ||
}); | ||
|
||
// check for tests | ||
if (typeof RocketChat !== 'undefined') { | ||
RocketChat.messageProperties = messageProperties; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -554,7 +554,13 @@ 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 && RocketChat.messageProperties(adjustedMessage).length > this.messageMaxSize; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this test on 'message' should not be done before? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, sorry about that 😅 |
||
} | ||
|
||
isEmpty() { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we have this replace in two places... maybe use an export/import? (: