diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-07-25 16:12:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-07-25 16:12:16 +0100 |
| commit | 2623cec8746392067e781164e8ed4f2236b15bec (patch) | |
| tree | c8e64399145114586b2044d0cba79f7ea133283e | |
| parent | fix: defer.returnValue takes one argument (diff) | |
| download | synapse-2623cec8746392067e781164e8ed4f2236b15bec.tar.xz | |
Don't add rejections to the state_group, persist all rejections
| -rw-r--r-- | synapse/storage/events.py | 9 | ||||
| -rw-r--r-- | synapse/storage/state.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 6610549281..41c9b17d14 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -591,10 +591,11 @@ class EventsStore(SQLBaseStore): ], ) - if context.rejected: - self._store_rejections_txn( - txn, event.event_id, context.rejected - ) + for event, context in events_and_contexts: + if context.rejected: + self._store_rejections_txn( + txn, event.event_id, context.rejected + ) self._simple_insert_many_txn( txn, diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 5b743db67a..cc1c7ec6a7 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -79,7 +79,7 @@ class StateStore(SQLBaseStore): state_events = dict(context.current_state) - if event.is_state(): + if event.is_state() and not context.rejected: state_events[(event.type, event.state_key)] = event state_group = context.new_state_group_id |