summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:47 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:47 +0000
commit605cd089f7e366506e16644c3ffb47dd01266c3e (patch)
tree9298a1a5f8603d1d1699cb2be72bdf30f515b983 /synapse/handlers
parentReject device display names that are too long (#6882) (diff)
parent1.10.0rc4 (diff)
downloadsynapse-605cd089f7e366506e16644c3ffb47dd01266c3e.tar.xz
Merge branch 'release-v1.10.0' into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index f8d60d32ba..4324bc702e 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -932,6 +932,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(