diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 9cffe59ce5..3adc576124 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -14,40 +14,36 @@
# limitations under the License.
from synapse.http.server import JsonResource
from synapse.rest import admin
-from synapse.rest.client import versions
-from synapse.rest.client.v1 import (
- directory,
- events,
- initial_sync,
- login as v1_login,
- logout,
- presence,
- profile,
- push_rule,
- pusher,
- room,
- voip,
-)
-from synapse.rest.client.v2_alpha import (
+from synapse.rest.client import (
account,
account_data,
account_validity,
auth,
capabilities,
devices,
+ directory,
+ events,
filter,
groups,
+ initial_sync,
keys,
knock,
+ login as v1_login,
+ logout,
notifications,
openid,
password_policy,
+ presence,
+ profile,
+ push_rule,
+ pusher,
read_marker,
receipts,
register,
relations,
report_event,
- room as roomv2,
+ room,
+ room_batch,
room_keys,
room_upgrade_rest_servlet,
sendtodevice,
@@ -57,6 +53,8 @@ from synapse.rest.client.v2_alpha import (
thirdparty,
tokenrefresh,
user_directory,
+ versions,
+ voip,
)
@@ -85,7 +83,6 @@ class ClientRestResource(JsonResource):
# Partially deprecated in r0
events.register_servlets(hs, client_resource)
- # "v1" + "r0"
room.register_servlets(hs, client_resource)
v1_login.register_servlets(hs, client_resource)
profile.register_servlets(hs, client_resource)
@@ -95,8 +92,6 @@ class ClientRestResource(JsonResource):
pusher.register_servlets(hs, client_resource)
push_rule.register_servlets(hs, client_resource)
logout.register_servlets(hs, client_resource)
-
- # "v2"
sync.register_servlets(hs, client_resource)
filter.register_servlets(hs, client_resource)
account.register_servlets(hs, client_resource)
@@ -118,7 +113,7 @@ class ClientRestResource(JsonResource):
user_directory.register_servlets(hs, client_resource)
groups.register_servlets(hs, client_resource)
room_upgrade_rest_servlet.register_servlets(hs, client_resource)
- roomv2.register_servlets(hs, client_resource)
+ room_batch.register_servlets(hs, client_resource)
capabilities.register_servlets(hs, client_resource)
account_validity.register_servlets(hs, client_resource)
relations.register_servlets(hs, client_resource)
|
