summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2020-02-10 18:07:35 +0000
committerGitHub <noreply@github.com>2020-02-10 18:07:35 +0000
commit01209382fbb5ccf7bdef71f1d42f754b125f625a (patch)
tree894f1373fa561c96043b9f40d048082e2debb7d2
parent1.10.0rc3 (diff)
downloadsynapse-01209382fbb5ccf7bdef71f1d42f754b125f625a.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--changelog.d/6884.feature1
-rw-r--r--synapse/handlers/sync.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6884.feature b/changelog.d/6884.feature
new file mode 100644
index 0000000000..4f6b9630b8
--- /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 cd95f85e3f..2b62fd83fd 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):