diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-31 13:55:02 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-31 14:26:22 +0100 |
| commit | c10cb581c6ce54e7dfa1f8a0f6449ee7f6d049d4 (patch) | |
| tree | 18c7bb219894d6d75489ff33e92b3cba897aa872 /synapse/handlers/room_member.py | |
| parent | Generate state group ids in state layer (diff) | |
| download | synapse-c10cb581c6ce54e7dfa1f8a0f6449ee7f6d049d4.tar.xz | |
Correctly handle the difference between prev and current state
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 ) |