refactor(timeline): simplify lightly computation of should_add_new_items for local events

Author: bnjbvr

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

@@ -786,22 +786,11 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
         let sender = self.room_data_provider.own_user_id().to_owned();
         let profile = self.room_data_provider.profile_from_user_id(&sender).await;
 
-        // Only add new items if the timeline is live.
-        let should_add_new_items = self.is_live().await;
-
         let date_divider_mode = self.settings.date_divider_mode.clone();
 
         let mut state = self.state.write().await;
         state
-            .handle_local_event(
-                sender,
-                profile,
-                should_add_new_items,
-                date_divider_mode,
-                txn_id,
-                send_handle,
-                content,
-            )
+            .handle_local_event(sender, profile, date_divider_mode, txn_id, send_handle, content)
             .await;
     }
 

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

@@ -142,12 +142,17 @@ impl TimelineState {
         &mut self,
         own_user_id: OwnedUserId,
         own_profile: Option<Profile>,
-        should_add_new_items: bool,
         date_divider_mode: DateDividerMode,
         txn_id: OwnedTransactionId,
         send_handle: Option<SendHandle>,
         content: AnyMessageLikeEventContent,
     ) {
+        // Only add new items if the timeline is live.
+        let should_add_new_items = match self.timeline_focus {
+            TimelineFocusKind::Live => true,
+            TimelineFocusKind::Event | TimelineFocusKind::PinnedEvents => false,
+        };
+
         let ctx = TimelineEventContext {
             sender: own_user_id,
             sender_profile: own_profile,

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

@@ -270,8 +270,7 @@ impl<'a> TimelineStateTransaction<'a> {
                         TimelineItemPosition::UpdateAt { timeline_item_index: idx } => self
                             .items
                             .get(idx)
-                            .and_then(|item| item.as_event())
-                            .and_then(|item| item.as_remote())
+                            .and_then(|item| item.as_event()?.as_remote())
                             .map_or(RemoteEventOrigin::Unknown, |item| item.origin),
                     };