Add support for /_matrix/client/v3 APIs (#11318)

This is one of the changes required to support Matrix 1.1 Signed-off-by: Aaron Raimist <[email protected]>
matrix-org · Nov 16, 2021 · dfa5364 · dfa5364
1 parent 7468723
commit dfa5364
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/changelog.d/11318.feature b/changelog.d/11318.feature
@@ -0,0 +1 @@
+Add support for the `/_matrix/client/v3` APIs from Matrix v1.1.
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
@@ -193,6 +193,7 @@ def _configure_named_resource(
                 {
                     "/_matrix/client/api/v1": client_resource,
                     "/_matrix/client/r0": client_resource,
+                    "/_matrix/client/v3": client_resource,
                     "/_matrix/client/unstable": client_resource,
                     "/_matrix/client/v2_alpha": client_resource,
                     "/_matrix/client/versions": client_resource,

diff --git a/synapse/rest/client/_base.py b/synapse/rest/client/_base.py
@@ -27,7 +27,7 @@
 
 def client_patterns(
     path_regex: str,
-    releases: Iterable[int] = (0,),
+    releases: Iterable[str] = ("r0", "v3"),
     unstable: bool = True,
     v1: bool = False,
 ) -> Iterable[Pattern]:
@@ -52,7 +52,7 @@ def client_patterns(
         v1_prefix = CLIENT_API_PREFIX + "/api/v1"
         patterns.append(re.compile("^" + v1_prefix + path_regex))
     for release in releases:
-        new_prefix = CLIENT_API_PREFIX + "/r%d" % (release,)
+        new_prefix = CLIENT_API_PREFIX + f"/{release}"
         patterns.append(re.compile("^" + new_prefix + path_regex))
 
     return patterns

diff --git a/synapse/rest/client/keys.py b/synapse/rest/client/keys.py
@@ -262,7 +262,7 @@ class SigningKeyUploadServlet(RestServlet):
     }
     """
 
-    PATTERNS = client_patterns("/keys/device_signing/upload$", releases=())
+    PATTERNS = client_patterns("/keys/device_signing/upload$", releases=("v3",))
 
     def __init__(self, hs: "HomeServer"):
         super().__init__()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add support for the `/_matrix/client/v3` APIs from Matrix v1.1.