summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 16:07:49 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 16:07:49 +0100
commitc141d47a28f1a0c3a79aa003ea2a4d8e9d58d053 (patch)
tree73d1f30feb8744f7e8b2f2a3a79eaa195ffda872 /synapse
parentMerge pull request #238 from matrix-org/fix_set_password (diff)
parentAdd m.room.avatar to default power levels. Change default required power leve... (diff)
downloadsynapse-c141d47a28f1a0c3a79aa003ea2a4d8e9d58d053.tar.xz
Merge pull request #235 from matrix-org/erikj/room_avatars
Add m.room.avatar to default power levels.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/constants.py1
-rw-r--r--synapse/handlers/room.py5
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 60a0d336da..1423986c1e 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -77,6 +77,7 @@ class EventTypes(object):
 
     RoomHistoryVisibility = "m.room.history_visibility"
     CanonicalAlias = "m.room.canonical_alias"
+    RoomAvatar = "m.room.avatar"
 
     # These are used for validation
     Message = "m.room.message"
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8108c2763d..c5d1001b50 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -247,10 +247,11 @@ class RoomCreationHandler(BaseHandler):
                 },
                 "users_default": 0,
                 "events": {
-                    EventTypes.Name: 100,
+                    EventTypes.Name: 50,
                     EventTypes.PowerLevels: 100,
                     EventTypes.RoomHistoryVisibility: 100,
-                    EventTypes.CanonicalAlias: 100,
+                    EventTypes.CanonicalAlias: 50,
+                    EventTypes.RoomAvatar: 50,
                 },
                 "events_default": 0,
                 "state_default": 50,