summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-28 13:40:12 +0100
committerErik Johnston <erik@matrix.org>2014-08-28 13:40:27 +0100
commitb485d622ccd53869e84a681ed82677f03cc0900b (patch)
tree6013016c11ab68f7712199a09fdd643fe0b6024c /synapse/handlers
parentAdded skeleton specification for a general feel of the layout. (diff)
downloadsynapse-b485d622ccd53869e84a681ed82677f03cc0900b.tar.xz
Fix bug where we used UserID objects instead of strigns
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index eb638fe50a..3e41d7a46b 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -325,7 +325,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)