permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-26 17:25:22 +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
+9 -20
View File
@@ -194,28 +194,21 @@ 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 {
self?.messageRouter = MessageRouter(
meshService: meshService, meshService: meshService,
nostrRelay: nostrRelayManager 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 {
peerManager.$peers
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] peers in .sink { [weak self] peers in
SecureLogger.log("📱 UI: Received \(peers.count) peers from PeerManager", SecureLogger.log("📱 UI: Received \(peers.count) peers from PeerManager",
@@ -228,7 +221,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
self?.allPeers = peers self?.allPeers = peers
// Update peer index for O(1) lookups // Update peer index for O(1) lookups
// Deduplicate peers by ID to prevent crash from duplicate keys // Deduplicate peers by ID to prevent crash from duplicate keys
var uniquePeers: [String: BitchatPeer] = [:] var uniquePeers: [String: PeerData] = [:]
for peer in peers { for peer in peers {
// Keep the first occurrence of each peer ID // Keep the first occurrence of each peer ID
if uniquePeers[peer.id] == nil { if uniquePeers[peer.id] == nil {
@@ -250,10 +243,6 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
} }
} }
.store(in: &cancellables) .store(in: &cancellables)
self?.cancellables = cancellables
}
}
}
} }
// Set up Noise encryption callbacks // Set up Noise encryption callbacks