OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor a bit

pull/7066/head
Brendan Abolivier 2020-03-11 18:49:41 +00:00
parent 37a9873f63
commit 8120a238a4
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
synapse/visibility.py
View File

@ -118,34 +118,36 @@ def filter_events_for_client(
the original event if they can see it as normal. the original event if they can see it as normal.
""" """
if event.type == "org.matrix.dummy_event" and filter_send_to_client: # Only run some checks if these events aren't about to be sent to clients. This is
return None # because, if this is not the case, we're probably only checking if the users can
# see events in the room at that point in the DAG, and that shouldn't be decided
# on those checks.
if filter_send_to_client:
if event.type == "org.matrix.dummy_event":
return None
if ( if not event.is_state() and event.sender in ignore_list:
not event.is_state() return None
and event.sender in ignore_list
and filter_send_to_client
):
return None
# Until MSC2261 has landed we can't redact malicious alias events, so for # Until MSC2261 has landed we can't redact malicious alias events, so for
# now we temporarily filter out m.room.aliases entirely to mitigate # now we temporarily filter out m.room.aliases entirely to mitigate
# abuse, while we spec a better solution to advertising aliases # abuse, while we spec a better solution to advertising aliases
# on rooms. # on rooms.
if event.type == EventTypes.Aliases and filter_send_to_client: if event.type == EventTypes.Aliases:
return None return None
# Don't try to apply the room's retention policy if the event is a state event, as # Don't try to apply the room's retention policy if the event is a state
# MSC1763 states that retention is only considered for non-state events. # event, as MSC1763 states that retention is only considered for non-state
if filter_send_to_client and not event.is_state(): # events.
retention_policy = retention_policies[event.room_id] if not event.is_state():
max_lifetime = retention_policy.get("max_lifetime") retention_policy = retention_policies[event.room_id]
max_lifetime = retention_policy.get("max_lifetime")
if max_lifetime is not None: if max_lifetime is not None:
oldest_allowed_ts = storage.main.clock.time_msec() - max_lifetime oldest_allowed_ts = storage.main.clock.time_msec() - max_lifetime
if event.origin_server_ts < oldest_allowed_ts: if event.origin_server_ts < oldest_allowed_ts:
return None return None
if event.event_id in always_include_ids: if event.event_id in always_include_ids:
return event return event