refactor: Adapt to non-exhaustive PushConditionRoomCtx

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk-base/src/response_processors/timeline.rs

@@ -16,6 +16,7 @@ use matrix_sdk_common::deserialized_responses::TimelineEvent;
 #[cfg(feature = "e2e-encryption")]
 use ruma::events::SyncMessageLikeEvent;
 use ruma::{
+    assign,
     events::{AnySyncMessageLikeEvent, AnySyncTimelineEvent},
     push::{Action, PushConditionRoomCtx},
     UInt, UserId,
@@ -238,11 +239,13 @@ pub async fn get_push_room_context(
         room.power_levels().await.ok()
     };
 
-    Ok(Some(PushConditionRoomCtx {
-        user_id: user_id.to_owned(),
-        room_id: room_id.to_owned(),
-        member_count: UInt::new(member_count).unwrap_or(UInt::MAX),
-        user_display_name,
-        power_levels: power_levels.map(Into::into),
-    }))
+    Ok(Some(assign!(
+        PushConditionRoomCtx::new(
+            room_id.to_owned(),
+            UInt::new(member_count).unwrap_or(UInt::MAX),
+            user_id.to_owned(),
+            user_display_name
+        ),
+        { power_levels: power_levels.map(Into::into) }
+    )))
 }

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

@@ -41,7 +41,7 @@ use matrix_sdk_base::{
 use matrix_sdk_test::{ALICE, DEFAULT_TEST_ROOM_ID, event_factory::EventFactory};
 use ruma::{
     EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedTransactionId,
-    OwnedUserId, TransactionId, UInt, UserId,
+    OwnedUserId, TransactionId, UInt, UserId, assign,
     events::{
         AnyMessageLikeEventContent, AnyTimelineEvent,
         reaction::ReactionEventContent,
@@ -407,18 +407,20 @@ impl RoomDataProvider for TestRoomDataProvider {
 
     async fn push_context(&self) -> Option<PushContext> {
         let push_rules = Ruleset::server_default(&ALICE);
-        let power_levels = PushConditionPowerLevelsCtx {
-            users: BTreeMap::new(),
-            users_default: int!(0),
-            notifications: NotificationPowerLevels::new(),
-        };
-        let push_condition_room_ctx = PushConditionRoomCtx {
-            room_id: room_id!("!my_room:server.name").to_owned(),
-            member_count: uint!(2),
-            user_id: ALICE.to_owned(),
-            user_display_name: "Alice".to_owned(),
-            power_levels: Some(power_levels),
-        };
+        let power_levels = PushConditionPowerLevelsCtx::new(
+            BTreeMap::new(),
+            int!(0),
+            NotificationPowerLevels::new(),
+        );
+        let push_condition_room_ctx = assign!(
+            PushConditionRoomCtx::new(
+                room_id!("!my_room:server.name").to_owned(),
+                uint!(2),
+                ALICE.to_owned(),
+                "Alice".to_owned(),
+            ),
+            { power_levels: Some(power_levels) }
+        );
         Some(PushContext::new(push_condition_room_ctx, push_rules))
     }
 

crates/matrix-sdk/src/room/mod.rs

@@ -2932,13 +2932,15 @@ impl Room {
 
         let power_levels = self.power_levels().await.ok().map(Into::into);
 
-        Ok(Some(PushConditionRoomCtx {
-            user_id: user_id.to_owned(),
-            room_id: room_id.to_owned(),
-            member_count: UInt::new(member_count).unwrap_or(UInt::MAX),
-            user_display_name,
-            power_levels,
-        }))
+        Ok(Some(assign!(
+            PushConditionRoomCtx::new(
+                room_id.to_owned(),
+                UInt::new(member_count).unwrap_or(UInt::MAX),
+                user_id.to_owned(),
+                user_display_name,
+            ),
+            { power_levels }
+        )))
     }
 
     /// Retrieves a [`PushContext`] that can be used to compute the push