Fix various bugs in the moderation feature. (#2608)

* Fix search field string.

* Show your own user as an Admin when changing roles.

* Also show invited users when changing roles.

* Don't allow admin's to kick/ban other admins or themselves.

* Fix a bug when left members were counted as admins/moderators.

* Show when a member is pending.

* Add sections to the change role screen.

ElementX.xcodeproj/project.pbxproj

@@ -379,6 +379,7 @@
 		5D2AF8C0DF872E7985F8FE54 /* TimelineDeliveryStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5AC06FC11B6638F7BF1670E /* TimelineDeliveryStatusView.swift */; };
 		5D4643E485C179B2F485C519 /* MentionSuggestionItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FD0E68C42CA7DDCD4CAD68D /* MentionSuggestionItemView.swift */; };
 		5D53AE9342A4C06B704247ED /* MediaLoaderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A02406480C351B8C6E0682C /* MediaLoaderProtocol.swift */; };
+		5D56CE09743C6B90C21B04C2 /* RoomMembersListScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E0929CEFA356090BE5FB8 /* RoomMembersListScreenViewModelTests.swift */; };
 		5D70FAE4D2BF4553AFFFFE41 /* NotificationItemProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */; };
 		5DD0EF30070DC0A82C5CCD33 /* RoomMembersListManageMemberSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC853F9B4FBE039D2C16EC6B /* RoomMembersListManageMemberSheet.swift */; };
 		5DD85A0FE3D85AEC3C7EFE36 /* DeveloperOptionsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7C7CFA6B2A62A685FF6CE3 /* DeveloperOptionsScreenCoordinator.swift */; };
@@ -829,7 +830,6 @@
 		C9F5B48D15B9BCAE1F8D564E /* RoomNotificationModeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1511766C534367700C8DD75 /* RoomNotificationModeProxy.swift */; };
 		CA12AE0DCD57D49CD96C699A /* WaveformCursorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB9EABCA9348DFA27439A809 /* WaveformCursorView.swift */; };
 		CA5BFF0C2EF5A8EF40CA2D69 /* VoiceMessageRecordingComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCB6F36CCE44A29A06FCAF1C /* VoiceMessageRecordingComposer.swift */; };
-		CAF8755E152204F55F8D6B5B /* RoomMembersListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B63F817FE305548DB4B512 /* RoomMembersListViewModelTests.swift */; };
 		CB137BFB3E083C33E398A6CB /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 020597E28A4BC8E1BE8EDF6E /* KeychainAccess */; };
 		CB498F4E27AA0545DCEF0F6F /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 36B7FC232711031AA2B0D188 /* DTCoreText */; };
 		CB6BCBF28E4B76EA08C2926D /* StateRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B16048D30F0438731C41F775 /* StateRoomTimelineItem.swift */; };
@@ -843,6 +843,7 @@
 		CCBEC2100CAF2EEBE9DB4156 /* TemplateScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA40B98B098B6F0371B750B3 /* TemplateScreenModels.swift */; };
 		CD0088B763CD970CF1CBF8CB /* DateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5E97E9615A158C76B2AB77 /* DateTests.swift */; };
 		CD6A72B65D3B6076F4045C30 /* PHGPostHogConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6B891A6DA826E2461DBB40F /* PHGPostHogConfiguration.swift */; };
+		CDAE3A37D4DF136F9D07DB61 /* RoomChangeRolesScreenSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF710CB1C31F8938EAA3A7D /* RoomChangeRolesScreenSection.swift */; };
 		CDCA8A559E098503DDE29477 /* AttributedStringBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5C6FBF97B6EED3D4FA5EFF /* AttributedStringBuilder.swift */; };
 		CE1694C7BB93C3311524EF28 /* Untranslated.strings in Resources */ = {isa = PBXBuildFile; fileRef = D2F7194F440375338F8E2487 /* Untranslated.strings */; };
 		CE6F237360875D3D573FD0B2 /* RoomNotificationSettingsProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD6B522BD637845AB9570B10 /* RoomNotificationSettingsProxy.swift */; };
@@ -1355,6 +1356,7 @@
 		3DFE4453AB0B34C203447162 /* ImageRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRoomTimelineItem.swift; sourceTree = "<group>"; };
 		3E6A9B9DFEE964962C179DE3 /* RoomAttachmentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomAttachmentPicker.swift; sourceTree = "<group>"; };
 		3E93A1BE7D8A2EBCAD51EEB4 /* Array.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
+		3E9E0929CEFA356090BE5FB8 /* RoomMembersListScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenViewModelTests.swift; sourceTree = "<group>"; };
 		3EF1AC723C2609C7705569CA /* MediaLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaLoaderTests.swift; sourceTree = "<group>"; };
 		3FFDA99C98BE05F43A92343B /* test_pdf.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test_pdf.pdf; sourceTree = "<group>"; };
 		40076C770A5FB83325252973 /* VoiceMessageMediaManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageMediaManager.swift; sourceTree = "<group>"; };
@@ -1503,7 +1505,6 @@
 		68010886142843705E342645 /* ProgressMaskModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressMaskModifier.swift; sourceTree = "<group>"; };
 		6861FE915C7B5466E6962BBA /* StartChatScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreen.swift; sourceTree = "<group>"; };
 		693E16574C6F7F9FA1015A8C /* Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = "<group>"; };
-		69B63F817FE305548DB4B512 /* RoomMembersListViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListViewModelTests.swift; sourceTree = "<group>"; };
 		69CB8242D69B7E4D0B32E18D /* AggregatedReactionMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AggregatedReactionMock.swift; sourceTree = "<group>"; };
 		69D42EE0102D2857933625DD /* CreateRoomViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomViewModelTests.swift; sourceTree = "<group>"; };
 		6A4C9547BBFEEF30AA11329B /* TimelineItemStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemStatusView.swift; sourceTree = "<group>"; };
@@ -2009,6 +2010,7 @@
 		E9D059BFE329BE09B6D96A9F /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ro; path = ro.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		EA4D639E27D5882A6A71AECF /* GlobalSearchScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalSearchScreenViewModelTests.swift; sourceTree = "<group>"; };
 		EA880E78AF4BD24E45A7808C /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		EAF710CB1C31F8938EAA3A7D /* RoomChangeRolesScreenSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangeRolesScreenSection.swift; sourceTree = "<group>"; };
 		EB3B237387B8288A5A938F1B /* UserAgentBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAgentBuilderTests.swift; sourceTree = "<group>"; };
 		EB63761D9F9CE8B23CBD6179 /* PollFormScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenModels.swift; sourceTree = "<group>"; };
 		EB76A9AFC6CCAD4998D9B045 /* IdentityConfirmationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityConfirmationScreenViewModel.swift; sourceTree = "<group>"; };
@@ -3217,6 +3219,7 @@
 			children = (
 				6B2A421198FD20AAAED20004 /* RoomChangeRolesScreen.swift */,
 				23E6EB7960BC9D0F7396B3BD /* RoomChangeRolesScreenRow.swift */,
+				EAF710CB1C31F8938EAA3A7D /* RoomChangeRolesScreenSection.swift */,
 				3D9B45D584D232CB9E5C7734 /* RoomChangeRolesScreenSelectedItem.swift */,
 			);
 			path = View;
@@ -3494,7 +3497,7 @@
 				4FCB2126C091EEF2454B4D56 /* RoomFlowCoordinatorTests.swift */,
 				8AE0C9653870803E4F91F474 /* RoomListFiltersStateTests.swift */,
 				EC589E641AE46EFB2962534D /* RoomMemberDetailsViewModelTests.swift */,
-				69B63F817FE305548DB4B512 /* RoomMembersListViewModelTests.swift */,
+				3E9E0929CEFA356090BE5FB8 /* RoomMembersListScreenViewModelTests.swift */,
 				58D295F0081084F38DB20893 /* RoomNotificationSettingsScreenViewModelTests.swift */,
 				F0096BC5DA86AF6B6E5742AC /* RoomPermissionsTests.swift */,
 				B40233F2989AD49906BB310D /* RoomPollsHistoryScreenViewModelTests.swift */,
@@ -5632,7 +5635,7 @@
 				095D3906CF2F940C2D2D17CC /* RoomFlowCoordinatorTests.swift in Sources */,
 				4C8C0C9FC10BA73AB7780534 /* RoomListFiltersStateTests.swift in Sources */,
 				6B31508C6334C617360C2EAB /* RoomMemberDetailsViewModelTests.swift in Sources */,
-				CAF8755E152204F55F8D6B5B /* RoomMembersListViewModelTests.swift in Sources */,
+				5D56CE09743C6B90C21B04C2 /* RoomMembersListScreenViewModelTests.swift in Sources */,
 				E49F74BD93230BDEFFE5EA51 /* RoomNotificationSettingsScreenViewModelTests.swift in Sources */,
 				2335D1AB954C151FD8779F45 /* RoomPermissionsTests.swift in Sources */,
 				7B1605C6FFD4D195F264A684 /* RoomPollsHistoryScreenViewModelTests.swift in Sources */,
@@ -6121,6 +6124,7 @@
 				244407B18B2F2D6466BA5961 /* RoomChangeRolesScreenCoordinator.swift in Sources */,
 				7FF6E1FBE6E9517FD29A1D8E /* RoomChangeRolesScreenModels.swift in Sources */,
 				7F941B063C94E1718DFC2CF3 /* RoomChangeRolesScreenRow.swift in Sources */,
+				CDAE3A37D4DF136F9D07DB61 /* RoomChangeRolesScreenSection.swift in Sources */,
 				BD6685592716CA957D7BAAC4 /* RoomChangeRolesScreenSelectedItem.swift in Sources */,
 				3EC5A41F9FB7DD63A4DC6144 /* RoomChangeRolesScreenViewModel.swift in Sources */,
 				4E36A66E0EDA74BF3A036FD0 /* RoomChangeRolesScreenViewModelProtocol.swift in Sources */,

ElementX/Resources/Localizations/en.lproj/Localizable.strings

@@ -519,6 +519,7 @@
 "screen_room_change_role_confirm_demote_self_action" = "Demote";
 "screen_room_change_role_confirm_demote_self_description" = "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.";
 "screen_room_change_role_confirm_demote_self_title" = "Demote yourself?";
+"screen_room_change_role_invited_member_name" = "%1$@ (Pending)";
 "screen_room_change_role_moderators_title" = "Edit Moderators";
 "screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_change_role_unsaved_changes_title" = "Save changes?";
@@ -793,6 +794,9 @@
 "screen_room_change_permissions_member_moderation" = "Member moderation";
 "screen_room_change_permissions_messages_and_content" = "Messages and content";
 "screen_room_change_permissions_room_details" = "Room details";
+"screen_room_change_role_section_administrators" = "Admins";
+"screen_room_change_role_section_moderators" = "Moderators";
+"screen_room_change_role_section_users" = "Members";
 "screen_room_details_invite_people_title" = "Invite people";
 "screen_room_details_leave_conversation_title" = "Leave conversation";
 "screen_room_details_leave_room_title" = "Leave room";

ElementX/Sources/Generated/Strings.swift

@@ -1263,8 +1263,18 @@ internal enum L10n {
   internal static var screenRoomChangeRoleConfirmDemoteSelfDescription: String { return L10n.tr("Localizable", "screen_room_change_role_confirm_demote_self_description") }
   /// Demote yourself?
   internal static var screenRoomChangeRoleConfirmDemoteSelfTitle: String { return L10n.tr("Localizable", "screen_room_change_role_confirm_demote_self_title") }
+  /// %1$@ (Pending)
+  internal static func screenRoomChangeRoleInvitedMemberName(_ p1: Any) -> String {
+    return L10n.tr("Localizable", "screen_room_change_role_invited_member_name", String(describing: p1))
+  }
   /// Edit Moderators
   internal static var screenRoomChangeRoleModeratorsTitle: String { return L10n.tr("Localizable", "screen_room_change_role_moderators_title") }
+  /// Admins
+  internal static var screenRoomChangeRoleSectionAdministrators: String { return L10n.tr("Localizable", "screen_room_change_role_section_administrators") }
+  /// Moderators
+  internal static var screenRoomChangeRoleSectionModerators: String { return L10n.tr("Localizable", "screen_room_change_role_section_moderators") }
+  /// Members
+  internal static var screenRoomChangeRoleSectionUsers: String { return L10n.tr("Localizable", "screen_room_change_role_section_users") }
   /// You have unsaved changes.
   internal static var screenRoomChangeRoleUnsavedChangesDescription: String { return L10n.tr("Localizable", "screen_room_change_role_unsaved_changes_description") }
   /// Save changes?

ElementX/Sources/Mocks/RoomMemberProxyMock.swift

@@ -53,7 +53,7 @@ extension RoomMemberProxyMock {
     
     static var mockMeAdmin: RoomMemberProxyMock {
         RoomMemberProxyMock(with: .init(userID: "@me:matrix.org",
-                                        displayName: "Me admin",
+                                        displayName: "Me",
                                         avatarURL: URL.picturesDirectory,
                                         membership: .join,
                                         powerLevel: 100,

ElementX/Sources/Screens/RoomChangeRolesScreen/RoomChangeRolesScreenModels.swift

@@ -24,8 +24,13 @@ enum RoomChangeRolesScreenViewModelAction {
 struct RoomChangeRolesScreenViewState: BindableState {
     /// The screen's current mode (which role we are promoting/demoting users to/from.
     let mode: RoomMemberDetails.Role
-    /// All of the room's members.
-    var members: [RoomMemberDetails]
+    /// All of the room's members who are currently admins.
+    var administrators: [RoomMemberDetails]
+    /// All of the room's members who are currently moderators.
+    var moderators: [RoomMemberDetails]
+    /// All of the room's members who are currently neither an admin or moderator.
+    var users: [RoomMemberDetails]
+    
     var bindings: RoomChangeRolesScreenViewStateBindings
     
     /// The members selected for promotion to the current role.
@@ -48,19 +53,24 @@ struct RoomChangeRolesScreenViewState: BindableState {
         }
     }
     
-    /// The visible members in the screen (after searching).
-    var visibleMembers: [RoomMemberDetails] {
-        guard !bindings.searchQuery.isEmpty else { return members }
-        
-        return members.filter { member in
-            member.name?.localizedStandardContains(bindings.searchQuery) == true
-                || member.id.localizedStandardContains(bindings.searchQuery)
-        }
+    /// The visible admins in the screen (after searching).
+    var visibleAdministrators: [RoomMemberDetails] {
+        administrators.filter { $0.matches(searchQuery: bindings.searchQuery) }
+    }
+    
+    /// The visible mods in the screen (after searching).
+    var visibleModerators: [RoomMemberDetails] {
+        moderators.filter { $0.matches(searchQuery: bindings.searchQuery) }
+    }
+    
+    /// The visible regular users in the screen (after searching).
+    var visibleUsers: [RoomMemberDetails] {
+        users.filter { $0.matches(searchQuery: bindings.searchQuery) }
     }
     
     /// All of the members who will gain/keep this screen's role after saving any changes.
     var membersWithRole: [RoomMemberDetails] {
-        members.filter(isMemberSelected)
+        administrators.filter(isMemberSelected) + moderators.filter(isMemberSelected) + users.filter(isMemberSelected)
     }
     
     /// Whether or not any changes have been made to the members.

ElementX/Sources/Screens/RoomChangeRolesScreen/RoomChangeRolesScreenViewModel.swift

@@ -40,7 +40,9 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
         self.analytics = analytics
         
         super.init(initialViewState: RoomChangeRolesScreenViewState(mode: mode,
-                                                                    members: [],
+                                                                    administrators: [],
+                                                                    moderators: [],
+                                                                    users: [],
                                                                     bindings: .init()))
         
         roomProxy.membersPublisher
@@ -82,10 +84,27 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
     // MARK: - Private
     
     private func updateMembers(_ members: [RoomMemberProxyProtocol]) {
-        state.members = members.sorted().compactMap { member in
-            guard member.membership == .join, member.userID != roomProxy.ownUserID else { return nil }
-            return RoomMemberDetails(withProxy: member)
+        var administrators = [RoomMemberDetails]()
+        var moderators = [RoomMemberDetails]()
+        var users = [RoomMemberDetails]()
+        
+        for member in members.sorted() {
+            guard member.isActive else { continue }
+            let memberDetails = RoomMemberDetails(withProxy: member)
+            
+            switch member.role {
+            case .administrator:
+                administrators.append(memberDetails)
+            case .moderator:
+                moderators.append(memberDetails)
+            case .user:
+                users.append(memberDetails)
+            }
         }
+        
+        state.administrators = administrators
+        state.moderators = moderators
+        state.users = users
     }
     
     private func toggleMember(_ member: RoomMemberDetails) {

ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift

@@ -56,34 +56,20 @@ struct RoomChangeRolesScreen: View {
                     }
                 }
                 
-                membersSection
+                RoomChangeRolesScreenSection(members: context.viewState.administrators,
+                                             title: L10n.screenRoomChangeRoleSectionAdministrators,
+                                             context: context)
+                RoomChangeRolesScreenSection(members: context.viewState.moderators,
+                                             title: L10n.screenRoomChangeRoleSectionModerators,
+                                             context: context)
+                RoomChangeRolesScreenSection(members: context.viewState.users,
+                                             title: L10n.screenRoomChangeRoleSectionUsers,
+                                             context: context)
             }
         }
     }
     
-    @ViewBuilder
-    private var membersSection: some View {
-        if !context.viewState.visibleMembers.isEmpty {
-            Section {
-                ForEach(context.viewState.visibleMembers, id: \.id) { member in
-                    RoomChangeRolesScreenRow(member: member,
-                                             imageProvider: context.imageProvider,
-                                             isSelected: context.viewState.isMemberSelected(member)) {
-                        context.send(viewAction: .toggleMember(member))
-                    }
-                    .disabled(member.role == .administrator)
-                }
-            } header: {
-                Text(L10n.screenRoomMemberListRoomMembersHeaderTitle)
-                    .compoundListSectionHeader()
-            }
-        } else {
-            Section.empty
-        }
-    }
-    
     @ScaledMetric private var cellWidth: CGFloat = 72
-
     private var membersWithRoleSection: some View {
         ScrollView(.horizontal, showsIndicators: false) {
             ScrollViewReader { scrollView in

ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenRow.swift

@@ -28,10 +28,20 @@ struct RoomChangeRolesScreenRow: View {
     let action: () -> Void
     
     var body: some View {
-        ListRow(label: .avatar(title: member.name ?? member.id,
+        ListRow(label: .avatar(title: memberName,
                                description: member.name == nil ? nil : member.id,
                                icon: avatar),
-                kind: isEnabled ? .multiSelection(isSelected: isSelected, action: action) : .label)
+                kind: .multiSelection(isSelected: isSelected, action: action))
+    }
+    
+    var memberName: String {
+        let name = member.name ?? member.id
+        
+        return if member.isInvited {
+            L10n.screenRoomChangeRoleInvitedMemberName(name)
+        } else {
+            name
+        }
     }
     
     var avatar: LoadableAvatarImage {
@@ -58,6 +68,11 @@ struct RoomChangeRolesScreenRow_Previews: PreviewProvider, TestablePreview {
                                      isSelected: false,
                                      action: action)
             
+            RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockInvited),
+                                     imageProvider: MockMediaProvider(),
+                                     isSelected: false,
+                                     action: action)
+            
             RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockCharlie),
                                      imageProvider: MockMediaProvider(),
                                      isSelected: true,

ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSection.swift

@@ -0,0 +1,43 @@
+//
+// Copyright 2024 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Compound
+import SwiftUI
+
+struct RoomChangeRolesScreenSection: View {
+    let members: [RoomMemberDetails]
+    let title: String
+    
+    @ObservedObject var context: RoomChangeRolesScreenViewModel.Context
+    
+    var body: some View {
+        if !members.isEmpty {
+            Section {
+                ForEach(members, id: \.id) { member in
+                    RoomChangeRolesScreenRow(member: member,
+                                             imageProvider: context.imageProvider,
+                                             isSelected: context.viewState.isMemberSelected(member)) {
+                        context.send(viewAction: .toggleMember(member))
+                    }
+                    .disabled(member.role == .administrator)
+                }
+            } header: {
+                Text(title)
+                    .compoundListSectionHeader()
+            }
+        }
+    }
+}

ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenModels.swift

@@ -19,6 +19,15 @@ import Foundation
 enum RoomMembersListScreenViewModelAction {
     case selectMember(_ member: RoomMemberProxyProtocol)
     case invite
+    
+    var isSelectMember: Bool {
+        switch self {
+        case .selectMember:
+            true
+        default:
+            false
+        }
+    }
 }
 
 /// The different modes that the screen can be in.
@@ -54,7 +63,7 @@ struct RoomMembersListScreenViewState: BindableState {
         self.bannedMembers = bannedMembers
         self.bindings = bindings
     }
-
+    
     var visibleJoinedMembers: [RoomMemberDetails] {
         joinedMembers
             .filter { $0.matches(searchQuery: bindings.searchQuery) }
@@ -76,12 +85,25 @@ struct RoomMembersListScreenViewStateBindings {
     /// The current mode the screen is in.
     var mode: RoomMembersListScreenMode = .members
     /// A selected member to kick, ban, promote etc.
-    var memberToManage: RoomMemberDetails?
+    var memberToManage: RoomMembersListScreenManagementDetails?
 
     /// Information describing the currently displayed alert.
     var alertInfo: AlertInfo<RoomMembersListScreenAlertType>?
 }
 
+/// Information about managing a particular room member.
+struct RoomMembersListScreenManagementDetails: Identifiable {
+    var id: String { member.id }
+    
+    /// The member that is being managed.
+    let member: RoomMemberDetails
+    
+    /// A management action that can be performed on the member.
+    enum Action { case kick, ban }
+    /// The management actions available for `member`.
+    let actions: [Action]
+}
+
 enum RoomMembersListScreenViewAction {
     case selectMember(RoomMemberDetails)
     case showMemberDetails(RoomMemberDetails)
@@ -94,13 +116,3 @@ enum RoomMembersListScreenViewAction {
 enum RoomMembersListScreenAlertType: Hashable {
     case unbanConfirmation(RoomMemberDetails)
 }
-
-private extension RoomMemberDetails {
-    func matches(searchQuery: String) -> Bool {
-        guard !searchQuery.isEmpty else {
-            return true
-        }
-        
-        return id.localizedCaseInsensitiveContains(searchQuery) || name?.localizedCaseInsensitiveContains(searchQuery) ?? false
-    }
-}

ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift

@@ -149,18 +149,32 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
     }
     
     private func selectMember(_ member: RoomMemberDetails) {
-        if appSettings.roomModerationEnabled, state.canKickUsers || state.canBanUsers {
-            if member.isBanned {
-                state.bindings.alertInfo = AlertInfo(id: .unbanConfirmation(member),
-                                                     title: L10n.screenRoomMemberListManageMemberUnbanTitle,
-                                                     message: L10n.screenRoomMemberListManageMemberUnbanMessage,
-                                                     primaryButton: .init(title: L10n.screenRoomMemberListManageMemberUnbanAction) { [weak self] in
-                                                         self?.context.send(viewAction: .unbanMember(member))
-                                                     },
-                                                     secondaryButton: .init(title: L10n.actionCancel, role: .cancel) { })
-            } else {
-                state.bindings.memberToManage = member
-            }
+        guard appSettings.roomModerationEnabled else {
+            showMemberDetails(member)
+            return
+        }
+        
+        if member.isBanned { // No need to check canBan here, banned users are only shown when it is true.
+            state.bindings.alertInfo = AlertInfo(id: .unbanConfirmation(member),
+                                                 title: L10n.screenRoomMemberListManageMemberUnbanTitle,
+                                                 message: L10n.screenRoomMemberListManageMemberUnbanMessage,
+                                                 primaryButton: .init(title: L10n.screenRoomMemberListManageMemberUnbanAction) { [weak self] in
+                                                     self?.context.send(viewAction: .unbanMember(member))
+                                                 },
+                                                 secondaryButton: .init(title: L10n.actionCancel, role: .cancel) { })
+            return
+        }
+        
+        var actions = [RoomMembersListScreenManagementDetails.Action]()
+        if state.canKickUsers, member.role != .administrator {
+            actions.append(.kick)
+        }
+        if state.canBanUsers, member.role != .administrator {
+            actions.append(.ban)
+        }
+        
+        if !actions.isEmpty {
+            state.bindings.memberToManage = .init(member: member, actions: actions)
         } else {
             showMemberDetails(member)
         }

ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListManageMemberSheet.swift

@@ -19,6 +19,8 @@ import SwiftUI
 
 struct RoomMembersListManageMemberSheet: View {
     let member: RoomMemberDetails
+    let actions: [RoomMembersListScreenManagementDetails.Action]
+    
     @ObservedObject var context: RoomMembersListScreenViewModel.Context
     
     @State private var isPresentingBanConfirmation = false
@@ -38,7 +40,7 @@ struct RoomMembersListManageMemberSheet: View {
                             context.send(viewAction: .showMemberDetails(member))
                         })
                 
-                if context.viewState.canKickUsers, !member.isBanned {
+                if actions.contains(.kick) {
                     ListRow(label: .default(title: L10n.screenRoomMemberListManageMemberRemove,
                                             icon: \.close),
                             kind: .button {
@@ -46,7 +48,7 @@ struct RoomMembersListManageMemberSheet: View {
                             })
                 }
                 
-                if context.viewState.canBanUsers, !member.isBanned {
+                if actions.contains(.ban) {
                     ListRow(label: .default(title: L10n.screenRoomMemberListManageMemberBan,
                                             icon: \.block,
                                             role: .destructive),
@@ -76,11 +78,13 @@ struct RoomMembersListManageMemberSheet_Previews: PreviewProvider, TestablePrevi
     
     static var previews: some View {
         RoomMembersListManageMemberSheet(member: .init(withProxy: RoomMemberProxyMock.mockDan),
+                                         actions: [.kick, .ban],
                                          context: viewModel.context)
             .previewDisplayName("Joined")
             .snapshot(delay: 0.2)
         
         RoomMembersListManageMemberSheet(member: .init(withProxy: RoomMemberProxyMock.mockBanned[3]),
+                                         actions: [],
                                          context: viewModel.context)
             .previewDisplayName("Banned")
             .snapshot(delay: 0.2)
@@ -94,6 +98,7 @@ struct RoomMembersListManageMemberSheetLive_Previews: PreviewProvider {
         Color.clear
             .sheet(isPresented: .constant(true)) {
                 RoomMembersListManageMemberSheet(member: .init(withProxy: RoomMemberProxyMock.mockDan),
+                                                 actions: [.kick, .ban],
                                                  context: viewModel.context)
             }
             .previewDisplayName("Sheet")

ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift

@@ -49,13 +49,15 @@ struct RoomMembersListScreen: View {
                     .background(.compound.bgCanvasDefault)
             }
         }
-        .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always))
+        .searchable(text: $context.searchQuery,
+                    placement: .navigationBarDrawer(displayMode: .always),
+                    prompt: L10n.commonSearchForSomeone)
         .compoundSearchField()
         .autocorrectionDisabled()
         .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
         .navigationTitle(L10n.commonPeople)
         .sheet(item: $context.memberToManage) {
-            RoomMembersListManageMemberSheet(member: $0, context: context)
+            RoomMembersListManageMemberSheet(member: $0.member, actions: $0.actions, context: context)
         }
         .alert(item: $context.alertInfo)
         .toolbar { toolbar }

ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift

@@ -94,8 +94,8 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
     // MARK: - Members
     
     private func updateMembers(_ members: [RoomMemberProxyProtocol]) {
-        state.administratorCount = members.filter { $0.role == .administrator }.count
-        state.moderatorCount = members.filter { $0.role == .moderator }.count
+        state.administratorCount = members.filter { $0.role == .administrator && $0.isActive }.count
+        state.moderatorCount = members.filter { $0.role == .moderator && $0.isActive }.count
     }
     
     private func updateOwnRole(_ role: RoomMemberDetails.Role) async {

ElementX/Sources/Services/Room/RoomMember/RoomMemberDetails.swift

@@ -23,11 +23,17 @@ struct RoomMemberDetails: Identifiable, Hashable {
     let avatarURL: URL?
     let permalink: URL?
     
+    var isInvited: Bool
     var isIgnored: Bool
     var isBanned: Bool
     
     enum Role { case administrator, moderator, user }
     let role: Role
+    
+    func matches(searchQuery: String) -> Bool {
+        guard !searchQuery.isEmpty else { return true }
+        return id.localizedStandardContains(searchQuery) || name?.localizedStandardContains(searchQuery) == true
+    }
 }
 
 extension RoomMemberDetails {
@@ -37,6 +43,7 @@ extension RoomMemberDetails {
         avatarURL = proxy.avatarURL
         permalink = proxy.permalink
         
+        isInvited = proxy.membership == .invite
         isIgnored = proxy.isIgnored
         isBanned = proxy.membership == .ban
         role = .init(proxy.role)
@@ -48,6 +55,7 @@ extension RoomMemberDetails {
         avatarURL = nil
         permalink = nil
         
+        isInvited = false
         isIgnored = false
         isBanned = false
         role = .user

ElementX/Sources/Services/Room/RoomMember/RoomMemberProxyProtocol.swift

@@ -31,6 +31,11 @@ protocol RoomMemberProxyProtocol: AnyObject {
 }
 
 extension RoomMemberProxyProtocol {
+    /// The member is active in the room (joined or invited).
+    var isActive: Bool {
+        membership == .join || membership == .invite
+    }
+    
     var permalink: URL? {
         try? PermalinkBuilder.permalinkTo(userIdentifier: userID,
                                           baseURL: ServiceLocator.shared.settings.permalinkBaseURL)

UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift

@@ -31,8 +31,10 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase {
         setupViewModel(mode: .administrator)
         XCTAssertEqual(context.viewState.membersToPromote, [])
         XCTAssertEqual(context.viewState.membersToDemote, [])
-        XCTAssertEqual(context.viewState.members, context.viewState.visibleMembers)
-        XCTAssertEqual(context.viewState.membersWithRole.count, 1)
+        XCTAssertEqual(context.viewState.administrators, context.viewState.visibleAdministrators)
+        XCTAssertEqual(context.viewState.moderators, context.viewState.visibleModerators)
+        XCTAssertEqual(context.viewState.users, context.viewState.visibleUsers)
+        XCTAssertEqual(context.viewState.membersWithRole.count, 2)
         XCTAssertEqual(context.viewState.membersWithRole.first?.id, RoomMemberProxyMock.mockAdmin.userID)
         XCTAssertFalse(context.viewState.hasChanges)
         XCTAssertFalse(context.viewState.isSearching)
@@ -42,7 +44,9 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase {
         setupViewModel(mode: .moderator)
         XCTAssertEqual(context.viewState.membersToPromote, [])
         XCTAssertEqual(context.viewState.membersToDemote, [])
-        XCTAssertEqual(context.viewState.members, context.viewState.visibleMembers)
+        XCTAssertEqual(context.viewState.administrators, context.viewState.visibleAdministrators)
+        XCTAssertEqual(context.viewState.moderators, context.viewState.visibleModerators)
+        XCTAssertEqual(context.viewState.users, context.viewState.visibleUsers)
         XCTAssertEqual(context.viewState.membersWithRole.count, 1)
         XCTAssertEqual(context.viewState.membersWithRole.first?.id, RoomMemberProxyMock.mockModerator.userID)
         XCTAssertFalse(context.viewState.hasChanges)
@@ -51,7 +55,7 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase {
     
     func testToggleUserOn() {
         testInitialStateModerators()
-        guard let firstUser = context.viewState.members.first(where: { !context.viewState.isMemberSelected($0) }) else {
+        guard let firstUser = context.viewState.users.first(where: { !context.viewState.isMemberSelected($0) }) else {
             XCTFail("There should be a regular user available to promote.")
             return
         }
@@ -150,7 +154,7 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase {
         // Given the change roles view model for moderators.
         setupViewModel(mode: .moderator)
         
-        guard let firstUser = context.viewState.members.first(where: { !context.viewState.isMemberSelected($0) }),
+        guard let firstUser = context.viewState.users.first(where: { !context.viewState.isMemberSelected($0) }),
               let existingModerator = context.viewState.membersWithRole.first else {
             XCTFail("There should be a regular user and a moderator to begin with.")
             return
@@ -175,7 +179,7 @@ class RoomChangeRolesScreenViewModelTests: XCTestCase {
         setupViewModel(mode: .administrator)
         XCTAssertNil(context.alertInfo)
         
-        guard let firstUser = context.viewState.members.first(where: { !context.viewState.isMemberSelected($0) }) else {
+        guard let firstUser = context.viewState.users.first(where: { !context.viewState.isMemberSelected($0) }) else {
             XCTFail("There should be a regular user to begin with.")
             return
         }

UnitTests/Sources/RoomMembersListScreenViewModelTests.swift

@@ -126,8 +126,128 @@ class RoomMembersListScreenViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.state.visibleJoinedMembers.count, 0)
     }
     
-    func testKickMember() async throws {
+    func testSelectUserAsUser() async throws {
+        // Given the room list viewed as a regular user.
         setup(with: .allMembers)
+        let deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        
+        // When tapping on another user in the list.
+        let memberDetailsAction = deferFulfillment(viewModel.actions) { $0.isSelectMember }
+        guard let user = viewModel.state.visibleJoinedMembers.first(where: { $0.role == .user && $0.id != RoomMemberProxyMock.mockMe.userID }) else {
+            XCTFail("Expected to find a regular user.")
+            return
+        }
+        context.send(viewAction: .selectMember(user))
+        
+        // Then the member's details should be shown.
+        try await memberDetailsAction.fulfill()
+        XCTAssertNil(context.memberToManage)
+    }
+    
+    func testSelectUserAsAdmin() async throws {
+        // Given the room list viewed as an admin.
+        setup(with: .allMembersAsAdmin)
+        var deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        XCTAssertNil(context.memberToManage)
+        
+        // When tapping on a user in the list.
+        deferred = deferFulfillment(context.$viewState) { $0.bindings.memberToManage != nil }
+        guard let user = viewModel.state.visibleJoinedMembers.first(where: { $0.role == .user && $0.id != RoomMemberProxyMock.mockMe.userID }) else {
+            XCTFail("Expected to find a regular user.")
+            return
+        }
+        context.send(viewAction: .selectMember(user))
+        try await deferred.fulfill()
+        
+        // Then member management should be shown for that user.
+        XCTAssertEqual(context.memberToManage?.member, user)
+        XCTAssertEqual(context.memberToManage?.actions, [.kick, .ban])
+    }
+    
+    func testSelectModeratorAsAdmin() async throws {
+        // Given the room list viewed as an admin.
+        setup(with: .allMembersAsAdmin)
+        var deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        XCTAssertNil(context.memberToManage)
+        
+        // When tapping on a moderator in the list.
+        deferred = deferFulfillment(context.$viewState) { $0.bindings.memberToManage != nil }
+        guard let moderator = viewModel.state.visibleJoinedMembers.first(where: { $0.role == .moderator }) else {
+            XCTFail("Expected to find a moderator.")
+            return
+        }
+        context.send(viewAction: .selectMember(moderator))
+        try await deferred.fulfill()
+        
+        // Then member management should be shown for the moderator.
+        XCTAssertEqual(context.memberToManage?.member, moderator)
+        XCTAssertEqual(context.memberToManage?.actions, [.kick, .ban])
+    }
+    
+    func testSelectAdminAsAdmin() async throws {
+        // Given the room list viewed as an admin.
+        setup(with: .allMembersAsAdmin)
+        let deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        
+        // When tapping on another administrator in the list.
+        let memberDetailsAction = deferFulfillment(viewModel.actions) { $0.isSelectMember }
+        guard let admin = viewModel.state.visibleJoinedMembers.first(where: { $0.role == .administrator && $0.id != RoomMemberProxyMock.mockMe.userID }) else {
+            XCTFail("Expected to find another admin.")
+            return
+        }
+        context.send(viewAction: .selectMember(admin))
+        
+        // Then the administrator's details should be shown.
+        try await memberDetailsAction.fulfill()
+        XCTAssertNil(context.memberToManage)
+    }
+    
+    func testSelectOwnMemberAsAdmin() async throws {
+        // Given the room list viewed as an admin.
+        setup(with: .allMembersAsAdmin)
+        let deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        
+        // When tapping on yourself in the list.
+        let memberDetailsAction = deferFulfillment(viewModel.actions) { $0.isSelectMember }
+        guard let ownMember = viewModel.state.visibleJoinedMembers.first(where: { $0.id == RoomMemberProxyMock.mockMe.userID }) else {
+            XCTFail("Expected to find own user admin.")
+            return
+        }
+        context.send(viewAction: .selectMember(ownMember))
+        
+        // Then your member's details should be shown.
+        try await memberDetailsAction.fulfill()
+        XCTAssertNil(context.memberToManage)
+    }
+    
+    func testSelectBannedMember() async throws {
+        // Given the room list viewed as an admin.
+        setup(with: .allMembersAsAdmin + RoomMemberProxyMock.mockBanned)
+        var deferred = deferFulfillment(context.$viewState) { !$0.visibleInvitedMembers.isEmpty }
+        try await deferred.fulfill()
+        XCTAssertNil(context.alertInfo)
+        
+        // When tapping on a banned member in the list.
+        deferred = deferFulfillment(context.$viewState) { $0.bindings.alertInfo != nil }
+        guard let bannedMember = viewModel.state.visibleBannedMembers.first else {
+            XCTFail("Expected to find a banned user.")
+            return
+        }
+        context.send(viewAction: .selectMember(bannedMember))
+        
+        // Then an alert should be shown to unban the user.
+        try await deferred.fulfill()
+        XCTAssertNil(context.memberToManage)
+        XCTAssertNotNil(context.alertInfo)
+    }
+    
+    func testKickMember() async throws {
+        setup(with: .allMembersAsAdmin)
         let deferred = deferFulfillment(context.$viewState) { !$0.visibleJoinedMembers.isEmpty }
         try await deferred.fulfill()
         
@@ -140,7 +260,7 @@ class RoomMembersListScreenViewModelTests: XCTestCase {
     }
     
     func testBanMember() async throws {
-        setup(with: .allMembers)
+        setup(with: .allMembersAsAdmin)
         let deferred = deferFulfillment(context.$viewState) { !$0.visibleJoinedMembers.isEmpty }
         try await deferred.fulfill()
         
@@ -153,7 +273,7 @@ class RoomMembersListScreenViewModelTests: XCTestCase {
     }
     
     func testUnbanMember() async throws {
-        setup(with: .allMembers)
+        setup(with: .allMembersAsAdmin)
         let deferred = deferFulfillment(context.$viewState) { !$0.visibleJoinedMembers.isEmpty }
         try await deferred.fulfill()
         
@@ -166,6 +286,9 @@ class RoomMembersListScreenViewModelTests: XCTestCase {
     }
     
     private func setup(with members: [RoomMemberProxyMock]) {
+        AppSettings.resetAllSettings()
+        ServiceLocator.shared.settings.roomModerationEnabled = true
+        
         roomProxy = RoomProxyMock(with: .init(name: "test", members: members))
         viewModel = .init(roomProxy: roomProxy,
                           mediaProvider: MockMediaProvider(),

changelog.d/pr-2608.wip

@@ -0,0 +1 @@
+Bug fixes on the moderation feature.