ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore permissions to creator and display them as owners in the list (#4369)

Browse Source 
* restore permissions to creator and display them as owners in the list

* improved the code to use actually 5 roles in the app to distinguish a real creator from an owner
This commit is contained in:
Mauro
2025-07-31 16:52:55 +02:00
committed by GitHub
parent 496c29ae36
commit 731d60b6e9
29 changed files with 205 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+64 -70
View File
@@ -13435,76 +13435,6 @@ class RoomPowerLevelsProxyMock: RoomPowerLevelsProxyProtocol, @unchecked Sendabl
var underlyingValues: RoomPowerLevelsValues!
var userPowerLevels: [String: Int64] = [:]
//MARK: - suggestedRole
var suggestedRoleForUserUnderlyingCallsCount = 0
var suggestedRoleForUserCallsCount: Int {
get {
if Thread.isMainThread {
return suggestedRoleForUserUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = suggestedRoleForUserUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
suggestedRoleForUserUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
suggestedRoleForUserUnderlyingCallsCount = newValue
}
}
}
}
var suggestedRoleForUserCalled: Bool {
return suggestedRoleForUserCallsCount > 0
}
var suggestedRoleForUserReceivedUserID: String?
var suggestedRoleForUserReceivedInvocations: [String] = []
var suggestedRoleForUserUnderlyingReturnValue: RoomMemberRole!
var suggestedRoleForUserReturnValue: RoomMemberRole! {
get {
if Thread.isMainThread {
return suggestedRoleForUserUnderlyingReturnValue
} else {
var returnValue: RoomMemberRole? = nil
DispatchQueue.main.sync {
returnValue = suggestedRoleForUserUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
suggestedRoleForUserUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
suggestedRoleForUserUnderlyingReturnValue = newValue
}
}
}
}
var suggestedRoleForUserClosure: ((String) -> RoomMemberRole)?
func suggestedRole(forUser userID: String) -> RoomMemberRole {
suggestedRoleForUserCallsCount += 1
suggestedRoleForUserReceivedUserID = userID
DispatchQueue.main.async {
self.suggestedRoleForUserReceivedInvocations.append(userID)
}
if let suggestedRoleForUserClosure = suggestedRoleForUserClosure {
return suggestedRoleForUserClosure(userID)
} else {
return suggestedRoleForUserReturnValue
}
}
//MARK: - canOwnUser
var canOwnUserSendMessageUnderlyingCallsCount = 0
@@ -14157,6 +14087,70 @@ class RoomPowerLevelsProxyMock: RoomPowerLevelsProxyProtocol, @unchecked Sendabl
return canOwnUserJoinCallReturnValue
}
}
//MARK: - canOwnUserEditRolesAndPermissions
var canOwnUserEditRolesAndPermissionsUnderlyingCallsCount = 0
var canOwnUserEditRolesAndPermissionsCallsCount: Int {
get {
if Thread.isMainThread {
return canOwnUserEditRolesAndPermissionsUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = canOwnUserEditRolesAndPermissionsUnderlyingCallsCount
}
return returnValue!
}
}
set {
if Thread.isMainThread {
canOwnUserEditRolesAndPermissionsUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
canOwnUserEditRolesAndPermissionsUnderlyingCallsCount = newValue
}
}
}
}
var canOwnUserEditRolesAndPermissionsCalled: Bool {
return canOwnUserEditRolesAndPermissionsCallsCount > 0
}
var canOwnUserEditRolesAndPermissionsUnderlyingReturnValue: Bool!
var canOwnUserEditRolesAndPermissionsReturnValue: Bool! {
get {
if Thread.isMainThread {
return canOwnUserEditRolesAndPermissionsUnderlyingReturnValue
} else {
var returnValue: Bool? = nil
DispatchQueue.main.sync {
returnValue = canOwnUserEditRolesAndPermissionsUnderlyingReturnValue
}
return returnValue!
}
}
set {
if Thread.isMainThread {
canOwnUserEditRolesAndPermissionsUnderlyingReturnValue = newValue
} else {
DispatchQueue.main.sync {
canOwnUserEditRolesAndPermissionsUnderlyingReturnValue = newValue
}
}
}
}
var canOwnUserEditRolesAndPermissionsClosure: (() -> Bool)?
func canOwnUserEditRolesAndPermissions() -> Bool {
canOwnUserEditRolesAndPermissionsCallsCount += 1
if let canOwnUserEditRolesAndPermissionsClosure = canOwnUserEditRolesAndPermissionsClosure {
return canOwnUserEditRolesAndPermissionsClosure()
} else {
return canOwnUserEditRolesAndPermissionsReturnValue
}
}
//MARK: - canUser
var canUserUserIDSendMessageUnderlyingCallsCount = 0
ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
+2 -6
View File
@@ -116,12 +116,8 @@ extension JoinedRoomProxyMock {
self?.membersPublisher.value.first { $0.userID == configuration.ownUserID }?.role ?? .user != .user
}
powerLevelsProxyMock.suggestedRoleForUserClosure = { [weak self] userID in
guard let member = self?.membersPublisher.value.first(where: { $0.userID == userID }) else {
return .user
}
return member.role
powerLevelsProxyMock.canOwnUserEditRolesAndPermissionsClosure = { [weak self] in
self?.membersPublisher.value.first { $0.userID == configuration.ownUserID }?.role.isAdminOrHigher ?? false
}
powerLevelsReturnValue = .success(powerLevelsProxyMock)
ElementX/Sources/Mocks/RoomMemberProxyMock.swift
+16
View File
@@ -120,6 +120,22 @@ extension RoomMemberProxyMock {
role: .administrator))
}
static var mockCreator: RoomMemberProxyMock {
RoomMemberProxyMock(with: .init(userID: "@creator:matrix.org",
displayName: "God",
membership: .join,
powerLevel: .infinite,
role: .creator))
}
static var mockOwner: RoomMemberProxyMock {
RoomMemberProxyMock(with: .init(userID: "@owner:matrix.org",
displayName: "Guinevere",
membership: .join,
powerLevel: .value(150),
role: .administrator))
}
static var mockModerator: RoomMemberProxyMock {
RoomMemberProxyMock(with: .init(userID: "@mod:matrix.org",
displayName: "Merlin",
ElementX/Sources/Mocks/RoomPowerLevelsProxyMock.swift
+3 -3
View File
@@ -18,6 +18,7 @@ struct RoomPowerLevelsProxyMockConfiguration {
var canUserTriggerRoomNotification = false
var canUserPin = true
var canUserJoinCall = true
var canUserEditRoomsAndPermissions = true
}
extension RoomPowerLevelsProxyMock {
@@ -25,9 +26,7 @@ extension RoomPowerLevelsProxyMock {
self.init()
underlyingValues = RoomPowerLevelsValues.mock
suggestedRoleForUserReturnValue = .administrator
canOwnUserSendMessageReturnValue = configuration.canUserSendMessage
canOwnUserSendStateEventReturnValue = configuration.canUserSendState
canOwnUserInviteReturnValue = configuration.canUserInvite
@@ -38,6 +37,7 @@ extension RoomPowerLevelsProxyMock {
canOwnUserTriggerRoomNotificationReturnValue = configuration.canUserTriggerRoomNotification
canOwnUserPinOrUnpinReturnValue = configuration.canUserPin
canOwnUserJoinCallReturnValue = configuration.canUserJoinCall
canOwnUserEditRolesAndPermissionsReturnValue = configuration.canUserEditRoomsAndPermissions
canUserUserIDSendMessageReturnValue = .success(configuration.canUserSendMessage)
canUserUserIDSendStateEventReturnValue = .success(configuration.canUserSendState)
ElementX/Sources/Screens/RoomChangeRolesScreen/RoomChangeRolesScreenModels.swift
+2 -1
View File
@@ -35,7 +35,8 @@ struct RoomChangeRolesScreenViewState: BindableState {
/// The screen's title.
var title: String {
switch mode {
case .administrator:
case .creator, .owner, .administrator:
// TODO: Handle the creator permissions change
L10n.screenRoomChangeRoleAdministratorsTitle
case .moderator:
L10n.screenRoomChangeRoleModeratorsTitle
ElementX/Sources/Screens/RoomChangeRolesScreen/RoomChangeRolesScreenViewModel.swift
+1 -1
View File
@@ -64,7 +64,7 @@ class RoomChangeRolesScreenViewModel: RoomChangeRolesScreenViewModelType, RoomCh
case .demoteMember(let member):
demoteMember(member)
case .save:
if state.mode == .administrator, !state.membersToPromote.isEmpty {
if state.mode.isAdminOrHigher, !state.membersToPromote.isEmpty {
showPromotionWarning()
} else {
Task { await save() }
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSection.swift
+2 -2
View File
@@ -24,7 +24,7 @@ struct RoomChangeRolesScreenSection: View {
isSelected: isMemberSelected(member)) {
context.send(viewAction: .toggleMember(member))
}
.disabled(member.role == .administrator)
.disabled(member.role.isAdminOrHigher)
}
} header: {
Text(title)
@@ -40,6 +40,6 @@ struct RoomChangeRolesScreenSection: View {
private func isMemberSelected(_ member: RoomMemberDetails) -> Bool {
// We always show administrators as selected, even on the moderators screen.
member.role == .administrator || context.viewState.isMemberSelected(member)
member.role.isAdminOrHigher || context.viewState.isMemberSelected(member)
}
}
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift
+1 -1
View File
@@ -232,7 +232,7 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
state.canKickUsers = powerLevels.canOwnUserKick()
state.canBanUsers = powerLevels.canOwnUserBan()
state.canJoinCall = powerLevels.canOwnUserJoinCall()
state.canEditRolesOrPermissions = powerLevels.suggestedRole(forUser: roomProxy.ownUserID) == .administrator
state.canEditRolesOrPermissions = powerLevels.canOwnUserEditRolesAndPermissions()
}
}
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
+2
View File
@@ -168,6 +168,8 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
.mockBob,
.mockCharlie,
mockAdmin,
.mockCreator,
.mockOwner,
.mockModerator
]
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
+2
View File
@@ -55,6 +55,8 @@ struct RoomMembersListScreenMemberCell: View {
var role: String? {
switch listEntry.member.role {
case .creator, .owner:
L10n.screenRoomMemberListRoleOwner
case .administrator:
L10n.screenRoomMemberListRoleAdministrator
case .moderator:
ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift
+2 -1
View File
@@ -84,7 +84,8 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
// MARK: - Members
private func updateMembers(_ members: [RoomMemberProxyProtocol]) {
state.administratorCount = members.filter { $0.role == .administrator && $0.isActive }.count
// TODO: Will probably be changed when we implement the owners list
state.administratorCount = members.filter { $0.role.isAdminOrHigher && $0.isActive }.count
state.moderatorCount = members.filter { $0.role == .moderator && $0.isActive }.count
}
ElementX/Sources/Services/Analytics/Helpers/RoomModerationRole.swift
+2 -1
View File
@@ -10,7 +10,8 @@ import AnalyticsEvents
extension AnalyticsEvent.RoomModeration.Role {
init(role: RoomMemberDetails.Role) {
switch role {
case .administrator:
case .administrator, .creator, .owner:
// This probably needs to be updates
self = .Administrator
case .moderator:
self = .Moderator
ElementX/Sources/Services/Room/RoomMember/RoomMemberDetails.swift
+49 -8
View File
@@ -19,7 +19,19 @@ struct RoomMemberDetails: Identifiable, Hashable {
var isBanned: Bool
var isActive: Bool
enum Role { case administrator, moderator, user }
enum Role {
/// Creator of the room, PL infinite
case creator
/// Same power of an admin, but they can also upgrade the room, PL 150 onwards
case owner
/// Able to edit room settings and perform any action aside from room upgrading PL 100...149
case administrator
/// Able to perform room moderation actions PL 50...99
case moderator
/// Default role PL 0...49
case user
}
let role: Role
let powerLevel: RoomPowerLevel
@@ -39,18 +51,47 @@ extension RoomMemberDetails {
isInvited = proxy.membership == .invite
isIgnored = proxy.isIgnored
isBanned = proxy.membership == .ban
role = .init(proxy.role)
role = .init(proxy.role, powerLevel: proxy.powerLevel)
powerLevel = proxy.powerLevel
}
}
extension RoomMemberDetails.Role {
init(_ role: RoomMemberRole) {
self = switch role {
// TODO: Implement creator role
case .creator, .administrator: .administrator
case .moderator: .moderator
case .user: .user
init(_ role: RoomMemberRole, powerLevel: RoomPowerLevel) {
switch role {
case .creator:
self = .creator
case .administrator:
switch powerLevel {
case .value(let value):
self = value >= 150 ? .owner : .administrator
default:
fatalError("Impossible")
}
case .moderator:
self = .moderator
case .user:
self = .user
}
}
var isAdminOrHigher: Bool {
switch self {
case .administrator, .creator, .owner:
return true
case .moderator, .user:
return false
}
}
}
extension RoomMemberRole {
var isAdminOrHigher: Bool {
switch self {
case .administrator, .creator:
return true
case .moderator, .user:
return false
}
}
}
ElementX/Sources/Services/Room/RoomPermissions.swift
+26 -5
View File
@@ -86,17 +86,34 @@ extension RoomPermissions {
extension RoomMemberDetails.Role {
init(powerLevelValue: Int64) {
// Also this is not great, and should be handled by a `suggestedRoleForPowerLevelValue` function from the SDK
guard powerLevelValue < 150 else {
self = .owner
return
}
do {
try self.init(suggestedRoleForPowerLevel(powerLevel: .value(value: powerLevelValue)))
switch try suggestedRoleForPowerLevel(powerLevel: .value(value: powerLevelValue)) {
case .administrator:
self = .administrator
case .creator:
fatalError("Impossible")
case .moderator:
self = .moderator
case .user:
self = .user
}
} catch {
MXLog.error("Falied to convert power level value to role: \(error)")
self.init(.user)
self = .user
}
}
var rustRole: RoomMemberRole {
switch self {
case .administrator:
case .creator:
.creator
case .administrator, .owner:
.administrator
case .moderator:
.moderator
@@ -108,11 +125,15 @@ extension RoomMemberDetails.Role {
/// To be used when setting the power level of a user to get the suggested equivalent power level value for that specific role
/// NOTE: Do not use for comparison, use the true power level instead.
var powerLevelValue: Int64 {
guard self != .owner else {
// Would be better if the SDK would return this, maybe a `suggestedPowerLevelValueForRole` function would solve the problem
return 150
}
do {
switch try suggestedPowerLevelForRole(role: rustRole) {
case .infinite:
// Would be better if the SDK would return this, maybe a `suggestedPowerLevelValueForRole` function would solve the problem
return 150
fatalError("Impossible")
case .value(let value):
return value
}
ElementX/Sources/Services/Room/RoomPowerLevelProxyProtocol.swift
+2 -3
View File
@@ -11,9 +11,7 @@ import MatrixRustSDK
protocol RoomPowerLevelsProxyProtocol {
var values: RoomPowerLevelsValues { get }
var userPowerLevels: [String: Int64] { get }
func suggestedRole(forUser userID: String) -> RoomMemberRole
func canOwnUser(sendMessage messageType: MessageLikeEventType) -> Bool
func canOwnUser(sendStateEvent event: StateEventType) -> Bool
func canOwnUserInvite() -> Bool
@@ -24,6 +22,7 @@ protocol RoomPowerLevelsProxyProtocol {
func canOwnUserTriggerRoomNotification() -> Bool
func canOwnUserPinOrUnpin() -> Bool
func canOwnUserJoinCall() -> Bool
func canOwnUserEditRolesAndPermissions() -> Bool
func canUser(userID: String, sendMessage messageType: MessageLikeEventType) -> Result<Bool, RoomProxyError>
func canUser(userID: String, sendStateEvent event: StateEventType) -> Result<Bool, RoomProxyError>
ElementX/Sources/Services/Room/RoomPowerLevelsProxy.swift
+4 -10
View File
@@ -26,16 +26,6 @@ struct RoomPowerLevelsProxy: RoomPowerLevelsProxyProtocol {
powerLevels.userPowerLevels()
}
func suggestedRole(forUser userID: String) -> RoomMemberRole {
do {
let powerLevelValue = powerLevels.userPowerLevels()[userID] ?? values.usersDefault
return try suggestedRoleForPowerLevel(powerLevel: .value(value: powerLevelValue))
} catch {
MXLog.error("Falied to get suggested role for user: \(error)")
return .user
}
}
func canOwnUser(sendMessage messageType: MessageLikeEventType) -> Bool {
powerLevels.canOwnUserSendMessage(message: messageType)
}
@@ -76,6 +66,10 @@ struct RoomPowerLevelsProxy: RoomPowerLevelsProxyProtocol {
powerLevels.canOwnUserSendState(stateEvent: .callMember)
}
func canOwnUserEditRolesAndPermissions() -> Bool {
powerLevels.canOwnUserSendState(stateEvent: .roomPowerLevels)
}
func canUser(userID: String, sendMessage messageType: MessageLikeEventType) -> Result<Bool, RoomProxyError> {
do {
return try .success(powerLevels.canUserSendMessage(userId: userID, message: messageType))