Merge branch 'dev' into emoji_reply_fix

Satellite-im · Jan 29, 2024 · a8a3973 · a8a3973
2 parents 90d54b8 + 6f22f75
commit a8a3973
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/common/src/warp_runner/mod.rs b/common/src/warp_runner/mod.rs
@@ -351,9 +351,22 @@ impl From<&DiscoveryMode> for Discovery {
                 },
             },
             DiscoveryMode::Shuttle => {
-                let addresses = Vec::from_iter(["/ip4/104.236.194.35/tcp/34053/p2p/12D3KooWJSes8386p2T1sMeZ2DzsNJThKkZWbj4US6uPMpEgBTHu"
-                .parse()
-                .expect("valid addr")]);
+                let env_addrs = std::env::var("SHUTTLE_ADDR_POINT")
+                    .map(|val| {
+                        val.split(',')
+                            .filter_map(|addr_str| addr_str.parse::<_>().ok())
+                            .collect::<Vec<_>>()
+                    })
+                    .unwrap_or_default();
+
+                let addresses = match env_addrs.is_empty() {
+                    true => Vec::from_iter(["/ip4/104.236.194.35/tcp/34053/p2p/12D3KooWJSes8386p2T1sMeZ2DzsNJThKkZWbj4US6uPMpEgBTHu"
+                                .parse()
+                                .expect("valid addr")]),
+                    false => env_addrs
+                };
+
+                log::debug!("shuttle addresses: {:?}", addresses);
 
                 Discovery::Shuttle { addresses }
             }

diff --git a/icons/src/icons/outline/document-audio.svg b/icons/src/icons/outline/document-audio.svg