diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
commit | 697f6714a4c65cec6019231a7bac84e1b544c42d (patch) | |
tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse/handlers/room.py | |
parent | Bump versions and changelog (diff) | |
parent | Just use a yaml list for turn servers (diff) | |
download | synapse-697f6714a4c65cec6019231a7bac84e1b544c42d.tar.xz |
Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 5bc1280432..c0f9a7c807 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"] @@ -255,6 +244,7 @@ class RoomCreationHandler(BaseHandler): etype=RoomOpsPowerLevelsEvent.TYPE, ban_level=50, kick_level=50, + redact_level=50, ) return [ |