diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:03:33 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:03:33 -0400 |
| commit | 204664d1adf95f26a14ff5b6a4635cbac75b044a (patch) | |
| tree | 2a9eb605318b29d6346c558e99a5a24dce2289d3 /synapse/app/generic_worker.py | |
| parent | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token" (diff) | |
| parent | 1.12.4 (diff) | |
| download | synapse-204664d1adf95f26a14ff5b6a4635cbac75b044a.tar.xz | |
Merge tag 'v1.12.4'
Synapse v1.12.4 Features: * Always send users their own device updates. (#7160) * Add support for handling GET requests for account_data on a worker. (#7311) Bugfixes: * Fix a bug that prevented cross-signing with users on worker-mode synapses. (#7255) * Do not treat display names as globs in push rules. (#7271) * Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. (#7289)
Diffstat (limited to 'synapse/app/generic_worker.py')
| -rw-r--r-- | synapse/app/generic_worker.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 5363642d64..66be6ea2ec 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -98,6 +98,10 @@ from synapse.rest.client.v1.voip import VoipRestServlet from synapse.rest.client.v2_alpha import groups, sync, user_directory from synapse.rest.client.v2_alpha._base import client_patterns from synapse.rest.client.v2_alpha.account import ThreepidRestServlet +from synapse.rest.client.v2_alpha.account_data import ( + AccountDataServlet, + RoomAccountDataServlet, +) from synapse.rest.client.v2_alpha.keys import KeyChangesServlet, KeyQueryServlet from synapse.rest.client.v2_alpha.register import RegisterRestServlet from synapse.rest.client.versions import VersionsRestServlet @@ -475,6 +479,8 @@ class GenericWorkerServer(HomeServer): ProfileDisplaynameRestServlet(self).register(resource) ProfileRestServlet(self).register(resource) KeyUploadServlet(self).register(resource) + AccountDataServlet(self).register(resource) + RoomAccountDataServlet(self).register(resource) sync.register_servlets(self, resource) events.register_servlets(self, resource) |