paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel_folders: Fix unread counts for show_channel_folders option.

Browse Source 
Previously the counts were being generated assuming `show_channel_folders`
was true. But when we're not showing folders, the unread counts for
folders need to be distributed to the "normal" section.
This commit is contained in:
Evy Kassirer
2025-10-27 17:17:43 -07:00
committed by Tim Abbott
parent dbcef2efd3
commit a8493e71aa
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
web/src/stream_list.ts
View File

@@ -819,7 +819,7 @@ export let update_dom_with_unread_counts = function (counts: FullUnreadCountsDat
if (sub.pin_to_top) {
pinned_unread_counts.unmuted += stream_count_info.unmuted_count;
pinned_unread_counts.muted += stream_count_info.muted_count;
} else if (sub.folder_id !== null) {
} else if (sub.folder_id !== null && user_settings.web_left_sidebar_show_channel_folders) {
if (!folder_unread_counts.has(sub.folder_id)) {
folder_unread_counts.set(sub.folder_id, {
unmuted: 0,
@@ -894,25 +894,27 @@ export let update_dom_with_unread_counts = function (counts: FullUnreadCountsDat
normal_section_unread_counts.muted_channel_muted,
);
for (const folder_id of channel_folders.get_all_folder_ids()) {
const unread_counts = folder_unread_counts.get(folder_id) ?? {
unmuted: 0,
muted: 0,
inactive_unmuted: 0,
inactive_muted: 0,
muted_channel_unmuted: 0,
muted_channel_muted: 0,
};
update_section_unread_count(
$(`#stream-list-${folder_id}-container .stream-list-subsection-header`),
unread_counts.unmuted,
unread_counts.muted,
);
update_section_unread_count(
$(`#stream-list-${folder_id}-container .show-inactive-or-muted-channels`),
unread_counts.inactive_unmuted + unread_counts.muted_channel_unmuted,
unread_counts.inactive_muted + unread_counts.muted_channel_muted,
);
if (user_settings.web_left_sidebar_show_channel_folders) {
for (const folder_id of channel_folders.get_all_folder_ids()) {
const unread_counts = folder_unread_counts.get(folder_id) ?? {
unmuted: 0,
muted: 0,
inactive_unmuted: 0,
inactive_muted: 0,
muted_channel_unmuted: 0,
muted_channel_muted: 0,
};
update_section_unread_count(
$(`#stream-list-${folder_id}-container .stream-list-subsection-header`),
unread_counts.unmuted,
unread_counts.muted,
);
update_section_unread_count(
$(`#stream-list-${folder_id}-container .show-inactive-or-muted-channels`),
unread_counts.inactive_unmuted + unread_counts.muted_channel_unmuted,
unread_counts.inactive_muted + unread_counts.muted_channel_muted,
);
}
}
};