summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-12 10:31:21 +0000
committerErik Johnston <erik@matrix.org>2019-03-06 16:22:16 +0000
commita9de04be724be9e19af0a5a5839c65924f90886a (patch)
tree2a3abf94c400b64173876b797e413342ba061c53 /synapse/storage/events.py
parentMerge pull request #4772 from jbweston/jbweston/server-version-api (diff)
downloadsynapse-a9de04be724be9e19af0a5a5839c65924f90886a.tar.xz
Implement soft fail
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r--synapse/storage/events.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 06db9e56e6..990a5eaaae 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -537,6 +537,7 @@ class EventsStore(StateGroupWorkerStore, EventFederationStore, EventsWorkerStore
         new_events = [
             event for event, ctx in event_contexts
             if not event.internal_metadata.is_outlier() and not ctx.rejected
+            and not event.internal_metadata.is_soft_failed()
         ]
 
         # start with the existing forward extremities