Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Set m.room.canonical_alias on room creation. #287

Merged
merged 2 commits into from
Sep 30, 2015
Merged

Set m.room.canonical_alias on room creation. #287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257fa1c
Set m.room.canonical_alias on room creation.
erikjohnston Sep 23, 2015
ecd0c0d
Remove double indentation
erikjohnston Sep 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion synapse/handlers/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def create_room(self, user_id, room_id, config):
preset_config=preset_config,
invite_list=invite_list,
initial_state=initial_state,
room_alias=room_alias,
)

msg_handler = self.hs.get_handlers().message_handler
Expand Down Expand Up @@ -202,7 +203,7 @@ def create_room(self, user_id, room_id, config):
defer.returnValue(result)

def _create_events_for_new_room(self, creator, room_id, preset_config,
invite_list, initial_state):
invite_list, initial_state, room_alias):
config = RoomCreationHandler.PRESETS_DICT[preset_config]

creator_id = creator.to_string()
Expand Down Expand Up @@ -271,6 +272,14 @@ def create(etype, content, **kwargs):

returned_events.append(power_levels_event)

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)

if (EventTypes.JoinRules, '') not in initial_state:
join_rules_event = create(
etype=EventTypes.JoinRules,
Expand Down