only show relay delete button next to account (advertised) relays

Author: ksedgwic

crates/notedeck/src/accounts.rs

@@ -633,6 +633,15 @@ impl Accounts {
         self.get_combined_relays(self.get_selected_account_data(), |_| true)
     }
 
+    // returns the active account's relays or empty set if there are none (no bootstrap)
+    pub fn get_advertised_relays(&self) -> BTreeSet<RelaySpec> {
+        if let Some(data) = self.get_selected_account_data() {
+            data.relay.advertised.lock().unwrap().clone()
+        } else {
+            BTreeSet::new()
+        }
+    }
+
     pub fn update(&mut self, subman: &mut SubMan, _ctx: &egui::Context) {
         // IMPORTANT - This function is called in the UI update loop,
         // make sure it is fast when idle

crates/notedeck_columns/src/ui/relay.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{BTreeSet, HashMap};
 
 use crate::colors::PINK;
 use crate::relay_pool_manager::{RelayPoolManager, RelayStatus};
@@ -69,6 +69,12 @@ impl<'a> RelayView<'a> {
 
     /// Show the current relays and return a relay the user selected to delete
     fn show_relays(&'a self, ui: &mut Ui) -> Option<String> {
+        let advertised_relays: BTreeSet<String> = self
+            .accounts
+            .get_advertised_relays()
+            .into_iter()
+            .map(|rs| rs.url)
+            .collect();
         let mut relay_to_remove = None;
         for (index, relay_info) in self.manager.get_relay_infos().iter().enumerate() {
             ui.add_space(8.0);
@@ -106,10 +112,13 @@ impl<'a> RelayView<'a> {
                         });
 
                         ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                            if ui.add(delete_button(ui.visuals().dark_mode)).clicked() {
-                                relay_to_remove = Some(relay_info.relay_url.to_string());
-                            };
-
+                            if advertised_relays.contains(relay_info.relay_url) {
+                                if ui.add(delete_button(ui.visuals().dark_mode)).clicked() {
+                                    relay_to_remove = Some(relay_info.relay_url.to_string());
+                                };
+                            } else {
+                                ui.add_space(16.0);
+                            }
                             show_connection_status(ui, relay_info.status);
                         });
                     });