clean up subscriptions a little more

.cargo/config.toml

@@ -1,2 +1,5 @@
 [target.wasm32-unknown-unknown]
 runner = 'wasm-bindgen-test-runner'
+
+[alias]
+xtask = "run --package xtask --"

xmtp_cryptography/Cargo.toml

@@ -4,6 +4,9 @@ name = "xmtp_cryptography"
 rust-version = "1.70"
 version.workspace = true
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown", "aarch64-apple-darwin"]
+
 [dependencies]
 tracing.workspace = true
 curve25519-dalek = "4"

xmtp_id/Cargo.toml

@@ -3,6 +3,9 @@ edition = "2021"
 name = "xmtp_id"
 version.workspace = true
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown", "aarch64-apple-darwin"]
+
 [dependencies]
 url = { workspace = true, features = ["serde"] }
 async-trait.workspace = true

xmtp_mls/Cargo.toml

@@ -48,9 +48,9 @@ xmtp_id = { path = "../xmtp_id" }
 xmtp_proto = { workspace = true, features = ["convert"] }
 
 # Optional/Features
+xmtp_api_http = { path = "../xmtp_api_http", optional = true }
 toml = { version = "0.8.4", optional = true }
 tracing-wasm = { version = "0.2", optional = true }
-xmtp_api_http = { path = "../xmtp_api_http", optional = true }
 reqwest = { version = "0.12.4", features = ["stream"], optional = true }
 console_error_panic_hook = { version = "0.1", optional = true }
 

xmtp_mls/src/lib.rs

@@ -71,7 +71,7 @@ pub async fn sleep(duration: core::time::Duration) {
     tokio::time::sleep(duration).await
 }
 
-/// Turn the Result<T, E> into an `Option<T>`, logging the error with `tracing::error` and
+/// Turn the `Result<T, E>` into an `Option<T>`, logging the error with `tracing::error` and
 /// returning `None` if the value matches on Result::Err().
 /// Optionally pass a message as the second argument.
 #[macro_export]

xmtp_mls/src/subscriptions.rs

@@ -165,13 +165,7 @@ where
             let metadata =
                 crate::optify!(group.metadata(provider), "error processing group metadata");
             metadata
-                .filter(|m| {
-                    if &Some(m.conversation_type) == conversation_type {
-                        true
-                    } else {
-                        conversation_type.is_none()
-                    }
-                })
+                .filter(|m| conversation_type.map_or(true, |ct| ct == m.conversation_type))
                 .map(|_| group)
         };
 

xmtp_v2/Cargo.toml

@@ -8,12 +8,14 @@ version.workspace = true
 aes-gcm = "0.10.1"
 ecdsa = "0.15.1"
 generic-array = "0.14.6"
-# getrandom = { workspace = true, features = ["js"] }
 hex = { workspace = true }
 hkdf = "0.12.3"
 k256 = { version = "0.12.0", features = ["ecdh"] }
 rand = { workspace = true }
 sha2 = "0.10.6"
 sha3 = "0.10.6"
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { workspace = true, features = ["js"] }
+
 [dev-dependencies]