From 01209382fbb5ccf7bdef71f1d42f754b125f625a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 10 Feb 2020 18:07:35 +0000
Subject: [PATCH] filter out m.room.aliases from /sync state blocks (#6884)

We forgot to filter out aliases from /sync state blocks as well as the timeline.
---
 changelog.d/6884.feature | 1 +
 synapse/handlers/sync.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/6884.feature

diff --git a/changelog.d/6884.feature b/changelog.d/6884.feature
new file mode 100644
index 000000000..4f6b9630b
--- /dev/null
+++ b/changelog.d/6884.feature
@@ -0,0 +1 @@
+Filter out m.room.aliases from /sync state blocks until a full fix lands.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index cd95f85e3..2b62fd83f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -883,6 +883,7 @@ class SyncHandler(object):
             for e in sync_config.filter_collection.filter_room_state(
                 list(state.values())
             )
+            if e.type != EventTypes.Aliases  # until MSC2261 or alternative solution
         }
 
     async def unread_notifs_for_room_id(self, room_id, sync_config):