diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-17 17:56:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 17:56:42 +0100 |
| commit | f8a1e76d645d818138ef30c81886d8bcd65d3b12 (patch) | |
| tree | 469a099dda4c13d93f0bb1cf7d3cb7e51d628d9d /synapse/handlers | |
| parent | Merge pull request #3212 from matrix-org/erikj/epa_stream (diff) | |
| parent | Move RoomCreationHandler out of synapse.handlers.Handlers (diff) | |
| download | synapse-f8a1e76d645d818138ef30c81886d8bcd65d3b12.tar.xz | |
Merge pull request #3225 from matrix-org/rav/move_creation_handler
Move RoomCreationHandler out of synapse.handlers.Handlers
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/__init__.py | 5 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 8f8fd82eb0..d358842b3e 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -14,9 +14,7 @@ # limitations under the License. from .register import RegistrationHandler -from .room import ( - RoomCreationHandler, RoomContextHandler, -) +from .room import RoomContextHandler from .message import MessageHandler from .federation import FederationHandler from .directory import DirectoryHandler @@ -47,7 +45,6 @@ class Handlers(object): def __init__(self, hs): self.registration_handler = RegistrationHandler(hs) self.message_handler = MessageHandler(hs) - self.room_creation_handler = RoomCreationHandler(hs) self.federation_handler = FederationHandler(hs) self.directory_handler = DirectoryHandler(hs) self.admin_handler = AdminHandler(hs) diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 8df8fcbbad..e36426de5a 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -72,10 +72,14 @@ class RoomCreationHandler(BaseHandler): """ Creates a new room. Args: - requester (Requester): The user who requested the room creation. + requester (synapse.types.Requester): + The user who requested the room creation. config (dict) : A dict of configuration options. + ratelimit (bool): set to False to disable the rate limiter Returns: - The new room ID. + Deferred[dict]: + a dict containing the keys `room_id` and, if an alias was + requested, `room_alias`. Raises: SynapseError if the room ID couldn't be stored, or something went horribly wrong. |