diff options
| author | Erik Johnston <erikj@jki.re> | 2019-03-08 14:51:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 14:51:06 +0000 |
| commit | 39e57f97286fd0db108656ddf3bfdc9bae91945f (patch) | |
| tree | 99c0052e1697e74379050ad7af4cef2d62f21c2e /synapse/storage/events.py | |
| parent | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_... (diff) | |
| download | synapse-39e57f97286fd0db108656ddf3bfdc9bae91945f.tar.xz | |
Merge pull request #4814 from matrix-org/erikj/soft_fail_impl
Implement soft fail
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 1 |
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 |