mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
Run SwiftFormat.
This commit is contained in:
@@ -16,7 +16,7 @@ class BannedRoomProxy: BannedRoomProxyProtocol {
|
||||
lazy var ownUserID = room.ownUserId()
|
||||
|
||||
let info: BaseRoomInfoProxyProtocol
|
||||
|
||||
|
||||
init(room: Room) async throws {
|
||||
self.room = room
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ class InvitedRoomProxy: InvitedRoomProxyProtocol {
|
||||
|
||||
let info: BaseRoomInfoProxyProtocol
|
||||
let inviter: RoomMemberProxyProtocol?
|
||||
|
||||
|
||||
init(room: Room) async throws {
|
||||
self.room = room
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
var infoPublisher: CurrentValuePublisher<RoomInfoProxyProtocol, Never> {
|
||||
infoSubject.asCurrentValuePublisher()
|
||||
}
|
||||
|
||||
|
||||
private let membersSubject = CurrentValueSubject<[RoomMemberProxyProtocol], Never>([])
|
||||
var membersPublisher: CurrentValuePublisher<[RoomMemberProxyProtocol], Never> {
|
||||
membersSubject.asCurrentValuePublisher()
|
||||
@@ -119,7 +119,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
}
|
||||
|
||||
subscribedForUpdates = true
|
||||
|
||||
|
||||
do {
|
||||
try await roomListService.subscribeToRooms(roomIds: [id])
|
||||
} catch {
|
||||
@@ -353,7 +353,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
MXLog.error("Failed updating members using sync API: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func getMember(userID: String) async -> Result<RoomMemberProxyProtocol, RoomProxyError> {
|
||||
if let member = membersPublisher.value.filter({ $0.userID == userID }).first {
|
||||
return .success(member)
|
||||
@@ -396,7 +396,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
return .failure(.sdkError(error))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func setTopic(_ topic: String) async -> Result<Void, RoomProxyError> {
|
||||
do {
|
||||
return try await .success(room.setTopic(topic: topic))
|
||||
@@ -420,7 +420,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
MXLog.error("Failed uploading avatar, invalid media: \(media)")
|
||||
return .failure(.invalidMedia)
|
||||
}
|
||||
|
||||
|
||||
do {
|
||||
let data = try Data(contentsOf: imageURL)
|
||||
return try await .success(room.uploadAvatar(mimeType: mimeType, data: data, mediaInfo: nil))
|
||||
@@ -790,7 +790,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
|
||||
return .failure(.sdkError(error))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func subscribeToTypingNotifications() {
|
||||
|
||||
@@ -16,7 +16,7 @@ class KnockedRoomProxy: KnockedRoomProxyProtocol {
|
||||
lazy var ownUserID: String = room.ownUserId()
|
||||
|
||||
let info: BaseRoomInfoProxyProtocol
|
||||
|
||||
|
||||
init(room: Room) async throws {
|
||||
self.room = room
|
||||
|
||||
|
||||
@@ -15,28 +15,28 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
|
||||
var id: String {
|
||||
roomInfo.id
|
||||
}
|
||||
|
||||
|
||||
var creators: [String] {
|
||||
roomInfo.creators ?? []
|
||||
}
|
||||
|
||||
|
||||
var displayName: String? {
|
||||
roomInfo.displayName
|
||||
}
|
||||
|
||||
|
||||
var rawName: String? {
|
||||
roomInfo.rawName
|
||||
}
|
||||
|
||||
|
||||
var topic: String? {
|
||||
roomInfo.topic
|
||||
}
|
||||
|
||||
|
||||
/// The room's avatar URL. Use this for editing and favour ``avatar`` for display.
|
||||
var avatarURL: URL? {
|
||||
roomInfo.avatarUrl.flatMap(URL.init)
|
||||
}
|
||||
|
||||
|
||||
/// Here we're assuming unknown rooms are unencrypted.
|
||||
/// Fortunately https://github.com/matrix-org/matrix-rust-sdk/pull/4778 makes that very much of an edge case and we
|
||||
/// also automatically start a `latestEncryptionState` fetch if needed.
|
||||
@@ -53,7 +53,7 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
|
||||
var isDM: Bool {
|
||||
roomInfo.isDm
|
||||
}
|
||||
|
||||
|
||||
var isSpace: Bool {
|
||||
roomInfo.isSpace
|
||||
}
|
||||
@@ -61,59 +61,59 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
|
||||
var successor: SuccessorRoom? {
|
||||
roomInfo.successorRoom
|
||||
}
|
||||
|
||||
|
||||
var isFavourite: Bool {
|
||||
roomInfo.isFavourite
|
||||
}
|
||||
|
||||
|
||||
var canonicalAlias: String? {
|
||||
roomInfo.canonicalAlias
|
||||
}
|
||||
|
||||
|
||||
var alternativeAliases: [String] {
|
||||
roomInfo.alternativeAliases
|
||||
}
|
||||
|
||||
|
||||
var membership: Membership {
|
||||
roomInfo.membership
|
||||
}
|
||||
|
||||
|
||||
var inviter: RoomMemberProxyProtocol? {
|
||||
roomInfo.inviter.map(RoomMemberProxy.init)
|
||||
}
|
||||
|
||||
|
||||
var heroes: [RoomHero] {
|
||||
roomInfo.heroes
|
||||
}
|
||||
|
||||
|
||||
var activeMembersCount: Int {
|
||||
Int(roomInfo.activeMembersCount)
|
||||
}
|
||||
|
||||
|
||||
var invitedMembersCount: Int {
|
||||
Int(roomInfo.invitedMembersCount)
|
||||
}
|
||||
|
||||
|
||||
var joinedMembersCount: Int {
|
||||
Int(roomInfo.joinedMembersCount)
|
||||
}
|
||||
|
||||
|
||||
var highlightCount: Int {
|
||||
Int(roomInfo.highlightCount)
|
||||
}
|
||||
|
||||
|
||||
var notificationCount: Int {
|
||||
Int(roomInfo.notificationCount)
|
||||
}
|
||||
|
||||
|
||||
var cachedUserDefinedNotificationMode: RoomNotificationMode? {
|
||||
roomInfo.cachedUserDefinedNotificationMode
|
||||
}
|
||||
|
||||
|
||||
var hasRoomCall: Bool {
|
||||
roomInfo.hasRoomCall
|
||||
}
|
||||
|
||||
|
||||
var activeRoomCallIntent: CallIntent? {
|
||||
switch roomInfo.activeRoomCallConsensusIntent {
|
||||
case .full(let intent):
|
||||
@@ -128,35 +128,35 @@ struct RoomInfoProxy: RoomInfoProxyProtocol {
|
||||
var activeRoomCallParticipants: [String] {
|
||||
roomInfo.activeRoomCallParticipants
|
||||
}
|
||||
|
||||
|
||||
var isMarkedUnread: Bool {
|
||||
roomInfo.isMarkedUnread
|
||||
}
|
||||
|
||||
|
||||
var unreadMessagesCount: UInt {
|
||||
UInt(roomInfo.numUnreadMessages)
|
||||
}
|
||||
|
||||
|
||||
var unreadNotificationsCount: UInt {
|
||||
UInt(roomInfo.numUnreadNotifications)
|
||||
}
|
||||
|
||||
|
||||
var unreadMentionsCount: UInt {
|
||||
UInt(roomInfo.numUnreadMentions)
|
||||
}
|
||||
|
||||
|
||||
var fullyReadEventID: String? {
|
||||
roomInfo.fullyReadEventId
|
||||
}
|
||||
|
||||
|
||||
var pinnedEventIDs: Set<String> {
|
||||
Set(roomInfo.pinnedEventIds)
|
||||
}
|
||||
|
||||
|
||||
var joinRule: JoinRule? {
|
||||
roomInfo.joinRule.map(JoinRule.init)
|
||||
}
|
||||
|
||||
|
||||
var historyVisibility: RoomHistoryVisibility {
|
||||
roomInfo.historyVisibility
|
||||
}
|
||||
@@ -174,39 +174,39 @@ struct RoomPreviewInfoProxy: BaseRoomInfoProxyProtocol {
|
||||
var id: String {
|
||||
roomPreviewInfo.roomId
|
||||
}
|
||||
|
||||
|
||||
var displayName: String? {
|
||||
roomPreviewInfo.name
|
||||
}
|
||||
|
||||
|
||||
var heroes: [RoomHero] {
|
||||
roomPreviewInfo.heroes ?? []
|
||||
}
|
||||
|
||||
|
||||
var topic: String? {
|
||||
roomPreviewInfo.topic
|
||||
}
|
||||
|
||||
|
||||
var canonicalAlias: String? {
|
||||
roomPreviewInfo.canonicalAlias
|
||||
}
|
||||
|
||||
|
||||
var avatarURL: URL? {
|
||||
roomPreviewInfo.avatarUrl.flatMap(URL.init)
|
||||
}
|
||||
|
||||
|
||||
var isDirect: Bool {
|
||||
roomPreviewInfo.isDirect ?? false
|
||||
}
|
||||
|
||||
|
||||
var isSpace: Bool {
|
||||
roomPreviewInfo.roomType == .space
|
||||
}
|
||||
|
||||
|
||||
var activeMembersCount: Int {
|
||||
Int(roomPreviewInfo.numActiveMembers ?? roomPreviewInfo.numJoinedMembers)
|
||||
}
|
||||
|
||||
|
||||
var joinedMembersCount: Int {
|
||||
Int(roomPreviewInfo.numJoinedMembers)
|
||||
}
|
||||
@@ -214,7 +214,7 @@ struct RoomPreviewInfoProxy: BaseRoomInfoProxyProtocol {
|
||||
var joinRule: JoinRule? {
|
||||
roomPreviewInfo.joinRule.map(JoinRule.init)
|
||||
}
|
||||
|
||||
|
||||
var membership: Membership? {
|
||||
roomPreviewInfo.membership
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ protocol RoomInfoProxyProtocol: BaseRoomInfoProxyProtocol {
|
||||
var topic: String? { get }
|
||||
/// The room's avatar URL. Use this for editing and favour ``avatar`` for display.
|
||||
var avatarURL: URL? { get }
|
||||
|
||||
|
||||
var isEncrypted: Bool { get }
|
||||
var isDirect: Bool { get }
|
||||
var isDM: Bool { get }
|
||||
|
||||
@@ -19,7 +19,7 @@ struct RoomMemberDetails: Identifiable, Hashable {
|
||||
var isIgnored: Bool
|
||||
var isBanned: Bool
|
||||
var isActive: Bool
|
||||
|
||||
|
||||
let role: RoomRole
|
||||
let powerLevel: RoomPowerLevel
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ struct RoomPermissionsSetting: Identifiable {
|
||||
value = newValue.powerLevelValue
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// The `RoomPermissions` property that this setting is for.
|
||||
let keyPath: KeyPath<RoomPermissions, Int64>
|
||||
/// The `RoomPowerLevelChanges` properties that this setting is saved into.
|
||||
|
||||
@@ -12,7 +12,7 @@ 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
|
||||
|
||||
@@ -76,7 +76,7 @@ struct RTCDeclinedEvent {
|
||||
// sourcery: AutoMockable
|
||||
protocol JoinedRoomProxyProtocol: RoomProxyProtocol {
|
||||
var infoPublisher: CurrentValuePublisher<RoomInfoProxyProtocol, Never> { get }
|
||||
|
||||
|
||||
var membersPublisher: CurrentValuePublisher<[RoomMemberProxyProtocol], Never> { get }
|
||||
|
||||
var typingMembersPublisher: CurrentValuePublisher<[String], Never> { get }
|
||||
@@ -116,11 +116,11 @@ protocol JoinedRoomProxyProtocol: RoomProxyProtocol {
|
||||
func reportContent(_ eventID: String, reason: String?) async -> Result<Void, RoomProxyError>
|
||||
|
||||
func reportRoom(reason: String) async -> Result<Void, RoomProxyError>
|
||||
|
||||
|
||||
func leaveRoom() async -> Result<Void, RoomProxyError>
|
||||
|
||||
func updateMembers() async
|
||||
|
||||
|
||||
func getMember(userID: String) async -> Result<RoomMemberProxyProtocol, RoomProxyError>
|
||||
|
||||
func invite(userID: String) async -> Result<Void, RoomProxyError>
|
||||
@@ -222,7 +222,7 @@ extension JoinedRoomProxyProtocol {
|
||||
isDirect: infoPublisher.value.isDirect,
|
||||
historySharingState: historySharingState)
|
||||
}
|
||||
|
||||
|
||||
func members() async -> [RoomMemberProxyProtocol]? {
|
||||
await updateMembers()
|
||||
return membersPublisher.value
|
||||
|
||||
@@ -49,7 +49,7 @@ extension RoomRole {
|
||||
self = .user
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var isAdminOrHigher: Bool {
|
||||
switch self {
|
||||
case .administrator, .creator, .owner:
|
||||
|
||||
@@ -70,7 +70,7 @@ struct RoomMessageEventStringBuilder {
|
||||
case .other(_, let body):
|
||||
message = AttributedString(body)
|
||||
}
|
||||
|
||||
|
||||
if style == .senderPrefixed {
|
||||
return prefix(message, with: isOutgoing ? L10n.commonYou : senderDisplayName)
|
||||
} else {
|
||||
@@ -90,7 +90,7 @@ struct RoomMessageEventStringBuilder {
|
||||
return message
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private func buildMessage(for style: Style, caption: String?, type: String) -> AttributedString {
|
||||
guard let caption else {
|
||||
return AttributedString(type)
|
||||
|
||||
@@ -31,7 +31,7 @@ struct RoomSummary {
|
||||
}
|
||||
|
||||
enum LastMessageState { case sending, failed }
|
||||
|
||||
|
||||
let room: Room
|
||||
|
||||
let id: String
|
||||
@@ -66,15 +66,15 @@ struct RoomSummary {
|
||||
var hasUnreadMessages: Bool {
|
||||
unreadMessagesCount > 0
|
||||
}
|
||||
|
||||
|
||||
var hasUnreadMentions: Bool {
|
||||
unreadMentionsCount > 0
|
||||
}
|
||||
|
||||
|
||||
var hasUnreadNotifications: Bool {
|
||||
unreadNotificationsCount > 0
|
||||
}
|
||||
|
||||
|
||||
var isMuted: Bool {
|
||||
notificationMode == .mute
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
|
||||
private let shouldUpdateVisibleRange: Bool
|
||||
private let notificationSettings: NotificationSettingsProxyProtocol
|
||||
private let appSettings: AppSettings
|
||||
|
||||
|
||||
private let roomListPageSize: UInt32
|
||||
|
||||
private let serialDispatchQueue: DispatchQueue
|
||||
@@ -40,7 +40,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
|
||||
var roomListPublisher: CurrentValuePublisher<[RoomSummary], Never> {
|
||||
roomListSubject.asCurrentValuePublisher()
|
||||
}
|
||||
|
||||
|
||||
var statePublisher: CurrentValuePublisher<RoomSummaryProviderState, Never> {
|
||||
stateSubject.asCurrentValuePublisher()
|
||||
}
|
||||
@@ -233,7 +233,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
|
||||
|
||||
return updatedItems
|
||||
}
|
||||
|
||||
|
||||
private func fetchRoomDetails(from room: Room) -> (roomInfo: RoomInfo?, latestEvent: LatestEventValue?) {
|
||||
class FetchResult {
|
||||
var roomInfo: RoomInfo?
|
||||
|
||||
@@ -76,7 +76,7 @@ class RoomThreadListProxy: RoomThreadListServiceProxyProtocol {
|
||||
|
||||
let sender = TimelineItemSender(senderID: threadListItemEvent.sender, senderProfile: threadListItemEvent.senderProfile)
|
||||
let timestamp = Date(timeIntervalSince1970: TimeInterval(threadListItemEvent.timestamp / 1000))
|
||||
|
||||
|
||||
let message: AttributedString? = if let content = threadListItemEvent.content {
|
||||
eventStringBuilder.buildAttributedString(for: content,
|
||||
sender: sender,
|
||||
|
||||
Reference in New Issue
Block a user