Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Only retrieve active users in RoomMemberListDataSource

Browse source
This commit is contained in:
Jorge Martín 2024-03-22 10:14:22 +01:00
parent 6fb960291d
commit b933dd929c
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
View file

@ -30,11 +30,13 @@ class RoomMemberListDataSource @Inject constructor(
) { ) {
suspend fun search(query: String): List<RoomMember> = withContext(coroutineDispatchers.io) { suspend fun search(query: String): List<RoomMember> = withContext(coroutineDispatchers.io) {
val roomMembersState = room.membersStateFlow.value val roomMembersState = room.membersStateFlow.value
val roomMembers = roomMembersState.roomMembers().orEmpty() val activeRoomMembers = roomMembersState.roomMembers()
?.filter { it.membership.isActive() }
.orEmpty()
val filteredMembers = if (query.isBlank()) { val filteredMembers = if (query.isBlank()) {
roomMembers activeRoomMembers
} else { } else {
roomMembers.filter { member -> activeRoomMembers.filter { member ->
member.userId.value.contains(query, ignoreCase = true) || member.userId.value.contains(query, ignoreCase = true) ||
member.displayName?.contains(query, ignoreCase = true).orFalse() member.displayName?.contains(query, ignoreCase = true).orFalse()
} }

4
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt
View file

@ -66,7 +66,9 @@ enum class RoomMembershipState {
INVITE, INVITE,
JOIN, JOIN,
KNOCK, KNOCK,
LEAVE LEAVE;
fun isActive(): Boolean = this == JOIN || this == INVITE
} }
/** /**