refactor(timeline): TimelineAction::from_content always returns Something now

Author: bnjbvr

crates/matrix-sdk-ui/src/timeline/controller/state.rs

@@ -190,14 +190,11 @@ impl<P: RoomDataProvider> TimelineState<P> {
             should_add_new_items,
         };
 
-        if let Some(timeline_action) =
-            TimelineAction::from_content(content, in_reply_to, thread_root, None)
-        {
-            TimelineEventHandler::new(&mut txn, ctx)
-                .handle_event(&mut date_divider_adjuster, timeline_action)
-                .await;
-            txn.adjust_date_dividers(date_divider_adjuster);
-        }
+        let timeline_action = TimelineAction::from_content(content, in_reply_to, thread_root, None);
+        TimelineEventHandler::new(&mut txn, ctx)
+            .handle_event(&mut date_divider_adjuster, timeline_action)
+            .await;
+        txn.adjust_date_dividers(date_divider_adjuster);
 
         txn.commit();
     }

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

@@ -245,17 +245,17 @@ impl TimelineAction {
                         // `TimelineEvent` containing an `m.room.encrypted` event without
                         // decrypting it. Possibly this means that encryption has not been
                         // configured. We treat it the same as any other message-like event.
-                        return Self::from_content(
+                        Self::from_content(
                             AnyMessageLikeEventContent::RoomEncrypted(content),
                             in_reply_to,
                             thread_root,
                             thread_summary,
-                        );
+                        )
                     }
                 }
 
                 Some(content) => {
-                    return Self::from_content(content, in_reply_to, thread_root, thread_summary);
+                    Self::from_content(content, in_reply_to, thread_root, thread_summary)
                 }
 
                 None => Self::add_item(redacted_message_or_none(ev.event_type())?),
@@ -302,8 +302,8 @@ impl TimelineAction {
         in_reply_to: Option<InReplyToDetails>,
         thread_root: Option<OwnedEventId>,
         thread_summary: Option<ThreadSummary>,
-    ) -> Option<Self> {
-        Some(match content {
+    ) -> Self {
+        match content {
             AnyMessageLikeEventContent::Reaction(c) => {
                 // This is a reaction to a message.
                 Self::HandleAggregation {
@@ -395,7 +395,7 @@ impl TimelineAction {
                     }),
                 }
             }
-        })
+        }
     }
 
     pub(super) fn failed_to_parse(event: FailedToParseEvent, error: serde_json::Error) -> Self {

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

@@ -115,13 +115,15 @@ impl LatestEventValue {
 
                 let is_sending = matches!(value, BaseLatestEventValue::LocalIsSending(_));
 
-                let Some(TimelineAction::AddItem { content }) =
-                    TimelineAction::from_content(message_like_event_content, None, None, None)
-                else {
-                    return Self::None;
-                };
-
-                Self::Local { timestamp, content, is_sending }
+                match TimelineAction::from_content(message_like_event_content, None, None, None) {
+                    TimelineAction::AddItem { content } => {
+                        Self::Local { timestamp, content, is_sending }
+                    }
+
+                    TimelineAction::HandleAggregation { kind, .. } => {
+                        Self::None
+                    }
+                }
             }
         }
     }