applying the same logic for banned rooms

element-hq · Feb 6, 2025 · 289ad1f · 289ad1f
1 parent dc4fa6a
commit 289ad1f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 13 deletions.
diff --git a/ElementX/Sources/Mocks/BannedRoomProxyMock.swift b/ElementX/Sources/Mocks/BannedRoomProxyMock.swift
@@ -22,7 +22,7 @@ extension BannedRoomProxyMock {
     convenience init(_ configuration: KnockedRoomProxyMockConfiguration) {
         self.init()
         id = configuration.id
-        info = RoomInfoProxy(roomInfo: .init(configuration))
+        underlyingInfo = RoomInfoProxy(roomInfo: .init(configuration))
     }
 }
 

diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -2048,11 +2048,27 @@ class AuthenticationClientBuilderMock: AuthenticationClientBuilderProtocol, @unc
     }
 }
 class BannedRoomProxyMock: BannedRoomProxyProtocol, @unchecked Sendable {
+    var infoCallsCount = 0
+    var infoCalled: Bool {
+        return infoCallsCount > 0
+    }
+
     var info: BaseRoomInfoProxyProtocol {
-        get { return underlyingInfo }
-        set(value) { underlyingInfo = value }
+        get async throws {
+            if let error = infoThrowableError {
+                throw error
+            }
+            infoCallsCount += 1
+            if let infoClosure = infoClosure {
+                return try await infoClosure()
+            } else {
+                return underlyingInfo
+            }
+        }
     }
     var underlyingInfo: BaseRoomInfoProxyProtocol!
+    var infoThrowableError: Error?
+    var infoClosure: (() async throws -> BaseRoomInfoProxyProtocol)?
     var id: String {
         get { return underlyingId }
         set(value) { underlyingId = value }

diff --git a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift
@@ -140,7 +140,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
                     }
             }
         case .banned(let bannedRoomProxy):
-            roomInfo = bannedRoomProxy.info
+            roomInfo = try? await bannedRoomProxy.info
         default:
             break
         }

diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -937,8 +937,8 @@ class ClientProxy: ClientProxyProtocol {
             case .left:
                 return .left
             case .banned:
-                return try await .banned(BannedRoomProxy(roomListItem: roomListItem,
-                                                         ownUserID: userID))
+                return .banned(BannedRoomProxy(roomListItem: roomListItem,
+                                               ownUserID: userID))
             }
         } catch {
             MXLog.error("Failed retrieving room: \(roomID), with error: \(error)")

diff --git a/ElementX/Sources/Services/Room/BannedRoomProxy.swift b/ElementX/Sources/Services/Room/BannedRoomProxy.swift
@@ -10,20 +10,31 @@ import MatrixRustSDK
 
 class BannedRoomProxy: BannedRoomProxyProtocol {
     private let roomListItem: RoomListItemProtocol
-    private let roomPreview: RoomPreviewProtocol
-    let info: BaseRoomInfoProxyProtocol
+    private var roomPreview: RoomPreviewProtocol {
+        get async throws {
+            try await roomPreviewTask.value
+        }
+    }
+
+    private var roomPreviewTask: Task<RoomPreviewProtocol, Error>
+
+    var info: BaseRoomInfoProxyProtocol {
+        get async throws {
+            try await RoomPreviewInfoProxy(roomPreviewInfo: roomPreview.info())
+        }
+    }
+
     let ownUserID: String
 
     // A room identifier is constant and lazy stops it from being fetched
     // multiple times over FFI
-    lazy var id = info.id
+    lazy var id = roomListItem.id()
 
     init(roomListItem: RoomListItemProtocol,
-         ownUserID: String) async throws {
+         ownUserID: String) {
         self.roomListItem = roomListItem
-        roomPreview = try await roomListItem.previewRoom(via: [])
         self.ownUserID = ownUserID
-        info = try RoomPreviewInfoProxy(roomPreviewInfo: roomPreview.info())
+        roomPreviewTask = Task { try await roomListItem.previewRoom(via: []) }
     }
 
     func forgetRoom() async -> Result<Void, RoomProxyError> {

diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@@ -47,7 +47,7 @@ protocol KnockedRoomProxyProtocol: RoomProxyProtocol {
 
 // sourcery: AutoMockable
 protocol BannedRoomProxyProtocol: RoomProxyProtocol {
-    var info: BaseRoomInfoProxyProtocol { get }
+    var info: BaseRoomInfoProxyProtocol { get async throws }
     func forgetRoom() async -> Result<Void, RoomProxyError>
 }