feat: expose call_intent for m.rtc.notification

This allows for notifications to use the intent for deciding how to
render the message (e.g. whether to call it a "call" or a "video call").

Signed-off-by: Bryant Mairs <bryant@mai.rs>

Author: Susurrus

bindings/matrix-sdk-ffi/src/timeline/content.rs

@@ -40,7 +40,9 @@ impl From<matrix_sdk_ui::timeline::TimelineItemContent> for TimelineItemContent
 
             Content::CallInvite => TimelineItemContent::CallInvite,
 
-            Content::RtcNotification => TimelineItemContent::RtcNotification,
+            Content::RtcNotification { call_intent } => TimelineItemContent::RtcNotification {
+                call_intent: call_intent.map(|s| s.to_string()),
+            },
 
             Content::MembershipChange(membership) => {
                 let reason = match membership.content() {
@@ -159,7 +161,9 @@ pub enum TimelineItemContent {
         content: MsgLikeContent,
     },
     CallInvite,
-    RtcNotification,
+    RtcNotification {
+        call_intent: Option<String>,
+    },
     RoomMembership {
         user_id: String,
         user_display_name: Option<String>,

crates/matrix-sdk-ui/CHANGELOG.md

@@ -30,12 +30,14 @@ All notable changes to this project will be documented in this file.
 
 ### Features
 
+- Add `call_intent` to `TimelineItemContent::RtcNotification`
+  ([#6412](https://github.com/matrix-org/matrix-rust-sdk/pull/6412))
 - Introduce a `ThreadListService` which offers reactive interfaces for rendering
   and managing the list of threads from a particular room.
-  ([6311](https://github.com/matrix-org/matrix-rust-sdk/pull/6311))
+  ([#6311](https://github.com/matrix-org/matrix-rust-sdk/pull/6311))
 - [**breaking**] Remove the `Room::load_thread_list` in favor of the new `ThreadListService`
-  ([6311](https://github.com/matrix-org/matrix-rust-sdk/pull/6311))
-- Add support for [MSC3489](https://github.com/matrix-org/matrix-spec-proposals/pull/3489)  
+  ([#6311](https://github.com/matrix-org/matrix-rust-sdk/pull/6311))
+- Add support for [MSC3489](https://github.com/matrix-org/matrix-spec-proposals/pull/3489)
   live location sharing through a new `TimelineItemContent::LiveLocation` variant.
 - The internal timeline unique ID may be recycled when an event is deduplicated from the timeline,
   so that embedders can notice that it's the same item and avoid unnecessary re-rendering.

crates/matrix-sdk-ui/src/timeline/event_handler.rs

@@ -411,8 +411,8 @@ impl TimelineAction {
                 Self::add_item(TimelineItemContent::CallInvite)
             }
 
-            AnyMessageLikeEventContent::RtcNotification(_) => {
-                Self::add_item(TimelineItemContent::RtcNotification)
+            AnyMessageLikeEventContent::RtcNotification(c) => {
+                Self::add_item(TimelineItemContent::RtcNotification { call_intent: c.call_intent })
             }
 
             AnyMessageLikeEventContent::Sticker(content) => {

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

@@ -47,6 +47,7 @@ use ruma::{
             tombstone::RoomTombstoneEventContent,
             topic::RoomTopicEventContent,
         },
+        rtc::notification::CallIntent,
         space::{child::SpaceChildEventContent, parent::SpaceParentEventContent},
         sticker::StickerEventContent,
     },
@@ -121,7 +122,10 @@ pub enum TimelineItemContent {
     CallInvite,
 
     /// An `m.rtc.notification` event
-    RtcNotification,
+    RtcNotification {
+        /// The intent of this notification.
+        call_intent: Option<CallIntent>,
+    },
 }
 
 impl TimelineItemContent {
@@ -146,7 +150,7 @@ impl TimelineItemContent {
             Self::FailedToParseMessageLike { event_type, .. } => Some(event_type.to_string()),
             Self::FailedToParseState { event_type, .. } => Some(event_type.to_string()),
             Self::CallInvite => Some(MessageLikeEventType::CallInvite.to_string()),
-            Self::RtcNotification => Some(MessageLikeEventType::RtcNotification.to_string()),
+            Self::RtcNotification { .. } => Some(MessageLikeEventType::RtcNotification.to_string()),
         }
     }
 
@@ -330,7 +334,7 @@ impl TimelineItemContent {
             TimelineItemContent::FailedToParseMessageLike { .. }
             | TimelineItemContent::FailedToParseState { .. } => "an event that couldn't be parsed",
             TimelineItemContent::CallInvite => "a call invite",
-            TimelineItemContent::RtcNotification => "a call notification",
+            TimelineItemContent::RtcNotification { .. } => "a call notification",
         }
     }
 
@@ -401,7 +405,7 @@ impl TimelineItemContent {
 
     pub(in crate::timeline) fn redact(&self, rules: &RedactionRules) -> Self {
         match self {
-            Self::MsgLike(_) | Self::CallInvite | Self::RtcNotification => {
+            Self::MsgLike(_) | Self::CallInvite | Self::RtcNotification { .. } => {
                 TimelineItemContent::MsgLike(MsgLikeContent::redacted())
             }
             Self::MembershipChange(ev) => Self::MembershipChange(ev.redact(rules)),
@@ -433,7 +437,7 @@ impl TimelineItemContent {
             | TimelineItemContent::FailedToParseMessageLike { .. }
             | TimelineItemContent::FailedToParseState { .. }
             | TimelineItemContent::CallInvite
-            | TimelineItemContent::RtcNotification => {
+            | TimelineItemContent::RtcNotification { .. } => {
                 // No reactions for these kind of items.
                 None
             }
@@ -458,7 +462,7 @@ impl TimelineItemContent {
             | TimelineItemContent::FailedToParseMessageLike { .. }
             | TimelineItemContent::FailedToParseState { .. }
             | TimelineItemContent::CallInvite
-            | TimelineItemContent::RtcNotification => {
+            | TimelineItemContent::RtcNotification { .. } => {
                 // No reactions for these kind of items.
                 None
             }

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

@@ -593,7 +593,7 @@ impl EventTimelineItem {
             | TimelineItemContent::FailedToParseMessageLike { .. }
             | TimelineItemContent::FailedToParseState { .. }
             | TimelineItemContent::CallInvite
-            | TimelineItemContent::RtcNotification => None,
+            | TimelineItemContent::RtcNotification { .. } => None,
         };
 
         if let Some(body) = body {

labs/multiverse/src/widgets/room_view/timeline.rs

@@ -139,7 +139,7 @@ fn format_timeline_item(item: &Arc<TimelineItem>, is_thread: bool) -> Option<Lis
                     kind: MsgLikeKind::Poll(_), ..
                 })
                 | TimelineItemContent::CallInvite
-                | TimelineItemContent::RtcNotification => {
+                | TimelineItemContent::RtcNotification { .. } => {
                     return None;
                 }