Skip to content

Commit e9a1c30

Browse files
committed
knock requests : expose api through Room
1 parent 5515c93 commit e9a1c30

File tree

6 files changed

+134
-0
lines changed

6 files changed

+134
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import io.element.android.libraries.matrix.api.media.MediaUploadHandler
2424
import io.element.android.libraries.matrix.api.media.VideoInfo
2525
import io.element.android.libraries.matrix.api.poll.PollKind
2626
import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
27+
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
2728
import io.element.android.libraries.matrix.api.room.location.AssetType
2829
import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
2930
import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
@@ -56,6 +57,11 @@ interface MatrixRoom : Closeable {
5657
val roomTypingMembersFlow: Flow<List<UserId>>
5758
val identityStateChangesFlow: Flow<List<IdentityStateChange>>
5859

60+
/**
61+
* The current knock requests in the room as a Flow.
62+
*/
63+
val knockRequestsFlow: Flow<List<KnockRequest>>
64+
5965
/**
6066
* A one-to-one is a room with exactly 2 members.
6167
* See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/#default-underride-rules).
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright 2024 New Vector Ltd.
3+
*
4+
* SPDX-License-Identifier: AGPL-3.0-only
5+
* Please see LICENSE in the repository root for full details.
6+
*/
7+
8+
package io.element.android.libraries.matrix.api.room.knock
9+
10+
import io.element.android.libraries.matrix.api.core.UserId
11+
12+
interface KnockRequest {
13+
val userId: UserId
14+
val displayName: String?
15+
val avatarUrl: String?
16+
val reason: String?
17+
val timestamp: Long?
18+
19+
suspend fun accept(): Result<Unit>
20+
21+
suspend fun decline(reason: String?): Result<Unit>
22+
23+
suspend fun declineAndBan(reason: String?): Result<Unit>
24+
25+
suspend fun markAsSeen(): Result<Unit>
26+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
3838
import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
3939
import io.element.android.libraries.matrix.api.room.StateEventType
4040
import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
41+
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
4142
import io.element.android.libraries.matrix.api.room.location.AssetType
4243
import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
4344
import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
@@ -50,6 +51,7 @@ import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
5051
import io.element.android.libraries.matrix.impl.core.RustSendHandle
5152
import io.element.android.libraries.matrix.impl.mapper.map
5253
import io.element.android.libraries.matrix.impl.room.draft.into
54+
import io.element.android.libraries.matrix.impl.room.knock.RustKnockRequest
5355
import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
5456
import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
5557
import io.element.android.libraries.matrix.impl.room.powerlevels.RoomPowerLevelsMapper
@@ -76,6 +78,8 @@ import kotlinx.coroutines.flow.onStart
7678
import kotlinx.coroutines.withContext
7779
import org.matrix.rustcomponents.sdk.DateDividerMode
7880
import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
81+
import org.matrix.rustcomponents.sdk.JoinRequest
82+
import org.matrix.rustcomponents.sdk.RequestsToJoinListener
7983
import org.matrix.rustcomponents.sdk.RoomInfo
8084
import org.matrix.rustcomponents.sdk.RoomInfoListener
8185
import org.matrix.rustcomponents.sdk.RoomListItem
@@ -157,6 +161,15 @@ class RustMatrixRoom(
157161
})
158162
}
159163

164+
override val knockRequestsFlow: Flow<List<KnockRequest>> = mxCallbackFlow {
165+
innerRoom.subscribeToJoinRequests(object : RequestsToJoinListener {
166+
override fun call(joinRequests: List<JoinRequest>) {
167+
val knockRequests = joinRequests.map { RustKnockRequest(it) }
168+
channel.trySend(knockRequests)
169+
}
170+
})
171+
}
172+
160173
// Create a dispatcher for all room methods...
161174
private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
162175

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright 2024 New Vector Ltd.
3+
*
4+
* SPDX-License-Identifier: AGPL-3.0-only
5+
* Please see LICENSE in the repository root for full details.
6+
*/
7+
8+
package io.element.android.libraries.matrix.impl.room.knock
9+
10+
import io.element.android.libraries.matrix.api.core.UserId
11+
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
12+
import org.matrix.rustcomponents.sdk.JoinRequest
13+
14+
class RustKnockRequest(
15+
private val inner: JoinRequest,
16+
) : KnockRequest {
17+
override val userId: UserId = UserId(inner.userId)
18+
override val displayName: String? = inner.displayName
19+
override val avatarUrl: String? = inner.avatarUrl
20+
override val reason: String? = inner.reason
21+
override val timestamp: Long? = inner.timestamp?.toLong()
22+
23+
override suspend fun accept(): Result<Unit> = runCatching {
24+
inner.actions.accept()
25+
}
26+
27+
override suspend fun decline(reason: String?): Result<Unit> = runCatching {
28+
inner.actions.decline(reason)
29+
}
30+
31+
override suspend fun declineAndBan(reason: String?): Result<Unit> = runCatching {
32+
inner.actions.declineAndBan(reason)
33+
}
34+
35+
override suspend fun markAsSeen(): Result<Unit> = runCatching {
36+
inner.actions.markAsSeen()
37+
}
38+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import io.element.android.libraries.matrix.api.room.MessageEventType
3333
import io.element.android.libraries.matrix.api.room.RoomMember
3434
import io.element.android.libraries.matrix.api.room.StateEventType
3535
import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
36+
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
3637
import io.element.android.libraries.matrix.api.room.location.AssetType
3738
import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
3839
import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
@@ -163,6 +164,13 @@ class FakeMatrixRoom(
163164
_identityStateChangesFlow.tryEmit(identityStateChanges)
164165
}
165166

167+
private val _knockRequestsFlow: MutableSharedFlow<List<KnockRequest>> = MutableSharedFlow(replay = 1)
168+
override val knockRequestsFlow: Flow<List<KnockRequest>> = _knockRequestsFlow
169+
170+
fun emitKnockRequests(knockRequests: List<KnockRequest>) {
171+
_knockRequestsFlow.tryEmit(knockRequests)
172+
}
173+
166174
override val membersStateFlow: MutableStateFlow<MatrixRoomMembersState> = MutableStateFlow(MatrixRoomMembersState.Unknown)
167175

168176
override val roomNotificationSettingsStateFlow: MutableStateFlow<MatrixRoomNotificationSettingsState> =
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright 2024 New Vector Ltd.
3+
*
4+
* SPDX-License-Identifier: AGPL-3.0-only
5+
* Please see LICENSE in the repository root for full details.
6+
*/
7+
8+
package io.element.android.libraries.matrix.test.room.knock
9+
10+
import io.element.android.libraries.matrix.api.core.UserId
11+
import io.element.android.libraries.matrix.api.room.knock.KnockRequest
12+
import io.element.android.libraries.matrix.test.AN_AVATAR_URL
13+
import io.element.android.libraries.matrix.test.A_USER_ID
14+
import io.element.android.libraries.matrix.test.A_USER_NAME
15+
import io.element.android.tests.testutils.lambda.lambdaError
16+
17+
class FakeKnockRequest(
18+
override val userId: UserId = A_USER_ID,
19+
override val displayName: String? = A_USER_NAME,
20+
override val avatarUrl: String? = AN_AVATAR_URL,
21+
override val reason: String? = null,
22+
override val timestamp: Long? = null,
23+
val acceptLambda: () -> Result<Unit> = { lambdaError() },
24+
val declineLambda: (String?) -> Result<Unit> = { lambdaError() },
25+
val declineAndBanLambda: (String?) -> Result<Unit> = { lambdaError() },
26+
val markAsSeenLambda: () -> Result<Unit> = { lambdaError() },
27+
) : KnockRequest {
28+
override suspend fun accept(): Result<Unit> {
29+
return acceptLambda()
30+
}
31+
32+
override suspend fun decline(reason: String?): Result<Unit> {
33+
return declineLambda(reason)
34+
}
35+
36+
override suspend fun declineAndBan(reason: String?): Result<Unit> {
37+
return declineAndBanLambda(reason)
38+
}
39+
40+
override suspend fun markAsSeen(): Result<Unit> {
41+
return markAsSeenLambda()
42+
}
43+
}

0 commit comments

Comments
 (0)