Remove Room moderation feature flag (#2678)

* Remove the feature flag * Add changelog * Increase login timeout for Maestro
element-hq · Apr 9, 2024 · d0f2677 · d0f2677
1 parent ecd2974
commit d0f2677
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 48 deletions.
diff --git a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
@@ -2,4 +2,4 @@ appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Confirm that it's you"
-    timeout: 10000
+    timeout: 20000
diff --git a/changelog.d/2678.misc b/changelog.d/2678.misc
@@ -0,0 +1 @@
+Enable room moderation feature.
diff --git a/...impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/...impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -78,10 +78,6 @@ class RoomDetailsPresenter @Inject constructor(
         val roomTopic by remember { derivedStateOf { roomInfo?.topic ?: room.topic } }
         val isFavorite by remember { derivedStateOf { roomInfo?.isFavorite.orFalse() } }
 
-        val isRoomModerationEnabled by produceState(initialValue = false) {
-            value = featureFlagService.isFeatureEnabled(FeatureFlags.RoomModeration)
-        }
-
         LaunchedEffect(Unit) {
             canShowNotificationSettings.value = featureFlagService.isFeatureEnabled(FeatureFlags.NotificationSettings)
             if (canShowNotificationSettings.value) {
@@ -147,7 +143,7 @@ class RoomDetailsPresenter @Inject constructor(
             leaveRoomState = leaveRoomState,
             roomNotificationSettings = roomNotificationSettingsState.roomNotificationSettings(),
             isFavorite = isFavorite,
-            displayRolesAndPermissionsSettings = isRoomModerationEnabled && !room.isDm && isUserAdmin,
+            displayRolesAndPermissionsSettings = !room.isDm && isUserAdmin,
             eventSink = ::handleEvents,
         )
     }

diff --git a/...in/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/...in/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -34,8 +34,6 @@ import io.element.android.features.roomdetails.impl.members.moderation.RoomMembe
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@@ -50,7 +48,6 @@ class RoomMemberListPresenter @AssistedInject constructor(
     private val room: MatrixRoom,
     private val roomMemberListDataSource: RoomMemberListDataSource,
     private val coroutineDispatchers: CoroutineDispatchers,
-    private val featureFlagService: FeatureFlagService,
     private val roomMembersModerationPresenter: RoomMembersModerationPresenter,
     @Assisted private val navigator: RoomMemberListNavigator,
 ) : Presenter<RoomMemberListState> {
@@ -74,15 +71,7 @@ class RoomMemberListPresenter @AssistedInject constructor(
             value = room.canInvite().getOrElse { false }
         }
 
-        val isRoomModerationEnabled by produceState(initialValue = false) {
-            value = featureFlagService.isFeatureEnabled(FeatureFlags.RoomModeration)
-        }
-
-        val roomModerationState = if (isRoomModerationEnabled) {
-            roomMembersModerationPresenter.present()
-        } else {
-            remember { roomMembersModerationPresenter.dummyState() }
-        }
+        val roomModerationState = roomMembersModerationPresenter.present()
 
         // Ensure we load the latest data when entering this screen
         LaunchedEffect(Unit) {

diff --git a/...oid/features/roomdetails/impl/members/moderation/DefaultRoomMembersModerationPresenter.kt b/...oid/features/roomdetails/impl/members/moderation/DefaultRoomMembersModerationPresenter.kt
@@ -31,8 +31,6 @@ import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.finally
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -51,7 +49,6 @@ import javax.inject.Inject
 @ContributesBinding(RoomScope::class)
 class DefaultRoomMembersModerationPresenter @Inject constructor(
     private val room: MatrixRoom,
-    private val featureFlagService: FeatureFlagService,
     private val dispatchers: CoroutineDispatchers,
     private val analyticsService: AnalyticsService,
 ) : RoomMembersModerationPresenter {
@@ -61,9 +58,8 @@ class DefaultRoomMembersModerationPresenter @Inject constructor(
     private suspend fun canKick() = room.canKick().getOrDefault(false)
 
     override suspend fun canDisplayModerationActions(): Boolean {
-        val isRoomModerationEnabled = featureFlagService.isFeatureEnabled(FeatureFlags.RoomModeration)
         val isDm = room.isDm && room.isEncrypted
-        return isRoomModerationEnabled && !isDm && (canBan() || canKick())
+        return !isDm && (canBan() || canKick())
     }
 
     @Composable
@@ -76,7 +72,7 @@ class DefaultRoomMembersModerationPresenter @Inject constructor(
         val unbanUserAsyncAction = remember { mutableStateOf(AsyncAction.Uninitialized as AsyncAction<Unit>) }
 
         val canDisplayBannedUsers by produceState(initialValue = false) {
-            value = featureFlagService.isFeatureEnabled(FeatureFlags.RoomModeration) && !room.isDm && canBan()
+            value = !room.isDm && canBan()
         }
 
         fun handleEvent(event: RoomMembersModerationEvents) {

diff --git a/...st/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTests.kt b/...st/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTests.kt
@@ -32,9 +32,6 @@ import io.element.android.features.roomdetails.impl.members.moderation.aRoomMemb
 import io.element.android.features.roomdetails.members.moderation.FakeRoomMembersModerationPresenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
@@ -241,14 +238,12 @@ private fun TestScope.createPresenter(
     coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
     matrixRoom: MatrixRoom = FakeMatrixRoom(),
     roomMemberListDataSource: RoomMemberListDataSource = createDataSource(coroutineDispatchers = coroutineDispatchers),
-    featureFlagService: FeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.RoomModeration.key to true)),
     moderationPresenter: FakeRoomMembersModerationPresenter = FakeRoomMembersModerationPresenter(),
     navigator: RoomMemberListNavigator = object : RoomMemberListNavigator { }
 ) = RoomMemberListPresenter(
     room = matrixRoom,
     roomMemberListDataSource = roomMemberListDataSource,
     coroutineDispatchers = coroutineDispatchers,
-    featureFlagService = featureFlagService,
     roomMembersModerationPresenter = moderationPresenter,
     navigator = navigator
 )
diff --git a/...oid/features/roomdetails/members/moderation/DefaultRoomMembersModerationPresenterTests.kt b/...oid/features/roomdetails/members/moderation/DefaultRoomMembersModerationPresenterTests.kt
@@ -28,8 +28,6 @@ import io.element.android.features.roomdetails.impl.members.moderation.Moderatio
 import io.element.android.features.roomdetails.impl.members.moderation.RoomMembersModerationEvents
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@@ -45,13 +43,6 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultRoomMembersModerationPresenterTests {
-    @Test
-    fun `canDisplayModerationActions - when feature flag is disabled returns false`() = runTest {
-        val featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.RoomModeration.key to false))
-        val presenter = createDefaultRoomMembersModerationPresenter(featureFlagService = featureFlagService)
-        assertThat(presenter.canDisplayModerationActions()).isFalse()
-    }
-
     @Test
     fun `canDisplayModerationActions - when room is DM is false`() = runTest {
         val room = FakeMatrixRoom(isDirect = true, isPublic = true, isOneToOne = true).apply {
@@ -309,13 +300,11 @@ class DefaultRoomMembersModerationPresenterTests {
 
     private fun TestScope.createDefaultRoomMembersModerationPresenter(
         matrixRoom: FakeMatrixRoom = FakeMatrixRoom(),
-        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.RoomModeration.key to true)),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ): DefaultRoomMembersModerationPresenter {
         return DefaultRoomMembersModerationPresenter(
             room = matrixRoom,
-            featureFlagService = featureFlagService,
             dispatchers = dispatchers,
             analyticsService = analyticsService,
         )

diff --git a/...tureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/...tureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -82,13 +82,6 @@ enum class FeatureFlags(
         defaultValue = true,
         isFinished = false,
     ),
-    RoomModeration(
-        key = "feature.roomModeration",
-        title = "Room moderation",
-        description = "Add moderation features to the room for users with permissions",
-        defaultValue = true,
-        isFinished = false,
-    ),
     RoomDirectorySearch(
         key = "feature.roomdirectorysearch",
         title = "Room directory search",

diff --git a/...rc/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt b/...rc/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
@@ -41,7 +41,6 @@ class StaticFeatureFlagProvider @Inject constructor() :
                 FeatureFlags.Mentions -> true
                 FeatureFlags.MarkAsUnread -> true
                 FeatureFlags.RoomListFilters -> true
-                FeatureFlags.RoomModeration -> false
                 FeatureFlags.RoomDirectorySearch -> false
             }
         } else {