diff --git a/damus/ContentView.swift b/damus/ContentView.swift index e658ac09..90251585 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -613,21 +613,21 @@ struct ContentView: View { let relay_filters = RelayFilters(our_pubkey: pubkey) let bootstrap_relays = load_bootstrap_relays(pubkey: pubkey) - let new_relay_filters = load_relay_filters(pubkey) == nil - for relay in bootstrap_relays { - if let url = RelayURL(relay) { - let descriptor = RelayDescriptor(url: url, info: .rw) - add_new_relay(model_cache: model_cache, relay_filters: relay_filters, pool: pool, descriptor: descriptor, new_relay_filters: new_relay_filters) - } - } - - pool.register_handler(sub_id: sub_id, handler: home.handle_event) - // dumb stuff needed for property wrappers UserSettingsStore.pubkey = pubkey let settings = UserSettingsStore() UserSettingsStore.shared = settings + let new_relay_filters = load_relay_filters(pubkey) == nil + for relay in bootstrap_relays { + if let url = RelayURL(relay) { + let descriptor = RelayDescriptor(url: url, info: .rw) + add_new_relay(model_cache: model_cache, relay_filters: relay_filters, pool: pool, descriptor: descriptor, new_relay_filters: new_relay_filters, logging_enabled: settings.developer_mode) + } + } + + pool.register_handler(sub_id: sub_id, handler: home.handle_event) + if let nwc_str = settings.nostr_wallet_connect, let nwc = WalletConnectURL(str: nwc_str) { try? pool.add_relay(.nwc(url: nwc.relay)) diff --git a/damus/Models/HomeModel.swift b/damus/Models/HomeModel.swift index ecd44f48..4c416e02 100644 --- a/damus/Models/HomeModel.swift +++ b/damus/Models/HomeModel.swift @@ -857,7 +857,7 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) { if new.contains(d) { if let url = RelayURL(d) { let descriptor = RelayDescriptor(url: url, info: decoded[d] ?? .rw) - add_new_relay(model_cache: state.relay_model_cache, relay_filters: state.relay_filters, pool: state.pool, descriptor: descriptor, new_relay_filters: new_relay_filters) + add_new_relay(model_cache: state.relay_model_cache, relay_filters: state.relay_filters, pool: state.pool, descriptor: descriptor, new_relay_filters: new_relay_filters, logging_enabled: state.settings.developer_mode) } } else { state.pool.remove_relay(d) @@ -871,7 +871,7 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) { } } -func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, pool: RelayPool, descriptor: RelayDescriptor, new_relay_filters: Bool) { +func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, pool: RelayPool, descriptor: RelayDescriptor, new_relay_filters: Bool, logging_enabled: Bool) { try? pool.add_relay(descriptor) let url = descriptor.url @@ -888,7 +888,10 @@ func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, po await MainActor.run { let model = RelayModel(url, metadata: meta) model_cache.insert(model: model) - pool.setLog(model.log, for: relay_id) + + if logging_enabled { + pool.setLog(model.log, for: relay_id) + } // if this is the first time adding filters, we should filter non-paid relays if new_relay_filters && !meta.is_paid { diff --git a/damus/Views/Relays/RelayDetailView.swift b/damus/Views/Relays/RelayDetailView.swift index ebe4bd3a..7a52ee95 100644 --- a/damus/Views/Relays/RelayDetailView.swift +++ b/damus/Views/Relays/RelayDetailView.swift @@ -125,7 +125,7 @@ struct RelayDetailView: View { } } - if let log_contents = log.contents { + if state.settings.developer_mode, let log_contents = log.contents { Section("Log") { Text(log_contents) .font(.system(size: 13))