diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-02-02 15:27:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 15:27:35 +0100 |
| commit | 18eae413af4be35b0bc3b894b16b1feaf86d1ea4 (patch) | |
| tree | 6298a97d17a4f604047d706309606aee27e1f7d1 /synapse/server.py | |
| parent | Merge pull request #2841 from matrix-org/rav/refactor_calc_state_delta (diff) | |
| parent | Factor out resolve_state_groups to a separate handler (diff) | |
| download | synapse-18eae413af4be35b0bc3b894b16b1feaf86d1ea4.tar.xz | |
Merge pull request #2842 from matrix-org/rav/state_resolution_handler
Factor out resolve_state_groups to a separate handler
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index ff8a8fbc46..3173aed1d0 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -66,7 +66,7 @@ from synapse.rest.media.v1.media_repository import ( MediaRepository, MediaRepositoryResource, ) -from synapse.state import StateHandler +from synapse.state import StateHandler, StateResolutionHandler from synapse.storage import DataStore from synapse.streams.events import EventSources from synapse.util import Clock @@ -102,6 +102,7 @@ class HomeServer(object): 'v1auth', 'auth', 'state_handler', + 'state_resolution_handler', 'presence_handler', 'sync_handler', 'typing_handler', @@ -224,6 +225,9 @@ class HomeServer(object): def build_state_handler(self): return StateHandler(self) + def build_state_resolution_handler(self): + return StateResolutionHandler(self) + def build_presence_handler(self): return PresenceHandler(self) |