From 71eabe5e63fc2d637785866c6e1f471fe67d0966 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 18 Jun 2024 19:41:41 -0500 Subject: [PATCH] Make room name optional --- synapse/handlers/sliding_sync.py | 3 +-- synapse/rest/client/sync.py | 4 +++- synapse/types/handlers/__init__.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py index 7a6ef1a2d9..f2b29ce1d1 100644 --- a/synapse/handlers/sliding_sync.py +++ b/synapse/handlers/sliding_sync.py @@ -879,8 +879,7 @@ class SlidingSyncHandler: return SlidingSyncResult.RoomResult( # TODO: Dummy value - # TODO: Make this optional because a computed name doesn't make sense for translated cases - name="TODO", + name=None, # TODO: Dummy value avatar=None, # TODO: Dummy value diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index 434eaa4789..da28c2b3a5 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -990,7 +990,6 @@ class SlidingSyncRestServlet(RestServlet): ) serialized_rooms[room_id] = { - "name": room_result.name, "required_state": serialized_required_state, "timeline": serialized_timeline, "prev_batch": await room_result.prev_batch.to_string(self.store), @@ -1002,6 +1001,9 @@ class SlidingSyncRestServlet(RestServlet): "num_live": room_result.num_live, } + if room_result.name: + serialized_rooms[room_id]["name"] = room_result.name + if room_result.avatar: serialized_rooms[room_id]["avatar"] = room_result.avatar diff --git a/synapse/types/handlers/__init__.py b/synapse/types/handlers/__init__.py index 04b0ab972b..1b544456a6 100644 --- a/synapse/types/handlers/__init__.py +++ b/synapse/types/handlers/__init__.py @@ -186,7 +186,7 @@ class SlidingSyncResult: (with potentially other old events in the timeline). """ - name: str + name: Optional[str] avatar: Optional[str] heroes: Optional[List[EventBase]] initial: bool