Fix duplicated candidate mentions in file rooms #1682
Merged
Conversation
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
danxuliu
added
2. developing
bug
feature: chat 💬
Member
Author
|
/backport to stable15 |
Member
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
In regular rooms only the current participants are candidates in mentions, but in file rooms the candidates are all the users with access to the file, even if they are not currently participants of the room. However, as the users with access to the file are a superset of the current participants those participants were returned twice. Therefore, now candidates for mentions in file rooms are got only from the users with access to the file instead of in addition to the current participants. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
danxuliu
force-pushed
the
fix-duplicated-candidate-mentions-in-file-rooms
branch
from
ed03ac4 to
475abd0
Compare
Member
Author
|
Rebased. |
nickvergessen
approved these changes
Apr 8, 2019
nickvergessen
deleted the
fix-duplicated-candidate-mentions-in-file-rooms
branch
|
backport to stable15 in #1693 |
| * @since 13.0.0 | ||
| */ | ||
| public function search($search, $limit, $offset, ISearchResult $searchResult) { | ||
| if ($this->room->getObjectType() === 'file') { |
Member
There was a problem hiding this comment.
btw jsut for the record:
I did it the other way around, so normal users are listed before users which are not in the room yet.
Member
Author
There was a problem hiding this comment.
Good point, I did not think on that. Then maybe it would be better to restore the previous code and explicitly remove duplicated elements?
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.
Requires #1676 and #1677
(I will rebase on master the last two commits of this pull request once those two pull requests are merged).In regular rooms only the current participants are candidates in mentions, but in file rooms the candidates are all the users with access to the file, even if they are not currently participants of the room. However, as the users with access to the file are a superset of the current participants those participants were returned twice. Therefore, now candidates for mentions in file rooms are got only from the users with access to the file instead of in addition to the current participants.
How to test:
Result with this pull request:
The other user appears once in the candidate mentions
Result without this pull request:
The other user appears twice in the candidate mentions