summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-07-31 15:48:57 +0200
committerBrendan Abolivier <babolivier@matrix.org>2019-07-31 15:48:57 +0200
commit35ec13baab12c1800d8e6d5503643bdc76ef165f (patch)
tree8dfc84967e34d14fc0e7799f067cbe5e048025c5
parentIgnore invalid redactions in _get_event_from_row (diff)
downloadsynapse-35ec13baab12c1800d8e6d5503643bdc76ef165f.tar.xz
Ignore redactions of redactions in get_events_as_list
-rw-r--r--synapse/storage/events_worker.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py
index b771cf98ce..5dc49822b5 100644
--- a/synapse/storage/events_worker.py
+++ b/synapse/storage/events_worker.py
@@ -272,10 +272,7 @@ class EventsWorkerStore(SQLBaseStore):
                 if orig_event_info["room_id"] != entry.event.room_id:
                     # Don't process redactions if the redacted event doesn't belong to the
                     # redaction's room.
-                    continue
-
-                if orig_event_info["type"] == EventTypes.Redaction:
-                    # Don't process redactions of redactions.
+                    logger.info("Ignoring redation in another room.")
                     continue
 
                 if entry.event.internal_metadata.need_to_check_redaction():