Publish kind 10_002

[v0l]

This PR adds publishing for kind 10_002 (NIP-65), Apologies if i done something stupid, i'm not an iOS developer.

[jb55]

Thanks! Reviewed-by: William Casarin ***@***.***>

…

On Thu, Nov 30, 2023 at 11:11:16PM +0000, Kieran wrote: Closes: #1783 --- damus/Models/Contacts.swift | 14 ++++++++++++++ damus/Views/AddRelayView.swift | 3 +++ damus/Views/Relays/RecommendedRelayView.swift | 4 ++++ damus/Views/Relays/RelayDetailView.swift | 8 ++++++++ damus/Views/Relays/RelayView.swift | 4 ++++ 5 files changed, 33 insertions(+) diff --git a/damus/Models/Contacts.swift b/damus/Models/Contacts.swift index 7fea57960..5c1317800 100644 --- a/damus/Models/Contacts.swift +++ b/damus/Models/Contacts.swift @@ -217,6 +217,20 @@ func add_relay(ev: NostrEvent, keypair: FullKeypair, current_relays: [RelayDescr return NostrEvent(content: content, keypair: keypair.to_keypair(), kind: 3, tags: ev.tags.strings()) } +func make_relay_metadata(relays: [RelayDescriptor], keypair: FullKeypair) -> NostrEvent? { + let tags = relays.compactMap { r -> [String]? in + var tag = ["r", r.url.id] + if (r.info.read ?? true) != (r.info.write ?? true) { + tag += r.info.read == true ? ["read"] : ["write"] + } + if ((r.info.read ?? true) || (r.info.write ?? true)) && r.variant == .regular { + return tag; + } + return nil + } + return NostrEvent(content: "", keypair: keypair.to_keypair(), kind: 10_002, tags: tags) +} + func ensure_relay_info(relays: [RelayDescriptor], content: String) -> [RelayURL: RelayInfo] { return decode_json_relays(content) ?? make_contact_relays(relays) } diff --git a/damus/Views/AddRelayView.swift b/damus/Views/AddRelayView.swift index 65a693558..32b84d3b4 100644 --- a/damus/Views/AddRelayView.swift +++ b/damus/Views/AddRelayView.swift @@ -113,6 +113,9 @@ struct AddRelayView: View { state.pool.send(.event(new_ev)) + if let relay_metadata = make_relay_metadata(relays: state.pool.our_descriptors, keypair: keypair) { + state.postbox.send(relay_metadata) + } new_relay = "" UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil) diff --git a/damus/Views/Relays/RecommendedRelayView.swift b/damus/Views/Relays/RecommendedRelayView.swift index ba368c415..9f99ec2f6 100644 --- a/damus/Views/Relays/RecommendedRelayView.swift +++ b/damus/Views/Relays/RecommendedRelayView.swift @@ -124,6 +124,10 @@ struct RecommendedRelayView: View { } process_contact_event(state: damus, ev: ev_after_add) damus.postbox.send(ev_after_add) + + if let relay_metadata = make_relay_metadata(relays: damus.pool.our_descriptors, keypair: keypair) { + damus.postbox.send(relay_metadata) + } } } diff --git a/damus/Views/Relays/RelayDetailView.swift b/damus/Views/Relays/RelayDetailView.swift index 76ad0b9dc..522d76f49 100644 --- a/damus/Views/Relays/RelayDetailView.swift +++ b/damus/Views/Relays/RelayDetailView.swift @@ -55,6 +55,10 @@ struct RelayDetailView: View { process_contact_event(state: state, ev: new_ev) state.postbox.send(new_ev) + + if let relay_metadata = make_relay_metadata(relays: state.pool.our_descriptors, keypair: keypair) { + state.postbox.send(relay_metadata) + } dismiss() }) { Text("Disconnect From Relay", comment: "Button to disconnect from the relay.") @@ -78,6 +82,10 @@ struct RelayDetailView: View { } process_contact_event(state: state, ev: ev_after_add) state.postbox.send(ev_after_add) + + if let relay_metadata = make_relay_metadata(relays: state.pool.our_descriptors, keypair: keypair) { + state.postbox.send(relay_metadata) + } dismiss() }) { Text("Connect To Relay", comment: "Button to connect to the relay.") diff --git a/damus/Views/Relays/RelayView.swift b/damus/Views/Relays/RelayView.swift index 6116bb537..e6784adca 100644 --- a/damus/Views/Relays/RelayView.swift +++ b/damus/Views/Relays/RelayView.swift @@ -102,6 +102,10 @@ struct RelayView: View { process_contact_event(state: state, ev: new_ev) state.postbox.send(new_ev) + + if let relay_metadata = make_relay_metadata(relays: state.pool.our_descriptors, keypair: keypair) { + state.postbox.send(relay_metadata) + } }) { if showText { Text(NSLocalizedString("Disconnect", comment: "Button to disconnect from a relay server."))