Should push follow ups (#1722)

* another wasm bump

* update protos

* mark cargo clippy happy

* read should push from queryable content

* fix typo; formatting

* add some logging

* more debug log

* Revert "more debug log"

This reverts commit b8687aa.

* Revert "add some logging"

This reverts commit 5c107f4.

---------

Co-authored-by: cameronvoell <cameronvoell@users.noreply.github.com>

Author: nplasterer

bindings_node/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @xmtp/node-bindings
 
+## 0.0.41
+
+- Fix `should_push` field on messages for push notifications
+
 ## 0.0.40
 
 - Fixed Rust Panic Error on Streams

bindings_node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/node-bindings",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "repository": {
     "type": "git",
     "url": "git+https://git@github.com/xmtp/libxmtp.git",

bindings_wasm/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @xmtp/wasm-bindings
 
+## 0.0.21
+
+- Fix `should_push` field on messages for push notifications
+
 ## 0.0.20
 
 - Fixed Rust Panic Error on Streams

bindings_wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/wasm-bindings",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "type": "module",
   "license": "MIT",
   "description": "WASM bindings for the libXMTP rust library",

xmtp_api/src/test_utils.rs

@@ -43,7 +43,7 @@ pub fn build_group_messages(num_messages: usize, group_id: Vec<u8>) -> Vec<Group
                 group_id: group_id.clone(),
                 data: vec![i as u8],
                 sender_hmac: vec![],
-                should_push: Some(true),
+                should_push: true,
             })),
         })
     }

xmtp_mls/src/groups/device_sync.rs

@@ -438,20 +438,15 @@ where
         let content = DeviceSyncContent::Request(request.clone());
         let content_bytes = serde_json::to_vec(&content)?;
 
-        let _message_id = sync_group.prepare_message(
-            &content_bytes,
-            provider,
-            {
-                let request = request.clone();
-                move |now| PlaintextEnvelope {
-                    content: Some(Content::V2(V2 {
-                        message_type: Some(MessageType::DeviceSyncRequest(request)),
-                        idempotency_key: now.to_string(),
-                    })),
-                }
-            },
-            false,
-        )?;
+        let _message_id = sync_group.prepare_message(&content_bytes, provider, {
+            let request = request.clone();
+            move |now| PlaintextEnvelope {
+                content: Some(Content::V2(V2 {
+                    message_type: Some(MessageType::DeviceSyncRequest(request)),
+                    idempotency_key: now.to_string(),
+                })),
+            }
+        })?;
 
         // publish the intent
         sync_group.publish_intents(provider).await?;
@@ -512,17 +507,12 @@ where
             (content_bytes, contents)
         };
 
-        sync_group.prepare_message(
-            &content_bytes,
-            provider,
-            |now| PlaintextEnvelope {
-                content: Some(Content::V2(V2 {
-                    message_type: Some(MessageType::DeviceSyncReply(contents)),
-                    idempotency_key: now.to_string(),
-                })),
-            },
-            false,
-        )?;
+        sync_group.prepare_message(&content_bytes, provider, |now| PlaintextEnvelope {
+            content: Some(Content::V2(V2 {
+                message_type: Some(MessageType::DeviceSyncReply(contents)),
+                idempotency_key: now.to_string(),
+            })),
+        })?;
 
         sync_group.publish_intents(provider).await?;
 

xmtp_mls/src/groups/device_sync/preference_sync.rs

@@ -31,17 +31,12 @@ impl UserPreferenceUpdate {
             .collect::<Result<Vec<_>, _>>()?;
         let update_proto = UserPreferenceUpdateProto { contents: updates };
         let content_bytes = serde_json::to_vec(&update_proto)?;
-        sync_group.prepare_message(
-            &content_bytes,
-            &provider,
-            |now| PlaintextEnvelope {
-                content: Some(Content::V2(V2 {
-                    message_type: Some(MessageType::UserPreferenceUpdate(update_proto)),
-                    idempotency_key: now.to_string(),
-                })),
-            },
-            false,
-        )?;
+        sync_group.prepare_message(&content_bytes, &provider, |now| PlaintextEnvelope {
+            content: Some(Content::V2(V2 {
+                message_type: Some(MessageType::UserPreferenceUpdate(update_proto)),
+                idempotency_key: now.to_string(),
+            })),
+        })?;
 
         sync_group.publish_intents(&provider).await?;
 

xmtp_mls/src/groups/mls_sync.rs

@@ -1716,7 +1716,7 @@ where
                 version: Some(GroupMessageInputVersion::V1(GroupMessageInputV1 {
                     data: payload.to_vec(),
                     sender_hmac: sender_hmac.into_bytes().to_vec(),
-                    should_push: Some(should_push),
+                    should_push,
                 })),
             });
         }

xmtp_mls/src/groups/mod.rs

@@ -795,12 +795,8 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
         self.maybe_update_installations(provider, update_interval_ns)
             .await?;
 
-        let message_id = self.prepare_message(
-            message,
-            provider,
-            |now| Self::into_envelope(message, now),
-            true,
-        )?;
+        let message_id =
+            self.prepare_message(message, provider, |now| Self::into_envelope(message, now))?;
 
         self.sync_until_last_intent_resolved(provider).await?;
         // implicitly set group consent state to allowed
@@ -838,12 +834,8 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
     /// Send a message, optimistically returning the ID of the message before the result of a message publish.
     pub fn send_message_optimistic(&self, message: &[u8]) -> Result<Vec<u8>, GroupError> {
         let provider = self.mls_provider()?;
-        let message_id = self.prepare_message(
-            message,
-            &provider,
-            |now| Self::into_envelope(message, now),
-            true,
-        )?;
+        let message_id =
+            self.prepare_message(message, &provider, |now| Self::into_envelope(message, now))?;
         Ok(message_id)
     }
 
@@ -877,7 +869,6 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
         message: &[u8],
         provider: &XmtpOpenMlsProvider,
         envelope: F,
-        should_push: bool,
     ) -> Result<Vec<u8>, GroupError>
     where
         F: FnOnce(i64) -> PlaintextEnvelope,
@@ -890,11 +881,17 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
             .map_err(GroupError::EncodeError)?;
 
         let intent_data: Vec<u8> = SendMessageIntentData::new(encoded_envelope).into();
-        self.queue_intent(provider, IntentKind::SendMessage, intent_data, should_push)?;
+        let queryable_content_fields: QueryableContentFields =
+            Self::extract_queryable_content_fields(message);
+        self.queue_intent(
+            provider,
+            IntentKind::SendMessage,
+            intent_data,
+            queryable_content_fields.should_push,
+        )?;
 
         // store this unpublished message locally before sending
         let message_id = calculate_message_id(&self.group_id, message, &now.to_string());
-        let queryable_content_fields = Self::extract_queryable_content_fields(message);
         let group_message = StoredGroupMessage {
             id: message_id.clone(),
             group_id: self.group_id.clone(),