summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-06 15:47:40 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-11-06 18:40:04 +0000
commitf03c9d34442368c8f2c26d2ac16b770bc451c76d (patch)
tree40dd60bec55f7a34fa8f8060bfe2fbbb81b62e48 /synapse/visibility.py
parentImplement per-room message retention policies (diff)
downloadsynapse-f03c9d34442368c8f2c26d2ac16b770bc451c76d.tar.xz
Don't apply retention policy based filtering on state events
As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
Diffstat (limited to 'synapse/visibility.py')
-rw-r--r--synapse/visibility.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py
index 4498c156bc..4d4141dacc 100644
--- a/synapse/visibility.py
+++ b/synapse/visibility.py
@@ -111,14 +111,17 @@ def filter_events_for_client(
         if not event.is_state() and event.sender in ignore_list:
             return None
 
-        retention_policy = retention_policies[event.room_id]
-        max_lifetime = retention_policy.get("max_lifetime")
+        # Don't try to apply the room's retention policy if the event is a state event, as
+        # MSC1763 states that retention is only considered for non-state events.
+        if not event.is_state():
+            retention_policy = retention_policies[event.room_id]
+            max_lifetime = retention_policy.get("max_lifetime")
 
-        if max_lifetime is not None:
-            oldest_allowed_ts = storage.main.clock.time_msec() - max_lifetime
+            if max_lifetime is not None:
+                oldest_allowed_ts = storage.main.clock.time_msec() - max_lifetime
 
-            if event.origin_server_ts < oldest_allowed_ts:
-                return None
+                if event.origin_server_ts < oldest_allowed_ts:
+                    return None
 
         if event.event_id in always_include_ids:
             return event