Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop

This commit is contained in:
Matthew Hodgson 2014-11-17 11:11:15 -08:00
parent b80d1925ff cf45e57d9c
commit d18fc97717
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -54,6 +54,7 @@ setup(
"mock" "mock"
], ],
include_package_data=True, include_package_data=True,
zip_safe=False,
long_description=read("README.rst"), long_description=read("README.rst"),
entry_points=""" entry_points="""
[console_scripts] [console_scripts]

18
synapse/handlers/room.py
View File

@ -111,15 +111,6 @@ class RoomCreationHandler(BaseHandler):
user, room_id, is_public=is_public user, room_id, is_public=is_public
) )
if room_alias:
directory_handler = self.hs.get_handlers().directory_handler
yield directory_handler.create_association(
user_id=user_id,
room_id=room_id,
room_alias=room_alias,
servers=[self.hs.hostname],
)
@defer.inlineCallbacks @defer.inlineCallbacks
def handle_event(event): def handle_event(event):
snapshot = yield self.store.snapshot_room(event) snapshot = yield self.store.snapshot_room(event)
@ -184,9 +175,18 @@ class RoomCreationHandler(BaseHandler):
join_event, join_event,
do_auth=False do_auth=False
) )
result = {"room_id": room_id} result = {"room_id": room_id}
if room_alias: if room_alias:
result["room_alias"] = room_alias.to_string() result["room_alias"] = room_alias.to_string()
directory_handler = self.hs.get_handlers().directory_handler
yield directory_handler.create_association(
user_id=user_id,
room_id=room_id,
room_alias=room_alias,
servers=[self.hs.hostname],
)
defer.returnValue(result) defer.returnValue(result)