diff --git a/Sources/Shared/XMPP/LumaRoomStore.swift b/Sources/Shared/XMPP/LumaRoomStore.swift index 73dc6d6..79a9882 100644 --- a/Sources/Shared/XMPP/LumaRoomStore.swift +++ b/Sources/Shared/XMPP/LumaRoomStore.swift @@ -1,20 +1,22 @@ import Foundation import Martin +/// Martin 3.2.4 does not expose `DefaultRoomStore.init()` outside its module. +/// This mirrors its in-memory behavior so the app can register XEP-0045 MUC. final class LumaRoomStore: RoomStore { typealias Room = RoomBase - private let dispatcher = QueueDispatcher(label: "LumaRoomStore") + private let queue = DispatchQueue(label: "LumaRoomStore") private var roomsByJID: [BareJID: RoomBase] = [:] func rooms(for context: Context) -> [RoomBase] { - dispatcher.sync { + queue.sync { Array(roomsByJID.values) } } func room(for context: Context, with jid: BareJID) -> RoomBase? { - dispatcher.sync { + queue.sync { roomsByJID[jid] } } @@ -25,7 +27,7 @@ final class LumaRoomStore: RoomStore { nickname: String, password: String? ) -> ConversationCreateResult { - dispatcher.sync { + queue.sync { if let room = roomsByJID[jid] { return .found(room) } @@ -34,7 +36,7 @@ final class LumaRoomStore: RoomStore { jid: jid, nickname: nickname, password: password, - dispatcher: dispatcher + dispatcher: QueueDispatcher(queue: queue) ) roomsByJID[jid] = room return .created(room) @@ -42,7 +44,7 @@ final class LumaRoomStore: RoomStore { } func close(room: RoomBase) -> Bool { - dispatcher.sync { + queue.sync { guard roomsByJID[room.jid] === room else { return false } roomsByJID.removeValue(forKey: room.jid) return true