summary refs log tree commit diff
path: root/synapse/visibility.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/visibility.py
parentMerge pull request #4772 from jbweston/jbweston/server-version-api (diff)
downloadsynapse-a9de04be724be9e19af0a5a5839c65924f90886a.tar.xz
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),