summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <eric.eastwood@beta.gouv.fr>2024-05-16 12:27:38 -0500
committerGitHub <noreply@github.com>2024-05-16 17:27:38 +0000
commitfe07995e691a8f6d84dde4de990f8f53634ec5b5 (patch)
tree9d871d88386622e8366133ab759ebaf8c44dcd07
parentRename to be obvious: `joined_rooms` -> `joined_room_ids` (#17203) (diff)
downloadsynapse-fe07995e691a8f6d84dde4de990f8f53634ec5b5.tar.xz
Fix `joined_rooms`/`joined_room_ids` usage (#17208)
This change was introduced in
https://github.com/element-hq/synapse/pull/17203

But then https://github.com/element-hq/synapse/pull/17207 was reverted
which brought back usage `joined_rooms` that needed to be updated.
Wasn't caught because `develop` wasn't up to date before merging.
-rw-r--r--changelog.d/17208.misc1
-rw-r--r--synapse/handlers/sync.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/17208.misc b/changelog.d/17208.misc
new file mode 100644
index 0000000000..142300b1f2
--- /dev/null
+++ b/changelog.d/17208.misc
@@ -0,0 +1 @@
+Rename to be obvious: `joined_rooms` -> `joined_room_ids`.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 6d4373008c..6634b3887e 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1875,7 +1875,7 @@ class SyncHandler:
                 # or if the changed user is the syncing user (as we always
                 # want to include device list updates of their own devices).
                 if user_id == changed_user_id or any(
-                    rid in joined_rooms for rid in entries
+                    rid in joined_room_ids for rid in entries
                 ):
                     users_that_have_changed.add(changed_user_id)
         else: