diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-24 10:43:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 10:43:30 +0100 |
| commit | a6781450108f476c2c83d25a70e27f331e4c832e (patch) | |
| tree | 2fbe0f15fe17c27664a6c4a7e0058e286bd6ed56 /synapse/app/client_reader.py | |
| parent | another couple of logcontext leaks (diff) | |
| parent | Merge pull request #3555 from matrix-org/erikj/client_apis_move (diff) | |
| download | synapse-a6781450108f476c2c83d25a70e27f331e4c832e.tar.xz | |
Merge branch 'develop' into rav/logcontext_fixes
Diffstat (limited to 'synapse/app/client_reader.py')
| -rw-r--r-- | synapse/app/client_reader.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index b0ea26dcb4..398bb36602 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -40,7 +40,13 @@ from synapse.replication.slave.storage.registration import SlavedRegistrationSto from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.transactions import TransactionStore from synapse.replication.tcp.client import ReplicationClientHandler -from synapse.rest.client.v1.room import PublicRoomListRestServlet +from synapse.rest.client.v1.room import ( + JoinedRoomMemberListRestServlet, + PublicRoomListRestServlet, + RoomEventContextServlet, + RoomMemberListRestServlet, + RoomStateRestServlet, +) from synapse.server import HomeServer from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree @@ -82,7 +88,13 @@ class ClientReaderServer(HomeServer): resources[METRICS_PREFIX] = MetricsResource(RegistryProxy) elif name == "client": resource = JsonResource(self, canonical_json=False) + PublicRoomListRestServlet(self).register(resource) + RoomMemberListRestServlet(self).register(resource) + JoinedRoomMemberListRestServlet(self).register(resource) + RoomStateRestServlet(self).register(resource) + RoomEventContextServlet(self).register(resource) + resources.update({ "/_matrix/client/r0": resource, "/_matrix/client/unstable": resource, |