From 8f28d6e1c23797b3d9c5624a6353a2a3a5283c14 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 20 May 2025 17:24:10 +0100 Subject: [PATCH] Don't group timeline items if more than 5 minutes has passed. Matches the behaviour on web. --- ElementX/Sources/Screens/Timeline/TimelineViewModel.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift index 67cec5ec7f..eae7ef7648 100644 --- a/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift +++ b/ElementX/Sources/Screens/Timeline/TimelineViewModel.swift @@ -840,8 +840,9 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol { return false } - // can be improved by adding a date threshold - return eventTimelineItem.properties.reactions.isEmpty && eventTimelineItem.sender == otherEventTimelineItem.sender + return eventTimelineItem.sender == otherEventTimelineItem.sender + && eventTimelineItem.properties.reactions.isEmpty // Reactions break the grouping. + && otherEventTimelineItem.timestamp.timeIntervalSince(eventTimelineItem.timestamp) < 5 * 60 // As does the passage of time. } // MARK: - Direct chats logics