summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-15 15:03:27 +0000
committerErik Johnston <erik@matrix.org>2014-12-15 15:03:27 +0000
commit65cdf4e724f3c528aa38d578abd94334d55ce593 (patch)
tree5018e740cdc853bbcae291c05c687dd12fc49116 /synapse/handlers/room.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into events_refactor (diff)
downloadsynapse-65cdf4e724f3c528aa38d578abd94334d55ce593.tar.xz
Get current member state from current_state snapshot. Fix leave test.
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index a1d542854d..d317f2b30e 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -343,9 +343,9 @@ class RoomMemberHandler(BaseHandler): """ target_user_id = event.state_key - # TODO(markjh): get prev state from snapshot. - prev_state = yield self.store.get_room_member( - target_user_id, event.room_id + prev_state = context.current_state.get( + (RoomMemberEvent.TYPE, target_user_id), + None ) room_id = event.room_id