Return a room's current join_rule in each public rooms list entry

matrix-org · Jun 9, 2021 · 0f55f5f · 0f55f5f
1 parent 4de8f3f
commit 0f55f5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
@@ -169,6 +169,7 @@ def build_room_entry(room):
                 "world_readable": room["history_visibility"]
                 == HistoryVisibility.WORLD_READABLE,
                 "guest_can_join": room["guest_access"] == "can_join",
+                "join_rule": room["join_rules"],
             }
 
             # Filter out Nones – rather omit the field altogether

diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
@@ -305,7 +305,7 @@ async def get_largest_public_rooms(
         sql = """
             SELECT
                 room_id, name, topic, canonical_alias, joined_members,
-                avatar, history_visibility, joined_members, guest_access
+                avatar, history_visibility, guest_access, join_rules
             FROM (
                 %(published_sql)s
             ) published