summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2022-09-06 19:28:44 +0000
committerGitHub <noreply@github.com>2022-09-06 15:28:44 -0400
commit26bc26586b4b95d63ce7e453e9312469843f796e (patch)
tree0a3434ba0a4e9415508049df56ee47709ce5028e
parentAdd a stub Rust crate (#12595) (diff)
downloadsynapse-26bc26586b4b95d63ce7e453e9312469843f796e.tar.xz
Remove the unspecced room_id field in the /hierarchy response. (#13506)
This is a re-do of 57d334a13d983406ea452dfa203bbe4837509c4e (#13365),
which was backed out in 12abd724974a2311d5311272d26d2f8aa11734a9 (#13501).

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/13506.bugfix1
-rw-r--r--synapse/handlers/room_summary.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/13506.bugfix b/changelog.d/13506.bugfix
new file mode 100644
index 0000000000..2e43668865
--- /dev/null
+++ b/changelog.d/13506.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`).
\ No newline at end of file
diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py
index 732b0310bc..ebd445adca 100644
--- a/synapse/handlers/room_summary.py
+++ b/synapse/handlers/room_summary.py
@@ -453,7 +453,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,
             }