diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
| commit | 8e2d4c6da55d2a21492f8610d595046f07d9887e (patch) | |
| tree | 85ca2f67dd9552a3884d76d7d645adfb88e179e4 /synapse/handlers/room.py | |
| parent | Create the correct events with the right configuration when creating a new room. (diff) | |
| parent | Merge branch 'release-v0.1.0' into develop (diff) | |
| download | synapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 1ced7d0613..d46bc308b4 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -360,7 +360,8 @@ class RoomMemberHandler(BaseRoomHandler): ) snapshot = yield self.store.snapshot_room( - room_id, joinee, RoomMemberEvent.TYPE, joinee + room_id, joinee.to_string(), RoomMemberEvent.TYPE, + joinee.to_string() ) yield self._do_join(new_event, snapshot, room_host=host, do_auth=True) |