Skip to content

Commit

Permalink
Revert "filter out m.room.aliases from the CS API until a better solu…
Browse files Browse the repository at this point in the history
…tion is specced (matrix-org#6878)"

This reverts commit 8e64c5a.
  • Loading branch information
ara4n authored and turt2live committed Feb 27, 2020
1 parent 9c1b83b commit 628b0de
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions synapse/visibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,6 @@ def allowed(event):
if not event.is_state() and event.sender in ignore_list:
return None

# Until MSC2261 has landed we can't redact malicious alias events, so for
# now we temporarily filter out m.room.aliases entirely to mitigate
# abuse, while we spec a better solution to advertising aliases
# on rooms.
if event.type == EventTypes.Aliases:
return None

# 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 apply_retention_policies and not event.is_state():
Expand Down

0 comments on commit 628b0de

Please sign in to comment.