Merge branch 'main' into feat/shuttle/hotspot

Satellite-im · Jan 17, 2025 · 54d13ce · 54d13ce
2 parents 225511d + aca31b5
commit 54d13ce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/extensions/warp-ipfs/Cargo.toml b/extensions/warp-ipfs/Cargo.toml
@@ -38,7 +38,7 @@ image = { workspace = true }
 derive_more.workspace = true
 mediatype.workspace = true
 
-async-rt = "0.1.3"
+async-rt = "0.1.4"
 
 bincode.workspace = true
 bytes.workspace = true

diff --git a/extensions/warp-ipfs/src/config.rs b/extensions/warp-ipfs/src/config.rs
@@ -76,12 +76,6 @@ impl Default for RelayClient {
             #[cfg(not(target_arch = "wasm32"))]
             relay_address: vec![
                 //NYC-1
-                "/ip4/146.190.184.59/tcp/4001/p2p/12D3KooWCHWLQXTR2N6ukWM99pZYc4TM82VS7eVaDE4Ryk8ked8h".parse().unwrap(),
-                "/ip4/146.190.184.59/udp/4001/quic-v1/p2p/12D3KooWCHWLQXTR2N6ukWM99pZYc4TM82VS7eVaDE4Ryk8ked8h".parse().unwrap(),
-                //SF-1
-                "/ip4/64.225.88.100/udp/4001/quic-v1/p2p/12D3KooWMfyuTCbehQYy68zPH6vpGUwg8raKbrS7pd3qZrG7bFuB".parse().unwrap(),
-                "/ip4/64.225.88.100/tcp/4001/p2p/12D3KooWMfyuTCbehQYy68zPH6vpGUwg8raKbrS7pd3qZrG7bFuB".parse().unwrap(),
-                //NYC-1-EXP
                 "/ip4/24.199.86.91/udp/46315/quic-v1/p2p/12D3KooWQcyxuNXxpiM7xyoXRZC7Vhfbh2yCtRg272CerbpFkhE6".parse().unwrap(),
                 "/ip4/24.199.86.91/tcp/46315/p2p/12D3KooWQcyxuNXxpiM7xyoXRZC7Vhfbh2yCtRg272CerbpFkhE6".parse().unwrap()
             ],

diff --git a/extensions/warp-ipfs/src/store/conversation.rs b/extensions/warp-ipfs/src/store/conversation.rs
@@ -273,8 +273,6 @@ impl ConversationDocument {
                         .iter()
                         .flat_map(|rec| rec.to_string().as_bytes().to_vec()),
                 )),
-                self.icon.map(|s| s.hash().digest().to_vec()),
-                self.banner.map(|s| s.hash().digest().to_vec()),
             ]
             .into_iter(),
             None,
@@ -313,8 +311,6 @@ impl ConversationDocument {
                             .iter()
                             .flat_map(|rec| rec.to_string().as_bytes().to_vec()),
                     )),
-                    self.icon.map(|s| s.hash().digest().to_vec()),
-                    self.banner.map(|s| s.hash().digest().to_vec()),
                 ]
                 .into_iter(),
                 None,