More Moderation tweaks (#2566)

* Show room member role changes in the timeline. * Fix a bug in room flow coordinator. * Tidy up roles and permissions flow. * Refresh the power levels in the room details screen. * Automatically update permissions after saving. * Remove extra button. * Add a short delay to the roles and permissions screen snapshots. The permissions rows are now in a loading state initially.
2026-11-03 06:55:59 +00:00 · 2024-03-13 15:36:38 +00:00
parent 9d68d9e250
commit 1c914c314f
17 changed files with 212 additions and 43 deletions
@@ -434,7 +434,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
                state.bindings.alertInfo = AlertInfo(id: UUID(), title: L10n.errorUnknown)
            case .some(.success):
                userIndicatorController.submitIndicator(UserIndicator(id: UUID().uuidString,
-                                                                      type: .modal(progress: .none, interactiveDismissDisabled: false, allowsInteraction: false),
+                                                                      type: .toast,
                                                                      title: L10n.commonCurrentUserLeftRoom,
                                                                      iconName: "checkmark"))
                actionsSubject.send(.roomLeft(roomIdentifier: roomId))
@@ -27,7 +27,7 @@ struct RoomChangePermissionsScreenCoordinatorParameters {
 }

 enum RoomChangePermissionsScreenCoordinatorAction {
-    case cancel
+    case complete
 }

 final class RoomChangePermissionsScreenCoordinator: CoordinatorProtocol {
@@ -55,8 +55,8 @@ final class RoomChangePermissionsScreenCoordinator: CoordinatorProtocol {
            
            guard let self else { return }
            switch action {
-            case .cancel:
-                actionsSubject.send(.cancel)
+            case .complete:
+                actionsSubject.send(.complete)
            }
        }
        .store(in: &cancellables)
@@ -18,7 +18,7 @@ import Foundation
 import MatrixRustSDK

 enum RoomChangePermissionsScreenViewModelAction {
-    case cancel
+    case complete
 }

 struct RoomChangePermissionsScreenViewState: BindableState {
@@ -21,8 +21,8 @@ import SwiftUI
 typealias RoomChangePermissionsScreenViewModelType = StateStoreViewModel<RoomChangePermissionsScreenViewState, RoomChangePermissionsScreenViewAction>

 class RoomChangePermissionsScreenViewModel: RoomChangePermissionsScreenViewModelType, RoomChangePermissionsScreenViewModelProtocol {
-    let roomProxy: RoomProxyProtocol
-    let userIndicatorController: UserIndicatorControllerProtocol
+    private let roomProxy: RoomProxyProtocol
+    private let userIndicatorController: UserIndicatorControllerProtocol
    private var actionsSubject: PassthroughSubject<RoomChangePermissionsScreenViewModelAction, Never> = .init()
    
    var actionsPublisher: AnyPublisher<RoomChangePermissionsScreenViewModelAction, Never> {
@@ -71,14 +71,7 @@ class RoomChangePermissionsScreenViewModel: RoomChangePermissionsScreenViewModel
        switch await roomProxy.applyPowerLevelChanges(changes) {
        case .success:
            MXLog.info("Success")
-        case .failure:
-            context.alertInfo = AlertInfo(id: .generic)
-            return
-        }
-        
-        switch await roomProxy.powerLevels() {
-        case .success(let powerLevels):
-            state.currentPermissions = .init(powerLevels: powerLevels)
+            actionsSubject.send(.complete)
        case .failure:
            context.alertInfo = AlertInfo(id: .generic)
            return
@@ -26,7 +26,7 @@ struct RoomChangeRolesScreenCoordinatorParameters {
 }

 enum RoomChangeRolesScreenCoordinatorAction {
-    case done
+    case complete
 }

 final class RoomChangeRolesScreenCoordinator: CoordinatorProtocol {
@@ -54,8 +54,8 @@ final class RoomChangeRolesScreenCoordinator: CoordinatorProtocol {
            
            guard let self else { return }
            switch action {
-            case .done:
-                self.actionsSubject.send(.done)
+            case .complete:
+                self.actionsSubject.send(.complete)
            }
        }
        .store(in: &cancellables)
@@ -18,7 +18,7 @@ import Collections
 import Foundation

 enum RoomChangeRolesScreenViewModelAction {
-    case done
+    case complete
 }

 struct RoomChangeRolesScreenViewState: BindableState {
@@ -122,9 +122,19 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
        
        let promotingUpdates = state.membersToPromote.map { ($0.id, state.mode.rustPowerLevel) }
        let demotingUpdates = state.membersToDemote.map { ($0.id, Int64(0)) }
+        
+        // A task we can await until the room's info gets modified with the new power levels.
+        let infoTask = Task { await roomProxy.actionsPublisher.values.first { $0 == .roomInfoUpdate } }
+        
        switch await roomProxy.updatePowerLevelsForUsers(promotingUpdates + demotingUpdates) {
        case .success:
            MXLog.info("Success")
+            
+            // Call updateMembers so the count is correct on the root screen.
+            _ = await infoTask.value
+            await roomProxy.updateMembers()
+            
+            actionsSubject.send(.complete)
        case .failure:
            context.alertInfo = AlertInfo(id: .error)
        }
@@ -135,6 +135,7 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
            .throttle(for: .milliseconds(200), scheduler: DispatchQueue.main, latest: true)
            .sink { [weak self] _ in
                self?.updateRoomInfo()
+                Task { await self?.updatePowerLevelPermissions() }
            }
            .store(in: &cancellables)
    }
@@ -26,7 +26,7 @@ struct RoomRolesAndPermissionsScreenCoordinatorParameters {

 enum RoomRolesAndPermissionsScreenCoordinatorAction {
    case editRoles(RoomRolesAndPermissionsScreenRole)
-    case editPermissions(RoomRolesAndPermissionsScreenPermissionsGroup)
+    case editPermissions(permissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup)
    case demotedOwnUser
 }

@@ -52,8 +52,8 @@ final class RoomRolesAndPermissionsScreenCoordinator: CoordinatorProtocol {
            switch action {
            case .editRoles(let role):
                actionsSubject.send(.editRoles(role))
-            case .editPermissions(let permissionsGroup):
-                actionsSubject.send(.editPermissions(permissionsGroup))
+            case .editPermissions(let permissions, let group):
+                actionsSubject.send(.editPermissions(permissions: permissions, group: group))
            case .demotedOwnUser:
                actionsSubject.send(.demotedOwnUser)
            }
@@ -20,7 +20,7 @@ enum RoomRolesAndPermissionsScreenViewModelAction {
    /// The user would like to edit member roles.
    case editRoles(RoomRolesAndPermissionsScreenRole)
    /// The user would like to edit room permissions.
-    case editPermissions(RoomRolesAndPermissionsScreenPermissionsGroup)
+    case editPermissions(permissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup)
    /// The user has demoted themself.
    case demotedOwnUser
 }
@@ -30,6 +30,8 @@ struct RoomRolesAndPermissionsScreenViewState: BindableState {
    var administratorCount: Int?
    /// The number of moderators in the room.
    var moderatorCount: Int?
+    /// The permissions of the room when loaded.
+    var permissions: RoomPermissions?
    var bindings = RoomRolesAndPermissionsScreenViewStateBindings()
 }

@@ -33,12 +33,26 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
        self.userIndicatorController = userIndicatorController
        super.init(initialViewState: RoomRolesAndPermissionsScreenViewState())
        
-        roomProxy.membersPublisher.sink { [weak self] members in
-            self?.updateMembers(members)
-        }
-        .store(in: &cancellables)
+        // Automatically update the admin/moderator counts.
+        roomProxy.membersPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] members in
+                self?.updateMembers(members)
+            }
+            .store(in: &cancellables)
        
        updateMembers(roomProxy.membersPublisher.value)
+        
+        // Automatically update the room permissions
+        roomProxy.actionsPublisher
+            .filter { $0 == .roomInfoUpdate }
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                Task { await self?.updatePermissions() }
+            }
+            .store(in: &cancellables)
+        
+        Task { await updatePermissions() }
    }
    
    // MARK: - Public
@@ -53,17 +67,17 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
            state.bindings.alertInfo = AlertInfo(id: .resetConfirmation,
                                                 title: L10n.screenRoomRolesAndPermissionsChangeMyRole,
                                                 message: L10n.screenRoomChangeRoleConfirmDemoteSelfDescription,
+                                                 primaryButton: .init(title: L10n.actionCancel, role: .cancel) { },
                                                 verticalButtons: [
                                                     .init(title: L10n.screenRoomRolesAndPermissionsChangeRoleDemoteToModerator, role: .destructive) {
                                                         Task { await self.updateOwnRole(.moderator) }
                                                     },
                                                     .init(title: L10n.screenRoomRolesAndPermissionsChangeRoleDemoteToMember, role: .destructive) {
                                                         Task { await self.updateOwnRole(.user) }
-                                                     },
-                                                     .init(title: L10n.actionCancel, role: .cancel) { }
+                                                     }
                                                 ])
        case .editPermissions(let permissionsGroup):
-            actionsSubject.send(.editPermissions(permissionsGroup))
+            editPermissions(group: permissionsGroup)
        case .reset:
            state.bindings.alertInfo = AlertInfo(id: .resetConfirmation,
                                                 title: L10n.screenRoomRolesAndPermissionsResetConfirmTitle,
@@ -85,10 +99,16 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
    private func updateOwnRole(_ role: RoomMemberDetails.Role) async {
        showSavingIndicator()
        
+        // A task we can await until the room's info gets modified with the new power levels.
+        let infoTask = Task { await roomProxy.actionsPublisher.values.first { $0 == .roomInfoUpdate } }
+        
        switch await roomProxy.updatePowerLevelsForUsers([(userID: roomProxy.ownUserID, powerLevel: role.rustPowerLevel)]) {
        case .success:
-            showSuccessIndicator()
+            _ = await infoTask.value
+            await roomProxy.updateMembers()
+            
            actionsSubject.send(.demotedOwnUser)
+            showSuccessIndicator()
        case .failure:
            state.bindings.alertInfo = AlertInfo(id: .error)
        }
@@ -96,6 +116,26 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
        hideSavingIndicator()
    }
    
+    // MARK: - Permissions
+    
+    private func updatePermissions() async {
+        switch await roomProxy.powerLevels() {
+        case .success(let powerLevels):
+            state.permissions = .init(powerLevels: powerLevels)
+        case .failure:
+            break
+        }
+    }
+    
+    private func editPermissions(group: RoomRolesAndPermissionsScreenPermissionsGroup) {
+        guard let permissions = state.permissions else {
+            state.bindings.alertInfo = AlertInfo(id: .error)
+            MXLog.error("Missing permissions.")
+            return
+        }
+        actionsSubject.send(.editPermissions(permissions: permissions, group: group))
+    }
+    
    private func resetPermissions() async {
        showSavingIndicator()
        
@@ -82,24 +82,30 @@ struct RoomRolesAndPermissionsScreen: View {
        Section {
            ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsRoomDetails,
                                    icon: \.info),
+                    details: .isWaiting(context.viewState.permissions == nil),
                    kind: .navigationLink {
                        context.send(viewAction: .editPermissions(.roomDetails))
                    })
                    .accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.roomDetails)
+                    .disabled(context.viewState.permissions == nil)
            
            ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsMessagesAndContent,
                                    icon: \.chat),
+                    details: .isWaiting(context.viewState.permissions == nil),
                    kind: .navigationLink {
                        context.send(viewAction: .editPermissions(.messagesAndContent))
                    })
                    .accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.messagesAndContent)
+                    .disabled(context.viewState.permissions == nil)
            
            ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsMemberModeration,
                                    icon: \.user),
+                    details: .isWaiting(context.viewState.permissions == nil),
                    kind: .navigationLink {
                        context.send(viewAction: .editPermissions(.memberModeration))
                    })
                    .accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.memberModeration)
+                    .disabled(context.viewState.permissions == nil)
        } header: {
            Text(L10n.screenRoomRolesAndPermissionsPermissionsHeader)
                .compoundListSectionHeader()
@@ -126,5 +132,6 @@ struct RoomRolesAndPermissionsScreen_Previews: PreviewProvider, TestablePreview
        NavigationStack {
            RoomRolesAndPermissionsScreen(context: viewModel.context)
        }
+        .snapshot(delay: 0.2)
    }
 }