summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-07-26 08:02:34 -0400
committerGitHub <noreply@github.com>2022-07-26 08:02:34 -0400
commit57d334a13d983406ea452dfa203bbe4837509c4e (patch)
tree06539dc245a097b4604ad961ed8e2b7811621e18
parentFix infinite loop in partial-state resync (#13353) (diff)
downloadsynapse-57d334a13d983406ea452dfa203bbe4837509c4e.tar.xz
Remove the unspecced `room_id` field in the `/hierarchy` response. (#13365)
The `room_id` field represented the parent space for each room
and was made redundant by changes in the API shape where the
`children_state` is now nested underneath each `room`.

The room ID of each child is in the `state_key` field and is still
available.
-rw-r--r--changelog.d/13365.bugfix1
-rw-r--r--synapse/handlers/room_summary.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/13365.bugfix b/changelog.d/13365.bugfix
new file mode 100644
index 0000000000..b915c3158c
--- /dev/null
+++ b/changelog.d/13365.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.41.0 where the `/hierarchy` API returned non-standard information (a `room_id` field under each entry in `children_state`).
diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py
index 13098f56ed..85811b5bde 100644
--- a/synapse/handlers/room_summary.py
+++ b/synapse/handlers/room_summary.py
@@ -452,7 +452,6 @@ class RoomSummaryHandler:
                 "type": e.type,
                 "state_key": e.state_key,
                 "content": e.content,
-                "room_id": e.room_id,
                 "sender": e.sender,
                 "origin_server_ts": e.origin_server_ts,
             }