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

Fix sliding-sync invite regression.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-10-25 07:04:45 +00:00
parent f5e98467be
commit b483306367
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/api/client/sync/v5/selector.rs
View File

@@ -80,6 +80,8 @@ where
{ {
static FULL_RANGE: (UInt, UInt) = (UInt::MIN, UInt::MAX); static FULL_RANGE: (UInt, UInt) = (UInt::MIN, UInt::MAX);
let SyncInfo { services, sender_user, .. } = sync_info;
let selections = lists let selections = lists
.keys() .keys()
.cloned() .cloned()
@@ -104,7 +106,9 @@ where
.filter(|&room| { .filter(|&room| {
conn.rooms conn.rooms
.get(&room.room_id) .get(&room.room_id)
.is_some_and(|conn_room| room.last_count > conn_room.roomsince) .is_some_and(|conn_room| {
conn_room.roomsince == 0 || room.last_count > conn_room.roomsince
})
}) })
.enumerate() .enumerate()
.skip_while(move |&(i, _)| i < start) .skip_while(move |&(i, _)| i < start)
@@ -120,13 +124,18 @@ where
.broad_filter_map(async |(room_id, _)| { .broad_filter_map(async |(room_id, _)| {
filter_room_meta(sync_info, room_id) filter_room_meta(sync_info, room_id)
.await .await
.then(|| WindowRoom { .into_option()?;
room_id: room_id.clone(),
membership: None, Some(WindowRoom {
lists: Default::default(), room_id: room_id.clone(),
ranked: usize::MAX, lists: Default::default(),
last_count: 0, ranked: usize::MAX,
}) last_count: 0,
membership: services
.state_cache
.user_membership(sender_user, room_id)
.await,
})
}) })
.map(|room| (room.room_id.clone(), room)); .map(|room| (room.room_id.clone(), room));
@@ -254,15 +263,4 @@ where
}) })
} }
fn room_sort(a: &WindowRoom, b: &WindowRoom) -> Ordering { fn room_sort(a: &WindowRoom, b: &WindowRoom) -> Ordering { b.last_count.cmp(&a.last_count) }
if a.membership != b.membership {
if a.membership == Some(MembershipState::Invite) {
return Ordering::Less;
}
if b.membership == Some(MembershipState::Invite) {
return Ordering::Greater;
}
}
b.last_count.cmp(&a.last_count)
}