From 0fda4e2e50b7ee33458cba58085147bc459453fe Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 30 Jul 2019 15:56:02 +0200 Subject: Should now work, unless we can't find the redaction event which happens for some reason (need to investigate) --- synapse/storage/events_worker.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'synapse/storage/events_worker.py') diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py index b5604cbdef..2983aec55b 100644 --- a/synapse/storage/events_worker.py +++ b/synapse/storage/events_worker.py @@ -559,26 +559,26 @@ class EventsWorkerStore(SQLBaseStore): ) if because: + # It's fine to do add the event directly, since get_pdu_json + # will serialise this field correctly + redacted_event.unsigned["redacted_because"] = because + + # Starting in room version v3, some redactions need to be + # rechecked if we didn't have the redacted event at the + # time, so we recheck on read instead. + if because.internal_metadata.need_to_check_redaction(): + expected_domain = get_domain_from_id(original_ev.sender) + if get_domain_from_id(because.sender) == expected_domain: + # This redaction event is allowed. Mark as not needing a + # recheck. + because.internal_metadata.recheck_redaction = False + else: + # Senders don't match, so the event isn't actually + # redacted + redacted_event = None + if because.room_id != original_ev.room_id: redacted_event = None - else: - # It's fine to do add the event directly, since get_pdu_json - # will serialise this field correctly - redacted_event.unsigned["redacted_because"] = because - - # Starting in room version v3, some redactions need to be - # rechecked if we didn't have the redacted event at the - # time, so we recheck on read instead. - if because.internal_metadata.need_to_check_redaction(): - expected_domain = get_domain_from_id(original_ev.sender) - if get_domain_from_id(because.sender) == expected_domain: - # This redaction event is allowed. Mark as not needing a - # recheck. - because.internal_metadata.recheck_redaction = False - else: - # Senders don't match, so the event isn't actually - # redacted - redacted_event = None cache_entry = _EventCacheEntry( event=original_ev, redacted_event=redacted_event -- cgit 1.5.1