From 806b25512ebb6f80d80b5b9ebfe68749b40f09b4 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 29 Sep 2022 18:49:09 -0500 Subject: Remove non-appservice usages split out to other PRs --- synapse/handlers/room_member.py | 2 +- synapse/handlers/user_directory.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 96cc6eae71..88158822e0 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -1150,7 +1150,7 @@ 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_local_users_in_room(old_room_id) + 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) # Add new room to the room directory if the old room was there diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py index 19df4de439..8c3c52e1ca 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py @@ -392,7 +392,6 @@ class UserDirectoryHandler(StateDeltasHandler): if is_public: await self.store.add_users_in_public_rooms(room_id, (user_id,)) else: - # TODO: get_local_users_in_room here users_in_room = await self.store.get_users_in_room(room_id) other_users_in_room = [ other -- cgit 1.5.1