Recommended relay view

Changelog-Changed: Show recommended relays in config. Currently just a fixed set.

damus/Views/ConfigView.swift

@@ -18,11 +18,14 @@ struct ConfigView: View {
     @State var privkey_copied: Bool = false
     @State var pubkey_copied: Bool = false
     
+    @State var relays: [RelayDescriptor]
+    
     let generator = UIImpactFeedbackGenerator(style: .light)
     
     init(state: DamusState) {
         self.state = state
         _privkey = State(initialValue: self.state.keypair.privkey_bech32 ?? "")
+        _relays = State(initialValue: state.pool.descriptors)
     }
     
     // TODO: (jb55) could be more general but not gonna worry about it atm
@@ -38,12 +41,28 @@ struct ConfigView: View {
         }
     }
     
+    var recommended: [RelayDescriptor] {
+        let rs: [RelayDescriptor] = []
+        return BOOTSTRAP_RELAYS.reduce(into: rs) { (xs, x) in
+            if let _ = state.pool.get_relay(x) {
+            } else {
+                xs.append(RelayDescriptor(url: URL(string: x)!, info: .rw))
+            }
+        }
+    }
+    
     var body: some View {
         ZStack(alignment: .leading) {
             Form {
                 Section("Relays") {
-                    List(Array(state.pool.relays), id: \.descriptor.url) { relay in
-                        RelayView(state: state, relay: relay.descriptor.url.absoluteString)
+                    List(Array(relays), id: \.url) { relay in
+                        RelayView(state: state, relay: relay.url.absoluteString)
+                    }
+                }
+                
+                Section("Recommended Relays") {
+                    List(recommended, id: \.url) { r in
+                        RecommendedRelayView(damus: state, relay: r.url.absoluteString)
                     }
                 }
                 
@@ -133,17 +152,21 @@ struct ConfigView: View {
                 
                 state.pool.connect(to: [new_relay])
                 
-                guard let new_ev = add_relay(ev: ev, privkey: privkey, relay: new_relay, info: info) else {
+                guard let new_ev = add_relay(ev: ev, privkey: privkey, current_relays: state.pool.descriptors, relay: new_relay, info: info) else {
                     return
                 }
                 
-                state.contacts.event = new_ev
+                process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: ev)
+                
                 state.pool.send(.event(new_ev))
             }
         }
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }
+        .onReceive(handle_notify(.relays_changed)) { _ in
+            self.relays = state.pool.descriptors
+        }
     }
 }
 

damus/Views/RecommendedRelayView.swift

@@ -0,0 +1,37 @@
+//
+//  RecommendedRelayView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-12-29.
+//
+
+import SwiftUI
+
+struct RecommendedRelayView: View {
+    let damus: DamusState
+    let relay: String
+    
+    var body: some View {
+        HStack {
+            Text(relay)
+            Spacer()
+            if let ev = damus.contacts.event {
+                if let privkey = damus.keypair.privkey {
+                    Button("Add") {
+                        guard let ev = add_relay(ev: ev, privkey: privkey, current_relays: damus.pool.descriptors, relay: relay, info: .rw) else {
+                            return
+                        }
+                        process_contact_event(pool: damus.pool, contacts: damus.contacts, pubkey: damus.pubkey, ev: ev)
+                        damus.pool.send(.event(ev))
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct RecommendedRelayView_Previews: PreviewProvider {
+    static var previews: some View {
+        RecommendedRelayView(damus: test_damus_state(), relay: "wss://relay.damus.io")
+    }
+}

damus/Views/RelayView.swift

@@ -44,26 +44,39 @@ struct RelayView: View {
         }
         .swipeActions {
             if let privkey = state.keypair.privkey {
-                Button {
-                    guard let ev = state.contacts.event else {
-                        return
-                    }
-                    
-                    let descriptors = state.pool.descriptors
-                    guard let new_ev = remove_relay( ev: ev, current_relays: descriptors, privkey: privkey, relay: relay) else {
-                        return
-                    }
-                    
-                    state.contacts.event = new_ev
-                    state.pool.send(.event(new_ev))
-                } label: {
-                    Label("Delete", systemImage: "trash")
-                }
-                .tint(.red)
+                RemoveAction(privkey: privkey)
+            }
+        }
+        .contextMenu {
+            if let privkey = state.keypair.privkey {
+                RemoveAction(privkey: privkey)
             }
         }
     }
     
+    func RemoveAction(privkey: String) -> some View {
+        Button {
+            guard let ev = state.contacts.event else {
+                return
+            }
+            
+            let descriptors = state.pool.descriptors
+            guard let new_ev = remove_relay( ev: ev, current_relays: descriptors, privkey: privkey, relay: relay) else {
+                return
+            }
+            
+            process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: new_ev)
+            state.pool.send(.event(new_ev))
+        } label: {
+            Label("Delete", systemImage: "trash")
+        }
+        .tint(.red)
+    }
+    
+}
+
+fileprivate func remove_action() {
+    
 }
 
 struct RelayView_Previews: PreviewProvider {