Merge branch 'main' into secret_file

Author: sandhose

crates/cli/src/util.rs

@@ -469,22 +469,22 @@ pub async fn homeserver_connection_from_config(
     http_client: reqwest::Client,
 ) -> anyhow::Result<Arc<dyn HomeserverConnection>> {
     Ok(match config.kind {
-        HomeserverKind::Synapse | HomeserverKind::SynapseLegacy => {
-            Arc::new(LegacySynapseConnection::new(
+        HomeserverKind::Synapse | HomeserverKind::SynapseModern => {
+            Arc::new(SynapseConnection::new(
                 config.homeserver.clone(),
                 config.endpoint.clone(),
                 config.secret().await?,
                 http_client,
             ))
         }
-        HomeserverKind::SynapseModern => Arc::new(SynapseConnection::new(
+        HomeserverKind::SynapseLegacy => Arc::new(LegacySynapseConnection::new(
             config.homeserver.clone(),
             config.endpoint.clone(),
             config.secret().await?,
             http_client,
         )),
         HomeserverKind::SynapseReadOnly => {
-            let connection = LegacySynapseConnection::new(
+            let connection = SynapseConnection::new(
                 config.homeserver.clone(),
                 config.endpoint.clone(),
                 config.secret().await?,

crates/config/src/sections/matrix.rs

@@ -29,24 +29,20 @@ fn default_endpoint() -> Url {
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum HomeserverKind {
-    /// Homeserver is Synapse, using the legacy API
-    ///
-    /// This will switch to using the modern API in a few releases.
+    /// Homeserver is Synapse, version 1.135.0 or newer
     #[default]
     Synapse,
 
-    /// Homeserver is Synapse, using the legacy API, in read-only mode
+    /// Homeserver is Synapse, version 1.135.0 or newer, in read-only mode
     ///
     /// This is meant for testing rolling out Matrix Authentication Service with
     /// no risk of writing data to the homeserver.
-    ///
-    /// This will switch to using the modern API in a few releases.
     SynapseReadOnly,
 
-    /// Homeserver is Synapse, using the legacy API,
+    /// Homeserver is Synapse, using the legacy API
     SynapseLegacy,
 
-    /// Homeserver is Synapse, with the modern API available
+    /// Homeserver is Synapse, with the modern API available (>= 1.135.0)
     SynapseModern,
 }
 

docs/config.schema.json

@@ -1710,28 +1710,28 @@
       "description": "The kind of homeserver it is.",
       "oneOf": [
         {
-          "description": "Homeserver is Synapse, using the legacy API\n\nThis will switch to using the modern API in a few releases.",
+          "description": "Homeserver is Synapse, version 1.135.0 or newer",
           "type": "string",
           "enum": [
             "synapse"
           ]
         },
         {
-          "description": "Homeserver is Synapse, using the legacy API, in read-only mode\n\nThis is meant for testing rolling out Matrix Authentication Service with no risk of writing data to the homeserver.\n\nThis will switch to using the modern API in a few releases.",
+          "description": "Homeserver is Synapse, version 1.135.0 or newer, in read-only mode\n\nThis is meant for testing rolling out Matrix Authentication Service with no risk of writing data to the homeserver.",
           "type": "string",
           "enum": [
             "synapse_read_only"
           ]
         },
         {
-          "description": "Homeserver is Synapse, using the legacy API,",
+          "description": "Homeserver is Synapse, using the legacy API",
           "type": "string",
           "enum": [
             "synapse_legacy"
           ]
         },
         {
-          "description": "Homeserver is Synapse, with the modern API available",
+          "description": "Homeserver is Synapse, with the modern API available (>= 1.135.0)",
           "type": "string",
           "enum": [
             "synapse_modern"