-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(contactsmenu): Sort by user status #41266
Merged
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
Fixed. It's a remote user overlapping with a local UID. |
miaulalala
approved these changes
Nov 8, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested it, works great!
Pytal
approved these changes
Nov 8, 2023
ab9bbe2
to
13685e6
Compare
If user_status is not enabled, fall back to sorting by contact name. Signed-off-by: Christoph Wurst <[email protected]>
13685e6
to
71080a8
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
4. to release
Ready to be released and/or waiting for tests to finish
enhancement
feature: contacts menu
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.
Summary
List system contacts with a recent custom status message first sorted descending by the status change time, then all other contacts sorted ascending by their name.
If user_status is not enabled or nobody set their custom status recently, fall back to sorting by contact name ascending only.
TODO
Fix usage ofNot used anyway. API now falls back to old behavior if offset is supplied.\OCP\Contacts\ContactsMenu\IContactsStore::getContacts
with pagination(avatars are only broken because automated tests deleted them …)
Follow-up
Checklist