mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user