diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-30 20:10:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 20:10:50 -0500 |
| commit | a52c40e2a6d3a142c9cf768479ec963354c3e360 (patch) | |
| tree | 035abad3b8487f8f9cbc0840ba7208bdddc14fc9 /synapse | |
| parent | Clarifications in user directory for users who share rooms tracking (#13966) (diff) | |
| download | synapse-a52c40e2a6d3a142c9cf768479ec963354c3e360.tar.xz | |
Fix `get_users_in_room` mis-use in `transfer_room_state_on_room_upgrade` (#13960)
Spawning from looking into `get_users_in_room` while investigating https://github.com/matrix-org/synapse/issues/13942#issuecomment-1262787050. See https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755 for the original exploration around finding `get_users_in_room` mis-uses. Related to the following PRs where we also cleaned up some `get_users_in_room` mis-uses: - https://github.com/matrix-org/synapse/pull/13605 - https://github.com/matrix-org/synapse/pull/13608 - https://github.com/matrix-org/synapse/pull/13606 - https://github.com/matrix-org/synapse/pull/13958
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 88158822e0..ee669eb30f 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -1150,8 +1150,8 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): logger.info("Transferring room state from %s to %s", old_room_id, room_id) # Find all local users that were in the old room and copy over each user's state - users = await self.store.get_users_in_room(old_room_id) - await self.copy_user_state_on_room_upgrade(old_room_id, room_id, users) + local_users = await self.store.get_local_users_in_room(old_room_id) + await self.copy_user_state_on_room_upgrade(old_room_id, room_id, local_users) # Add new room to the room directory if the old room was there # Remove old room from the room directory |