diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-02 10:59:24 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-02 10:59:24 +0100 |
| commit | 965168a842f62958bd9bbb33d2ef4678f2f48b27 (patch) | |
| tree | e2cb7b2327f8de1f5aec03d0f91b461e09940541 /synapse/handlers/room_member.py | |
| parent | Fix up the calls to the notifier for device messages (diff) | |
| parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
| download | synapse-965168a842f62958bd9bbb33d2ef4678f2f48b27.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device_synchrotron
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index dd4b90ee24..3ba5335af7 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -93,7 +93,7 @@ class RoomMemberHandler(BaseHandler): ratelimit=ratelimit, ) - prev_member_event_id = context.current_state_ids.get( + prev_member_event_id = context.prev_state_ids.get( (EventTypes.Member, target.to_string()), None ) @@ -341,7 +341,7 @@ class RoomMemberHandler(BaseHandler): if event.membership == Membership.JOIN: if requester.is_guest: - guest_can_join = yield self._can_guest_join(context.current_state_ids) + guest_can_join = yield self._can_guest_join(context.prev_state_ids) if not guest_can_join: # This should be an auth check, but guests are a local concept, # so don't really fit into the general auth process. @@ -355,7 +355,7 @@ class RoomMemberHandler(BaseHandler): ratelimit=ratelimit, ) - prev_member_event_id = context.current_state_ids.get( + prev_member_event_id = context.prev_state_ids.get( (EventTypes.Member, event.state_key), None ) |