summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-30 16:46:24 +0100
committerErik Johnston <erik@matrix.org>2015-09-30 16:46:24 +0100
commitecd0c0dfc50ceed16aa47cf066bc412211af2335 (patch)
tree0253130902b7c65d1cc78abca3e328e177756986 /synapse/handlers
parentSet m.room.canonical_alias on room creation. (diff)
downloadsynapse-ecd0c0dfc50ceed16aa47cf066bc412211af2335.tar.xz
Remove double indentation
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index e194f39e70..2b15136bda 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -272,14 +272,13 @@ class RoomCreationHandler(BaseHandler): returned_events.append(power_levels_event) - if room_alias: - if (EventTypes.CanonicalAlias, '') not in initial_state: - room_alias_event = create( - etype=EventTypes.CanonicalAlias, - content={"alias": room_alias.to_string()}, - ) + if room_alias and (EventTypes.CanonicalAlias, '') not in initial_state: + room_alias_event = create( + etype=EventTypes.CanonicalAlias, + content={"alias": room_alias.to_string()}, + ) - returned_events.append(room_alias_event) + returned_events.append(room_alias_event) if (EventTypes.JoinRules, '') not in initial_state: join_rules_event = create(