Move Relay configuration to its own section on the sidebar

Changelog-Changed: Moved relay config to its own sidebar entry

damus/Views/Relays/RecommendedRelayView.swift

@@ -0,0 +1,53 @@
+//
+//  RecommendedRelayView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-12-29.
+//
+
+import SwiftUI
+
+struct RecommendedRelayView: View {
+    let damus: DamusState
+    let relay: String
+    let add_button: Bool
+    
+    init(damus: DamusState, relay: String) {
+        self.damus = damus
+        self.relay = relay
+        self.add_button = true
+    }
+    
+    init(damus: DamusState, relay: String, add_button: Bool) {
+        self.damus = damus
+        self.relay = relay
+        self.add_button = add_button
+    }
+    
+    var body: some View {
+        HStack {
+            Text(relay)
+            Spacer()
+            if add_button {
+                if let privkey = damus.keypair.privkey {
+                    Button(NSLocalizedString("Add", comment: "Button to add recommended relay server.")) {
+                        guard let ev_before_add = damus.contacts.event else {
+                            return
+                        }
+                        guard let ev_after_add = add_relay(ev: ev_before_add, 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_after_add)
+                        damus.pool.send(.event(ev_after_add))
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct RecommendedRelayView_Previews: PreviewProvider {
+    static var previews: some View {
+        RecommendedRelayView(damus: test_damus_state(), relay: "wss://relay.damus.io")
+    }
+}

damus/Views/Relays/RelayConfigView.swift

@@ -0,0 +1,109 @@
+//
+//  RelayConfigView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-30.
+//
+
+import SwiftUI
+
+struct RelayConfigView: View {
+    let state: DamusState
+    @State var new_relay: String = ""
+    @State var show_add_relay: Bool = false
+    @State var relays: [RelayDescriptor]
+    
+    init(state: DamusState) {
+        self.state = state
+        _relays = State(initialValue: state.pool.descriptors)
+    }
+    
+    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 {
+        MainContent
+        .onReceive(handle_notify(.relays_changed)) { _ in
+            self.relays = state.pool.descriptors
+        }
+        .sheet(isPresented: $show_add_relay) {
+            AddRelayView(show_add_relay: $show_add_relay, relay: $new_relay) { m_relay in
+                guard var relay = m_relay else {
+                    return
+                }
+                
+                if relay.starts(with: "wss://") == false && relay.starts(with: "ws://") == false {
+                    relay = "wss://" + relay
+                }
+                
+                guard let url = URL(string: relay) else {
+                    return
+                }
+                
+                guard let ev = state.contacts.event else {
+                    return
+                }
+                
+                guard let privkey = state.keypair.privkey else {
+                    return
+                }
+                
+                let info = RelayInfo.rw
+                
+                guard (try? state.pool.add_relay(url, info: info)) != nil else {
+                    return
+                }
+                
+                state.pool.connect(to: [relay])
+                
+                guard let new_ev = add_relay(ev: ev, privkey: privkey, current_relays: state.pool.descriptors, relay: relay, info: info) else {
+                    return
+                }
+                
+                process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: ev)
+                
+                state.pool.send(.event(new_ev))
+            }
+        }
+    }
+    
+    var MainContent: some View {
+        Form {
+            Section {
+                List(Array(relays), id: \.url) { relay in
+                    RelayView(state: state, relay: relay.url.absoluteString)
+                }
+            } header: {
+                HStack {
+                    Text("Relays", comment: "Header text for relay server list for configuration.")
+                    Spacer()
+                    Button(action: { show_add_relay = true }) {
+                        Image(systemName: "plus")
+                            .foregroundColor(.accentColor)
+                    }
+                }
+            }
+            
+            if recommended.count > 0 {
+                Section(NSLocalizedString("Recommended Relays", comment: "Section title for recommend relay servers that could be added as part of configuration")) {
+                    List(recommended, id: \.url) { r in
+                        RecommendedRelayView(damus: state, relay: r.url.absoluteString)
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct RelayConfigView_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayConfigView(state: test_damus_state())
+    }
+}

damus/Views/Relays/RelayView.swift

@@ -0,0 +1,91 @@
+//
+//  RelayView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-10-16.
+//
+
+import SwiftUI
+
+struct RelayView: View {
+    let state: DamusState
+    let relay: String
+    
+    let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
+    @State var conn_color: Color = .gray
+    
+    func update_connection_color() {
+        for relay in state.pool.relays {
+            if relay.id == self.relay {
+                let c = relay.connection
+                if c.isConnected {
+                    conn_color = .green
+                } else if c.isConnecting || c.isReconnecting {
+                    conn_color = .yellow
+                } else {
+                    conn_color = .red
+                }
+            }
+        }
+    }
+    
+    var body: some View {
+        HStack {
+            Circle()
+                .frame(width: 8.0, height: 8.0)
+                .foregroundColor(conn_color)
+            Text(relay)
+        }
+        .onReceive(timer) { _ in
+            update_connection_color()
+        }
+        .onAppear() {
+            update_connection_color()
+        }
+        .swipeActions {
+            if let privkey = state.keypair.privkey {
+                RemoveAction(privkey: privkey)
+            }
+        }
+        .contextMenu {
+            CopyAction(relay: relay)
+            
+            if let privkey = state.keypair.privkey {
+                RemoveAction(privkey: privkey)
+            }
+        }
+    }
+    
+    func CopyAction(relay: String) -> some View {
+        Button {
+            UIPasteboard.general.setValue(relay, forPasteboardType: "public.plain-text")
+        } label: {
+            Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), systemImage: "doc.on.doc")
+        }
+    }
+    
+    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(NSLocalizedString("Delete", comment: "Button to delete a relay server that the user connects to."), systemImage: "trash")
+        }
+        .tint(.red)
+    }
+}
+
+struct RelayView_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayView(state: test_damus_state(), relay: "wss://relay.damus.io", conn_color: .red)
+    }
+}