4 files changed, 55 insertions, 50 deletions

diff --git a/src/client.rs b/src/client.rs
index ccd5cfb..3b18ad8 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -517,7 +517,13 @@ impl Connect for Client {
             fresh_profiles = HashSet::new();
 
             let relay = self.client.relay(&relay_url).await?;
-            let events: Vec<nostr::Event> = get_events_of(&relay, filters, &None).await?;
+            let events: Vec<nostr::Event> = get_events_of(&relay, filters.clone(), &None)
+                .await?
+                .iter()
+                // don't process events that don't match filters
+                .filter(|e| filters.iter().any(|f| f.match_event(e)))
+                .cloned()
+                .collect();
             // TODO: try reconcile
 
             process_fetched_events(
@@ -1363,3 +1369,26 @@ pub struct FetchRequest {
     profiles_to_fetch_from_user_relays: HashMap<PublicKey, (Timestamp, Timestamp)>,
     user_relays_for_profiles: HashSet<Url>,
 }
+
+pub async fn fetching_with_report(
+    git_repo_path: &Path,
+    #[cfg(test)] client: &crate::client::MockConnect,
+    #[cfg(not(test))] client: &Client,
+    repo_coordinates: &HashSet<Coordinate>,
+) -> Result<FetchReport> {
+    let term = console::Term::stderr();
+    term.write_line("fetching updates...")?;
+    let (relay_reports, progress_reporter) = client
+        .fetch_all(git_repo_path, repo_coordinates, &HashSet::new())
+        .await?;
+    if !relay_reports.iter().any(std::result::Result::is_err) {
+        let _ = progress_reporter.clear();
+    }
+    let report = consolidate_fetch_reports(relay_reports);
+    if report.to_string().is_empty() {
+        println!("no updates");
+    } else {
+        println!("updates: {report}");
+    }
+    Ok(report)
+}
diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index 9bc3201..3e1fd22 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -313,14 +313,14 @@ pub async fn get_repo_coordinates(
 }
 
 fn ask_for_naddr() -> Result<Coordinate> {
-    let mut prompt = "repository naddr";
     Ok(loop {
         if let Ok(c) = Coordinate::parse(
-            Interactor::default().input(PromptInputParms::default().with_prompt(prompt))?,
+            Interactor::default()
+                .input(PromptInputParms::default().with_prompt("repository naddr"))?,
         ) {
             break c;
         }
-        prompt = "repository valid naddr";
+        println!("not a valid naddr");
     })
 }
 
diff --git a/src/sub_commands/fetch.rs b/src/sub_commands/fetch.rs
index 28eb960..ab6e0fc 100644
--- a/src/sub_commands/fetch.rs
+++ b/src/sub_commands/fetch.rs
@@ -9,7 +9,7 @@ use crate::client::Client;
 #[cfg(test)]
 use crate::client::MockConnect;
 use crate::{
-    client::{consolidate_fetch_reports, Connect},
+    client::{fetching_with_report, Connect},
     git::{Repo, RepoActions},
     repo_ref::get_repo_coordinates,
     Cli,
@@ -38,16 +38,7 @@ pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
         }
         repo_coordinates
     };
-    println!("fetching updates...");
-    let (relay_reports, _) = client
-        .fetch_all(git_repo.get_path()?, &repo_coordinates, &HashSet::new())
-        .await?;
-    let report = consolidate_fetch_reports(relay_reports);
-    if report.to_string().is_empty() {
-        println!("no updates");
-    } else {
-        println!("updates: {report}");
-    }
+    fetching_with_report(git_repo.get_path()?, &client, &repo_coordinates).await?;
     client.disconnect().await?;
     Ok(())
 }
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index 410e119..a289def 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -1,4 +1,4 @@
-use std::{str::FromStr, time::Duration};
+use std::{path::Path, str::FromStr, time::Duration};
 
 use anyhow::{bail, Context, Result};
 use console::Style;
@@ -19,10 +19,12 @@ use crate::{
     cli_interactor::{
         Interactor, InteractorPrompt, PromptConfirmParms, PromptInputParms, PromptMultiChoiceParms,
     },
-    client::{sign_event, Connect},
+    client::{
+        fetching_with_report, get_events_from_cache, get_repo_ref_from_cache, sign_event, Connect,
+    },
     git::{Repo, RepoActions},
     login,
-    repo_ref::{self, RepoRef, REPO_REF_KIND},
+    repo_ref::{get_repo_coordinates, RepoRef, REPO_REF_KIND},
     Cli,
 };
 
@@ -49,6 +51,7 @@ pub struct SubCommandArgs {
 #[allow(clippy::too_many_lines)]
 pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
     let git_repo = Repo::discover().context("cannot find a git repository")?;
+    let git_repo_path = git_repo.get_path()?;
 
     let (main_branch_name, main_tip) = git_repo
         .get_main_or_master_branch()
@@ -59,13 +62,13 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
     #[cfg(test)]
     let mut client = <MockConnect as std::default::Default>::default();
 
-    let (root_proposal_id, mention_tags) = get_root_proposal_id_and_mentions_from_in_reply_to(
-        &client,
-        // TODO: user repo relays when when event cache is in place
-        client.get_fallback_relays(),
-        &args.in_reply_to,
-    )
-    .await?;
+    let repo_coordinates = get_repo_coordinates(&git_repo, &client).await?;
+
+    fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
+
+    let (root_proposal_id, mention_tags) =
+        get_root_proposal_id_and_mentions_from_in_reply_to(git_repo.get_path()?, &args.in_reply_to)
+            .await?;
 
     if let Some(root_ref) = args.in_reply_to.first() {
         if root_proposal_id.is_some() {
@@ -191,17 +194,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     client.set_signer(signer.clone()).await;
 
-    let repo_ref = repo_ref::fetch(
-        &git_repo,
-        git_repo
-            .get_root_commit()
-            .context("failed to get root commit of the repository")?
-            .to_string(),
-        &client,
-        user_ref.relays.write(),
-        true,
-    )
-    .await?;
+    let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
 
     // oldest first
     commits.reverse();
@@ -520,9 +513,7 @@ fn summarise_commit_for_selection(git_repo: &Repo, commit: &Sha1Hash) -> Result<
 }
 
 async fn get_root_proposal_id_and_mentions_from_in_reply_to(
-    #[cfg(test)] client: &crate::client::MockConnect,
-    #[cfg(not(test))] client: &Client,
-    repo_relays: &[String],
+    git_repo_path: &Path,
     in_reply_to: &[String],
 ) -> Result<(Option<String>, Vec<nostr::Tag>)> {
     let root_proposal_id = if let Some(first) = in_reply_to.first() {
@@ -535,13 +526,10 @@ async fn get_root_proposal_id_and_mentions_from_in_reply_to(
                 marker: _,
                 public_key: _,
             }) => {
-                let events = client
-                    .get_events(
-                        repo_relays.to_vec(),
-                        vec![nostr::Filter::new().id(*event_id)],
-                    )
-                    .await
-                    .context("whilst getting events specified in --in-reply-to")?;
+                let events =
+                    get_events_from_cache(git_repo_path, vec![nostr::Filter::new().id(*event_id)])
+                        .await?;
+
                 if let Some(first) = events.iter().find(|e| e.id.eq(event_id)) {
                     if event_is_patch_set_root(first) {
                         Some(event_id.to_string())
@@ -549,10 +537,7 @@ async fn get_root_proposal_id_and_mentions_from_in_reply_to(
                         None
                     }
                 } else {
-                    bail!(
-                        "cannot find first event specified in --in-reply-to \"{}\"",
-                        first,
-                    )
+                    None
                 }
             }
             _ => None,