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

Let JoinRule and AllowRule be Immutable.

Browse source
This commit is contained in:
Benoit Marty 2025-08-22 16:13:55 +02:00
parent 8f15d11707
commit ec53561de0
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
View file

@ -58,6 +58,7 @@ import io.element.android.tests.testutils.lambda.assert
import io.element.android.tests.testutils.lambda.lambdaRecorder import io.element.android.tests.testutils.lambda.lambdaRecorder
import io.element.android.tests.testutils.lambda.value import io.element.android.tests.testutils.lambda.value
import io.element.android.tests.testutils.test import io.element.android.tests.testutils.test
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
@ -913,7 +914,7 @@ class JoinRoomPresenterTest {
val client = FakeMatrixClient( val client = FakeMatrixClient(
getNotJoinedRoomResult = { _, _ -> getNotJoinedRoomResult = { _, _ ->
Result.success( Result.success(
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(emptyList()))) aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(persistentListOf())))
) )
} }
) )
@ -933,7 +934,7 @@ class JoinRoomPresenterTest {
val client = FakeMatrixClient( val client = FakeMatrixClient(
getNotJoinedRoomResult = { _, _ -> getNotJoinedRoomResult = { _, _ ->
Result.success( Result.success(
aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Restricted(emptyList()))) aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Restricted(persistentListOf())))
) )
} }
) )

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/AllowRule.kt
View file

@ -7,8 +7,10 @@
package io.element.android.libraries.matrix.api.room.join package io.element.android.libraries.matrix.api.room.join
import androidx.compose.runtime.Immutable
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
@Immutable
sealed interface AllowRule { sealed interface AllowRule {
data class RoomMembership(val roomId: RoomId) : AllowRule data class RoomMembership(val roomId: RoomId) : AllowRule
data class Custom(val json: String) : AllowRule data class Custom(val json: String) : AllowRule

8
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt
View file

@ -7,12 +7,16 @@
package io.element.android.libraries.matrix.api.room.join package io.element.android.libraries.matrix.api.room.join
import androidx.compose.runtime.Immutable
import kotlinx.collections.immutable.ImmutableList
@Immutable
sealed interface JoinRule { sealed interface JoinRule {
data object Public : JoinRule data object Public : JoinRule
data object Private : JoinRule data object Private : JoinRule
data object Knock : JoinRule data object Knock : JoinRule
data object Invite : JoinRule data object Invite : JoinRule
data class Restricted(val rules: List<AllowRule>) : JoinRule data class Restricted(val rules: ImmutableList<AllowRule>) : JoinRule
data class KnockRestricted(val rules: List<AllowRule>) : JoinRule data class KnockRestricted(val rules: ImmutableList<AllowRule>) : JoinRule
data class Custom(val value: String) : JoinRule data class Custom(val value: String) : JoinRule
} }

5
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt
View file

@ -8,6 +8,7 @@
package io.element.android.libraries.matrix.impl.room.join package io.element.android.libraries.matrix.impl.room.join
import io.element.android.libraries.matrix.api.room.join.JoinRule import io.element.android.libraries.matrix.api.room.join.JoinRule
import kotlinx.collections.immutable.toPersistentList
import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
fun RustJoinRule.map(): JoinRule { fun RustJoinRule.map(): JoinRule {
@ -16,9 +17,9 @@ fun RustJoinRule.map(): JoinRule {
RustJoinRule.Private -> JoinRule.Private RustJoinRule.Private -> JoinRule.Private
RustJoinRule.Knock -> JoinRule.Knock RustJoinRule.Knock -> JoinRule.Knock
RustJoinRule.Invite -> JoinRule.Invite RustJoinRule.Invite -> JoinRule.Invite
is RustJoinRule.Restricted -> JoinRule.Restricted(rules.map { it.map() }) is RustJoinRule.Restricted -> JoinRule.Restricted(rules.map { it.map() }.toPersistentList())
is RustJoinRule.Custom -> JoinRule.Custom(repr) is RustJoinRule.Custom -> JoinRule.Custom(repr)
is RustJoinRule.KnockRestricted -> JoinRule.KnockRestricted(rules.map { it.map() }) is RustJoinRule.KnockRestricted -> JoinRule.KnockRestricted(rules.map { it.map() }.toPersistentList())
} }
} }