fix(init): improve git server explaination

and move it below maintainers input

1 files changed, 70 insertions, 45 deletions

diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index d0b4b6d..0f6a77c 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -164,50 +164,6 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         )?,
     };
 
-    let git_server = if args.clone_url.is_empty() {
-        Interactor::default()
-            .input(
-                PromptInputParms::default()
-                    .with_prompt("clone url (for fetch)")
-                    .with_default(if let Some(repo_ref) = &repo_ref {
-                        repo_ref.git_server.clone().join(" ")
-                    } else if let Ok(url) = git_repo.get_origin_url() {
-                        if let Ok(fetch_url) = convert_clone_url_to_https(&url) {
-                            fetch_url
-                        } else {
-                            // local repo or custom protocol
-                            url
-                        }
-                    } else {
-                        String::new()
-                    }),
-            )?
-            .split(' ')
-            .map(std::string::ToString::to_string)
-            .collect()
-    } else {
-        args.clone_url.clone()
-    };
-
-    let web: Vec<String> = if args.web.is_empty() {
-        Interactor::default()
-            .input(
-                PromptInputParms::default()
-                    .with_prompt("web")
-                    .optional()
-                    .with_default(if let Some(repo_ref) = &repo_ref {
-                        repo_ref.web.clone().join(" ")
-                    } else {
-                        format!("https://gitworkshop.dev/repo/{}", &identifier)
-                    }),
-            )?
-            .split(' ')
-            .map(std::string::ToString::to_string)
-            .collect()
-    } else {
-        args.web.clone()
-    };
-
     let maintainers: Vec<PublicKey> = {
         let mut dont_ask = !args.other_maintainers.is_empty();
         let mut maintainers_string = if !args.other_maintainers.is_empty() {
@@ -309,6 +265,72 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         }
     };
 
+    let no_state = if let Ok(Some(s)) = git_repo.get_git_config_item("nostr.nostate", None) {
+        s == "true"
+    } else {
+        false
+    };
+    if no_state {
+        println!(
+            "you have opted out of storing git state on nostr, so a git server must be used for the state of authoritative branches, tags and related git objects."
+        );
+    } else {
+        println!(
+            "your repository state will be stored on nostr, but a git server is still required to store the git objects associated with this state."
+        );
+    }
+    println!(
+        "you can change this git server at any time and even configure multiple servers for redundancy. In this case, the git plugin will push to all of them when using the nostr remote."
+    );
+    println!("only maintainers need write access as PRs are sent over nostr.");
+    println!(
+        "a lightweight git server implementation for use with nostr, requiring no signup, is in development. several providers have shown interest in hosting it. for now use github, codeberg, or self-hosted song, forge, etc."
+    );
+
+    let git_server = if args.clone_url.is_empty() {
+        Interactor::default()
+            .input(
+                PromptInputParms::default()
+                    .with_prompt("git server remote url(s) (space seperated)")
+                    .with_default(if let Some(repo_ref) = &repo_ref {
+                        repo_ref.git_server.clone().join(" ")
+                    } else if let Ok(url) = git_repo.get_origin_url() {
+                        if let Ok(fetch_url) = convert_clone_url_to_https(&url) {
+                            fetch_url
+                        } else {
+                            // local repo or custom protocol
+                            url
+                        }
+                    } else {
+                        String::new()
+                    }),
+            )?
+            .split(' ')
+            .map(std::string::ToString::to_string)
+            .collect()
+    } else {
+        args.clone_url.clone()
+    };
+
+    let web: Vec<String> = if args.web.is_empty() {
+        Interactor::default()
+            .input(
+                PromptInputParms::default()
+                    .with_prompt("repo website")
+                    .optional()
+                    .with_default(if let Some(repo_ref) = &repo_ref {
+                        repo_ref.web.clone().join(" ")
+                    } else {
+                        format!("https://gitworkshop.dev/repo/{}", &identifier)
+                    }),
+            )?
+            .split(' ')
+            .map(std::string::ToString::to_string)
+            .collect()
+    } else {
+        args.web.clone()
+    };
+
     // TODO: check if relays are free to post to so contributors can submit patches
     // TODO: recommend some reliable free ones
     let relays: Vec<String> = if args.relays.is_empty() {
@@ -331,6 +353,9 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
         args.relays.clone()
     };
 
+    println!(
+        "the earliest unique commit helps with discoverability. It defaults to the root commit. Only change this if your repo has completely forked off an has formed its own identity."
+    );
     let earliest_unique_commit = match &args.earliest_unique_commit {
         Some(t) => t.clone(),
         None => {
@@ -342,7 +367,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             loop {
                 earliest_unique_commit = Interactor::default().input(
                     PromptInputParms::default()
-                        .with_prompt("earliest unique commit")
+                        .with_prompt("earliest unique commit (to help with discoverability)")
                         .with_default(earliest_unique_commit.clone()),
                 )?;
                 if let Ok(exists) = git_repo.does_commit_exist(&earliest_unique_commit) {