OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #287 from matrix-org/erikj/canonical_alias 

Set m.room.canonical_alias on room creation.
pull/291/head
Erik Johnston 2015-09-30 17:14:55 +01:00
parent 301141515a ecd0c0dfc5
commit 0ec78b360c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/handlers/room.py
View File

@ -155,6 +155,7 @@ class RoomCreationHandler(BaseHandler):
preset_config=preset_config,
invite_list=invite_list,
initial_state=initial_state,
room_alias=room_alias,
)
msg_handler = self.hs.get_handlers().message_handler
@ -202,7 +203,7 @@ class RoomCreationHandler(BaseHandler):
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()
@ -271,6 +272,14 @@ class RoomCreationHandler(BaseHandler):
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,