From d1283a6b55826175423bd382a859928e0f92ffe7 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 22 Jul 2025 13:47:28 +0100 Subject: fix: remove blossom from grasp server detection a grasp server doesnt need to appear in repo announcement event `blossoms` tag as blossom has been removed from the grasp spec --- src/lib/repo_ref.rs | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'src/lib') diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs index 0236e34..bca4a3b 100644 --- a/src/lib/repo_ref.rs +++ b/src/lib/repo_ref.rs @@ -309,7 +309,7 @@ impl RepoRef { } pub fn grasp_servers(&self) -> Vec { - detect_existing_grasp_servers(Some(self), &[], &[], &[], &self.identifier) + detect_existing_grasp_servers(Some(self), &[], &[], &self.identifier) } } @@ -593,7 +593,6 @@ pub fn detect_existing_grasp_servers( repo_ref: Option<&RepoRef>, args_relays: &[String], args_clone_url: &[String], - args_blossoms: &[String], identifier: &str, ) -> Vec { // Collect clone URLs from arguments or repo_ref @@ -617,18 +616,6 @@ pub fn detect_existing_grasp_servers( Vec::new() }; - // Collect blossom server URLs from arguments or repo_ref - let blossoms: Vec = if !args_blossoms.is_empty() { - args_blossoms - .iter() - .filter_map(|r| Url::parse(r).ok()) - .collect() - } else if let Some(repo) = repo_ref { - repo.blossoms.clone() - } else { - Vec::new() - }; - let mut existing_grasp_servers = Vec::new(); for url in &clone_urls { let Ok(formatted_as_grasp_server_url) = normalize_grasp_server_url(url) else { @@ -655,14 +642,6 @@ pub fn detect_existing_grasp_servers( continue; } - let matches_blossoms = blossoms.iter().any(|r| { - normalize_grasp_server_url(r.as_str()) - .is_ok_and(|r| r.eq(&formatted_as_grasp_server_url)) - }); - if !matches_blossoms { - continue; - } - existing_grasp_servers.push(formatted_as_grasp_server_url); } existing_grasp_servers -- cgit v1.2.3