From bee489b99aa70bf27b21ec5f4b3e433d6f2687ec Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Dec 2019 13:47:28 +0000 Subject: [PATCH 1/4] Support CS API v0.6.0 --- synapse/rest/client/versions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index 2a477ad22e0e..ccd01d70b96e 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -49,6 +49,7 @@ def on_GET(self, request): "r0.3.0", "r0.4.0", "r0.5.0", + "r0.6.0", ], # as per MSC1497: "unstable_features": { From c82f21c1b1e585836140386f50442461bc504fd2 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Dec 2019 13:52:48 +0000 Subject: [PATCH 2/4] Remove CS API v0.5.0 unstable feature flags --- synapse/rest/client/versions.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index ccd01d70b96e..0fb54eef62dd 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -54,21 +54,6 @@ def on_GET(self, request): # as per MSC1497: "unstable_features": { "m.lazy_load_members": True, - # as per MSC2190, as amended by MSC2264 - # to be removed in r0.6.0 - "m.id_access_token": True, - # Advertise to clients that they need not include an `id_server` - # parameter during registration or password reset, as Synapse now decides - # itself which identity server to use (or none at all). - # - # This is also used by a client when they wish to bind a 3PID to their - # account, but not bind it to an identity server, the endpoint for which - # also requires `id_server`. If the homeserver is handling 3PID - # verification itself, there is no need to ask the user for `id_server` to - # be supplied. - "m.require_identity_server": False, - # as per MSC2290 - "m.separate_add_and_bind": True, # Implements support for label-based filtering as described in # MSC2326. "org.matrix.label_based_filtering": True, From fb209a710f66ba7ac60a98d59fb37d157d5bbc2c Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 1 Jun 2020 15:33:00 +0100 Subject: [PATCH 3/4] Changelog --- changelog.d/6585.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6585.feature diff --git a/changelog.d/6585.feature b/changelog.d/6585.feature new file mode 100644 index 000000000000..ab2a85374ea3 --- /dev/null +++ b/changelog.d/6585.feature @@ -0,0 +1 @@ +Advertise support for Client-Server API r0.6.0 and remove related unstable feature flags. \ No newline at end of file From 143d32dc813c96780390573bc75dfbdc47f99487 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 5 Jun 2020 11:46:14 +0100 Subject: [PATCH 4/4] Remove lazy-load members once again Was removed previously in #6877. --- synapse/rest/client/versions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index f1ccdcaf5a7f..0d668df0b6f4 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -53,7 +53,6 @@ def on_GET(self, request): ], # as per MSC1497: "unstable_features": { - "m.lazy_load_members": True, # Implements support for label-based filtering as described in # MSC2326. "org.matrix.label_based_filtering": True,