Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions #11273
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
rodrigok
requested changes
Jun 27, 2018
| const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); | ||
| if (!sub) { | ||
| return; | ||
| return room; |
There was a problem hiding this comment.
actually there are no difference (callbacks use the last value returned !== undefined, just to avoid some misunderstanding.
| const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); | ||
| if (!sub) { | ||
| return; | ||
| return room; | ||
| } | ||
| const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)}; |
There was a problem hiding this comment.
Please break this object in multiple lines and remove the space before the first colon.
There was a problem hiding this comment.
I'm ok with the spaces (our linter could help with that) but I dont like create a tabbed simple querys =/
| const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); | ||
| if (!sub) { | ||
| return; | ||
| return room; | ||
| } | ||
| const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)}; | ||
| RocketChat.models.Subscriptions.update({ rid: room._id }, {$set}); |
There was a problem hiding this comment.
Why not declare the set here instead of have a variable and pass it here?
rodrigok
requested changes
Jun 27, 2018
server/stream/mq.js
Outdated
| @@ -0,0 +1,5 @@ | |||
| import redisMq from 'mqemitter-redis'; | |||
rodrigok
changed the title
rodrigok
previously approved these changes
Jun 27, 2018
Merged
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.
Closes #ISSUE_NUMBER