summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-19 12:03:09 +0100
committerErik Johnston <erik@matrix.org>2015-08-19 12:03:09 +0100
commitd7272f8d9d0ce3ac9a4095969453efef5aecce40 (patch)
tree0f8c85f9ee093a9e99102e083bc584b19c75bd61 /synapse
parentRemove an access token log line (diff)
downloadsynapse-d7272f8d9d0ce3ac9a4095969453efef5aecce40.tar.xz
Add canonical alias to the default power levels
Diffstat (limited to '')
-rw-r--r--synapse/api/constants.py1
-rw-r--r--synapse/handlers/room.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 7156ee4e7d..60a0d336da 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -76,6 +76,7 @@ class EventTypes(object):
     Feedback = "m.room.message.feedback"
 
     RoomHistoryVisibility = "m.room.history_visibility"
+    CanonicalAlias = "m.room.canonical_alias"
 
     # These are used for validation
     Message = "m.room.message"
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 7511d294f3..c56112a92a 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,