Add RoomMembershipDetails to get the room member info for the current user and the sender of its m.room.member state event in the room.
This commit is contained in:
committed by
Jorge Martin Espinosa
parent
311fbb84f7
commit
02addf54dd
@@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Copyright 2025 New Vector 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.libraries.matrix.api.room
|
||||
|
||||
/**
|
||||
* Room membership details for the current user and the sender of the membership event.
|
||||
*
|
||||
* It also includes the reason the current user's membership changed, if any.
|
||||
*/
|
||||
data class RoomMembershipDetails(
|
||||
val currentUserMember: RoomMember,
|
||||
val senderMember: RoomMember?,
|
||||
) {
|
||||
val membershipChangeReason: String? = currentUserMember.membershipChangeReason
|
||||
}
|
||||
@@ -22,4 +22,9 @@ interface RoomPreview : AutoCloseable {
|
||||
* Forget the room if we had access to it, and it was left or banned.
|
||||
*/
|
||||
suspend fun forget(): Result<Unit>
|
||||
|
||||
/**
|
||||
* Get the membership details of the user in the room, as well as from the user who sent the `m.room.member` event.
|
||||
*/
|
||||
suspend fun membershipDetails(): Result<RoomMembershipDetails?>
|
||||
}
|
||||
|
||||
@@ -40,6 +40,14 @@ class RustRoomPreview(
|
||||
inner.forget()
|
||||
}
|
||||
|
||||
override suspend fun membershipDetails(): Result<RoomMembershipDetails?> = runCatching {
|
||||
val details = inner.ownMembershipDetails() ?: return@runCatching null
|
||||
RoomMembershipDetails(
|
||||
currentUserMember = RoomMemberMapper.map(details.ownRoomMember),
|
||||
senderMember = details.senderRoomMember?.let { RoomMemberMapper.map(it) },
|
||||
)
|
||||
}
|
||||
|
||||
override fun close() {
|
||||
inner.destroy()
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ class FakeRoomPreview(
|
||||
override val info: RoomPreviewInfo = aRoomPreviewInfo(),
|
||||
private val declineInviteResult: () -> Result<Unit> = { lambdaError() },
|
||||
private val forgetRoomResult: () -> Result<Unit> = { lambdaError() },
|
||||
private val roomMembershipDetails: () -> Result<RoomMembershipDetails?> = { lambdaError() },
|
||||
) : RoomPreview {
|
||||
override suspend fun leave(): Result<Unit> = simulateLongTask {
|
||||
declineInviteResult()
|
||||
@@ -31,5 +32,9 @@ class FakeRoomPreview(
|
||||
forgetRoomResult()
|
||||
}
|
||||
|
||||
override suspend fun membershipDetails(): Result<RoomMembershipDetails?> = simulateLongTask {
|
||||
roomMembershipDetails()
|
||||
}
|
||||
|
||||
override fun close() = Unit
|
||||
}
|
||||
|
||||
@@ -27,11 +27,13 @@ fun aRoomPreview(
|
||||
info: RoomPreviewInfo = aRoomPreviewInfo(),
|
||||
declineInviteResult: () -> Result<Unit> = { lambdaError() },
|
||||
forgetRoomResult: () -> Result<Unit> = { lambdaError() },
|
||||
roomMembershipDetails: () -> Result<RoomMembershipDetails?> = { lambdaError() },
|
||||
) = FakeRoomPreview(
|
||||
sessionId = sessionId,
|
||||
info = info,
|
||||
declineInviteResult = declineInviteResult,
|
||||
forgetRoomResult = forgetRoomResult,
|
||||
roomMembershipDetails = roomMembershipDetails,
|
||||
)
|
||||
|
||||
fun aRoomPreviewInfo(
|
||||
|
||||
Reference in New Issue
Block a user