Improvements to message quoting #3328
Merged
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
| @@ -5,7 +5,7 @@ Template.message.helpers | |||
| unless RocketChat.settings.get('UI_DisplayRoles') | |||
| return [] | |||
| roles = _.union(UserRoles.findOne(this.u?._id)?.roles, RoomRoles.findOne({'u._id': this.u?._id, rid: this.rid })?.roles) | |||
| return _.compact(_.map(roles, (role) -> return RocketChat.models.Roles.findOne({ _id: role, description: { $exists: 1 } })?.description)); | |||
| return RocketChat.models.Roles.find({_id: {$in: roles}, description: {$exists: true, $ne: ''}}, {_id: false, description: true}) | |||
There was a problem hiding this comment.
to restrict fields returned from the query, you need to specify the fields property on the second parameter:
return RocketChat.models.Roles.find({ _id: { $in: roles }, description: { $exists: true, $ne: '' } }, { fields: { description: true } })
|
thanks again for the contribution @lucasvanhalst =) the function |
|
@sampaiodiego hmm I see, but the cog which opens the message actions isn't visible when previewing a channel (it did when I made this, but not anymore on master) so that should never happen |
|
cool.. I thought it was generating the link when rendering the quoted message (my mistake).. =) |
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 #3278