diff options
author | Andrej Shadura <andrewsh@debian.org> | 2020-05-25 11:54:03 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2020-05-25 11:54:03 +0200 |
commit | da7f96aa2a3b1485dafa016f38aac1d4376b64e7 (patch) | |
tree | 2c4cdc1096370cff409af72b9e97d3edf5f84c59 /synapse/events | |
parent | bef77b10b264d8c082a3604656e186ab162e5d64 (diff) |
New upstream version 1.13.0
Diffstat (limited to 'synapse/events')
-rw-r--r-- | synapse/events/snapshot.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 9ea85e93..7c5f620d 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -322,11 +322,14 @@ class _AsyncEventContextImpl(EventContext): self._current_state_ids = yield self._storage.state.get_state_ids_for_group( self.state_group ) - if self._prev_state_id and self._event_state_key is not None: + if self._event_state_key is not None: self._prev_state_ids = dict(self._current_state_ids) key = (self._event_type, self._event_state_key) - self._prev_state_ids[key] = self._prev_state_id + if self._prev_state_id: + self._prev_state_ids[key] = self._prev_state_id + else: + self._prev_state_ids.pop(key, None) else: self._prev_state_ids = self._current_state_ids |