diff options
Diffstat (limited to 'src/lib/client.rs')
| -rw-r--r-- | src/lib/client.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/lib/client.rs b/src/lib/client.rs index 455725c..59e17f2 100644 --- a/src/lib/client.rs +++ b/src/lib/client.rs | |||
| @@ -53,6 +53,7 @@ pub struct Client { | |||
| 53 | fallback_relays: Vec<String>, | 53 | fallback_relays: Vec<String>, |
| 54 | more_fallback_relays: Vec<String>, | 54 | more_fallback_relays: Vec<String>, |
| 55 | blaster_relays: Vec<String>, | 55 | blaster_relays: Vec<String>, |
| 56 | fallback_signer_relays: Vec<String>, | ||
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | #[cfg_attr(test, automock)] | 59 | #[cfg_attr(test, automock)] |
| @@ -66,6 +67,7 @@ pub trait Connect { | |||
| 66 | fn get_fallback_relays(&self) -> &Vec<String>; | 67 | fn get_fallback_relays(&self) -> &Vec<String>; |
| 67 | fn get_more_fallback_relays(&self) -> &Vec<String>; | 68 | fn get_more_fallback_relays(&self) -> &Vec<String>; |
| 68 | fn get_blaster_relays(&self) -> &Vec<String>; | 69 | fn get_blaster_relays(&self) -> &Vec<String>; |
| 70 | fn get_fallback_signer_relays(&self) -> &Vec<String>; | ||
| 69 | async fn send_event_to( | 71 | async fn send_event_to( |
| 70 | &self, | 72 | &self, |
| 71 | git_repo_path: &Path, | 73 | git_repo_path: &Path, |
| @@ -132,6 +134,13 @@ impl Connect for Client { | |||
| 132 | } else { | 134 | } else { |
| 133 | vec!["wss://nostr.mutinywallet.com".to_string()] | 135 | vec!["wss://nostr.mutinywallet.com".to_string()] |
| 134 | }; | 136 | }; |
| 137 | |||
| 138 | let fallback_signer_relays: Vec<String> = if std::env::var("NGITTEST").is_ok() { | ||
| 139 | vec!["ws://localhost:8051".to_string()] | ||
| 140 | } else { | ||
| 141 | vec!["wss://relay.nsec.app".to_string()] | ||
| 142 | }; | ||
| 143 | |||
| 135 | Client { | 144 | Client { |
| 136 | client: nostr_sdk::ClientBuilder::new() | 145 | client: nostr_sdk::ClientBuilder::new() |
| 137 | .opts(Options::new().relay_limits(RelayLimits::disable())) | 146 | .opts(Options::new().relay_limits(RelayLimits::disable())) |
| @@ -139,6 +148,7 @@ impl Connect for Client { | |||
| 139 | fallback_relays, | 148 | fallback_relays, |
| 140 | more_fallback_relays, | 149 | more_fallback_relays, |
| 141 | blaster_relays, | 150 | blaster_relays, |
| 151 | fallback_signer_relays, | ||
| 142 | } | 152 | } |
| 143 | } | 153 | } |
| 144 | fn new(opts: Params) -> Self { | 154 | fn new(opts: Params) -> Self { |
| @@ -153,6 +163,7 @@ impl Connect for Client { | |||
| 153 | fallback_relays: opts.fallback_relays, | 163 | fallback_relays: opts.fallback_relays, |
| 154 | more_fallback_relays: opts.more_fallback_relays, | 164 | more_fallback_relays: opts.more_fallback_relays, |
| 155 | blaster_relays: opts.blaster_relays, | 165 | blaster_relays: opts.blaster_relays, |
| 166 | fallback_signer_relays: opts.fallback_signer_relays, | ||
| 156 | } | 167 | } |
| 157 | } | 168 | } |
| 158 | 169 | ||
| @@ -198,6 +209,10 @@ impl Connect for Client { | |||
| 198 | &self.blaster_relays | 209 | &self.blaster_relays |
| 199 | } | 210 | } |
| 200 | 211 | ||
| 212 | fn get_fallback_signer_relays(&self) -> &Vec<String> { | ||
| 213 | &self.fallback_signer_relays | ||
| 214 | } | ||
| 215 | |||
| 201 | async fn send_event_to( | 216 | async fn send_event_to( |
| 202 | &self, | 217 | &self, |
| 203 | git_repo_path: &Path, | 218 | git_repo_path: &Path, |
| @@ -629,6 +644,7 @@ pub struct Params { | |||
| 629 | pub fallback_relays: Vec<String>, | 644 | pub fallback_relays: Vec<String>, |
| 630 | pub more_fallback_relays: Vec<String>, | 645 | pub more_fallback_relays: Vec<String>, |
| 631 | pub blaster_relays: Vec<String>, | 646 | pub blaster_relays: Vec<String>, |
| 647 | pub fallback_signer_relays: Vec<String>, | ||
| 632 | } | 648 | } |
| 633 | 649 | ||
| 634 | fn get_dedup_events(relay_results: Vec<Result<Vec<nostr::Event>>>) -> Vec<Event> { | 650 | fn get_dedup_events(relay_results: Vec<Result<Vec<nostr::Event>>>) -> Vec<Event> { |