summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 20:27:45 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 20:27:45 +0100
commit6d285606264928b92eab759bbc42192553ca20e6 (patch)
tree4c7ebda12fdf3d94505e777de6d806197655db83
parentMerge branch 'develop' of github.com:matrix-org/synapse into room_config (diff)
downloadsynapse-6d285606264928b92eab759bbc42192553ca20e6.tar.xz
Don't put required power levels on permission state events
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index f33bec9cc1..9858d1af50 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -149,6 +149,7 @@ class RoomCreationHandler(BaseRoomHandler):
         event_keys = {
             "room_id": room_id,
             "user_id": creator.to_string(),
+            "required_power_level": 10,
         }
 
         def create(etype, **content):
@@ -164,9 +165,10 @@ class RoomCreationHandler(BaseRoomHandler):
             default=0,
         )
 
-        power_levels_event = create(
+        power_levels_event = self.event_factory.create_event(
             etype=RoomPowerLevelsEvent.TYPE,
-            **{creator.to_string(): 10, "default": 0}
+            content={creator.to_string(): 10, "default": 0},
+            **event_keys
         )
 
         join_rule = JoinRules.PUBLIC if is_public else JoinRules.INVITE