permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-26 19:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix compilation errors in ChatViewModel"

Browse Source 
This reverts commit e2d50e3684.
This commit is contained in:
jack
2025-08-01 20:26:28 +02:00
parent e2d50e3684
commit 172b06721b
1 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/ChatViewModel.swift
+43 -54
View File
@@ -194,66 +194,55 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
MessageRetryService.shared.meshService = meshService MessageRetryService.shared.meshService = meshService
// Initialize Nostr services // Initialize Nostr services
Task { [weak self] in Task { @MainActor in
await MainActor.run { nostrRelayManager = NostrRelayManager.shared
self?.nostrRelayManager = NostrRelayManager.shared nostrRelayManager?.connect()
self?.nostrRelayManager?.connect()
if let meshService = self?.meshService, messageRouter = MessageRouter(
let nostrRelayManager = self?.nostrRelayManager { meshService: meshService,
self?.messageRouter = MessageRouter( nostrRelay: nostrRelayManager!
meshService: meshService, )
nostrRelay: nostrRelayManager
)
}
// Initialize peer manager // Initialize peer manager
if let meshService = self?.meshService { peerManager = PeerManager(meshService: meshService)
self?.peerManager = PeerManager(meshService: meshService) peerManager?.updatePeers()
self?.peerManager?.updatePeers()
// Bind peer manager's peer list to our published property // Bind peer manager's peer list to our published property
if let peerManager = self?.peerManager, peerManager?.$peers
var cancellables = self?.cancellables { .receive(on: DispatchQueue.main)
peerManager.$peers .sink { [weak self] peers in
.receive(on: DispatchQueue.main) SecureLogger.log("📱 UI: Received \(peers.count) peers from PeerManager",
.sink { [weak self] peers in category: SecureLogger.session, level: .info)
SecureLogger.log("📱 UI: Received \(peers.count) peers from PeerManager", for peer in peers {
category: SecureLogger.session, level: .info) SecureLogger.log(" - \(peer.displayName): connected=\(peer.isConnected), state=\(peer.connectionState)",
for peer in peers { category: SecureLogger.session, level: .debug)
SecureLogger.log(" - \(peer.displayName): connected=\(peer.isConnected), state=\(peer.connectionState)", }
category: SecureLogger.session, level: .debug) // Update peers directly
} self?.allPeers = peers
// Update peers directly // Update peer index for O(1) lookups
self?.allPeers = peers // Deduplicate peers by ID to prevent crash from duplicate keys
// Update peer index for O(1) lookups var uniquePeers: [String: PeerData] = [:]
// Deduplicate peers by ID to prevent crash from duplicate keys for peer in peers {
var uniquePeers: [String: BitchatPeer] = [:] // Keep the first occurrence of each peer ID
for peer in peers { if uniquePeers[peer.id] == nil {
// Keep the first occurrence of each peer ID uniquePeers[peer.id] = peer
if uniquePeers[peer.id] == nil { } else {
uniquePeers[peer.id] = peer SecureLogger.log("⚠️ Duplicate peer ID detected: \(peer.id) (\(peer.displayName))",
} else { category: SecureLogger.session, level: .warning)
SecureLogger.log("⚠️ Duplicate peer ID detected: \(peer.id) (\(peer.displayName))", }
category: SecureLogger.session, level: .warning) }
} self?.peerIndex = uniquePeers
} // Schedule UI update if peers changed
self?.peerIndex = uniquePeers if peers.count > 0 || self?.allPeers.count ?? 0 > 0 {
// Schedule UI update if peers changed // UI will update automatically
if peers.count > 0 || self?.allPeers.count ?? 0 > 0 { }
// UI will update automatically
}
// Update private chat peer ID if needed when peers change // Update private chat peer ID if needed when peers change
if self?.selectedPrivateChatFingerprint != nil { if self?.selectedPrivateChatFingerprint != nil {
self?.updatePrivateChatPeerIfNeeded() self?.updatePrivateChatPeerIfNeeded()
}
}
.store(in: &cancellables)
self?.cancellables = cancellables
} }
} }
} .store(in: &cancellables)
} }
// Set up Noise encryption callbacks // Set up Noise encryption callbacks