summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2023-02-13 16:30:58 +0000
committerGitHub <noreply@github.com>2023-02-13 16:30:58 +0000
commit3d7aead5d62e6da97e006199b3f957325e54b053 (patch)
tree46582b41a84118b41455a8544b6fb5de19339a7a
parentUpdate pyo3-log to v0.8.1 (#15043) (diff)
downloadsynapse-3d7aead5d62e6da97e006199b3f957325e54b053.tar.xz
Tweak comment on `_is_local_room_accessible` as part of room visibility in `/hierarchy` to clarify the condition for a room being visible. (#14834)
-rw-r--r--changelog.d/14834.misc1
-rw-r--r--synapse/handlers/room_summary.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/14834.misc b/changelog.d/14834.misc
new file mode 100644
index 0000000000..e683212dc4
--- /dev/null
+++ b/changelog.d/14834.misc
@@ -0,0 +1 @@
+Tweak comment on `_is_local_room_accessible` as part of room visibility in `/hierarchy` to clarify the condition for a room being visible.
\ No newline at end of file
diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py
index 4472019fbc..807245160d 100644
--- a/synapse/handlers/room_summary.py
+++ b/synapse/handlers/room_summary.py
@@ -521,8 +521,8 @@ class RoomSummaryHandler:
 
         It should return true if:
 
-        * The requester is joined or can join the room (per MSC3173).
-        * The origin server has any user that is joined or can join the room.
+        * The requesting user is joined or can join the room (per MSC3173); or
+        * The origin server has any user that is joined or can join the room; or
         * The history visibility is set to world readable.
 
         Args: