diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-01 10:54:37 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-01 14:36:50 +0000 |
commit | 784f036306a020fcde495887c2881209b913b9b8 (patch) | |
tree | 87eb76c9a058034dab5c82baa1b01a59152bc33f /synapse/rest/client/v1/admin.py | |
parent | Merge pull request #2920 from matrix-org/erikj/retry_send_event (diff) | |
download | synapse-784f036306a020fcde495887c2881209b913b9b8.tar.xz |
Move RoomMemberHandler out of Handlers
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r-- | synapse/rest/client/v1/admin.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 6073cc6fa2..3917eee42d 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -180,6 +180,7 @@ class ShutdownRoomRestServlet(ClientV1RestServlet): self.handlers = hs.get_handlers() self.state = hs.get_state_handler() self.event_creation_handler = hs.get_event_creation_handler() + self.room_member_handler = hs.get_room_member_handler() @defer.inlineCallbacks def on_POST(self, request, room_id): @@ -238,7 +239,7 @@ class ShutdownRoomRestServlet(ClientV1RestServlet): logger.info("Kicking %r from %r...", user_id, room_id) target_requester = create_requester(user_id) - yield self.handlers.room_member_handler.update_membership( + yield self.room_member_handler.update_membership( requester=target_requester, target=target_requester.user, room_id=room_id, @@ -247,9 +248,9 @@ class ShutdownRoomRestServlet(ClientV1RestServlet): ratelimit=False ) - yield self.handlers.room_member_handler.forget(target_requester.user, room_id) + yield self.room_member_handler.forget(target_requester.user, room_id) - yield self.handlers.room_member_handler.update_membership( + yield self.room_member_handler.update_membership( requester=target_requester, target=target_requester.user, room_id=new_room_id, |