diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-01 14:20:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:20:42 +0100 |
| commit | 44982606ee7486f970cbfab545e77c10892fd672 (patch) | |
| tree | 91c6ff57c8b781b772044e303450322e101a34c8 /synapse/handlers/room_member.py | |
| parent | Lower get_linearized_receipts_for_room cache size (diff) | |
| parent | Use state_groups table to test existence (diff) | |
| download | synapse-44982606ee7486f970cbfab545e77c10892fd672.tar.xz | |
Merge pull request #1060 from matrix-org/erikj/state_ids
Assign state groups in state handler.
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 ) |