summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 11:26:09 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 11:26:09 +0100
commitcbd053bb8f0e5732f88a6ca3a9b8209ec41d7975 (patch)
treed36a52e67cdd805d45a7a90d5f546a4e819b99b8 /synapse/handlers/room.py
parentMerge pull request #234 from matrix-org/email_login (diff)
parentCheck that the canonical room alias actually points to the room (diff)
downloadsynapse-cbd053bb8f0e5732f88a6ca3a9b8209ec41d7975.tar.xz
Merge pull request #233 from matrix-org/erikj/canonical_alias
Add server side support for canonical aliases
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 82c16013a3..8108c2763d 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -250,6 +250,7 @@ class RoomCreationHandler(BaseHandler):
                     EventTypes.Name: 100,
                     EventTypes.PowerLevels: 100,
                     EventTypes.RoomHistoryVisibility: 100,
+                    EventTypes.CanonicalAlias: 100,
                 },
                 "events_default": 0,
                 "state_default": 50,