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

Merge branch 'develop' into daniel/roomcleanupincremental 

Conflicts:
	synapse/handlers/room.py
pull/583/head
Daniel Wagner-Hall 2016-02-16 11:34:48 +00:00
parent 4bfb32f685 a182e5d721
commit feedaa37fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/room.py
View File

@ -80,13 +80,13 @@ class RoomCreationHandler(BaseHandler):
""" Creates a new room. """ Creates a new room.
Args: Args:
user_id (str): The ID of the user creating the new room. requester (Requester): The user who requested the room creation.
config (dict) : A dict of configuration options. config (dict) : A dict of configuration options.
Returns: Returns:
The new room ID. The new room ID.
Raises: Raises:
SynapseError if the room ID was taken, couldn't be stored, or SynapseError if the room ID couldn't be stored, or something went
something went horribly wrong. horribly wrong.
""" """
user_id = requester.user.to_string() user_id = requester.user.to_string()