Merge pull request #297 from csmith/102-show-invites-list

Feat: show invites list

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -32,6 +32,7 @@ import java.io.Closeable
 interface MatrixClient : Closeable {
     val sessionId: SessionId
     val roomSummaryDataSource: RoomSummaryDataSource
+    val invitesDataSource: RoomSummaryDataSource
     fun getRoom(roomId: RoomId): MatrixRoom?
     fun findDM(userId: UserId): MatrixRoom?
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomSummary.kt

@@ -34,9 +34,11 @@ sealed interface RoomSummary {
 data class RoomSummaryDetails(
     val roomId: RoomId,
     val name: String,
+    val canonicalAlias: String? = null,
     val isDirect: Boolean,
     val avatarURLString: String?,
     val lastMessage: RoomMessage?,
     val lastMessageTimestamp: Long?,
     val unreadNotificationCount: Int,
+    val inviter: RoomMember? = null,
 )

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -87,20 +87,18 @@ class RustMatrixClient constructor(
         }
     }
 
-    private val slidingSyncFilters by lazy {
-        SlidingSyncRequestListFilters(
-            isDm = null,
-            spaces = emptyList(),
-            isEncrypted = null,
-            isInvite = false,
-            isTombstoned = false,
-            roomTypes = emptyList(),
-            notRoomTypes = listOf("m.space"),
-            roomNameLike = null,
-            tags = emptyList(),
-            notTags = emptyList()
-        )
-    }
+    private val visibleRoomsSlidingSyncFilters = SlidingSyncRequestListFilters(
+        isDm = null,
+        spaces = emptyList(),
+        isEncrypted = null,
+        isInvite = false,
+        isTombstoned = false,
+        roomTypes = emptyList(),
+        notRoomTypes = listOf("m.space"),
+        roomNameLike = null,
+        tags = emptyList(),
+        notTags = emptyList()
+    )
 
     private val visibleRoomsSlidingSyncList = SlidingSyncListBuilder()
         .timelineLimit(limit = 1u)
@@ -111,7 +109,7 @@ class RustMatrixClient constructor(
                 RequiredState(key = "m.room.join_rules", value = ""),
             )
         )
-        .filters(slidingSyncFilters)
+        .filters(visibleRoomsSlidingSyncFilters)
         .name(name = "CurrentlyVisibleRooms")
         .syncMode(mode = SlidingSyncMode.SELECTIVE)
         .addRange(0u, 20u)
@@ -119,12 +117,32 @@ class RustMatrixClient constructor(
             it.build()
         }
 
+    private val invitesSlidingSyncFilters = visibleRoomsSlidingSyncFilters.copy(isInvite = true)
+
+    private val invitesSlidingSyncList = SlidingSyncListBuilder()
+        .timelineLimit(limit = 1u)
+        .requiredState(
+            requiredState = listOf(
+                RequiredState(key = "m.room.avatar", value = ""),
+                RequiredState(key = "m.room.encryption", value = ""),
+                RequiredState(key = "m.room.canonical_alias", value = ""),
+            )
+        )
+        .filters(invitesSlidingSyncFilters)
+        .name(name = "CurrentInvites")
+        .syncMode(mode = SlidingSyncMode.SELECTIVE)
+        .addRange(0u, 20u)
+        .use {
+            it.build()
+        }
+
     private val slidingSync = client
         .slidingSync()
         .homeserver("https://slidingsync.lab.matrix.org")
         .withCommonExtensions()
         .storageKey("ElementX")
         .addList(visibleRoomsSlidingSyncList)
+        .addList(invitesSlidingSyncList)
         .use {
             it.build()
         }
@@ -142,6 +160,18 @@ class RustMatrixClient constructor(
     override val roomSummaryDataSource: RoomSummaryDataSource
         get() = rustRoomSummaryDataSource
 
+    private val rustInvitesDataSource: RustRoomSummaryDataSource =
+        RustRoomSummaryDataSource(
+            slidingSyncObserverProxy.updateSummaryFlow,
+            slidingSync,
+            invitesSlidingSyncList,
+            dispatchers,
+            ::onRestartSync
+        )
+
+    override val invitesDataSource: RoomSummaryDataSource
+        get() = rustInvitesDataSource
+
     private var slidingSyncObserverToken: TaskHandle? = null
 
     private val mediaResolver = RustMediaResolver(this)
@@ -152,6 +182,7 @@ class RustMatrixClient constructor(
     init {
         client.setDelegate(clientDelegate)
         rustRoomSummaryDataSource.init()
+        rustInvitesDataSource.init()
         slidingSync.setObserver(slidingSyncObserverProxy)
         slidingSyncUpdateJob = slidingSyncObserverProxy.updateSummaryFlow
             .onEach { onSlidingSyncUpdate() }
@@ -248,6 +279,7 @@ class RustMatrixClient constructor(
         stopSync()
         slidingSync.setObserver(null)
         rustRoomSummaryDataSource.close()
+        rustInvitesDataSource.close()
         client.setDelegate(null)
         visibleRoomsSlidingSyncList.destroy()
         slidingSync.destroy()

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSummaryDetailsFactory.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.libraries.matrix.impl.room
 
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomSummaryDetails
 import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
@@ -29,14 +28,17 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
         val latestRoomMessage = slidingSyncRoom.latestRoomMessage()?.use {
             roomMessageFactory.create(it)
         }
+
         return RoomSummaryDetails(
             roomId = RoomId(slidingSyncRoom.roomId()),
             name = slidingSyncRoom.name() ?: slidingSyncRoom.roomId(),
+            canonicalAlias = room?.canonicalAlias(),
             isDirect = slidingSyncRoom.isDm() ?: false,
             avatarURLString = room?.avatarUrl(),
             unreadNotificationCount = slidingSyncRoom.unreadNotifications().use { it.notificationCount().toInt() },
             lastMessage = latestRoomMessage,
-            lastMessageTimestamp = latestRoomMessage?.originServerTs
+            lastMessageTimestamp = latestRoomMessage?.originServerTs,
+            inviter = room?.inviter()?.let(RoomMemberMapper::map),
         )
     }
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -41,6 +41,7 @@ class FakeMatrixClient(
     private val userDisplayName: Result<String> = Result.success(A_USER_NAME),
     private val userAvatarURLString: Result<String> = Result.success(AN_AVATAR_URL),
     override val roomSummaryDataSource: RoomSummaryDataSource = FakeRoomSummaryDataSource(),
+    override val invitesDataSource: RoomSummaryDataSource = FakeRoomSummaryDataSource(),
     private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
     private val pushersService: FakePushersService = FakePushersService(),
     private val notificationService: FakeNotificationService = FakeNotificationService(),