From 5a0b33fcd1e545d682849edded5c69841ff82ac0 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Mon, 12 May 2025 16:51:47 +0200 Subject: [PATCH] refactor(timeline): use `TimelineEventKind::AddItem` for call invite/notify/sticker --- .../src/timeline/event_handler.rs | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/crates/matrix-sdk-ui/src/timeline/event_handler.rs b/crates/matrix-sdk-ui/src/timeline/event_handler.rs index 4888a0aed..bf3726e88 100644 --- a/crates/matrix-sdk-ui/src/timeline/event_handler.rs +++ b/crates/matrix-sdk-ui/src/timeline/event_handler.rs @@ -284,6 +284,24 @@ impl TimelineEventKind { kind: HandleAggregationKind::PollEnd, }, + AnyMessageLikeEventContent::CallInvite(_) => { + Self::add_item(TimelineItemContent::CallInvite) + } + + AnyMessageLikeEventContent::CallNotify(_) => { + Self::add_item(TimelineItemContent::CallNotify) + } + + AnyMessageLikeEventContent::Sticker(content) => { + Self::add_item(TimelineItemContent::MsgLike(MsgLikeContent { + kind: MsgLikeKind::Sticker(Sticker { content }), + reactions: Default::default(), + thread_root: None, + in_reply_to: None, + thread_summary: None, + })) + } + _ => { // Default path: TODO remove Self::Message { content, relations: ev.relations() } @@ -502,21 +520,6 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> { } } - AnyMessageLikeEventContent::Sticker(content) => { - if should_add { - self.add_item( - TimelineItemContent::MsgLike(MsgLikeContent { - kind: MsgLikeKind::Sticker(Sticker { content }), - reactions: Default::default(), - thread_root: None, - in_reply_to: None, - thread_summary: None, - }), - None, - ); - } - } - AnyMessageLikeEventContent::UnstablePollStart( UnstablePollStartEventContent::New(c), ) => { @@ -525,18 +528,6 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> { } } - AnyMessageLikeEventContent::CallInvite(_) => { - if should_add { - self.add_item(TimelineItemContent::CallInvite, None); - } - } - - AnyMessageLikeEventContent::CallNotify(_) => { - if should_add { - self.add_item(TimelineItemContent::CallNotify, None) - } - } - // TODO _ => { debug!(