mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-08 06:02:14 +00:00
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
This commit is contained in:
parent
ad4c14e4b0
commit
a52c40e2a6
1
changelog.d/13960.misc
Normal file
1
changelog.d/13960.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Use dedicated `get_local_users_in_room(room_id)` function to find local users when calculating users to copy over during a room upgrade.
|
@ -1150,8 +1150,8 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
|
|||||||
logger.info("Transferring room state from %s to %s", old_room_id, room_id)
|
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
|
# 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)
|
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, users)
|
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
|
# Add new room to the room directory if the old room was there
|
||||||
# Remove old room from the room directory
|
# Remove old room from the room directory
|
||||||
|
Loading…
Reference in New Issue
Block a user