diff --git a/changelog.d/18726.bugfix b/changelog.d/18726.bugfix new file mode 100644 index 000000000..619546748 --- /dev/null +++ b/changelog.d/18726.bugfix @@ -0,0 +1 @@ +Register the MSC4306 endpoints in the CS API when the experimental feature is enabled. diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index aeb4267bb..a24ca0984 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -63,6 +63,7 @@ from synapse.rest.client import ( sync, tags, thirdparty, + thread_subscriptions, tokenrefresh, user_directory, versions, @@ -122,6 +123,7 @@ CLIENT_SERVLET_FUNCTIONS: Tuple[RegisterServletsFunc, ...] = ( login_token_request.register_servlets, rendezvous.register_servlets, auth_metadata.register_servlets, + thread_subscriptions.register_servlets, ) SERVLET_GROUPS: Dict[str, Iterable[RegisterServletsFunc]] = { diff --git a/synapse/rest/client/thread_subscriptions.py b/synapse/rest/client/thread_subscriptions.py index 5307132ec..eb724500b 100644 --- a/synapse/rest/client/thread_subscriptions.py +++ b/synapse/rest/client/thread_subscriptions.py @@ -1,5 +1,5 @@ from http import HTTPStatus -from typing import Tuple +from typing import TYPE_CHECKING, Tuple from synapse._pydantic_compat import StrictBool from synapse.api.errors import Codes, NotFoundError, SynapseError @@ -10,10 +10,12 @@ from synapse.http.servlet import ( ) from synapse.http.site import SynapseRequest from synapse.rest.client._base import client_patterns -from synapse.server import HomeServer from synapse.types import JsonDict, RoomID from synapse.types.rest import RequestBodyModel +if TYPE_CHECKING: + from synapse.server import HomeServer + class ThreadSubscriptionsRestServlet(RestServlet): PATTERNS = client_patterns(