From b4833063673d40f6c041b255b8b686ef3e216bfb Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 25 Oct 2025 07:04:45 +0000
Subject: [PATCH] Fix sliding-sync invite regression.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/api/client/sync/v5/selector.rs | 38 ++++++++++++++----------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/api/client/sync/v5/selector.rs b/src/api/client/sync/v5/selector.rs
index ce584a6c..59151a22 100644
--- a/src/api/client/sync/v5/selector.rs
+++ b/src/api/client/sync/v5/selector.rs
@@ -80,6 +80,8 @@ where
 {
 	static FULL_RANGE: (UInt, UInt) = (UInt::MIN, UInt::MAX);
 
+	let SyncInfo { services, sender_user, .. } = sync_info;
+
 	let selections = lists
 		.keys()
 		.cloned()
@@ -104,7 +106,9 @@ where
 				.filter(|&room| {
 					conn.rooms
 						.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()
 				.skip_while(move |&(i, _)| i < start)
@@ -120,13 +124,18 @@ where
 		.broad_filter_map(async |(room_id, _)| {
 			filter_room_meta(sync_info, room_id)
 				.await
-				.then(|| WindowRoom {
-					room_id: room_id.clone(),
-					membership: None,
-					lists: Default::default(),
-					ranked: usize::MAX,
-					last_count: 0,
-				})
+				.into_option()?;
+
+			Some(WindowRoom {
+				room_id: room_id.clone(),
+				lists: Default::default(),
+				ranked: usize::MAX,
+				last_count: 0,
+				membership: services
+					.state_cache
+					.user_membership(sender_user, room_id)
+					.await,
+			})
 		})
 		.map(|room| (room.room_id.clone(), room));
 
@@ -254,15 +263,4 @@ where
 		})
 }
 
-fn room_sort(a: &WindowRoom, b: &WindowRoom) -> Ordering {
-	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)
-}
+fn room_sort(a: &WindowRoom, b: &WindowRoom) -> Ordering { b.last_count.cmp(&a.last_count) }