Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-04 17:28:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into room_config

Browse source
This commit is contained in:
Erik Johnston 2014-08-29 14:22:04 +01:00
commit 8e2d4c6da5
33 changed files with 1977 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/handlers/room.py
View file

@ -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)