From c02d5daf7d6f87efcf8a929d89965054b18a4afa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Apr 2024 14:31:38 +0200
Subject: [PATCH] Improve anInviteSender() and use it in RoomListStateProvider.

---
 .../features/roomlist/impl/RoomListStateProvider.kt |  8 ++------
 .../impl/model/RoomListRoomSummaryProvider.kt       | 13 +++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
index bdc8938503..bf73a74ef8 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
@@ -23,10 +23,10 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.leaveroom.api.aLeaveRoomState
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
 import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState
-import io.element.android.features.roomlist.impl.model.InviteSender
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
 import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.anInviteSender
 import io.element.android.features.roomlist.impl.search.RoomListSearchState
 import io.element.android.features.roomlist.impl.search.aRoomListSearchState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -88,11 +88,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room Invited",
             avatarData = AvatarData("!roomId", "Room with Alice and Bob", size = AvatarSize.RoomListItem),
             id = "!roomId:domain",
-            inviteSender = InviteSender(
-                userId = UserId("@bob:domain"),
-                displayName = "Bob",
-                avatarData = AvatarData("@bob:domain", "Bob", size = AvatarSize.InviteSender),
-            ),
+            inviteSender = anInviteSender(),
             displayType = RoomSummaryDisplayType.INVITE,
         ),
         aRoomListRoomSummary(
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
index 7691fab188..25e0a35d25 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
@@ -86,7 +86,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 aRoomListRoomSummary(
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
-                        userId = "@alice:matrix.org",
+                        userId = UserId("@alice:matrix.org"),
                         displayName = "Alice",
                     ),
                     canonicalAlias = RoomAlias("#alias:matrix.org"),
@@ -95,7 +95,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     name = "Bob",
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
-                        userId = "@bob:matrix.org",
+                        userId = UserId("@bob:matrix.org"),
                         displayName = "Bob",
                     ),
                     isDirect = true,
@@ -105,12 +105,13 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
 }
 
 internal fun anInviteSender(
-    userId: String,
-    displayName: String,
+    userId: UserId = UserId("@bob:domain"),
+    displayName: String = "Bob",
+    avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
 ) = InviteSender(
-    userId = UserId(userId),
+    userId = userId,
     displayName = displayName,
-    avatarData = AvatarData(userId, displayName, size = AvatarSize.InviteSender),
+    avatarData = avatarData,
 )
 
 internal fun aRoomListRoomSummary(