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

change (member moderation) : clean up

Browse source
This commit is contained in:
ganfra 2025-05-24 11:23:09 +02:00
parent 5eef211b04
commit 37bf88d53f
21 changed files with 15 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationEvents.kt
View file

@ -9,7 +9,7 @@ package io.element.android.features.roommembermoderation.impl
import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
sealed interface InternalRoomMemberModerationEvents: RoomMemberModerationEvents {
sealed interface InternalRoomMemberModerationEvents : RoomMemberModerationEvents {
data class DoKickUser(val reason: String) : InternalRoomMemberModerationEvents
data class DoBanUser(val reason: String) : InternalRoomMemberModerationEvents
data object DoUnbanUser : InternalRoomMemberModerationEvents

1
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationState.kt
View file

@ -26,4 +26,3 @@ data class InternalRoomMemberModerationState(
) : RoomMemberModerationState {
val canDisplayActions = actions.isNotEmpty()
}

4
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt
View file

@ -48,7 +48,6 @@ class RoomMemberModerationPresenter @Inject constructor(
private val dispatchers: CoroutineDispatchers,
private val analyticsService: AnalyticsService,
) : Presenter<RoomMemberModerationState> {
@Composable
override fun present(): RoomMemberModerationState {
val coroutineScope = rememberCoroutineScope()
@ -147,7 +146,8 @@ class RoomMemberModerationPresenter @Inject constructor(
return buildList {
add(ModerationActionState(action = ModerationAction.DisplayProfile, isEnabled = true))
// Assume the member is a regular user when it's unknown
val canModerateThisUser = (member?.powerLevel ?: 0) < currentUserMemberPowerLevel
val targetMemberPowerLevel = member?.powerLevel ?: 0
val canModerateThisUser = currentUserMemberPowerLevel > targetMemberPowerLevel
// Assume the member is joined when it's unknown
val membership = member?.membership ?: RoomMembershipState.JOIN
if (canKick) {

1
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
View file

@ -327,7 +327,6 @@ internal fun RoomMemberModerationViewPreview(@PreviewParameter(InternalRoomMembe
RoomMemberModerationView(
state = state,
onSelectAction = { _, _ ->
},
)
}

1
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationModule.kt
View file

@ -14,7 +14,6 @@ import io.element.android.features.roommembermoderation.api.RoomMemberModeration
import io.element.android.features.roommembermoderation.impl.RoomMemberModerationPresenter
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.di.SessionScope
@ContributesTo(RoomScope::class)
@Module

1
features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenterTest.kt
View file

@ -35,7 +35,6 @@ import org.junit.Rule
import org.junit.Test
class RoomMemberModerationPresenterTest {
@get:Rule
val warmUpRule = WarmUpRule()