Don't add the events to forward extremities if the event is rejected

This commit is contained in:
Mark Haines 2016-07-25 17:13:37 +01:00
parent 2623cec874
commit 8f7f4cb92b

View file

@ -498,8 +498,8 @@ class EventsStore(SQLBaseStore):
sql, sql,
(False, event.event_id,) (False, event.event_id,)
) )
if not context.rejected:
self._update_extremeties(txn, [event]) self._update_extremeties(txn, [event])
events_and_contexts = [ events_and_contexts = [
ec for ec in events_and_contexts if ec[0] not in to_remove ec for ec in events_and_contexts if ec[0] not in to_remove
@ -512,7 +512,10 @@ class EventsStore(SQLBaseStore):
self._handle_mult_prev_events( self._handle_mult_prev_events(
txn, txn,
events=[event for event, _ in events_and_contexts], events=[
event for event, context in events_and_contexts
if not context.rejected
],
) )
for event, _ in events_and_contexts: for event, _ in events_and_contexts: