Sliding Sync timeline events and extensions

Cargo.toml

@@ -29,3 +29,7 @@ debug = 0
 # for the extra time of optimizing it for a clean build of matrix-sdk-ffi.
 quote = { opt-level = 2 }
 sha2 = { opt-level = 2 }
+
+[patch.crates-io]
+ruma = { git = "https://github.com/gnunicorn/ruma", branch = "ben-update-sliding-sync"}
+ruma-common = { git = "https://github.com/gnunicorn/ruma", branch = "ben-update-sliding-sync"}

bindings/matrix-sdk-crypto-ffi/src/responses.rs

@@ -19,7 +19,7 @@ use ruma::{
             },
         },
         message::send_message_event::v3::Response as RoomMessageResponse,
-        sync::sync_events::v3::DeviceLists as RumaDeviceLists,
+        sync::sync_events::DeviceLists as RumaDeviceLists,
         to_device::send_event_to_device::v3::Response as ToDeviceResponse,
     },
     assign,

bindings/matrix-sdk-crypto-js/src/sync_events.rs

@@ -9,7 +9,7 @@ use crate::{downcast, identifiers};
 #[wasm_bindgen]
 #[derive(Debug)]
 pub struct DeviceLists {
-    pub(crate) inner: ruma::api::client::sync::sync_events::v3::DeviceLists,
+    pub(crate) inner: ruma::api::client::sync::sync_events::DeviceLists,
 }
 
 #[wasm_bindgen]
@@ -19,7 +19,7 @@ impl DeviceLists {
     /// `changed` and `left` must be an array of `UserId`.
     #[wasm_bindgen(constructor)]
     pub fn new(changed: Option<Array>, left: Option<Array>) -> Result<DeviceLists, JsError> {
-        let mut inner = ruma::api::client::sync::sync_events::v3::DeviceLists::default();
+        let mut inner = ruma::api::client::sync::sync_events::DeviceLists::default();
 
         inner.changed = changed
             .unwrap_or_default()

bindings/matrix-sdk-crypto-nodejs/src/sync_events.rs

@@ -7,7 +7,7 @@ use crate::identifiers;
 /// Information on E2E device updates.
 #[napi]
 pub struct DeviceLists {
-    pub(crate) inner: ruma::api::client::sync::sync_events::v3::DeviceLists,
+    pub(crate) inner: ruma::api::client::sync::sync_events::DeviceLists,
 }
 
 #[napi]
@@ -18,7 +18,7 @@ impl DeviceLists {
         changed: Option<Vec<&identifiers::UserId>>,
         left: Option<Vec<&identifiers::UserId>>,
     ) -> Self {
-        let mut inner = ruma::api::client::sync::sync_events::v3::DeviceLists::default();
+        let mut inner = ruma::api::client::sync::sync_events::DeviceLists::default();
 
         inner.changed = changed.into_iter().flatten().map(|user| user.inner.clone()).collect();
         inner.left = left.into_iter().flatten().map(|user| user.inner.clone()).collect();

bindings/matrix-sdk-ffi/src/api.udl

@@ -217,6 +217,9 @@ interface SlidingSyncBuilder {
     [Self=ByArc]
     SlidingSyncBuilder add_view(SlidingSyncView view);
 
+    [Self=ByArc]
+    SlidingSyncBuilder with_common_extensions();
+
     [Throws=ClientError, Self=ByArc]
     SlidingSync build();
 };

bindings/matrix-sdk-ffi/src/client.rs

@@ -175,7 +175,7 @@ impl Client {
                             &*session_verification_controller.read().await
                         {
                             session_verification_controller
-                                .process_to_device_messages(sync_response.to_device)
+                                .process_to_device_messages(sync_response.to_device_events)
                                 .await;
                         }
 

bindings/matrix-sdk-ffi/src/session_verification.rs

@@ -6,8 +6,8 @@ use matrix_sdk::{
         verification::{SasVerification, VerificationRequest},
     },
     ruma::{
-        api::client::sync::sync_events::v3::ToDevice,
         events::{key::verification::VerificationMethod, AnyToDeviceEvent},
+        serde::Raw,
     },
 };
 
@@ -105,10 +105,10 @@ impl SessionVerificationController {
         })
     }
 
-    pub async fn process_to_device_messages(&self, to_device: ToDevice) {
+    pub async fn process_to_device_messages(&self, to_device_events: Vec<Raw<AnyToDeviceEvent>>) {
         let sas_verification = self.sas_verification.clone();
 
-        for event in to_device.events.into_iter().filter_map(|e| e.deserialize().ok()) {
+        for event in to_device_events.into_iter().filter_map(|e| e.deserialize().ok()) {
             match event {
                 AnyToDeviceEvent::KeyVerificationReady(event) => {
                     if !self.is_transaction_id_valid(event.content.transaction_id.to_string()) {

bindings/matrix-sdk-ffi/src/sliding_sync.rs

@@ -558,6 +558,12 @@ impl SlidingSyncBuilder {
         Arc::new(builder)
     }
 
+    pub fn with_common_extensions(self: Arc<Self>) -> Arc<Self> {
+        let mut builder = unwrap_or_clone_arc(self);
+        builder.inner = builder.inner.with_common_extensions();
+        Arc::new(builder)
+    }
+
     pub fn build(self: Arc<Self>) -> anyhow::Result<Arc<SlidingSync>> {
         let builder = unwrap_or_clone_arc(self);
         Ok(Arc::new(SlidingSync::new(builder.inner.build()?, builder.client)))

crates/matrix-sdk-base/src/client.rs

@@ -255,10 +255,12 @@ impl BaseClient {
     }
 
     #[allow(clippy::too_many_arguments)]
-    async fn handle_timeline(
+    pub(crate) async fn handle_timeline(
         &self,
         room: &Room,
-        ruma_timeline: api::sync::sync_events::v3::Timeline,
+        limited: bool,
+        events: Vec<Raw<AnySyncTimelineEvent>>,
+        prev_batch: Option<String>,
         push_rules: &Ruleset,
         user_ids: &mut BTreeSet<OwnedUserId>,
         room_info: &mut RoomInfo,
@@ -267,10 +269,10 @@ impl BaseClient {
     ) -> Result<Timeline> {
         let room_id = room.room_id();
         let user_id = room.own_user_id();
-        let mut timeline = Timeline::new(ruma_timeline.limited, ruma_timeline.prev_batch.clone());
+        let mut timeline = Timeline::new(limited, prev_batch);
         let mut push_context = self.get_push_room_context(room, room_info, changes).await?;
 
-        for event in ruma_timeline.events {
+        for event in events {
             #[allow(unused_mut)]
             let mut event: SyncTimelineEvent = event.into();
 
@@ -502,7 +504,7 @@ impl BaseClient {
         Ok(user_ids)
     }
 
-    async fn handle_room_account_data(
+    pub(crate) async fn handle_room_account_data(
         &self,
         room_id: &RoomId,
         events: &[Raw<AnyRoomAccountDataEvent>],
@@ -515,7 +517,7 @@ impl BaseClient {
         }
     }
 
-    async fn handle_account_data(
+    pub(crate) async fn handle_account_data(
         &self,
         events: &[Raw<AnyGlobalAccountDataEvent>],
         changes: &mut StateChanges,
@@ -589,22 +591,24 @@ impl BaseClient {
 
         let now = Instant::now();
 
+        let to_device_events = to_device.events;
+
         #[cfg(feature = "e2e-encryption")]
-        let to_device = {
+        let to_device_events = {
             if let Some(o) = self.olm_machine() {
                 // Let the crypto machine handle the sync response, this
                 // decrypts to-device events, but leaves room events alone.
                 // This makes sure that we have the decryption keys for the room
                 // events at hand.
                 o.receive_sync_changes(
-                    to_device,
+                    to_device_events,
                     &device_lists,
                     &device_one_time_keys_count,
                     device_unused_fallback_key_types.as_deref(),
                 )
                 .await?
             } else {
-                to_device
+                to_device_events
             }
         };
 
@@ -650,7 +654,9 @@ impl BaseClient {
             let timeline = self
                 .handle_timeline(
                     &room,
-                    new_info.timeline,
+                    new_info.timeline.limited,
+                    new_info.timeline.events,
+                    new_info.timeline.prev_batch,
                     &push_rules,
                     &mut user_ids,
                     &mut room_info,
@@ -701,7 +707,7 @@ impl BaseClient {
                 JoinedRoom::new(
                     timeline,
                     new_info.state,
-                    new_info.account_data,
+                    new_info.account_data.events,
                     new_info.ephemeral,
                     notification_count,
                 ),
@@ -727,7 +733,9 @@ impl BaseClient {
             let timeline = self
                 .handle_timeline(
                     &room,
-                    new_info.timeline,
+                    new_info.timeline.limited,
+                    new_info.timeline.events,
+                    new_info.timeline.prev_batch,
                     &push_rules,
                     &mut user_ids,
                     &mut room_info,
@@ -789,8 +797,8 @@ impl BaseClient {
             next_batch,
             rooms: new_rooms,
             presence,
-            account_data,
-            to_device,
+            account_data: account_data.events,
+            to_device_events,
             device_lists,
             device_one_time_keys_count: device_one_time_keys_count
                 .into_iter()