Merge branch 'add-PR-feature-to-remote'

1 files changed, 4 insertions, 12 deletions

diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 1242e45..eaaf83d 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -229,7 +229,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
                 .map(std::string::ToString::to_string)
                 .collect::<Vec<String>>()
         } else {
-            client.get_fallback_relays().clone()
+            client.get_relay_default_set().clone()
         }
     } else {
         args.relays.clone()
@@ -252,14 +252,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         args.blossoms.clone()
     };
 
-    let fallback_grasp_servers =
-        if let Ok(Some(s)) = git_repo.get_git_config_item("nostr.grasp-default-set", None) {
-            s.split(';')
-                .filter_map(|url| normalize_grasp_server_url(url).ok()) // Attempt to parse and filter out errors
-                .collect()
-        } else {
-            vec!["relay.ngit.dev".to_string(), "gitnostr.com".to_string()]
-        };
+    let fallback_grasp_servers = client.get_grasp_default_set();
 
     let selected_grasp_servers = if has_server_and_relay_flags {
         // ignore so a script running `ngit init` can contiue without prompts
@@ -269,14 +262,13 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             repo_ref.as_ref(),
             &args.relays,
             &args.clone_url,
-            &args.blossoms,
             &identifier,
         );
         let mut selections: Vec<bool> = vec![true; options.len()]; // Initialize selections based on existing options
         let empty = options.is_empty();
         for fallback in fallback_grasp_servers {
             // Check if any option contains the fallback as a substring
-            if !options.iter().any(|option| option.contains(&fallback)) {
+            if !options.iter().any(|option| option.contains(fallback)) {
                 options.push(fallback.clone()); // Add fallback if not found
                 selections.push(empty); // mark as selected if no existing ngit relay otherwise not
             }
@@ -464,7 +456,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             let mut selections: Vec<bool> = vec![true; options.len()];
 
             // add fallback relays as options
-            for relay in client.get_fallback_relays().clone() {
+            for relay in client.get_relay_default_set().clone() {
                 if !options.iter().any(|r| r.contains(&relay))
                     && !formatted_selected_grasp_servers
                         .iter()