From ede39370a492267362c4fb0ff8e23db70824002e Mon Sep 17 00:00:00 2001
From: Lambda <csgl@xiretza.xyz>
Date: Sun, 10 Aug 2025 18:53:10 +0000
Subject: [PATCH] MSC3575: allow empty conn_id

---
 src/api/client_server/sync/msc3575.rs | 32 +++++++++++----------------
 src/service/users.rs                  |  4 ----
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/api/client_server/sync/msc3575.rs b/src/api/client_server/sync/msc3575.rs
index 63ded1ae..8a98cd92 100644
--- a/src/api/client_server/sync/msc3575.rs
+++ b/src/api/client_server/sync/msc3575.rs
@@ -83,9 +83,7 @@ pub(crate) async fn sync_events_v4_route(
     };
 
     if globalsince == 0 {
-        if body.conn_id.is_some() {
-            services().users.forget_sync_request_connection(&connection_key);
-        }
+        services().users.forget_sync_request_connection(&connection_key);
     }
 
     let known_rooms =
@@ -377,14 +375,12 @@ pub(crate) async fn sync_events_v4_route(
             },
         );
 
-        if body.conn_id.is_some() {
-            services().users.update_sync_known_rooms(
-                connection_key.clone(),
-                list_id,
-                new_known_rooms,
-                globalsince,
-            );
-        }
+        services().users.update_sync_known_rooms(
+            connection_key.clone(),
+            list_id,
+            new_known_rooms,
+            globalsince,
+        );
     }
 
     let mut known_subscription_rooms = BTreeSet::new();
@@ -405,14 +401,12 @@ pub(crate) async fn sync_events_v4_route(
         known_subscription_rooms.remove(&r);
     }
 
-    if body.conn_id.is_some() {
-        services().users.update_sync_known_rooms(
-            connection_key.clone(),
-            "subscriptions".to_owned(),
-            known_subscription_rooms,
-            globalsince,
-        );
-    }
+    services().users.update_sync_known_rooms(
+        connection_key.clone(),
+        "subscriptions".to_owned(),
+        known_subscription_rooms,
+        globalsince,
+    );
 
     let mut rooms = BTreeMap::new();
     for (
diff --git a/src/service/users.rs b/src/service/users.rs
index ac57b71d..ab64130e 100644
--- a/src/service/users.rs
+++ b/src/service/users.rs
@@ -70,10 +70,6 @@ impl Service {
         &self,
         connection_key: ConnectionKey,
     ) -> BTreeMap<String, BTreeMap<OwnedRoomId, u64>> {
-        if connection_key.connection.is_none() {
-            return BTreeMap::new();
-        };
-
         let cached = self.get_cache_entry(connection_key);
         let cached = cached.lock().unwrap();