Skip to content

Commit 02251f2

Browse files
bmartybmarty
authored
Merge pull request #901 from vector-im/feature/fga/power_level
Feature/fga/power level
2 parents f8d5d25 + 52ae2ca commit 02251f2

File tree

10 files changed

+109
-81
lines changed

10 files changed

+109
-81
lines changed

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
7272
import io.element.android.libraries.matrix.api.room.MessageEventType
7373
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
7474
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
75-
import io.element.android.libraries.matrix.ui.room.canSendEventAsState
75+
import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
7676
import io.element.android.libraries.textcomposer.MessageComposerMode
7777
import kotlinx.coroutines.CoroutineScope
7878
import kotlinx.coroutines.launch
@@ -108,7 +108,7 @@ class MessagesPresenter @AssistedInject constructor(
108108
val retryState = retrySendMenuPresenter.present()
109109

110110
val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
111-
val userHasPermissionToSendMessage by room.canSendEventAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
111+
val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
112112
val roomName by produceState(initialValue = room.displayName, key1 = syncUpdateFlow.value) {
113113
value = room.displayName
114114
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import io.element.android.libraries.matrix.api.core.EventId
3333
import io.element.android.libraries.matrix.api.room.MatrixRoom
3434
import io.element.android.libraries.matrix.api.room.MessageEventType
3535
import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
36-
import io.element.android.libraries.matrix.ui.room.canSendEventAsState
36+
import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
3737
import kotlinx.collections.immutable.ImmutableList
3838
import kotlinx.coroutines.CoroutineScope
3939
import kotlinx.coroutines.flow.launchIn
@@ -67,7 +67,7 @@ class TimelinePresenter @Inject constructor(
6767
val timelineItems by timelineItemsFactory.collectItemsAsState()
6868
val paginationState by timeline.paginationState.collectAsState()
6969
val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
70-
val userHasPermissionToSendMessage by room.canSendEventAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
70+
val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
7171

7272
val prevMostRecentItemId = rememberSaveable { mutableStateOf<String?>(null) }
7373
val hasNewItems = remember { mutableStateOf(false) }

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
3232
import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
3333
import io.element.android.libraries.matrix.api.room.RoomMember
3434
import io.element.android.libraries.matrix.api.room.StateEventType
35+
import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
36+
import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
3537
import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
3638
import javax.inject.Inject
3739

@@ -50,9 +52,9 @@ class RoomDetailsPresenter @Inject constructor(
5052

5153
val membersState by room.membersStateFlow.collectAsState()
5254
val canInvite by getCanInvite(membersState)
53-
val canEditName by getCanSendStateEvent(membersState, StateEventType.ROOM_NAME)
54-
val canEditAvatar by getCanSendStateEvent(membersState, StateEventType.ROOM_AVATAR)
55-
val canEditTopic by getCanSendStateEvent(membersState, StateEventType.ROOM_TOPIC)
55+
val canEditName by getCanSendState(membersState, StateEventType.ROOM_NAME)
56+
val canEditAvatar by getCanSendState(membersState, StateEventType.ROOM_AVATAR)
57+
val canEditTopic by getCanSendState(membersState, StateEventType.ROOM_TOPIC)
5658
val dmMember by room.getDirectRoomMember(membersState)
5759
val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMember)
5860
val roomType by getRoomType(dmMember)
@@ -117,7 +119,7 @@ class RoomDetailsPresenter @Inject constructor(
117119
}
118120

119121
@Composable
120-
private fun getCanSendStateEvent(membersState: MatrixRoomMembersState, type: StateEventType) = produceState(false, membersState) {
121-
value = room.canSendStateEvent(type).getOrElse { false }
122+
private fun getCanSendState(membersState: MatrixRoomMembersState, type: StateEventType) = produceState(false, membersState) {
123+
value = room.canSendState(type).getOrElse { false }
122124
}
123125
}

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import io.element.android.libraries.architecture.runCatchingUpdatingState
3535
import io.element.android.libraries.core.mimetype.MimeTypes
3636
import io.element.android.libraries.matrix.api.room.MatrixRoom
3737
import io.element.android.libraries.matrix.api.room.StateEventType
38+
import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
3839
import io.element.android.libraries.matrix.ui.media.AvatarAction
3940
import io.element.android.libraries.mediapickers.api.PickerProvider
4041
import io.element.android.libraries.mediaupload.api.MediaPreProcessor
@@ -79,9 +80,9 @@ class RoomDetailsEditPresenter @Inject constructor(
7980
var canChangeAvatar by remember { mutableStateOf(false) }
8081

8182
LaunchedEffect(Unit) {
82-
canChangeName = room.canSendStateEvent(StateEventType.ROOM_NAME).getOrElse { false }
83-
canChangeTopic = room.canSendStateEvent(StateEventType.ROOM_TOPIC).getOrElse { false }
84-
canChangeAvatar = room.canSendStateEvent(StateEventType.ROOM_AVATAR).getOrElse { false }
83+
canChangeName = room.canSendState(StateEventType.ROOM_NAME).getOrElse { false }
84+
canChangeTopic = room.canSendState(StateEventType.ROOM_TOPIC).getOrElse { false }
85+
canChangeAvatar = room.canSendState(StateEventType.ROOM_AVATAR).getOrElse { false }
8586
}
8687

8788
val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker(

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.compose.runtime.State
2222
import androidx.compose.runtime.collectAsState
2323
import androidx.compose.runtime.getValue
2424
import androidx.compose.runtime.mutableStateOf
25+
import androidx.compose.runtime.produceState
2526
import androidx.compose.runtime.remember
2627
import androidx.compose.runtime.saveable.rememberSaveable
2728
import androidx.compose.runtime.setValue
@@ -32,6 +33,7 @@ import io.element.android.libraries.designsystem.theme.components.SearchBarResul
3233
import io.element.android.libraries.matrix.api.room.MatrixRoom
3334
import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
3435
import io.element.android.libraries.matrix.api.room.RoomMembershipState
36+
import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
3537
import kotlinx.collections.immutable.toImmutableList
3638
import kotlinx.coroutines.withContext
3739
import javax.inject.Inject
@@ -52,7 +54,9 @@ class RoomMemberListPresenter @Inject constructor(
5254
var isSearchActive by rememberSaveable { mutableStateOf(false) }
5355

5456
val membersState by room.membersStateFlow.collectAsState()
55-
val canInvite by getCanInvite(membersState = membersState)
57+
val canInvite by produceState(initialValue = false, key1 = membersState) {
58+
value = room.canInvite().getOrElse { false }
59+
}
5660

5761
LaunchedEffect(Unit) {
5862
withContext(coroutineDispatchers.io) {
@@ -98,13 +102,5 @@ class RoomMemberListPresenter @Inject constructor(
98102
)
99103
}
100104

101-
@Composable
102-
private fun getCanInvite(membersState: MatrixRoomMembersState): State<Boolean> {
103-
val canInvite = remember(membersState) { mutableStateOf(false) }
104-
LaunchedEffect(membersState) {
105-
canInvite.value = room.canInvite().getOrElse { false }
106-
}
107-
return canInvite
108-
}
109105
}
110106

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ interface MatrixRoom : Closeable {
9999

100100
suspend fun inviteUserById(id: UserId): Result<Unit>
101101

102-
suspend fun canInvite(): Result<Boolean>
102+
suspend fun canUserInvite(userId: UserId): Result<Boolean>
103103

104-
suspend fun canSendStateEvent(type: StateEventType): Result<Boolean>
104+
suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean>
105105

106-
suspend fun canSendEvent(type: MessageEventType): Result<Boolean>
106+
suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean>
107107

108108
suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit>
109109

@@ -134,3 +134,5 @@ interface MatrixRoom : Closeable {
134134
assetType: AssetType? = null,
135135
): Result<Unit>
136136
}
137+
138+

‎libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomPowerLevels.kt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright (c) 2023 New Vector Ltd
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package io.element.android.libraries.matrix.api.room.powerlevels
18+
19+
import io.element.android.libraries.matrix.api.room.MatrixRoom
20+
import io.element.android.libraries.matrix.api.room.MessageEventType
21+
import io.element.android.libraries.matrix.api.room.StateEventType
22+
23+
/**
24+
* Shortcut for calling [MatrixRoom.canUserInvite] with our own user.
25+
*/
26+
suspend fun MatrixRoom.canInvite(): Result<Boolean> = canUserInvite(sessionId)
27+
28+
/**
29+
* Shortcut for calling [MatrixRoom.canUserSendState] with our own user.
30+
*/
31+
suspend fun MatrixRoom.canSendState(type: StateEventType): Result<Boolean> = canUserSendState(sessionId, type)
32+
33+
/**
34+
* Shortcut for calling [MatrixRoom.canUserSendMessage] with our own user.
35+
*/
36+
suspend fun MatrixRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type)

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

Lines changed: 41 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import kotlinx.coroutines.withContext
5757
import org.matrix.rustcomponents.sdk.RequiredState
5858
import org.matrix.rustcomponents.sdk.Room
5959
import org.matrix.rustcomponents.sdk.RoomListItem
60-
import org.matrix.rustcomponents.sdk.RoomMember
6160
import org.matrix.rustcomponents.sdk.RoomSubscription
6261
import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
6362
import org.matrix.rustcomponents.sdk.genTransactionId
@@ -200,19 +199,17 @@ class RustMatrixRoom(
200199
}
201200
}
202201

203-
override suspend fun userDisplayName(userId: UserId): Result<String?> =
204-
withContext(roomDispatcher) {
205-
runCatching {
206-
innerRoom.memberDisplayName(userId.value)
207-
}
202+
override suspend fun userDisplayName(userId: UserId): Result<String?> = withContext(roomDispatcher) {
203+
runCatching {
204+
innerRoom.memberDisplayName(userId.value)
208205
}
206+
}
209207

210-
override suspend fun userAvatarUrl(userId: UserId): Result<String?> =
211-
withContext(roomDispatcher) {
212-
runCatching {
213-
innerRoom.memberAvatarUrl(userId.value)
214-
}
208+
override suspend fun userAvatarUrl(userId: UserId): Result<String?> = withContext(roomDispatcher) {
209+
runCatching {
210+
innerRoom.memberAvatarUrl(userId.value)
215211
}
212+
}
216213

217214
override suspend fun sendMessage(message: String): Result<Unit> = withContext(roomDispatcher) {
218215
val transactionId = genTransactionId()
@@ -269,21 +266,21 @@ class RustMatrixRoom(
269266
}
270267
}
271268

272-
override suspend fun canInvite(): Result<Boolean> = withContext(roomMembersDispatcher) {
273-
runCatching {
274-
innerRoom.member(sessionId.value).use(RoomMember::canInvite)
269+
override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
270+
return runCatching {
271+
innerRoom.canUserInvite(userId.value)
275272
}
276273
}
277274

278-
override suspend fun canSendStateEvent(type: StateEventType): Result<Boolean> = withContext(roomMembersDispatcher) {
279-
runCatching {
280-
innerRoom.member(sessionId.value).use { it.canSendState(type.map()) }
275+
override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
276+
return runCatching {
277+
innerRoom.canUserSendState(userId.value, type.map())
281278
}
282279
}
283280

284-
override suspend fun canSendEvent(type: MessageEventType): Result<Boolean> = withContext(roomMembersDispatcher) {
285-
runCatching {
286-
innerRoom.member(sessionId.value).use { it.canSendMessage(type.map()) }
281+
override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
282+
return runCatching {
283+
innerRoom.canUserSendMessage(userId.value, type.map())
287284
}
288285
}
289286

@@ -325,48 +322,42 @@ class RustMatrixRoom(
325322
}
326323
}
327324

328-
override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> =
329-
withContext(roomDispatcher) {
330-
runCatching {
331-
innerRoom.retrySend(transactionId.value)
332-
}
325+
override suspend fun retrySendMessage(transactionId: TransactionId): Result<Unit> = withContext(roomDispatcher) {
326+
runCatching {
327+
innerRoom.retrySend(transactionId.value)
333328
}
329+
}
334330

335-
override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> =
336-
withContext(roomDispatcher) {
337-
runCatching {
338-
innerRoom.cancelSend(transactionId.value)
339-
}
331+
override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> = withContext(roomDispatcher) {
332+
runCatching {
333+
innerRoom.cancelSend(transactionId.value)
340334
}
335+
}
341336

342337
@OptIn(ExperimentalUnsignedTypes::class)
343-
override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> =
344-
withContext(roomDispatcher) {
345-
runCatching {
346-
innerRoom.uploadAvatar(mimeType, data.toUByteArray().toList())
347-
}
338+
override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> = withContext(roomDispatcher) {
339+
runCatching {
340+
innerRoom.uploadAvatar(mimeType, data.toUByteArray().toList())
348341
}
342+
}
349343

350-
override suspend fun removeAvatar(): Result<Unit> =
351-
withContext(roomDispatcher) {
352-
runCatching {
353-
innerRoom.removeAvatar()
354-
}
344+
override suspend fun removeAvatar(): Result<Unit> = withContext(roomDispatcher) {
345+
runCatching {
346+
innerRoom.removeAvatar()
355347
}
348+
}
356349

357-
override suspend fun setName(name: String): Result<Unit> =
358-
withContext(roomDispatcher) {
359-
runCatching {
360-
innerRoom.setName(name)
361-
}
350+
override suspend fun setName(name: String): Result<Unit> = withContext(roomDispatcher) {
351+
runCatching {
352+
innerRoom.setName(name)
362353
}
354+
}
363355

364-
override suspend fun setTopic(topic: String): Result<Unit> =
365-
withContext(roomDispatcher) {
366-
runCatching {
367-
innerRoom.setTopic(topic)
368-
}
356+
override suspend fun setTopic(topic: String): Result<Unit> = withContext(roomDispatcher) {
357+
runCatching {
358+
innerRoom.setTopic(topic)
369359
}
360+
}
370361

371362
private suspend fun fetchMembers() = withContext(roomDispatcher) {
372363
runCatching {
@@ -411,4 +402,3 @@ private suspend fun sendAttachment(handle: () -> SendAttachmentJoinHandle): Resu
411402
}
412403
}
413404
}
414-

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
2222
import io.element.android.libraries.matrix.api.core.SessionId
2323
import io.element.android.libraries.matrix.api.core.TransactionId
2424
import io.element.android.libraries.matrix.api.core.UserId
25-
import io.element.android.libraries.matrix.api.room.location.AssetType
2625
import io.element.android.libraries.matrix.api.media.AudioInfo
2726
import io.element.android.libraries.matrix.api.media.FileInfo
2827
import io.element.android.libraries.matrix.api.media.ImageInfo
@@ -31,6 +30,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
3130
import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
3231
import io.element.android.libraries.matrix.api.room.MessageEventType
3332
import io.element.android.libraries.matrix.api.room.StateEventType
33+
import io.element.android.libraries.matrix.api.room.location.AssetType
3434
import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
3535
import io.element.android.libraries.matrix.test.A_ROOM_ID
3636
import io.element.android.libraries.matrix.test.A_SESSION_ID
@@ -202,15 +202,15 @@ class FakeMatrixRoom(
202202
inviteUserResult
203203
}
204204

205-
override suspend fun canInvite(): Result<Boolean> {
205+
override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
206206
return canInviteResult
207207
}
208208

209-
override suspend fun canSendStateEvent(type: StateEventType): Result<Boolean> {
209+
override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
210210
return canSendStateResults[type] ?: Result.failure(IllegalStateException("No fake answer"))
211211
}
212212

213-
override suspend fun canSendEvent(type: MessageEventType): Result<Boolean> {
213+
override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
214214
return canSendEventResults[type] ?: Result.failure(IllegalStateException("No fake answer"))
215215
}
216216

‎libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import androidx.compose.runtime.State
2121
import androidx.compose.runtime.produceState
2222
import io.element.android.libraries.matrix.api.room.MatrixRoom
2323
import io.element.android.libraries.matrix.api.room.MessageEventType
24+
import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
2425

2526
@Composable
26-
fun MatrixRoom.canSendEventAsState(type: MessageEventType, updateKey: Long): State<Boolean> {
27+
fun MatrixRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): State<Boolean> {
2728
return produceState(initialValue = true, key1 = updateKey) {
28-
value = canSendEvent(type).getOrElse { true }
29+
value = canSendMessage(type).getOrElse { true }
2930
}
3031
}
3132

0 commit comments

Comments
 (0)