tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source
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

9
synapse/storage/events.py
View file

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

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