diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
| commit | f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/handlers/room.py | |
| parent | Separate out the matrix http client completely because just about all of its ... (diff) | |
| parent | Fix pep8 codestyle warnings (diff) | |
| download | synapse-f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae.tar.xz | |
Merge branch 'develop' into http_client_refactor
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 7d9458e1d0..88955160c5 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -178,7 +178,9 @@ class RoomCreationHandler(BaseHandler): if room_alias: result["room_alias"] = room_alias.to_string() - directory_handler.send_room_alias_update_event(user_id, room_id) + yield directory_handler.send_room_alias_update_event( + user_id, room_id + ) defer.returnValue(result) @@ -211,7 +213,6 @@ class RoomCreationHandler(BaseHandler): **event_keys ) - power_levels_event = self.event_factory.create_event( etype=RoomPowerLevelsEvent.TYPE, content={ @@ -480,7 +481,7 @@ class RoomMemberHandler(BaseHandler): ) user = self.hs.parse_userid(event.user_id) - self.distributor.fire( + yield self.distributor.fire( "user_joined_room", user=user, room_id=room_id ) |