Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-10 13:02:46 -05:00
Code Issues Projects Releases Packages Wiki Activity

Make 'event.redacts' never raise. (#6771)

Browse source 
There are quite a few places that we assume that a redaction event has a
corresponding `redacts` key, which is not always the case. So lets
cheekily make it so that event.redacts just returns None instead.
This commit is contained in:
Erik Johnston 2020-01-23 15:19:03 +00:00 • committed by GitHub
parent 51fc3f693e
commit fa4d609e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/data_stores/main/events.py
View file

@ -951,7 +951,7 @@ class EventsStore(
elif event.type == EventTypes.Message:
# Insert into the event_search table.
self._store_room_message_txn(txn, event)
elif event.type == EventTypes.Redaction:
elif event.type == EventTypes.Redaction and event.redacts is not None:
# Insert into the redactions table.
self._store_redaction(txn, event)
elif event.type == EventTypes.Retention:

2
synapse/storage/data_stores/main/events_worker.py
View file

@ -287,7 +287,7 @@ class EventsWorkerStore(SQLBaseStore):
# we have to recheck auth now.
if not allow_rejected and entry.event.type == EventTypes.Redaction:
if not hasattr(entry.event, "redacts"):
if entry.event.redacts is None:
# A redacted redaction doesn't have a `redacts` key, in
# which case lets just withhold the event.
#