studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix serializing zero notification count in never-read room case.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-12-28 04:55:09 +00:00
parent f4ee8bc433
commit 432e6a2663
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/client/sync/v3.rs
View File

@@ -10,7 +10,7 @@ use futures::{
pin_mut, pin_mut,
}; };
use ruma::{ use ruma::{
DeviceId, EventId, OwnedRoomId, OwnedUserId, RoomId, UserId, DeviceId, EventId, OwnedRoomId, OwnedUserId, RoomId, UInt, UserId,
api::client::{ api::client::{
filter::FilterDefinition, filter::FilterDefinition,
sync::sync_events::{ sync::sync_events::{
@@ -995,6 +995,13 @@ async fn load_joined_room(
.flatten() .flatten()
.is_none_or(|last_count| last_count.gt(&since)); .is_none_or(|last_count| last_count.gt(&since));
let send_notification_resets = last_notification_read
.flatten()
.is_some_and(|last_count| last_count.gt(&since));
let send_notification_count_filter =
|count: &UInt| *count != uint!(0) || send_notification_resets;
let notification_count: OptionFuture<_> = send_notification_counts let notification_count: OptionFuture<_> = send_notification_counts
.then(|| { .then(|| {
services services
@@ -1169,7 +1176,10 @@ async fn load_joined_room(
.map(Event::into_format) .map(Event::into_format)
.collect(), .collect(),
}, },
unread_notifications: UnreadNotificationsCount { highlight_count, notification_count }, unread_notifications: UnreadNotificationsCount {
highlight_count: highlight_count.filter(send_notification_count_filter),
notification_count: notification_count.filter(send_notification_count_filter),
},
unread_thread_notifications: BTreeMap::new(), unread_thread_notifications: BTreeMap::new(),
}; };