diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-08 11:44:20 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-08 11:44:20 +0000 |
| commit | 8c4896668fd602e2822dfc48e992ed48bbc5adf7 (patch) | |
| tree | 99c0052e1697e74379050ad7af4cef2d62f21c2e /synapse/rest/client/v1/admin.py | |
| parent | Factor out soft fail checks (diff) | |
| parent | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates (diff) | |
| download | synapse-8c4896668fd602e2822dfc48e992ed48bbc5adf7.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_impl
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 0201cf1186..2a29f0c2af 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -488,17 +488,6 @@ class ShutdownRoomRestServlet(ClientV1RestServlet): ) new_room_id = info["room_id"] - yield self.event_creation_handler.create_and_send_nonmember_event( - room_creator_requester, - { - "type": "m.room.message", - "content": {"body": message, "msgtype": "m.text"}, - "room_id": new_room_id, - "sender": new_room_user_id, - }, - ratelimit=False, - ) - requester_user_id = requester.user.to_string() logger.info("Shutting down room %r", room_id) @@ -536,6 +525,17 @@ class ShutdownRoomRestServlet(ClientV1RestServlet): kicked_users.append(user_id) + yield self.event_creation_handler.create_and_send_nonmember_event( + room_creator_requester, + { + "type": "m.room.message", + "content": {"body": message, "msgtype": "m.text"}, + "room_id": new_room_id, + "sender": new_room_user_id, + }, + ratelimit=False, + ) + aliases_for_room = yield self.store.get_aliases_for_room(room_id) yield self.store.update_aliases_for_room( |