summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-12-18 09:51:51 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-18 09:51:51 +0000
commit6e8f8e14f272a5de61de675f6a01a5e1fc834c41 (patch)
tree5cc934c1e024e101cde67f698ee5b957101942b3 /synapse/visibility.py
parentRemove unused `get_pagination_rows` methods. (#6557) (diff)
parentFix bug where we added duplicate event IDs as auth_events (#6560) (diff)
downloadsynapse-6e8f8e14f272a5de61de675f6a01a5e1fc834c41.tar.xz
Merge release-v1.7.1 into develop
Diffstat (limited to 'synapse/visibility.py')
-rw-r--r--synapse/visibility.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py

index dffe943b28..100dc47a8a 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py
@@ -52,7 +52,8 @@ def filter_events_for_client( apply_retention_policies=True, ): """ - Check which events a user is allowed to see + Check which events a user is allowed to see. If the user can see the event but its + sender asked for their data to be erased, prune the content of the event. Args: storage