github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 01:14:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sort chat channels by slug (#25656)

Browse Source 
Channels can include emojis in front of the channel title which causes problems when sorting.

Using the channel slug is a more reliable way to sort and avoid these kind of issues.
This commit is contained in:
David Battersby
2024-02-13 12:59:46 +08:00
committed by GitHub
parent 949b5f3fa9
commit 85001a27e9
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js
View File

@ -120,7 +120,7 @@ export default class ChatChannelsManager extends Service {
if (this.site.mobileView) {
return this.#sortChannelsByActivity(channels);
} else {
return channels.sort((a, b) => a?.title?.localeCompare?.(b?.title));
return channels.sort((a, b) => a?.slug?.localeCompare?.(b?.slug));
}
}
@ -161,27 +161,27 @@ export default class ChatChannelsManager extends Service {
#sortChannelsByActivity(channels) {
return channels.sort((a, b) => {
// if both channels have mention count, sort by aplhabetical order
// if both channels have mention count, sort by slug
// otherwise prioritize channel with mention count
if (a.tracking.mentionCount > 0 && b.tracking.mentionCount > 0) {
return a.title?.localeCompare?.(b.title);
return a.slug?.localeCompare?.(b.slug);
}
if (a.tracking.mentionCount > 0 || b.tracking.mentionCount > 0) {
return a.tracking.mentionCount > b.tracking.mentionCount ? -1 : 1;
}
// if both channels have unread count, sort by aplhabetical order
// if both channels have unread count, sort by slug
// otherwise prioritize channel with unread count
if (a.tracking.unreadCount > 0 && b.tracking.unreadCount > 0) {
return a.title?.localeCompare?.(b.title);
return a.slug?.localeCompare?.(b.slug);
}
if (a.tracking.unreadCount > 0 || b.tracking.unreadCount > 0) {
return a.tracking.unreadCount > b.tracking.unreadCount ? -1 : 1;
}
return a.title?.localeCompare?.(b.title);
return a.slug?.localeCompare?.(b.slug);
});
}