Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't add rejections to the state_group, persist all rejections

This commit is contained in:
Mark Haines 2016-07-25 16:12:16 +01:00
parent 955ef1f06c
commit 2623cec874
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/storage/events.py
View File

@ -591,6 +591,7 @@ class EventsStore(SQLBaseStore):
], ],
) )
for event, context in events_and_contexts:
if context.rejected: if context.rejected:
self._store_rejections_txn( self._store_rejections_txn(
txn, event.event_id, context.rejected txn, event.event_id, context.rejected

2
synapse/storage/state.py
View File

@ -79,7 +79,7 @@ class StateStore(SQLBaseStore):
state_events = dict(context.current_state) 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_events[(event.type, event.state_key)] = event
state_group = context.new_state_group_id state_group = context.new_state_group_id