summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-19 17:52:58 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-19 17:52:58 +0000
commit420ccfc925bbdc4344e3f870b61dba2dd5069f6b (patch)
treea705309ba66e2e60e3796c276bd2e2f3867e1956 /synapse/handlers/room.py
parentMerge branch 'release-v0.6.0' (diff)
parentMock ratelimiter to make tests pass. (diff)
downloadsynapse-420ccfc925bbdc4344e3f870b61dba2dd5069f6b.tar.xz
Merge branch 'hotfixes-v0.6.0' v0.6.0a
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 9644cd3d34..deefc3c11e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -130,6 +130,7 @@ class RoomCreationHandler(BaseHandler):
                 "type": EventTypes.Name,
                 "room_id": room_id,
                 "sender": user_id,
+                "state_key": "",
                 "content": {"name": name},
             })
 
@@ -139,6 +140,7 @@ class RoomCreationHandler(BaseHandler):
                 "type": EventTypes.Topic,
                 "room_id": room_id,
                 "sender": user_id,
+                "state_key": "",
                 "content": {"topic": topic},
             })