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

Fix how push_actions are redacted.

Browse source
This commit is contained in:
Mark Haines 2016-07-26 11:05:39 +01:00
parent efeb6176c1
commit a6f06ce3e2
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
synapse/storage/events.py
View file

@ -522,6 +522,8 @@ class EventsStore(SQLBaseStore):
] ]
if not events_and_contexts: if not events_and_contexts:
# Make sure we don't pass an empty list to functions that expect to
# be storing at least one element.
return return
# From this point onwards the events are only events that we haven't # From this point onwards the events are only events that we haven't
@ -608,6 +610,13 @@ class EventsStore(SQLBaseStore):
txn, event, context.push_actions txn, event, context.push_actions
) )
if event.type == EventTypes.Redaction and event.redacts is not None:
# Remove the entries in the event_push_actions table for the
# redacted event.
self._remove_push_actions_for_event_id_txn(
txn, event.room_id, event.redacts
)
self._simple_insert_many_txn( self._simple_insert_many_txn(
txn, txn,
table="event_auth", table="event_auth",
@ -622,13 +631,6 @@ class EventsStore(SQLBaseStore):
], ],
) )
if event.type == EventTypes.Redaction and event.redacts is not None:
# Remove the entries in the event_push_actions table for the
# redacted event.
self._remove_push_actions_for_event_id_txn(
txn, event.room_id, event.redacts
)
# Insert into the state_groups, state_groups_state, and # Insert into the state_groups, state_groups_state, and
# event_to_state_groups tables. # event_to_state_groups tables.
self._store_mult_state_groups_txn(txn, events_and_contexts) self._store_mult_state_groups_txn(txn, events_and_contexts)
@ -716,7 +718,7 @@ class EventsStore(SQLBaseStore):
], ],
) )
# Prefil the event cache # Prefill the event cache
self._add_to_cache(txn, events_and_contexts) self._add_to_cache(txn, events_and_contexts)
if backfilled: if backfilled: