misc : remove direct usage of RoomSummary in UI and let RoomSummary use RoomInfo.

2024-10-08 21:34:34 +02:00 · 2024-10-08 21:34:34 +02:00 · eeb6b6f4bf
commit eeb6b6f4bf
parent 5a4e5d0575
47 changed files with 628 additions and 467 deletions
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
@ -33,6 +33,13 @@ data class MatrixRoomInfo(
    val canonicalAlias: RoomAlias?,
    val alternativeAliases: ImmutableList<RoomAlias>,
    val currentUserMembership: CurrentUserMembership,
+    /**
+     * Member who invited the current user to a room that's in the invited
+     * state.
+     *
+     * Can be missing if the room membership invite event is missing from the
+     * store.
+     */
    val inviter: RoomMember?,
    val activeMembersCount: Long,
    val invitedMembersCount: Long,
@ -43,7 +50,26 @@ data class MatrixRoomInfo(
    val userDefinedNotificationMode: RoomNotificationMode?,
    val hasRoomCall: Boolean,
    val activeRoomCallParticipants: ImmutableList<UserId>,
+    val isMarkedUnread: Boolean,
+    /**
+     * "Interesting" messages received in that room, independently of the
+     * notification settings.
+     */
+    val numUnreadMessages: Long,
+    /**
+     * Events that will notify the user, according to their
+     * notification settings.
+     */
+    val numUnreadNotifications: Long,
+    /**
+     * Events causing mentions/highlights for the user, according to their
+     * notification settings.
+     */
+    val numUnreadMentions: Long,
    val heroes: ImmutableList<MatrixUser>,
    val pinnedEventIds: ImmutableList<EventId>,
    val creator: UserId?,
-)
+) {
+    val aliases: List<RoomAlias>
+        get() = listOfNotNull(canonicalAlias) + alternativeAliases
+}
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
@ -7,35 +7,14 @@

 package io.element.android.libraries.matrix.api.roomlist

-import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
-import io.element.android.libraries.matrix.api.user.MatrixUser

 data class RoomSummary(
-    val roomId: RoomId,
-    val name: String?,
-    val canonicalAlias: RoomAlias?,
-    val alternativeAliases: List<RoomAlias>,
-    val isDirect: Boolean,
-    val avatarUrl: String?,
+    val info: MatrixRoomInfo,
    val lastMessage: RoomMessage?,
-    val numUnreadMessages: Int,
-    val numUnreadMentions: Int,
-    val numUnreadNotifications: Int,
-    val isMarkedUnread: Boolean,
-    val inviter: RoomMember?,
-    val userDefinedNotificationMode: RoomNotificationMode?,
-    val hasRoomCall: Boolean,
-    val isDm: Boolean,
-    val isFavorite: Boolean,
-    val currentUserMembership: CurrentUserMembership,
-    val heroes: List<MatrixUser>,
 ) {
+    val roomId = info.id
    val lastMessageTimestamp = lastMessage?.originServerTs
-    val aliases: List<RoomAlias>
-        get() = listOfNotNull(canonicalAlias) + alternativeAliases
+    val isOneToOne get() = info.activeMembersCount == 2L
 }
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
@ -53,6 +53,10 @@ class MatrixRoomInfoMapper {
            activeRoomCallParticipants = it.activeRoomCallParticipants.map(::UserId).toImmutableList(),
            heroes = it.elementHeroes().toImmutableList(),
            pinnedEventIds = it.pinnedEventIds.map(::EventId).toImmutableList(),
+            isMarkedUnread = it.isMarkedUnread,
+            numUnreadMessages = it.numUnreadMessages.toLong(),
+            numUnreadMentions = it.numUnreadMentions.toLong(),
+            numUnreadNotifications = it.numUnreadNotifications.toLong(),
        )
    }
 }
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
@ -31,7 +31,7 @@ internal class RoomListFactory(
    private val innerRoomListService: RoomListService,
    private val sessionCoroutineScope: CoroutineScope,
 ) {
-    private val roomSummaryDetailsFactory: RoomSummaryDetailsFactory = RoomSummaryDetailsFactory()
+    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory()

    /**
     * Creates a room list that can be used to load more rooms and filter them dynamically.
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt
@ -8,6 +8,7 @@
 package io.element.android.libraries.matrix.impl.roomlist

 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary

@ -17,19 +18,19 @@ val RoomListFilter.predicate
        is RoomListFilter.Any -> { _: RoomSummary -> true }
        RoomListFilter.None -> { _: RoomSummary -> false }
        RoomListFilter.Category.Group -> { roomSummary: RoomSummary ->
-            !roomSummary.isDm && !roomSummary.isInvited()
+            !roomSummary.info.isDm && !roomSummary.isInvited()
        }
        RoomListFilter.Category.People -> { roomSummary: RoomSummary ->
-            roomSummary.isDm && !roomSummary.isInvited()
+            roomSummary.info.isDm && !roomSummary.isInvited()
        }
        RoomListFilter.Favorite -> { roomSummary: RoomSummary ->
-            roomSummary.isFavorite && !roomSummary.isInvited()
+            roomSummary.info.isFavorite && !roomSummary.isInvited()
        }
        RoomListFilter.Unread -> { roomSummary: RoomSummary ->
-            !roomSummary.isInvited() && (roomSummary.numUnreadNotifications > 0 || roomSummary.isMarkedUnread)
+            !roomSummary.isInvited() && (roomSummary.info.numUnreadNotifications > 0 || roomSummary.info.isMarkedUnread)
        }
        is RoomListFilter.NormalizedMatchRoomName -> { roomSummary: RoomSummary ->
-            roomSummary.name.orEmpty().contains(pattern, ignoreCase = true)
+            roomSummary.info.name.orEmpty().contains(pattern, ignoreCase = true)
        }
        RoomListFilter.Invite -> { roomSummary: RoomSummary ->
            roomSummary.isInvited()
@ -50,4 +51,4 @@ fun List<RoomSummary>.filter(filter: RoomListFilter): List<RoomSummary> {
    }
 }

-private fun RoomSummary.isInvited() = currentUserMembership == CurrentUserMembership.INVITED
+private fun RoomSummary.isInvited() = info.currentUserMembership == CurrentUserMembership.INVITED
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
@ -1,51 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- * Please see LICENSE in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.roomlist
-
-import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.isDm
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.impl.notificationsettings.RoomNotificationSettingsMapper
-import io.element.android.libraries.matrix.impl.room.elementHeroes
-import io.element.android.libraries.matrix.impl.room.map
-import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
-import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
-import org.matrix.rustcomponents.sdk.RoomListItem
-import org.matrix.rustcomponents.sdk.use
-
-class RoomSummaryDetailsFactory(
-    private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory(),
-) {
-    suspend fun create(roomListItem: RoomListItem): RoomSummary {
-        val roomInfo = roomListItem.roomInfo()
-        val latestRoomMessage = roomListItem.latestEvent().use { event ->
-            roomMessageFactory.create(event)
-        }
-        return RoomSummary(
-            roomId = RoomId(roomInfo.id),
-            name = roomInfo.displayName,
-            canonicalAlias = roomInfo.canonicalAlias?.let(::RoomAlias),
-            alternativeAliases = roomInfo.alternativeAliases.map(::RoomAlias),
-            isDirect = roomInfo.isDirect,
-            avatarUrl = roomInfo.avatarUrl,
-            numUnreadMentions = roomInfo.numUnreadMentions.toInt(),
-            numUnreadMessages = roomInfo.numUnreadMessages.toInt(),
-            numUnreadNotifications = roomInfo.numUnreadNotifications.toInt(),
-            isMarkedUnread = roomInfo.isMarkedUnread,
-            lastMessage = latestRoomMessage,
-            inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
-            userDefinedNotificationMode = roomInfo.cachedUserDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
-            hasRoomCall = roomInfo.hasRoomCall,
-            isDm = isDm(isDirect = roomInfo.isDirect, activeMembersCount = roomInfo.activeMembersCount.toInt()),
-            isFavorite = roomInfo.isFavourite,
-            currentUserMembership = roomInfo.membership.map(),
-            heroes = roomInfo.elementHeroes(),
-        )
-    }
-}
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
@ -0,0 +1,30 @@
+/*
+ * Copyright 2023, 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.roomlist
+
+import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.impl.room.MatrixRoomInfoMapper
+import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
+import org.matrix.rustcomponents.sdk.RoomListItem
+import org.matrix.rustcomponents.sdk.use
+
+class RoomSummaryFactory(
+    private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory(),
+    private val roomInfoMapper: MatrixRoomInfoMapper = MatrixRoomInfoMapper(),
+) {
+    suspend fun create(roomListItem: RoomListItem): RoomSummary {
+        val roomInfo = roomListItem.roomInfo().let(roomInfoMapper::map)
+        val latestRoomMessage = roomListItem.latestEvent().use { event ->
+            roomMessageFactory.create(event)
+        }
+        return RoomSummary(
+            info = roomInfo,
+            lastMessage = latestRoomMessage,
+        )
+    }
+}
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
@ -23,7 +23,7 @@ class RoomSummaryListProcessor(
    private val roomSummaries: MutableSharedFlow<List<RoomSummary>>,
    private val roomListService: RoomListServiceInterface,
    private val coroutineContext: CoroutineContext,
-    private val roomSummaryDetailsFactory: RoomSummaryDetailsFactory = RoomSummaryDetailsFactory(),
+    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory(),
 ) {
    private val roomSummariesByIdentifier = HashMap<String, RoomSummary>()
    private val mutex = Mutex()
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt
@ -105,6 +105,10 @@ class MatrixRoomInfoMapperTest {
                ).toImmutableList(),
                pinnedEventIds = listOf(AN_EVENT_ID).toPersistentList(),
                creator = A_USER_ID,
+                isMarkedUnread = false,
+                numUnreadMessages = 12L,
+                numUnreadNotifications = 13L,
+                numUnreadMentions = 14L,
            )
        )
    }
@ -174,6 +178,10 @@ class MatrixRoomInfoMapperTest {
                heroes = emptyList<MatrixUser>().toImmutableList(),
                pinnedEventIds = emptyList<EventId>().toPersistentList(),
                creator = null,
+                isMarkedUnread = true,
+                numUnreadMessages = 12L,
+                numUnreadNotifications = 13L,
+                numUnreadMentions = 14L,
            )
        )
    }
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
@ -19,7 +19,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SERVER_LIST
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
-import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@ -29,7 +29,7 @@ import org.junit.Test
 class DefaultJoinRoomTest {
    @Test
    fun `when using roomId and there is no server names, the classic join room API is used`() = runTest {
-        val roomSummary = aRoomSummaryFilled()
+        val roomSummary = aRoomSummary()
        val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
        val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
        val roomResult = FakeMatrixRoom()
@ -64,7 +64,7 @@ class DefaultJoinRoomTest {

    @Test
    fun `when using roomId and server names are available, joinRoomByIdOrAlias API is used`() = runTest {
-        val roomSummary = aRoomSummaryFilled()
+        val roomSummary = aRoomSummary()
        val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
        val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
        val roomResult = FakeMatrixRoom()
@ -100,7 +100,7 @@ class DefaultJoinRoomTest {

    @Test
    fun `when using roomAlias, joinRoomByIdOrAlias API is used`() = runTest {
-        val roomSummary = aRoomSummaryFilled()
+        val roomSummary = aRoomSummary()
        val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
        val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
        val roomResult = FakeMatrixRoom()
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt
@ -16,10 +16,11 @@ import org.junit.Test

 class RoomListFilterTest {
    private val regularRoom = aRoomSummary(
-        isDm = false
+        isDirect = false,
    )
    private val dmRoom = aRoomSummary(
-        isDm = true
+        isDirect = true,
+        activeMembersCount = 2
    )
    private val favoriteRoom = aRoomSummary(
        isFavorite = true
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 import io.element.android.libraries.matrix.test.A_ROOM_ID_3
 import io.element.android.libraries.matrix.test.room.aRoomSummary
-import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
@ -40,7 +39,7 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `PushBack adds a new entry at the end of the list`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled())
+        summaries.value = listOf(aRoomSummary())
        val processor = createProcessor()
        processor.postUpdate(listOf(RoomListEntriesUpdate.PushBack(FakeRustRoomListItem(A_ROOM_ID_2))))

@ -50,7 +49,7 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `PushFront inserts a new entry at the start of the list`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled())
+        summaries.value = listOf(aRoomSummary())
        val processor = createProcessor()
        processor.postUpdate(listOf(RoomListEntriesUpdate.PushFront(FakeRustRoomListItem(A_ROOM_ID_2))))

@ -60,7 +59,7 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Set replaces an entry at some index`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled())
+        summaries.value = listOf(aRoomSummary())
        val processor = createProcessor()
        val index = 0

@ -72,7 +71,7 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Insert inserts a new entry at the provided index`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled())
+        summaries.value = listOf(aRoomSummary())
        val processor = createProcessor()
        val index = 0

@ -84,7 +83,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Remove removes an entry at some index`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()
        val index = 0

@ -96,7 +98,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `PopBack removes an entry at the end of the list`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()
        val index = 0

@ -108,7 +113,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `PopFront removes an entry at the start of the list`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()
        val index = 0

@ -120,7 +128,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Clear removes all the entries`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()

        processor.postUpdate(listOf(RoomListEntriesUpdate.Clear))
@ -130,7 +141,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Truncate removes all entries after the provided length`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()
        val index = 0

@ -142,7 +156,10 @@ class RoomSummaryListProcessorTest {

    @Test
    fun `Reset removes all entries and add the provided ones`() = runTest {
-        summaries.value = listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(A_ROOM_ID_2))
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(A_ROOM_ID_2)
+        )
        val processor = createProcessor()
        val index = 0

@ -156,6 +173,6 @@ class RoomSummaryListProcessorTest {
        summaries,
        FakeRustRoomListService(),
        coroutineContext = StandardTestDispatcher(testScheduler),
-        roomSummaryDetailsFactory = RoomSummaryDetailsFactory(),
+        roomSummaryDetailsFactory = RoomSummaryFactory(),
    )
 }
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.IntentionalMention
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
@ -31,7 +30,6 @@ import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.MatrixRoomNotificationSettingsState
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.location.AssetType
@ -39,21 +37,15 @@ import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerL
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
-import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
-import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@ -508,62 +500,6 @@ class FakeMatrixRoom(
    }
 }

-fun aRoomInfo(
-    id: RoomId = A_ROOM_ID,
-    name: String? = A_ROOM_NAME,
-    rawName: String? = name,
-    topic: String? = "A topic",
-    avatarUrl: String? = AN_AVATAR_URL,
-    isDirect: Boolean = false,
-    isPublic: Boolean = true,
-    isSpace: Boolean = false,
-    isTombstoned: Boolean = false,
-    isFavorite: Boolean = false,
-    canonicalAlias: RoomAlias? = null,
-    alternativeAliases: List<RoomAlias> = emptyList(),
-    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
-    inviter: RoomMember? = null,
-    activeMembersCount: Long = 1,
-    invitedMembersCount: Long = 0,
-    joinedMembersCount: Long = 1,
-    highlightCount: Long = 0,
-    notificationCount: Long = 0,
-    userDefinedNotificationMode: RoomNotificationMode? = null,
-    hasRoomCall: Boolean = false,
-    userPowerLevels: ImmutableMap<UserId, Long> = persistentMapOf(),
-    activeRoomCallParticipants: List<UserId> = emptyList(),
-    heroes: List<MatrixUser> = emptyList(),
-    pinnedEventIds: List<EventId> = emptyList(),
-    roomCreator: UserId? = null,
-) = MatrixRoomInfo(
-    id = id,
-    name = name,
-    rawName = rawName,
-    topic = topic,
-    avatarUrl = avatarUrl,
-    isDirect = isDirect,
-    isPublic = isPublic,
-    isSpace = isSpace,
-    isTombstoned = isTombstoned,
-    isFavorite = isFavorite,
-    canonicalAlias = canonicalAlias,
-    alternativeAliases = alternativeAliases.toImmutableList(),
-    currentUserMembership = currentUserMembership,
-    inviter = inviter,
-    activeMembersCount = activeMembersCount,
-    invitedMembersCount = invitedMembersCount,
-    joinedMembersCount = joinedMembersCount,
-    highlightCount = highlightCount,
-    notificationCount = notificationCount,
-    userDefinedNotificationMode = userDefinedNotificationMode,
-    hasRoomCall = hasRoomCall,
-    userPowerLevels = userPowerLevels,
-    activeRoomCallParticipants = activeRoomCallParticipants.toImmutableList(),
-    heroes = heroes.toImmutableList(),
-    pinnedEventIds = pinnedEventIds.toImmutableList(),
-    creator = roomCreator,
-)
-
 fun defaultRoomPowerLevels() = MatrixRoomPowerLevels(
    ban = 50,
    invite = 0,
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
@ -0,0 +1,90 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.room
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.test.AN_AVATAR_URL
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_RAW_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableList
+
+fun aRoomInfo(
+    id: RoomId = A_ROOM_ID,
+    name: String? = A_ROOM_NAME,
+    rawName: String? = A_ROOM_RAW_NAME,
+    topic: String? = A_ROOM_TOPIC,
+    avatarUrl: String? = AN_AVATAR_URL,
+    isDirect: Boolean = false,
+    isPublic: Boolean = true,
+    isSpace: Boolean = false,
+    isTombstoned: Boolean = false,
+    isFavorite: Boolean = false,
+    canonicalAlias: RoomAlias? = null,
+    alternativeAliases: List<RoomAlias> = emptyList(),
+    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
+    inviter: RoomMember? = null,
+    activeMembersCount: Long = 1,
+    invitedMembersCount: Long = 0,
+    joinedMembersCount: Long = 1,
+    highlightCount: Long = 0,
+    notificationCount: Long = 0,
+    userDefinedNotificationMode: RoomNotificationMode? = null,
+    hasRoomCall: Boolean = false,
+    userPowerLevels: ImmutableMap<UserId, Long> = persistentMapOf(),
+    activeRoomCallParticipants: List<UserId> = emptyList(),
+    heroes: List<MatrixUser> = emptyList(),
+    pinnedEventIds: List<EventId> = emptyList(),
+    roomCreator: UserId? = null,
+    isMarkedUnread: Boolean = false,
+    numUnreadMessages: Long = 0,
+    numUnreadNotifications: Long = 0,
+    numUnreadMentions: Long = 0,
+) = MatrixRoomInfo(
+    id = id,
+    name = name,
+    rawName = rawName,
+    topic = topic,
+    avatarUrl = avatarUrl,
+    isDirect = isDirect,
+    isPublic = isPublic,
+    isSpace = isSpace,
+    isTombstoned = isTombstoned,
+    isFavorite = isFavorite,
+    canonicalAlias = canonicalAlias,
+    alternativeAliases = alternativeAliases.toImmutableList(),
+    currentUserMembership = currentUserMembership,
+    inviter = inviter,
+    activeMembersCount = activeMembersCount,
+    invitedMembersCount = invitedMembersCount,
+    joinedMembersCount = joinedMembersCount,
+    highlightCount = highlightCount,
+    notificationCount = notificationCount,
+    userDefinedNotificationMode = userDefinedNotificationMode,
+    hasRoomCall = hasRoomCall,
+    userPowerLevels = userPowerLevels,
+    activeRoomCallParticipants = activeRoomCallParticipants.toImmutableList(),
+    heroes = heroes.toImmutableList(),
+    pinnedEventIds = pinnedEventIds.toImmutableList(),
+    creator = roomCreator,
+    isMarkedUnread = isMarkedUnread,
+    numUnreadMessages = numUnreadMessages,
+    numUnreadNotifications = numUnreadNotifications,
+    numUnreadMentions = numUnreadMentions,
+)
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@ -12,6 +12,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
@ -21,69 +22,88 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_RAW_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toPersistentList

-fun aRoomSummaryFilled(
-    roomId: RoomId = A_ROOM_ID,
-    name: String = A_ROOM_NAME,
-    isDirect: Boolean = false,
-    avatarUrl: String? = null,
+fun aRoomSummary(
+    info: MatrixRoomInfo = aRoomInfo(),
    lastMessage: RoomMessage? = aRoomMessage(),
-    numUnreadMentions: Int = 0,
-    numUnreadMessages: Int = 0,
-    notificationMode: RoomNotificationMode? = null,
-    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
-) = aRoomSummary(
-    roomId = roomId,
-    name = name,
-    isDirect = isDirect,
-    avatarUrl = avatarUrl,
+) = RoomSummary(
+    info = info,
    lastMessage = lastMessage,
-    numUnreadMentions = numUnreadMentions,
-    numUnreadMessages = numUnreadMessages,
-    notificationMode = notificationMode,
-    currentUserMembership = currentUserMembership,
 )

 fun aRoomSummary(
    roomId: RoomId = A_ROOM_ID,
    name: String? = A_ROOM_NAME,
-    isDirect: Boolean = false,
+    rawName: String? = A_ROOM_RAW_NAME,
+    topic: String? = A_ROOM_TOPIC,
    avatarUrl: String? = null,
-    lastMessage: RoomMessage? = aRoomMessage(),
-    numUnreadMentions: Int = 0,
-    numUnreadMessages: Int = 0,
-    numUnreadNotifications: Int = 0,
-    isMarkedUnread: Boolean = false,
-    notificationMode: RoomNotificationMode? = null,
-    inviter: RoomMember? = null,
+    isDirect: Boolean = false,
+    isPublic: Boolean = true,
+    isSpace: Boolean = false,
+    isTombstoned: Boolean = false,
+    isFavorite: Boolean = false,
    canonicalAlias: RoomAlias? = null,
    alternativeAliases: List<RoomAlias> = emptyList(),
-    hasRoomCall: Boolean = false,
-    isDm: Boolean = false,
-    isFavorite: Boolean = false,
    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
+    inviter: RoomMember? = null,
+    activeMembersCount: Long = 1,
+    invitedMembersCount: Long = 0,
+    joinedMembersCount: Long = 1,
+    highlightCount: Long = 0,
+    notificationCount: Long = 0,
+    userDefinedNotificationMode: RoomNotificationMode? = null,
+    hasRoomCall: Boolean = false,
+    userPowerLevels: ImmutableMap<UserId, Long> = persistentMapOf(),
+    activeRoomCallParticipants: List<UserId> = emptyList(),
    heroes: List<MatrixUser> = emptyList(),
+    pinnedEventIds: List<EventId> = emptyList(),
+    roomCreator: UserId? = null,
+    isMarkedUnread: Boolean = false,
+    numUnreadMessages: Long = 0,
+    numUnreadNotifications: Long = 0,
+    numUnreadMentions: Long = 0,
+    lastMessage: RoomMessage? = aRoomMessage(),
 ) = RoomSummary(
-    roomId = roomId,
-    name = name,
-    isDirect = isDirect,
-    avatarUrl = avatarUrl,
+    info = MatrixRoomInfo(
+        id = roomId,
+        name = name,
+        rawName = rawName,
+        topic = topic,
+        avatarUrl = avatarUrl,
+        isDirect = isDirect,
+        isPublic = isPublic,
+        isSpace = isSpace,
+        isTombstoned = isTombstoned,
+        isFavorite = isFavorite,
+        canonicalAlias = canonicalAlias,
+        alternativeAliases = alternativeAliases.toPersistentList(),
+        currentUserMembership = currentUserMembership,
+        inviter = inviter,
+        activeMembersCount = activeMembersCount,
+        invitedMembersCount = invitedMembersCount,
+        joinedMembersCount = joinedMembersCount,
+        userPowerLevels = userPowerLevels,
+        highlightCount = highlightCount,
+        notificationCount = notificationCount,
+        userDefinedNotificationMode = userDefinedNotificationMode,
+        hasRoomCall = hasRoomCall,
+        activeRoomCallParticipants = activeRoomCallParticipants.toPersistentList(),
+        heroes = heroes.toPersistentList(),
+        pinnedEventIds = pinnedEventIds.toPersistentList(),
+        creator = roomCreator,
+        isMarkedUnread = isMarkedUnread,
+        numUnreadMessages = numUnreadMessages,
+        numUnreadNotifications = numUnreadNotifications,
+        numUnreadMentions = numUnreadMentions,
+    ),
    lastMessage = lastMessage,
-    numUnreadMentions = numUnreadMentions,
-    numUnreadMessages = numUnreadMessages,
-    numUnreadNotifications = numUnreadNotifications,
-    isMarkedUnread = isMarkedUnread,
-    userDefinedNotificationMode = notificationMode,
-    inviter = inviter,
-    canonicalAlias = canonicalAlias,
-    alternativeAliases = alternativeAliases,
-    hasRoomCall = hasRoomCall,
-    isDm = isDm,
-    isFavorite = isFavorite,
-    currentUserMembership = currentUserMembership,
-    heroes = heroes,
 )

 fun aRoomMessage(