mirror of
https://github.com/element-hq/synapse
synced 2024-09-05 20:00:05 +00:00
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts: synapse/handlers/room.py
This commit is contained in:
commit
feedaa37fa
1 changed files with 3 additions and 3 deletions
|
@ -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()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue