summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-03-08 14:51:06 +0000
committerGitHub <noreply@github.com>2019-03-08 14:51:06 +0000
commit39e57f97286fd0db108656ddf3bfdc9bae91945f (patch)
tree99c0052e1697e74379050ad7af4cef2d62f21c2e /synapse/visibility.py
parentMerge pull request #4829 from matrix-org/erikj/device_list_seen_updates (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_... (diff)
downloadsynapse-39e57f97286fd0db108656ddf3bfdc9bae91945f.tar.xz
Merge pull request #4814 from matrix-org/erikj/soft_fail_impl
Implement soft fail
Diffstat (limited to 'synapse/visibility.py')
-rw-r--r--synapse/visibility.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py
index efec21673b..16c40cd74c 100644
--- a/synapse/visibility.py
+++ b/synapse/visibility.py
@@ -67,6 +67,10 @@ def filter_events_for_client(store, user_id, events, is_peeking=False,
     Returns:
         Deferred[list[synapse.events.EventBase]]
     """
+    # Filter out events that have been soft failed so that we don't relay them
+    # to clients.
+    events = list(e for e in events if not e.internal_metadata.is_soft_failed())
+
     types = (
         (EventTypes.RoomHistoryVisibility, ""),
         (EventTypes.Member, user_id),