diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-20 20:26:31 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-20 21:21:49 +0000 |
| commit | 724e02ac8c538e9dfe4faa072082fad301e49b10 (patch) | |
| tree | a0ebaf0039eef54f071ca3c4bfea790c7e7839e5 /src/bin/ngit/sub_commands/init.rs | |
| parent | 64747526c9f6ab43f9dac461d056bb42992573b4 (diff) | |
drop default relays from announcement events
ngit init and accept_maintainership_with_defaults no longer seed relay
lists from the client default set. The relay list in a Kind:30617
announcement now contains only grasp-server-derived relay URLs; no
additional public relays are suggested or added automatically.
Diffstat (limited to 'src/bin/ngit/sub_commands/init.rs')
| -rw-r--r-- | src/bin/ngit/sub_commands/init.rs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs index d24a41e..1b3bf28 100644 --- a/src/bin/ngit/sub_commands/init.rs +++ b/src/bin/ngit/sub_commands/init.rs | |||
| @@ -729,13 +729,9 @@ fn resolve_fields( | |||
| 729 | .filter(|r| !is_grasp_derived_relay(r, &my_existing_grasp_servers)) | 729 | .filter(|r| !is_grasp_derived_relay(r, &my_existing_grasp_servers)) |
| 730 | .collect() | 730 | .collect() |
| 731 | } else if let Ok(config) = repo_config_result { | 731 | } else if let Ok(config) = repo_config_result { |
| 732 | if config.relays.is_empty() { | 732 | config.relays.clone() |
| 733 | client.get_relay_default_set().clone() | ||
| 734 | } else { | ||
| 735 | config.relays.clone() | ||
| 736 | } | ||
| 737 | } else { | 733 | } else { |
| 738 | client.get_relay_default_set().clone() | 734 | vec![] |
| 739 | }; | 735 | }; |
| 740 | 736 | ||
| 741 | let mut git_servers = if args.clone.is_empty() { | 737 | let mut git_servers = if args.clone.is_empty() { |
| @@ -795,20 +791,12 @@ fn resolve_fields( | |||
| 795 | .iter() | 791 | .iter() |
| 796 | .filter_map(|r| format_grasp_server_url_as_relay_url(r).ok()) | 792 | .filter_map(|r| format_grasp_server_url_as_relay_url(r).ok()) |
| 797 | .collect(); | 793 | .collect(); |
| 798 | let mut options: Vec<String> = relay_strings | 794 | let options: Vec<String> = relay_strings |
| 799 | .iter() | 795 | .iter() |
| 800 | .filter(|s| !grasp_relay_urls.iter().any(|r| s.as_str() == r)) | 796 | .filter(|s| !grasp_relay_urls.iter().any(|r| s.as_str() == r)) |
| 801 | .cloned() | 797 | .cloned() |
| 802 | .collect(); | 798 | .collect(); |
| 803 | let mut selections: Vec<bool> = vec![true; options.len()]; | 799 | let selections: Vec<bool> = vec![true; options.len()]; |
| 804 | for relay in client.get_relay_default_set().clone() { | ||
| 805 | if !options.iter().any(|r| r.contains(&relay)) | ||
| 806 | && !grasp_relay_urls.iter().any(|r| relay.contains(r)) | ||
| 807 | { | ||
| 808 | options.push(relay); | ||
| 809 | selections.push(selections.is_empty()); | ||
| 810 | } | ||
| 811 | } | ||
| 812 | let selected = multi_select_with_custom_value( | 800 | let selected = multi_select_with_custom_value( |
| 813 | "additional nostr relays on top of nostr-relays - 1 or 2 public relays are reccomended", | 801 | "additional nostr relays on top of nostr-relays - 1 or 2 public relays are reccomended", |
| 814 | "nostr relay", | 802 | "nostr relay", |