[FIX] Real names were not displayed in the reactions (API/UI)#13495
Merged
[FIX] Real names were not displayed in the reactions (API/UI)#13495
Conversation
MarcosSpessatto
changed the title
rodrigok
requested changes
Mar 2, 2019
packages/rocketchat-utils/server/lib/composeMessageObjectWithUser.js
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@rodrigok done |
| if (message.u && message.u._id && settings.get('UI_Use_Real_Name')) { | ||
| const user = getUser(message.u._id); | ||
| message.u.name = user && user.name; | ||
| if (message.u && message.u.name && !settings.get('UI_Use_Real_Name')) { |
Member
There was a problem hiding this comment.
why did you change to remove the field instead of adding it?
Contributor
Author
There was a problem hiding this comment.
In this case, because the real name is already saved in the Messages collection(mentions and username). So if you are not using Real Names, we remove the real name.
Member
There was a problem hiding this comment.
the problem is that property is not updated (like if an user changes its name), that's why we always inject it before sending to client. I don't even know why we save it there in the first place.
Contributor
Author
There was a problem hiding this comment.
I changed to the old behavior.
Member
|
@MarcosSpessatto can you fix the conflicts? |
Contributor
Author
|
@rodrigok done |
rodrigok
approved these changes
Apr 6, 2019
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Closes #12889