tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only show the relay log in developer mode

Browse Source 
Signed-off-by: Bryan Montz <bryanmontz@me.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Bryan Montz
2023-07-09 08:45:40 -05:00
committed by William Casarin
parent 2d9f7128ee
commit faaa3e3bd9
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
damus/ContentView.swift
View File

@@ -613,21 +613,21 @@ struct ContentView: View {
let relay_filters = RelayFilters(our_pubkey: pubkey) let relay_filters = RelayFilters(our_pubkey: pubkey)
let bootstrap_relays = load_bootstrap_relays(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 // dumb stuff needed for property wrappers
UserSettingsStore.pubkey = pubkey UserSettingsStore.pubkey = pubkey
let settings = UserSettingsStore() let settings = UserSettingsStore()
UserSettingsStore.shared = settings 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, if let nwc_str = settings.nostr_wallet_connect,
let nwc = WalletConnectURL(str: nwc_str) { let nwc = WalletConnectURL(str: nwc_str) {
try? pool.add_relay(.nwc(url: nwc.relay)) try? pool.add_relay(.nwc(url: nwc.relay))

7
damus/Models/HomeModel.swift
View File

@@ -857,7 +857,7 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
if new.contains(d) { if new.contains(d) {
if let url = RelayURL(d) { if let url = RelayURL(d) {
let descriptor = RelayDescriptor(url: url, info: decoded[d] ?? .rw) 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 { } else {
state.pool.remove_relay(d) 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) try? pool.add_relay(descriptor)
let url = descriptor.url let url = descriptor.url
@@ -888,7 +888,10 @@ func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, po
await MainActor.run { await MainActor.run {
let model = RelayModel(url, metadata: meta) let model = RelayModel(url, metadata: meta)
model_cache.insert(model: model) model_cache.insert(model: model)
if logging_enabled {
pool.setLog(model.log, for: relay_id) pool.setLog(model.log, for: relay_id)
}
// if this is the first time adding filters, we should filter non-paid relays // if this is the first time adding filters, we should filter non-paid relays
if new_relay_filters && !meta.is_paid { if new_relay_filters && !meta.is_paid {

2
damus/Views/Relays/RelayDetailView.swift
View File

@@ -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") { Section("Log") {
Text(log_contents) Text(log_contents)
.font(.system(size: 13)) .font(.system(size: 13))