feat(ui) Use the types from http instead of ruma directly.

Author: Hywan

Cargo.lock

@@ -32,7 +32,8 @@ use async_stream::stream;
 use futures_core::stream::Stream;
 use futures_util::{pin_mut, StreamExt};
 use matrix_sdk::{Client, SlidingSync, LEASE_DURATION_MS};
-use ruma::{api::client::sync::sync_events::v4, assign};
+use matrix_sdk_base::sliding_sync::http;
+use ruma::assign;
 use tokio::sync::OwnedMutexGuard;
 use tracing::{debug, instrument, trace, Span};
 
@@ -104,9 +105,11 @@ impl EncryptionSyncService {
             .map_err(Error::SlidingSync)?
             //.share_pos() // TODO(bnjbvr) This is racy, needs cross-process lock :')
             .with_to_device_extension(
-                assign!(v4::ToDeviceConfig::default(), { enabled: Some(true)}),
+                assign!(http::ss::extensions::RequestToDevice::default(), { enabled: Some(true)}),
             )
-            .with_e2ee_extension(assign!(v4::E2EEConfig::default(), { enabled: Some(true)}));
+            .with_e2ee_extension(
+                assign!(http::ss::extensions::RequestE2EE::default(), { enabled: Some(true)}),
+            );
 
         if let Some((poll_timeout, network_timeout)) = poll_and_network_timeouts {
             builder = builder.poll_timeout(poll_timeout).network_timeout(network_timeout);

crates/matrix-sdk-ui/src/encryption_sync_service.rs

@@ -22,12 +22,10 @@ use matrix_sdk::{room::Room, Client, ClientBuildError, SlidingSyncList, SlidingS
 use matrix_sdk_base::{
     crypto::{vodozemac, MegolmError},
     deserialized_responses::TimelineEvent,
+    sliding_sync::http,
     RoomState, StoreError,
 };
 use ruma::{
-    api::client::sync::sync_events::v4::{
-        AccountDataConfig, RoomSubscription, SyncRequestListFilters,
-    },
     assign,
     events::{
         room::{member::StrippedRoomMemberEvent, message::SyncRoomMessageEvent},
@@ -358,7 +356,7 @@ impl NotificationClient {
             .sync_mode(SlidingSyncMode::new_selective().add_range(0..=16))
             .timeline_limit(8)
             .required_state(required_state.clone())
-            .filters(Some(assign!(SyncRequestListFilters::default(), {
+            .filters(Some(assign!(http::ss::RequestListFilters::default(), {
                 is_invite: Some(true),
                 is_tombstoned: Some(false),
                 not_room_types: vec!["m.space".to_owned()],
@@ -371,15 +369,15 @@ impl NotificationClient {
             .poll_timeout(Duration::from_secs(1))
             .network_timeout(Duration::from_secs(3))
             .with_account_data_extension(
-                assign!(AccountDataConfig::default(), { enabled: Some(true) }),
+                assign!(http::ss::extensions::RequestAccountData::default(), { enabled: Some(true) }),
             )
             .add_list(invites)
             .build()
             .await?;
 
         sync.subscribe_to_room(
             room_id.to_owned(),
-            Some(assign!(RoomSubscription::default(), {
+            Some(assign!(http::ss::RequestRoomSubscription::default(), {
                 required_state,
                 timeline_limit: Some(uint!(16))
             })),

crates/matrix-sdk-ui/src/notification_client.rs

@@ -66,13 +66,10 @@ use matrix_sdk::{
     event_cache::EventCacheError, Client, Error as SlidingSyncError, SlidingSync, SlidingSyncList,
     SlidingSyncMode,
 };
+use matrix_sdk_base::sliding_sync::http;
 pub use room::*;
 pub use room_list::*;
 use ruma::{
-    api::client::sync::sync_events::v4::{
-        AccountDataConfig, E2EEConfig, ReceiptsConfig, RoomReceiptConfig, SyncRequestListFilters,
-        ToDeviceConfig, TypingConfig,
-    },
     assign,
     events::{StateEventType, TimelineEventType},
     OwnedRoomId, RoomId,
@@ -123,21 +120,21 @@ impl RoomListService {
             .sliding_sync("room-list")
             .map_err(Error::SlidingSync)?
             .with_account_data_extension(
-                assign!(AccountDataConfig::default(), { enabled: Some(true) }),
+                assign!(http::ss::extensions::RequestAccountData::default(), { enabled: Some(true) }),
             )
-            .with_receipt_extension(assign!(ReceiptsConfig::default(), {
+            .with_receipt_extension(assign!(http::ss::extensions::RequestReceipts::default(), {
                 enabled: Some(true),
-                rooms: Some(vec![RoomReceiptConfig::AllSubscribed])
+                rooms: Some(vec![http::ss::extensions::RequestReceiptsRoom::AllSubscribed])
             }))
-            .with_typing_extension(assign!(TypingConfig::default(), {
+            .with_typing_extension(assign!(http::ss::extensions::RequestTyping::default(), {
                 enabled: Some(true),
             }));
 
         if with_encryption {
             builder = builder
-                .with_e2ee_extension(assign!(E2EEConfig::default(), { enabled: Some(true) }))
+                .with_e2ee_extension(assign!(http::ss::extensions::RequestE2EE::default(), { enabled: Some(true) }))
                 .with_to_device_extension(
-                    assign!(ToDeviceConfig::default(), { enabled: Some(true) }),
+                    assign!(http::ss::extensions::RequestToDevice::default(), { enabled: Some(true) }),
                 );
         }
 
@@ -158,7 +155,7 @@ impl RoomListService {
                     ])
                     .sort(vec!["by_recency".to_owned(), "by_name".to_owned()])
                     .include_heroes(Some(true))
-                    .filters(Some(assign!(SyncRequestListFilters::default(), {
+                    .filters(Some(assign!(http::ss::RequestListFilters::default(), {
                         // As defined in the [SlidingSync MSC](https://github.com/matrix-org/matrix-spec-proposals/blob/9450ced7fb9cf5ea9077d029b3adf36aebfa8709/proposals/3575-sync.md?plain=1#L444)
                         // If unset, both invited and joined rooms are returned. If false, no invited rooms are
                         // returned. If true, only invited rooms are returned.

crates/matrix-sdk-ui/src/room_list_service/mod.rs

@@ -19,7 +19,8 @@ use std::{ops::Deref, sync::Arc};
 
 use async_once_cell::OnceCell as AsyncOnceCell;
 use matrix_sdk::SlidingSync;
-use ruma::{api::client::sync::sync_events::v4::RoomSubscription, events::StateEventType, RoomId};
+use matrix_sdk_base::sliding_sync::http;
+use ruma::{events::StateEventType, RoomId};
 
 use super::Error;
 use crate::{
@@ -91,7 +92,7 @@ impl Room {
     ///
     /// It means that all events from this room will be received every time, no
     /// matter how the `RoomList` is configured.
-    pub fn subscribe(&self, settings: Option<RoomSubscription>) {
+    pub fn subscribe(&self, settings: Option<http::ss::RequestRoomSubscription>) {
         let mut settings = settings.unwrap_or_default();
 
         // Make sure to always include the room creation event in the required state

crates/matrix-sdk-ui/src/room_list_service/room.rs

@@ -558,12 +558,11 @@ mod tests {
     use assert_matches2::assert_let;
     use matrix_sdk::test_utils::logged_in_client;
     use matrix_sdk_base::{
-        deserialized_responses::SyncTimelineEvent, latest_event::LatestEvent, MinimalStateEvent,
-        OriginalMinimalStateEvent,
+        deserialized_responses::SyncTimelineEvent, latest_event::LatestEvent, sliding_sync::http,
+        MinimalStateEvent, OriginalMinimalStateEvent,
     };
     use matrix_sdk_test::{async_test, sync_timeline_event};
     use ruma::{
-        api::client::sync::sync_events::v4,
         events::{
             room::{
                 member::RoomMemberEventContent,
@@ -619,7 +618,7 @@ mod tests {
         let user_id = user_id!("@t:o.uk");
         let event = message_event(room_id, user_id, "**My M**", "<b>My M</b>", 122344);
         let client = logged_in_client(None).await;
-        let mut room = v4::SlidingSyncRoom::new();
+        let mut room = http::ss::ResponseRoom::new();
         room.timeline.push(member_event(room_id, user_id, "Alice Margatroid", "mxc://e.org/SEs"));
 
         // And the room is stored in the client so it can be extracted when needed
@@ -662,7 +661,7 @@ mod tests {
                 .unwrap(),
         );
 
-        let room = v4::SlidingSyncRoom::new();
+        let room = http::ss::ResponseRoom::new();
         // Do not push the `member_event` inside the room. Let's say it's flying in the
         // `StateChanges`.
 
@@ -717,8 +716,8 @@ mod tests {
         })
     }
 
-    fn response_with_room(room_id: &RoomId, room: v4::SlidingSyncRoom) -> v4::Response {
-        let mut response = v4::Response::new("6".to_owned());
+    fn response_with_room(room_id: &RoomId, room: http::ss::ResponseRoom) -> http::ss::Response {
+        let mut response = http::ss::Response::new("6".to_owned());
         response.rooms.insert(room_id.to_owned(), room);
         response
     }

crates/matrix-sdk-ui/src/timeline/event_item/mod.rs

@@ -7,7 +7,9 @@ use assert_matches::assert_matches;
 use eyeball_im::VectorDiff;
 use futures_util::{pin_mut, FutureExt, StreamExt};
 use matrix_sdk::{test_utils::logged_in_client_with_server, Client};
-use matrix_sdk_base::sync::UnreadNotificationsCount;
+use matrix_sdk_base::{
+    sliding_sync::http::ss::RequestRoomSubscription, sync::UnreadNotificationsCount,
+};
 use matrix_sdk_test::async_test;
 use matrix_sdk_ui::{
     room_list_service::{
@@ -18,7 +20,6 @@ use matrix_sdk_ui::{
     RoomListService,
 };
 use ruma::{
-    api::client::sync::sync_events::v4::RoomSubscription,
     assign, event_id,
     events::{room::message::RoomMessageEventContent, StateEventType},
     mxc_uri, room_id, uint,
@@ -2102,7 +2103,7 @@ async fn test_room_subscription() -> Result<(), Error> {
 
     // Subscribe.
 
-    room1.subscribe(Some(assign!(RoomSubscription::default(), {
+    room1.subscribe(Some(assign!(RequestRoomSubscription::default(), {
         required_state: vec![
             (StateEventType::RoomName, "".to_owned()),
             (StateEventType::RoomTopic, "".to_owned()),

crates/matrix-sdk-ui/tests/integration/room_list_service.rs

@@ -16,6 +16,7 @@ futures = { version = "0.3.29", features = ["executor"] }
 futures-core = { workspace = true }
 futures-util = { workspace = true }
 http = { workspace = true }
+matrix-sdk-base = { workspace = true, default-features = true, features = ["testing", "qrcode"] }
 matrix-sdk = { workspace = true, default-features = true, features = ["testing", "qrcode"] }
 matrix-sdk-ui = { workspace = true, default-features = true }
 matrix-sdk-test = { workspace = true }

testing/matrix-sdk-integration-testing/Cargo.toml

@@ -16,9 +16,6 @@ use matrix_sdk::{
         api::client::{
             receipt::create_receipt::v3::ReceiptType,
             room::create_room::v3::{Request as CreateRoomRequest, RoomPreset},
-            sync::sync_events::v4::{
-                AccountDataConfig, E2EEConfig, ReceiptsConfig, ToDeviceConfig,
-            },
         },
         assign,
         events::{
@@ -36,6 +33,7 @@ use matrix_sdk::{
     },
     Client, RoomInfo, RoomMemberships, RoomState, SlidingSyncList, SlidingSyncMode,
 };
+use matrix_sdk_base::sliding_sync::http;
 use matrix_sdk_ui::{
     room_list_service::filters::new_filter_all, sync_service::SyncService, RoomListService,
 };
@@ -373,12 +371,12 @@ async fn test_room_notification_count() -> Result<()> {
     spawn({
         let sync = alice
             .sliding_sync("main")?
-            .with_receipt_extension(assign!(ReceiptsConfig::default(), { enabled: Some(true) }))
+            .with_receipt_extension(assign!(http::ss::extensions::RequestReceipts::default(), { enabled: Some(true) }))
             .with_account_data_extension(
-                assign!(AccountDataConfig::default(), { enabled: Some(true) }),
+                assign!(http::ss::extensions::RequestAccountData::default(), { enabled: Some(true) }),
             )
-            .with_e2ee_extension(assign!(E2EEConfig::default(), { enabled: Some(true) }))
-            .with_to_device_extension(assign!(ToDeviceConfig::default(), { enabled: Some(true) }))
+            .with_e2ee_extension(assign!(http::ss::extensions::RequestE2EE::default(), { enabled: Some(true) }))
+            .with_to_device_extension(assign!(http::ss::extensions::RequestToDevice::default(), { enabled: Some(true) }))
             .add_list(
                 SlidingSyncList::builder("all")
                     .sync_mode(SlidingSyncMode::new_selective().add_range(0..=20))