[FIX] Undefined room name in push and e-mail notifications #10318
Conversation
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
renatobecker-zz
changed the title
sampaiodiego
requested changes
Apr 16, 2018
| @@ -4,7 +4,7 @@ import s from 'underscore.string'; | |||
| function getEmailContent({ messageContent, message, user, room }) { | |||
| const lng = user && user.language || RocketChat.settings.get('language') || 'en'; | |||
|
|
|||
| const roomName = `#${ RocketChat.settings.get('UI_Allow_room_names_with_special_chars') ? room.fname || room.name : room.name }`; | |||
| const roomName = `#${ (RocketChat.settings.get('UI_Allow_room_names_with_special_chars') && room.fname) ? room.fname : RocketChat.roomTypes.getRoomName(room.t, room) }`; | |||
There was a problem hiding this comment.
it is not needed anymore to test for UI_Allow_room_names_with_special_chars setting here. this test is done on implementations of getRoomName (like this)..
…otifications # Conflicts: # packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
rodrigok
deleted the
undefined-room-name-livechat-push-email-notifications
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@RocketChat/core
Closes #3201
Closes #9341
When an agent goes offline and the visitor continues to send messages, push and e-mail notifications are sent to the agent using the
nameof the room.Since the Livechat rooms don't use the
name prop, this PR fixes the issue using thegetRoomNamemethod.