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

Enable default relays when location permission granted

Browse Source
This commit is contained in:
jack
2025-09-21 12:43:27 +02:00
parent f2c1bb2131
commit d1e5ce21a7
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Nostr/NostrRelayManager.swift
+23 -10
View File
@@ -41,6 +41,8 @@ final class NostrRelayManager: ObservableObject {
@Published private(set) var isConnected = false @Published private(set) var isConnected = false
private var allowDefaultRelays: Bool = false private var allowDefaultRelays: Bool = false
private var hasMutualFavorites: Bool = false
private var hasLocationPermission: Bool = false
private var connections: [String: URLSessionWebSocketTask] = [:] private var connections: [String: URLSessionWebSocketTask] = [:]
private var subscriptions: [String: Set<String>] = [:] // relay URL -> active subscription IDs private var subscriptions: [String: Set<String>] = [:] // relay URL -> active subscription IDs
private var pendingSubscriptions: [String: [String: String]] = [:] // relay URL -> (subscription id -> encoded REQ JSON) private var pendingSubscriptions: [String: [String: String]] = [:] // relay URL -> (subscription id -> encoded REQ JSON)
@@ -82,17 +84,27 @@ final class NostrRelayManager: ObservableObject {
private var connectionGeneration: Int = 0 private var connectionGeneration: Int = 0
init() { init() {
let hasMutual = !FavoritesPersistenceService.shared.mutualFavorites.isEmpty hasMutualFavorites = !FavoritesPersistenceService.shared.mutualFavorites.isEmpty
allowDefaultRelays = hasMutual hasLocationPermission = LocationChannelManager.shared.permissionState == .authorized
if hasMutual { applyDefaultRelayPolicy(force: true)
self.relays = Self.defaultRelays.map { Relay(url: $0) }
}
// Deterministic JSON shape for outbound requests // Deterministic JSON shape for outbound requests
self.encoder.outputFormatting = .sortedKeys self.encoder.outputFormatting = .sortedKeys
FavoritesPersistenceService.shared.$mutualFavorites FavoritesPersistenceService.shared.$mutualFavorites
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] favorites in .sink { [weak self] favorites in
self?.updateDefaultRelayPolicy(hasMutual: !favorites.isEmpty) guard let self = self else { return }
self.hasMutualFavorites = !favorites.isEmpty
self.applyDefaultRelayPolicy()
}
.store(in: &cancellables)
LocationChannelManager.shared.$permissionState
.receive(on: DispatchQueue.main)
.sink { [weak self] state in
guard let self = self else { return }
let authorized = (state == .authorized)
if authorized == self.hasLocationPermission { return }
self.hasLocationPermission = authorized
self.applyDefaultRelayPolicy()
} }
.store(in: &cancellables) .store(in: &cancellables)
} }
@@ -326,10 +338,11 @@ final class NostrRelayManager: ObservableObject {
} }
} }
private func updateDefaultRelayPolicy(hasMutual: Bool) { private func applyDefaultRelayPolicy(force: Bool = false) {
guard hasMutual != allowDefaultRelays else { return } let shouldAllow = hasMutualFavorites || hasLocationPermission
allowDefaultRelays = hasMutual if !force && shouldAllow == allowDefaultRelays { return }
if hasMutual { allowDefaultRelays = shouldAllow
if shouldAllow {
var existing = Set(relays.map { $0.url }) var existing = Set(relays.map { $0.url })
for url in Self.defaultRelays where !existing.contains(url) { for url in Self.defaultRelays where !existing.contains(url) {
relays.append(Relay(url: url)) relays.append(Relay(url: url))