From 54d41f336928f4892519d5ad74d044b025fc52d0 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Tue, 2 May 2023 12:25:29 -0700 Subject: [PATCH 1/4] remove references to supporting per-user flag for msc2654 --- docs/admin_api/experimental_features.md | 6 ++---- synapse/rest/admin/experimental_features.py | 1 - tests/rest/admin/test_admin.py | 8 ++------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docs/admin_api/experimental_features.md b/docs/admin_api/experimental_features.md index c1aebe4b01a8..e33764bb6138 100644 --- a/docs/admin_api/experimental_features.md +++ b/docs/admin_api/experimental_features.md @@ -2,8 +2,7 @@ This API allows a server administrator to enable or disable some experimental features on a per-user basis. Currently supported features are [msc3026](https://github.com/matrix-org/matrix-spec-proposals/pull/3026): busy -presence state enabled, [msc2654](https://github.com/matrix-org/matrix-spec-proposals/pull/2654): enable unread counts, -[msc3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications +presence state enabled, [msc3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications for another client, and [msc3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967): do not require UIA when first uploading cross-signing keys. @@ -19,7 +18,7 @@ provide a body containing the user id and listing the features to enable/disable { "features": { "msc3026":true, - "msc2654":true + "msc3881":true } } ``` @@ -46,7 +45,6 @@ user like so: { "features": { "msc3026": true, - "msc2654": true, "msc3881": false, "msc3967": false } diff --git a/synapse/rest/admin/experimental_features.py b/synapse/rest/admin/experimental_features.py index 1d409ac2b7b0..abf273af100e 100644 --- a/synapse/rest/admin/experimental_features.py +++ b/synapse/rest/admin/experimental_features.py @@ -33,7 +33,6 @@ class ExperimentalFeature(str, Enum): """ MSC3026 = "msc3026" - MSC2654 = "msc2654" MSC3881 = "msc3881" MSC3967 = "msc3967" diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py index 645a00b4b124..695e84357ad2 100644 --- a/tests/rest/admin/test_admin.py +++ b/tests/rest/admin/test_admin.py @@ -399,7 +399,7 @@ def test_enable_and_disable(self) -> None: "PUT", url, content={ - "features": {"msc3026": True, "msc2654": True}, + "features": {"msc3026": True, "msc3881": True}, }, access_token=self.admin_user_tok, ) @@ -420,7 +420,7 @@ def test_enable_and_disable(self) -> None: ) self.assertEqual( True, - channel.json_body["features"]["msc2654"], + channel.json_body["features"]["msc3881"], ) # test disabling a feature works @@ -448,10 +448,6 @@ def test_enable_and_disable(self) -> None: ) self.assertEqual( True, - channel.json_body["features"]["msc2654"], - ) - self.assertEqual( - False, channel.json_body["features"]["msc3881"], ) self.assertEqual( From 8007e71e7fb9b73b878bcc3f7afd91edca8ae588 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Tue, 2 May 2023 12:30:23 -0700 Subject: [PATCH 2/4] newsfragment --- changelog.d/15522.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15522.misc diff --git a/changelog.d/15522.misc b/changelog.d/15522.misc new file mode 100644 index 000000000000..5ab2a962e67a --- /dev/null +++ b/changelog.d/15522.misc @@ -0,0 +1 @@ +Remove references to supporting per-user flag for msc2654 (#15522). From d865969aa9ae02af7ed821878e66f97c5cdf5dd9 Mon Sep 17 00:00:00 2001 From: Shay Date: Tue, 2 May 2023 12:47:36 -0700 Subject: [PATCH 3/4] Update changelog.d/15522.misc Co-authored-by: Patrick Cloke --- changelog.d/15522.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/15522.misc b/changelog.d/15522.misc index 5ab2a962e67a..a5a229e4a092 100644 --- a/changelog.d/15522.misc +++ b/changelog.d/15522.misc @@ -1 +1 @@ -Remove references to supporting per-user flag for msc2654 (#15522). +Remove references to supporting per-user flag for [MSC2654](https://github.com/matrix-org/matrix-spec-proposals/pull/2654) (#15522). From 2eb81aeb8a41989609fa71c65156c08c9de15e31 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Tue, 2 May 2023 12:50:32 -0700 Subject: [PATCH 4/4] capitalize msc and list-ify currently supported features --- docs/admin_api/experimental_features.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/admin_api/experimental_features.md b/docs/admin_api/experimental_features.md index e33764bb6138..07b630915d59 100644 --- a/docs/admin_api/experimental_features.md +++ b/docs/admin_api/experimental_features.md @@ -1,9 +1,12 @@ # Experimental Features API This API allows a server administrator to enable or disable some experimental features on a per-user -basis. Currently supported features are [msc3026](https://github.com/matrix-org/matrix-spec-proposals/pull/3026): busy -presence state enabled, [msc3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications -for another client, and [msc3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967): do not require +basis. The currently supported features are: +- [MSC3026](https://github.com/matrix-org/matrix-spec-proposals/pull/3026): busy +presence state enabled +- [MSC3881](https://github.com/matrix-org/matrix-spec-proposals/pull/3881): enable remotely toggling push notifications +for another client +- [MSC3967](https://github.com/matrix-org/matrix-spec-proposals/pull/3967): do not require UIA when first uploading cross-signing keys.