Merge remote-tracking branch 'origin/develop' into anoa/msc4429

# Conflicts:
#	rust/src/config/mod.rs

rust/src/config/mod.rs

@@ -47,7 +47,7 @@ pub struct AuthConfig {
 }
 #[derive(FromPyObject, Clone)]
 pub struct ServerConfig {
-    pub max_event_delay_ms: Option<u64>,
+    pub msc4140_enabled: bool,
     pub include_profile_updates_in_sync: bool,
 }
 
@@ -73,4 +73,5 @@ pub struct ExperimentalConfig {
     pub msc4222_enabled: bool,
     pub msc4491_enabled: bool,
     pub msc4143_enabled: bool,
+    pub msc4446_enabled: bool,
 }

rust/src/handlers/versions.rs

@@ -269,6 +269,9 @@ pub struct UnstableFeatureMap {
     /// MSC4143: Matrix RTC transports (LiveKit backend)
     #[serde(rename = "org.matrix.msc4143")]
     msc4143_enabled: bool,
+    /// MSC4446: Allow moving the fully read marker backwards.
+    #[serde(rename = "com.beeper.msc4446")]
+    msc4446_enabled: bool,
 
     // Whether new rooms will be set to encrypted or not (based on presets).
     #[serde(rename = "io.element.e2ee_forced.public")]
@@ -307,10 +310,7 @@ pub fn synapse_config_to_global_unstable_feature_map(
         msc4028: config.experimental.msc4028_push_encrypted_events,
         msc4108: config.experimental.msc4108_enabled
             || (config.experimental.msc4108_delegation_endpoint.is_some()),
-        msc4140: config
-            .server
-            .max_event_delay_ms
-            .is_some_and(|max_event_delay_ms| max_event_delay_ms > 0),
+        msc4140: config.server.msc4140_enabled,
         msc3575: config.experimental.msc3575_enabled,
         msc4133: config.experimental.msc4133_enabled,
         msc4133_stable: true,
@@ -323,6 +323,7 @@ pub fn synapse_config_to_global_unstable_feature_map(
         msc4445_initial_sync_timeline_topological_ordering: true,
         msc4491_enabled: config.experimental.msc4491_enabled,
         msc4143_enabled: config.experimental.msc4143_enabled,
+        msc4446_enabled: config.experimental.msc4446_enabled,
         e2ee_forced_public: config
             .room
             .encryption_enabled_by_default_for_room_presets