Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-04 06:34:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't apply retention policy based filtering on state events

Browse source 
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.
This commit is contained in:
Brendan Abolivier 2019-11-06 15:47:40 +00:00
parent 09957ce0e4
commit f03c9d3444
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/visibility.py
View file

@ -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