letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Make the room power levels optional as they can be missing depending on what state events are requested

Browse Source
This commit is contained in:
Stefan Ceriu
2025-06-25 12:35:04 +03:00
committed by Stefan Ceriu
parent 64f0d4cd01
commit 4b68d1caf3
16 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
View File

@@ -8651,13 +8651,13 @@ class JoinedRoomProxyMock: JoinedRoomProxyProtocol, @unchecked Sendable {
return powerLevelsCallsCount > 0
}
var powerLevelsUnderlyingReturnValue: Result<RoomPowerLevelsProxyProtocol, RoomProxyError>!
var powerLevelsReturnValue: Result<RoomPowerLevelsProxyProtocol, RoomProxyError>! {
var powerLevelsUnderlyingReturnValue: Result<RoomPowerLevelsProxyProtocol?, RoomProxyError>!
var powerLevelsReturnValue: Result<RoomPowerLevelsProxyProtocol?, RoomProxyError>! {
get {
if Thread.isMainThread {
return powerLevelsUnderlyingReturnValue
} else {
var returnValue: Result<RoomPowerLevelsProxyProtocol, RoomProxyError>? = nil
var returnValue: Result<RoomPowerLevelsProxyProtocol?, RoomProxyError>? = nil
DispatchQueue.main.sync {
returnValue = powerLevelsUnderlyingReturnValue
}
@@ -8675,9 +8675,9 @@ class JoinedRoomProxyMock: JoinedRoomProxyProtocol, @unchecked Sendable {
}
}
}
var powerLevelsClosure: (() async -> Result<RoomPowerLevelsProxyProtocol, RoomProxyError>)?
var powerLevelsClosure: (() async -> Result<RoomPowerLevelsProxyProtocol?, RoomProxyError>)?
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol, RoomProxyError> {
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol?, RoomProxyError> {
powerLevelsCallsCount += 1
if let powerLevelsClosure = powerLevelsClosure {
return await powerLevelsClosure()
@@ -13518,11 +13518,7 @@ class RoomInfoProxyMock: RoomInfoProxyProtocol, @unchecked Sendable {
set(value) { underlyingHistoryVisibility = value }
}
var underlyingHistoryVisibility: RoomHistoryVisibility!
var powerLevels: RoomPowerLevelsProxyProtocol {
get { return underlyingPowerLevels }
set(value) { underlyingPowerLevels = value }
}
var underlyingPowerLevels: RoomPowerLevelsProxyProtocol!
var powerLevels: RoomPowerLevelsProxyProtocol?
var successor: SuccessorRoom?
var heroes: [RoomHero] = []
@@ -13587,6 +13583,7 @@ class RoomPowerLevelsProxyMock: RoomPowerLevelsProxyProtocol, @unchecked Sendabl
set(value) { underlyingValues = value }
}
var underlyingValues: RoomPowerLevelsValues!
var userPowerLevels: [String: Int64] = [:]
//MARK: - canOwnUser

7
ElementX/Sources/Screens/KnockRequestsListScreen/KnockRequestsListScreenViewModel.swift
View File

@@ -218,9 +218,10 @@ class KnockRequestsListScreenViewModel: KnockRequestsListScreenViewModelType, Kn
state.isKnockableRoom = false
}
state.canAccept = roomInfo.powerLevels.canOwnUserInvite()
state.canDecline = roomInfo.powerLevels.canOwnUserKick()
state.canBan = roomInfo.powerLevels.canOwnUserBan()
guard let powerLevels = roomProxy.infoPublisher.value.powerLevels else { fatalError("Missing room power levels") }
state.canAccept = powerLevels.canOwnUserInvite()
state.canDecline = powerLevels.canOwnUserKick()
state.canBan = powerLevels.canOwnUserBan()
}
private static let loadingIndicatorIdentifier = "\(KnockRequestsListScreenViewModel.self)-Loading"

7
ElementX/Sources/Screens/RoomDetailsEditScreen/RoomDetailsEditScreenViewModel.swift
View File

@@ -87,9 +87,10 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
// MARK: - Private
private func updateRoomInfo(roomInfo: RoomInfoProxyProtocol) {
state.canEditAvatar = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomAvatar)
state.canEditName = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomName)
state.canEditTopic = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomTopic)
guard let powerLevels = roomInfo.powerLevels else { fatalError("Missing room power levels") }
state.canEditAvatar = powerLevels.canOwnUser(sendStateEvent: .roomAvatar)
state.canEditName = powerLevels.canOwnUser(sendStateEvent: .roomName)
state.canEditTopic = powerLevels.canOwnUser(sendStateEvent: .roomTopic)
}
private func saveRoomDetails() {

18
ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenViewModel.swift
View File

@@ -224,13 +224,17 @@ class RoomDetailsScreenViewModel: RoomDetailsScreenViewModelType, RoomDetailsScr
state.isKnockableRoom = false
}
state.canEditRoomName = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomName)
state.canEditRoomTopic = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomTopic)
state.canEditRoomAvatar = roomInfo.powerLevels.canOwnUser(sendStateEvent: .roomAvatar)
state.canInviteUsers = roomInfo.powerLevels.canOwnUserInvite()
state.canKickUsers = roomInfo.powerLevels.canOwnUserKick()
state.canBanUsers = roomInfo.powerLevels.canOwnUserBan()
state.canJoinCall = roomInfo.powerLevels.canOwnUserJoinCall()
if let powerLevels = roomInfo.powerLevels {
state.canEditRoomName = powerLevels.canOwnUser(sendStateEvent: .roomName)
state.canEditRoomTopic = powerLevels.canOwnUser(sendStateEvent: .roomTopic)
state.canEditRoomAvatar = powerLevels.canOwnUser(sendStateEvent: .roomAvatar)
state.canInviteUsers = powerLevels.canOwnUserInvite()
state.canKickUsers = powerLevels.canOwnUserKick()
state.canBanUsers = powerLevels.canOwnUserBan()
state.canJoinCall = powerLevels.canOwnUserJoinCall()
} else {
fatalError("Missing room power levels")
}
Task {
state.canEditRolesOrPermissions = await (try? roomProxy.suggestedRole(for: roomProxy.ownUserID).get()) == .administrator

8
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift
View File

@@ -88,6 +88,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
Task {
showLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
defer {
hideLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
}
let members = members.sorted()
let roomMembersDetails = await buildMembersDetails(members: members)
self.members = members
@@ -99,12 +103,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
bannedMembers: roomMembersDetails.bannedMembers,
bindings: state.bindings)
let powerLevels = roomProxy.infoPublisher.value.powerLevels
guard let powerLevels = roomProxy.infoPublisher.value.powerLevels else { fatalError("Missing room power levels") }
self.state.canInviteUsers = powerLevels.canOwnUserInvite()
self.state.canKickUsers = powerLevels.canOwnUserKick()
self.state.canBanUsers = powerLevels.canOwnUserBan()
hideLoadingIndicator(Self.updateStateLoadingIndicatorIdentifier)
}
}

3
ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/RoomRolesAndPermissionsScreenViewModel.swift
View File

@@ -114,7 +114,8 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
// MARK: - Permissions
private func updateRoomInfo(roomInfo: RoomInfoProxyProtocol) {
state.permissions = .init(powerLevels: roomInfo.powerLevels.values)
guard let powerLevels = roomInfo.powerLevels else { fatalError("Missing room power levels") }
state.permissions = .init(powerLevels: powerLevels.values)
}
private func editPermissions(group: RoomRolesAndPermissionsScreenPermissionsGroup) {

3
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionService.swift
View File

@@ -47,7 +47,8 @@ final class CompletionSuggestionService: CompletionSuggestionServiceProtocol {
self?.suggestionTriggerSubject.value != nil ? .milliseconds(500) : .milliseconds(0)
}
canMentionAllUsers = roomProxy.infoPublisher.value.powerLevels.canOwnUserTriggerRoomNotification()
guard let powerLevels = roomProxy.infoPublisher.value.powerLevels else { fatalError("Missing room power levels") }
canMentionAllUsers = powerLevels.canOwnUserTriggerRoomNotification()
}
func processTextMessage(_ textMessage: String, selectedRange: NSRange) {

11
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
View File

@@ -348,11 +348,12 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
state.isKnockableRoom = false
}
state.canSendMessage = roomInfo.powerLevels.canOwnUser(sendMessage: .roomMessage)
state.canJoinCall = roomInfo.powerLevels.canOwnUserJoinCall()
state.canAcceptKnocks = roomInfo.powerLevels.canOwnUserInvite()
state.canDeclineKnocks = roomInfo.powerLevels.canOwnUserKick()
state.canBan = roomInfo.powerLevels.canOwnUserBan()
guard let powerLevels = roomInfo.powerLevels else { fatalError("Missing room power levels") }
state.canSendMessage = powerLevels.canOwnUser(sendMessage: .roomMessage)
state.canJoinCall = powerLevels.canOwnUserJoinCall()
state.canAcceptKnocks = powerLevels.canOwnUserInvite()
state.canDeclineKnocks = powerLevels.canOwnUserKick()
state.canBan = powerLevels.canOwnUserBan()
}
private func setupPinnedEventsTimelineItemProviderIfNeeded() {

3
ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenViewModel.swift
View File

@@ -63,6 +63,7 @@ class ThreadTimelineScreenViewModel: ThreadTimelineScreenViewModelType, ThreadTi
// MARK: - Private
private func handleRoomInfoUpdate(_ roomInfo: RoomInfoProxyProtocol) {
state.canSendMessage = roomInfo.powerLevels.canOwnUser(sendMessage: .roomMessage)
guard let powerLevels = roomInfo.powerLevels else { fatalError("Missing room power levels") }
state.canSendMessage = powerLevels.canOwnUser(sendMessage: .roomMessage)
}
}

13
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
View File

@@ -405,12 +405,13 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
private func updateRoomInfo(roomInfo: RoomInfoProxyProtocol) {
state.pinnedEventIDs = roomInfo.pinnedEventIDs
state.canCurrentUserSendMessage = roomInfo.powerLevels.canOwnUser(sendMessage: .roomMessage)
state.canCurrentUserRedactOthers = roomInfo.powerLevels.canOwnUserRedactOther()
state.canCurrentUserRedactSelf = roomInfo.powerLevels.canOwnUserRedactOwn()
state.canCurrentUserPin = roomInfo.powerLevels.canOwnUserPinOrUnpin()
state.canCurrentUserKick = roomInfo.powerLevels.canOwnUserKick()
state.canCurrentUserBan = roomInfo.powerLevels.canOwnUserBan()
guard let powerLevels = roomInfo.powerLevels else { fatalError("Missing room power levels") }
state.canCurrentUserSendMessage = powerLevels.canOwnUser(sendMessage: .roomMessage)
state.canCurrentUserRedactOthers = powerLevels.canOwnUserRedactOther()
state.canCurrentUserRedactSelf = powerLevels.canOwnUserRedactOwn()
state.canCurrentUserPin = powerLevels.canOwnUserPinOrUnpin()
state.canCurrentUserKick = powerLevels.canOwnUserKick()
state.canCurrentUserBan = powerLevels.canOwnUserBan()
}
private func setupSubscriptions() {

2
ElementX/Sources/Services/Room/JoinedRoomProxy.swift
View File

@@ -552,7 +552,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
// MARK: - Power Levels
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol, RoomProxyError> {
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol?, RoomProxyError> {
do {
return try await .success(RoomPowerLevelsProxy(room.getPowerLevels()))
} catch {

2
ElementX/Sources/Services/Room/RoomInfoProxy.swift
View File

@@ -53,7 +53,7 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
var joinRule: JoinRule? { roomInfo.joinRule }
var historyVisibility: RoomHistoryVisibility { roomInfo.historyVisibility }
var powerLevels: RoomPowerLevelsProxyProtocol { RoomPowerLevelsProxy(roomInfo.powerLevels) }
var powerLevels: RoomPowerLevelsProxyProtocol? { RoomPowerLevelsProxy(roomInfo.powerLevels) }
}
struct RoomPreviewInfoProxy: BaseRoomInfoProxyProtocol {

2
ElementX/Sources/Services/Room/RoomInfoProxyProtocol.swift
View File

@@ -63,7 +63,7 @@ protocol RoomInfoProxyProtocol: BaseRoomInfoProxyProtocol {
var joinRule: JoinRule? { get }
var historyVisibility: RoomHistoryVisibility { get }
var powerLevels: RoomPowerLevelsProxyProtocol { get }
var powerLevels: RoomPowerLevelsProxyProtocol? { get }
}
extension BaseRoomInfoProxyProtocol {

2
ElementX/Sources/Services/Room/RoomPowerLevelProxyProtocol.swift
View File

@@ -11,6 +11,8 @@ import MatrixRustSDK
protocol RoomPowerLevelsProxyProtocol {
var values: RoomPowerLevelsValues { get }
var userPowerLevels: [String: Int64] { get }
func canOwnUser(sendMessage messageType: MessageLikeEventType) -> Bool
func canOwnUser(sendStateEvent event: StateEventType) -> Bool
func canOwnUserInvite() -> Bool

10
ElementX/Sources/Services/Room/RoomPowerLevelsProxy.swift
View File

@@ -10,7 +10,11 @@ import MatrixRustSDK
struct RoomPowerLevelsProxy: RoomPowerLevelsProxyProtocol {
private let powerLevels: RoomPowerLevels
init(_ powerLevels: RoomPowerLevels) {
init?(_ powerLevels: RoomPowerLevels?) {
guard let powerLevels else {
return nil
}
self.powerLevels = powerLevels
}
@@ -18,6 +22,10 @@ struct RoomPowerLevelsProxy: RoomPowerLevelsProxyProtocol {
powerLevels.values()
}
var userPowerLevels: [String: Int64] {
powerLevels.userPowerLevels()
}
func canOwnUser(sendMessage messageType: MessageLikeEventType) -> Bool {
powerLevels.canOwnUserSendMessage(message: messageType)
}

2
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
View File

@@ -152,7 +152,7 @@ protocol JoinedRoomProxyProtocol: RoomProxyProtocol {
// MARK: - Power Levels
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol, RoomProxyError>
func powerLevels() async -> Result<RoomPowerLevelsProxyProtocol?, RoomProxyError>
func applyPowerLevelChanges(_ changes: RoomPowerLevelChanges) async -> Result<Void, RoomProxyError>
func resetPowerLevels() async -> Result<Void, RoomProxyError>
func suggestedRole(for userID: String) async -> Result<RoomMemberRole, RoomProxyError>