ffi: RoomInfo notification mode must reflect the user-defined mode

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

@@ -28,7 +28,7 @@ pub struct RoomInfo {
     joined_members_count: u64,
     highlight_count: u64,
     notification_count: u64,
-    notification_mode: Option<RoomNotificationMode>,
+    user_defined_notification_mode: Option<RoomNotificationMode>,
 }
 
 impl RoomInfo {
@@ -63,7 +63,10 @@ impl RoomInfo {
             joined_members_count: room.joined_members_count(),
             highlight_count: unread_notification_counts.highlight_count,
             notification_count: unread_notification_counts.notification_count,
-            notification_mode: room.notification_mode().await.map(Into::into),
+            user_defined_notification_mode: room
+                .user_defined_notification_mode()
+                .await
+                .map(Into::into),
         })
     }
 }

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

@@ -2387,6 +2387,17 @@ impl Room {
             None
         }
     }
+
+    /// Get the user-defined notification mode
+    pub async fn user_defined_notification_mode(&self) -> Option<RoomNotificationMode> {
+        if !matches!(self.state(), RoomState::Joined) {
+            return None;
+        }
+        let notification_settings = self.client().notification_settings().await;
+
+        // Get the user-defined mode if available
+        notification_settings.get_user_defined_room_notification_mode(self.room_id()).await
+    }
 }
 
 /// Details of the (latest) invite.

crates/matrix-sdk/tests/integration/room/notification_mode.rs

@@ -61,11 +61,17 @@ async fn get_notification_mode() {
         .mount(&server)
         .await;
 
+    // With a room without specific notification rules
     let room = client.get_room(room_no_rules_id).unwrap();
     assert_eq!(room.state(), RoomState::Joined);
+    // getting the mode should return the default one
     let mode = room.notification_mode().await;
     assert_matches!(mode, Some(RoomNotificationMode::MentionsAndKeywordsOnly));
 
+    // getting the user-defined mode must return None
+    let mode = room.user_defined_notification_mode().await;
+    assert_matches!(mode, None);
+
     // Room not joined
     let room = client.get_room(room_not_joined_id).unwrap();
     assert_eq!(room.state(), RoomState::Invited);