Remove unstable flags for threads. github/clokep/stable-threads clokep/stable-threads

4 files changed, 1 insertions, 22 deletions

diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 26be377d03..f9bbdff66d 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -91,12 +91,11 @@ ROOM_EVENT_FILTER_SCHEMA = {
         "lazy_load_members": {"type": "boolean"},
         "include_redundant_members": {"type": "boolean"},
         "unread_thread_notifications": {"type": "boolean"},
-        "org.matrix.msc3773.unread_thread_notifications": {"type": "boolean"},
         # Include or exclude events with the provided labels.
         # cf https://github.com/matrix-org/matrix-doc/pull/2326
         "org.matrix.labels": {"type": "array", "items": {"type": "string"}},
         "org.matrix.not_labels": {"type": "array", "items": {"type": "string"}},
-        # MSC3440, filtering by event relations.
+        # Filtering by event relations, deprecated.
         "related_by_senders": {"type": "array", "items": {"type": "string"}},
         "related_by_rel_types": {"type": "array", "items": {"type": "string"}},
     },
@@ -318,13 +317,6 @@ class Filter:
         self.unread_thread_notifications: bool = filter_json.get(
             "unread_thread_notifications", False
         )
-        if (
-            not self.unread_thread_notifications
-            and hs.config.experimental.msc3773_enabled
-        ):
-            self.unread_thread_notifications = filter_json.get(
-                "org.matrix.msc3773.unread_thread_notifications", False
-            )
 
         self.types = filter_json.get("types", None)
         self.not_types = filter_json.get("not_types", [])
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index 4009add01d..c41f9efb18 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -95,9 +95,6 @@ class ExperimentalConfig(Config):
         # MSC2815 (allow room moderators to view redacted event content)
         self.msc2815_enabled: bool = experimental.get("msc2815_enabled", False)
 
-        # MSC3773: Thread notifications
-        self.msc3773_enabled: bool = experimental.get("msc3773_enabled", False)
-
         # MSC3848: Introduce errcodes for specific event sending failures
         self.msc3848_enabled: bool = experimental.get("msc3848_enabled", False)
 
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py
index 8a16459105..612a44db68 100644
--- a/synapse/rest/client/sync.py
+++ b/synapse/rest/client/sync.py
@@ -100,7 +100,6 @@ class SyncRestServlet(RestServlet):
         self._server_notices_sender = hs.get_server_notices_sender()
         self._event_serializer = hs.get_event_client_serializer()
         self._msc2654_enabled = hs.config.experimental.msc2654_enabled
-        self._msc3773_enabled = hs.config.experimental.msc3773_enabled
 
     async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         # This will always be set by the time Twisted calls us.
@@ -512,10 +511,6 @@ class SyncRestServlet(RestServlet):
             result["unread_notifications"] = room.unread_notifications
             if room.unread_thread_notifications:
                 result["unread_thread_notifications"] = room.unread_thread_notifications
-                if self._msc3773_enabled:
-                    result[
-                        "org.matrix.msc3773.unread_thread_notifications"
-                    ] = room.unread_thread_notifications
             result["summary"] = room.summary
             if self._msc2654_enabled:
                 result["org.matrix.msc2654.unread_count"] = room.unread_count
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 9b1b72c68a..816ecccc40 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -103,11 +103,6 @@ class VersionsRestServlet(RestServlet):
                     "org.matrix.msc2716": self.config.experimental.msc2716_enabled,
                     # Adds support for jump to date endpoints (/timestamp_to_event) as per MSC3030
                     "org.matrix.msc3030": self.config.experimental.msc3030_enabled,
-                    # Adds support for thread relations, per MSC3440.
-                    "org.matrix.msc3440.stable": True,  # TODO: remove when "v1.3" is added above
-                    # Support for thread read receipts & notification counts.
-                    "org.matrix.msc3771": True,
-                    "org.matrix.msc3773": self.config.experimental.msc3773_enabled,
                     # Allows moderators to fetch redacted event content as described in MSC2815
                     "fi.mau.msc2815": self.config.experimental.msc2815_enabled,
                     # Adds support for login token requests as per MSC3882