Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move empty day separator filtering to a timeline post-processor (#6866)

Browse source 
* Move empty day separator filtering to a timeline post-processor

* Split `FilterPublicMembershipChangesPostProcessor` from `RoomBeginningPostProcessor`
This commit is contained in:
Jorge Martin Espinosa 2026-05-26 10:28:32 +02:00 • committed by GitHub
parent 0e2213a199
commit 1e67c2f77b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 292 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

26
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
View file

@ -16,7 +16,6 @@ import io.element.android.features.messages.impl.timeline.factories.event.Timeli
import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemVirtualFactory
import io.element.android.features.messages.impl.timeline.groups.TimelineItemGrouper
import io.element.android.features.messages.impl.timeline.model.TimelineItem
import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
import io.element.android.libraries.androidutils.diff.DiffCacheUpdater
import io.element.android.libraries.androidutils.diff.MutableListDiffCache
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@ -97,8 +96,7 @@ class TimelineItemsFactory(
}
}
val result = timelineItemGrouper.group(newTimelineItemStates).toImmutableList()
val filteredResult = filterEmptyDaySeparators(result)
this._timelineItems.emit(filteredResult)
this._timelineItems.emit(result)
}
private suspend fun buildAndCacheItem(
@ -116,25 +114,3 @@ class TimelineItemsFactory(
return timelineItem
}
}
// Remove day separators for days with no events after the client-side event filtering
internal fun filterEmptyDaySeparators(items: List<TimelineItem>): ImmutableList<TimelineItem> {
return buildList {
var hasEventBefore = false
for (item in items) {
when (item) {
is TimelineItem.Event, is TimelineItem.GroupedEvents -> {
hasEventBefore = true
add(item)
}
is TimelineItem.Virtual if item.model is TimelineItemDaySeparatorModel -> {
if (hasEventBefore) {
add(item)
}
hasEventBefore = false
}
else -> add(item)
}
}
}.toImmutableList()
}

160
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryTest.kt
View file

@ -1,160 +0,0 @@
/*
* Copyright (c) 2026 Element Creations Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.messages.impl.timeline.factories
import com.google.common.truth.Truth.assertThat
import io.element.android.features.messages.impl.fixtures.aMessageEvent
import io.element.android.features.messages.impl.timeline.aTimelineItemDebugInfo
import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
import io.element.android.features.messages.impl.timeline.model.ReadReceiptData
import io.element.android.features.messages.impl.timeline.model.TimelineItem
import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel
import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
import io.element.android.libraries.designsystem.components.avatar.anAvatarData
import io.element.android.libraries.matrix.api.core.UniqueId
import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
import io.element.android.libraries.matrix.test.AN_EVENT_ID
import io.element.android.libraries.matrix.test.A_USER_ID
import io.element.android.libraries.matrix.test.core.FakeSendHandle
import kotlinx.collections.immutable.toImmutableList
import org.junit.Test
class TimelineItemsFactoryTest {
private val anEvent = TimelineItem.Event(
id = UniqueId("event"),
eventId = AN_EVENT_ID,
senderId = A_USER_ID,
senderAvatar = anAvatarData(),
senderProfile = ProfileDetails.Ready(displayName = "User", displayNameAmbiguous = false, avatarUrl = null),
content = aMessageEvent().content,
reactionsState = aTimelineItemReactions(count = 0),
readReceiptState = TimelineItemReadReceipts(emptyList<ReadReceiptData>().toImmutableList()),
localSendState = LocalEventSendState.Sent(AN_EVENT_ID),
isEditable = false,
canBeRepliedTo = false,
inReplyTo = null,
threadInfo = null,
origin = null,
timelineItemDebugInfoProvider = { aTimelineItemDebugInfo() },
messageShieldProvider = { null },
sendHandleProvider = { FakeSendHandle() },
forwarder = null,
forwarderProfile = null,
)
private fun aDaySeparator(date: String) = TimelineItem.Virtual(
id = UniqueId("day_$date"),
model = aTimelineItemDaySeparatorModel(date)
)
@Test
fun `filterEmptyDaySeparators keeps day separator with events after it`() {
val items = listOf(
anEvent,
aDaySeparator("Today"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(2)
assertThat(result[0]).isEqualTo(anEvent)
assertThat(result[1]).isEqualTo(aDaySeparator("Today"))
}
@Test
fun `filterEmptyDaySeparators removes day separator with no events after it`() {
val items = listOf(
aDaySeparator("Today"),
aDaySeparator("Yesterday"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).isEmpty()
}
@Test
fun `filterEmptyDaySeparators removes first day separator and keeps second when only second has events`() {
val items = listOf(
aDaySeparator("Today"),
anEvent,
aDaySeparator("Yesterday"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(2)
assertThat(result[0]).isEqualTo(anEvent)
assertThat(result[1]).isEqualTo(aDaySeparator("Yesterday"))
}
@Test
fun `filterEmptyDaySeparators handles multiple day separators in a row with no events`() {
val items = listOf(
aDaySeparator("Today"),
aDaySeparator("Yesterday"),
aDaySeparator("Last week"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).isEmpty()
}
@Test
fun `filterEmptyDaySeparators keeps all items when no day separators`() {
val items = listOf(
anEvent,
anEvent.copy(id = UniqueId("event2")),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(2)
}
@Test
fun `filterEmptyDaySeparators handles grouped events after day separator`() {
val groupedEvents = TimelineItem.GroupedEvents(
id = UniqueId("grouped"),
events = listOf(anEvent).toImmutableList(),
aggregatedReadReceipts = emptyList<ReadReceiptData>().toImmutableList(),
)
val items = listOf(
groupedEvents,
aDaySeparator("Today"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(2)
assertThat(result[0]).isEqualTo(groupedEvents)
assertThat(result[1]).isEqualTo(aDaySeparator("Today"))
}
@Test
fun `filterEmptyDaySeparators removes day separator followed by non-event virtual item`() {
val readMarker = TimelineItem.Virtual(
id = UniqueId("readMarker"),
model = TimelineItemReadMarkerModel
)
val items = listOf(
aDaySeparator("Today"),
readMarker,
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(1)
assertThat(result[0]).isEqualTo(readMarker)
}
@Test
fun `filterEmptyDaySeparators keeps day separator when non-event virtual items are between separator and event`() {
val readMarker = TimelineItem.Virtual(
id = UniqueId("readMarker"),
model = TimelineItemReadMarkerModel
)
val items = listOf(
anEvent,
readMarker,
aDaySeparator("Today"),
)
val result = filterEmptyDaySeparators(items)
assertThat(result).hasSize(3)
assertThat(result[2]).isEqualTo(aDaySeparator("Today"))
}
}