summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-24 16:58:39 +0100
committerErik Johnston <erik@matrix.org>2014-09-24 16:59:57 +0100
commit72eb360f2d98b6aead026b9911080d54983b99fb (patch)
treeacf24ca99b2a06c18f5970d5dd3acb4dd931c206 /synapse/handlers
parentFixed getUserDisplayname when the user has a null displayname (diff)
downloadsynapse-72eb360f2d98b6aead026b9911080d54983b99fb.tar.xz
Don't set the room name to be the room alias on room creation if the client didn't supply a name
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 5bc1280432..4d8727e8af 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -146,17 +146,6 @@ class RoomCreationHandler(BaseHandler):
             )
 
             yield handle_event(name_event)
-        elif room_alias:
-            name = room_alias.to_string()
-            name_event = self.event_factory.create_event(
-                etype=RoomNameEvent.TYPE,
-                room_id=room_id,
-                user_id=user_id,
-                required_power_level=50,
-                content={"name": name},
-            )
-
-            yield handle_event(name_event)
 
         if "topic" in config:
             topic = config["topic"]