Skip to content

Commit 669e62e

Browse files
committed
PowerLevel: use new api exposed from rust which doesn't need to load members.
1 parent 7cefff8 commit 669e62e

File tree

10 files changed

+74
-37
lines changed

10 files changed

+74
-37
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
@@ -71,7 +71,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
7171
import io.element.android.libraries.matrix.api.room.MessageEventType
7272
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
7373
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
74-
import io.element.android.libraries.matrix.ui.room.canSendEventAsState
74+
import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
7575
import io.element.android.libraries.textcomposer.MessageComposerMode
7676
import kotlinx.coroutines.CoroutineScope
7777
import kotlinx.coroutines.launch
@@ -107,7 +107,7 @@ class MessagesPresenter @AssistedInject constructor(
107107
val retryState = retrySendMenuPresenter.present()
108108

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

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: 3 additions & 1 deletion
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

@@ -118,6 +120,6 @@ class RoomDetailsPresenter @Inject constructor(
118120

119121
@Composable
120122
private fun getCanSendStateEvent(membersState: MatrixRoomMembersState, type: StateEventType) = produceState(false, membersState) {
121-
value = room.canSendStateEvent(type).getOrElse { false }
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
@@ -101,11 +101,11 @@ interface MatrixRoom : Closeable {
101101

102102
suspend fun inviteUserById(id: UserId): Result<Unit>
103103

104-
suspend fun canInvite(): Result<Boolean>
104+
suspend fun canUserInvite(userId: UserId): Result<Boolean>
105105

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

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

110110
suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit>
111111

@@ -136,3 +136,5 @@ interface MatrixRoom : Closeable {
136136
assetType: AssetType? = null,
137137
): Result<Unit>
138138
}
139+
140+
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 out own user.
25+
*/
26+
suspend fun MatrixRoom.canInvite(): Result<Boolean> = canUserInvite(sessionId)
27+
28+
/**
29+
* Shortcut for calling [MatrixRoom.canUserSendState] with out own user.
30+
*/
31+
suspend fun MatrixRoom.canSendState(type: StateEventType): Result<Boolean> = canUserSendState(sessionId, type)
32+
33+
/**
34+
* Shortcut for calling [MatrixRoom.canUserSendMessage] with out 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: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import io.element.android.libraries.matrix.impl.timeline.RustMatrixTimeline
4343
import io.element.android.libraries.matrix.impl.timeline.backPaginationStatusFlow
4444
import io.element.android.libraries.matrix.impl.timeline.timelineDiffFlow
4545
import io.element.android.libraries.sessionstorage.api.SessionData
46-
import io.element.android.libraries.sessionstorage.api.SessionStore
4746
import io.element.android.services.toolbox.api.systemclock.SystemClock
4847
import kotlinx.coroutines.CoroutineScope
4948
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -58,7 +57,6 @@ import kotlinx.coroutines.withContext
5857
import org.matrix.rustcomponents.sdk.RequiredState
5958
import org.matrix.rustcomponents.sdk.Room
6059
import org.matrix.rustcomponents.sdk.RoomListItem
61-
import org.matrix.rustcomponents.sdk.RoomMember
6260
import org.matrix.rustcomponents.sdk.RoomSubscription
6361
import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
6462
import org.matrix.rustcomponents.sdk.genTransactionId
@@ -82,6 +80,7 @@ class RustMatrixRoom(
8280

8381
// Create a dispatcher for all room methods...
8482
private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
83+
8584
//...except getMember methods as it could quickly fill the roomDispatcher...
8685
private val roomMembersDispatcher = coroutineDispatchers.io.limitedParallelism(8)
8786

@@ -275,21 +274,21 @@ class RustMatrixRoom(
275274
}
276275
}
277276

278-
override suspend fun canInvite(): Result<Boolean> = withContext(roomMembersDispatcher) {
279-
runCatching {
280-
innerRoom.member(sessionId.value).use(RoomMember::canInvite)
277+
override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
278+
return runCatching {
279+
innerRoom.canUserInvite(userId.value)
281280
}
282281
}
283282

284-
override suspend fun canSendStateEvent(type: StateEventType): Result<Boolean> = withContext(roomMembersDispatcher) {
285-
runCatching {
286-
innerRoom.member(sessionId.value).use { it.canSendState(type.map()) }
283+
override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
284+
return runCatching {
285+
innerRoom.canUserSendState(userId.value, type.map())
287286
}
288287
}
289288

290-
override suspend fun canSendEvent(type: MessageEventType): Result<Boolean> = withContext(roomMembersDispatcher) {
291-
runCatching {
292-
innerRoom.member(sessionId.value).use { it.canSendMessage(type.map()) }
289+
override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
290+
return runCatching {
291+
innerRoom.canUserSendMessage(userId.value, type.map())
293292
}
294293
}
295294

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
@@ -213,15 +213,15 @@ class FakeMatrixRoom(
213213
inviteUserResult
214214
}
215215

216-
override suspend fun canInvite(): Result<Boolean> {
216+
override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
217217
return canInviteResult
218218
}
219219

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

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

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)