fix tests and add message expiration starts timestamp

bindings_ffi/src/mls.rs

@@ -633,7 +633,7 @@ pub struct FfiConversations {
 
 #[derive(uniffi::Enum, Clone, Debug)]
 pub enum FfiGroupPermissionsOptions {
-    AllMembers,
+    Default,
     AdminOnly,
     CustomPolicy,
 }
@@ -789,7 +789,7 @@ pub struct FfiPermissionPolicySet {
 impl From<PreconfiguredPolicies> for FfiGroupPermissionsOptions {
     fn from(policy: PreconfiguredPolicies) -> Self {
         match policy {
-            PreconfiguredPolicies::AllMembers => FfiGroupPermissionsOptions::AllMembers,
+            PreconfiguredPolicies::Default => FfiGroupPermissionsOptions::Default,
             PreconfiguredPolicies::AdminsOnly => FfiGroupPermissionsOptions::AdminOnly,
         }
     }
@@ -815,6 +815,14 @@ impl TryFrom<FfiPermissionPolicySet> for PolicySet {
             MetadataField::GroupPinnedFrameUrl.to_string(),
             policy_set.update_group_pinned_frame_url_policy.try_into()?,
         );
+        // MessageExpirationFromMillis follows the same policy as MessageExpirationMillis
+        metadata_permissions_map.insert(
+            MetadataField::MessageExpirationFromMillis.to_string(),
+            policy_set
+                .update_message_expiration_ms_policy
+                .clone()
+                .try_into()?,
+        );
         metadata_permissions_map.insert(
             MetadataField::MessageExpirationMillis.to_string(),
             policy_set.update_message_expiration_ms_policy.try_into()?,
@@ -877,8 +885,8 @@ impl FfiConversations {
         let metadata_options = opts.clone().into_group_metadata_options();
 
         let group_permissions = match opts.permissions {
-            Some(FfiGroupPermissionsOptions::AllMembers) => {
-                Some(xmtp_mls::groups::PreconfiguredPolicies::AllMembers.to_policy_set())
+            Some(FfiGroupPermissionsOptions::Default) => {
+                Some(xmtp_mls::groups::PreconfiguredPolicies::Default.to_policy_set())
             }
             Some(FfiGroupPermissionsOptions::AdminOnly) => {
                 Some(xmtp_mls::groups::PreconfiguredPolicies::AdminsOnly.to_policy_set())
@@ -1370,6 +1378,7 @@ pub struct FfiCreateGroupOptions {
     pub group_description: Option<String>,
     pub group_pinned_frame_url: Option<String>,
     pub custom_permission_policy_set: Option<FfiPermissionPolicySet>,
+    pub message_expiration_from_ms: Option<i64>,
     pub message_expiration_ms: Option<i64>,
 }
 
@@ -1380,6 +1389,7 @@ impl FfiCreateGroupOptions {
             image_url_square: self.group_image_url_square,
             description: self.group_description,
             pinned_frame_url: self.group_pinned_frame_url,
+            message_expiration_from_ms: self.message_expiration_from_ms,
             message_expiration_ms: self.message_expiration_ms,
         }
     }
@@ -2689,6 +2699,7 @@ mod tests {
                     group_description: Some("group description".to_string()),
                     group_pinned_frame_url: Some("pinned frame".to_string()),
                     custom_permission_policy_set: None,
+                    message_expiration_from_ms: None,
                     message_expiration_ms: None,
                 },
             )
@@ -3935,7 +3946,7 @@ mod tests {
 
         // Create all_members group
         let all_members_options = FfiCreateGroupOptions {
-            permissions: Some(FfiGroupPermissionsOptions::AllMembers),
+            permissions: Some(FfiGroupPermissionsOptions::Default),
             ..Default::default()
         };
         let alix_group_all_members = alix
@@ -4085,6 +4096,7 @@ mod tests {
             group_description: Some("A test group".to_string()),
             group_pinned_frame_url: Some("https://example.com/frame.png".to_string()),
             custom_permission_policy_set: Some(custom_permissions),
+            message_expiration_from_ms: None,
             message_expiration_ms: None,
         };
 
@@ -4213,6 +4225,7 @@ mod tests {
             group_description: Some("A test group".to_string()),
             group_pinned_frame_url: Some("https://example.com/frame.png".to_string()),
             custom_permission_policy_set: Some(custom_permissions_invalid_1),
+            message_expiration_from_ms: None,
             message_expiration_ms: None,
         };
 
@@ -4227,12 +4240,13 @@ mod tests {
         assert!(results_1.is_err());
 
         let create_group_options_invalid_2 = FfiCreateGroupOptions {
-            permissions: Some(FfiGroupPermissionsOptions::AllMembers),
+            permissions: Some(FfiGroupPermissionsOptions::Default),
             group_name: Some("Test Group".to_string()),
             group_image_url_square: Some("https://example.com/image.png".to_string()),
             group_description: Some("A test group".to_string()),
             group_pinned_frame_url: Some("https://example.com/frame.png".to_string()),
             custom_permission_policy_set: Some(custom_permissions_valid.clone()),
+            message_expiration_from_ms: None,
             message_expiration_ms: None,
         };
 
@@ -4253,6 +4267,7 @@ mod tests {
             group_description: Some("A test group".to_string()),
             group_pinned_frame_url: Some("https://example.com/frame.png".to_string()),
             custom_permission_policy_set: Some(custom_permissions_valid.clone()),
+            message_expiration_from_ms: None,
             message_expiration_ms: None,
         };
 
@@ -4273,6 +4288,7 @@ mod tests {
             group_description: Some("A test group".to_string()),
             group_pinned_frame_url: Some("https://example.com/frame.png".to_string()),
             custom_permission_policy_set: Some(custom_permissions_valid),
+            message_expiration_from_ms: None,
             message_expiration_ms: None,
         };
 

bindings_node/src/conversations.rs

@@ -122,6 +122,7 @@ pub struct CreateGroupOptions {
   pub group_description: Option<String>,
   pub group_pinned_frame_url: Option<String>,
   pub custom_permission_policy_set: Option<PermissionPolicySet>,
+  pub message_expiration_from_ms: Option<i64>,
   pub message_expiration_ms: Option<i64>,
 }
 
@@ -132,6 +133,7 @@ impl CreateGroupOptions {
       image_url_square: self.group_image_url_square,
       description: self.group_description,
       pinned_frame_url: self.group_pinned_frame_url,
+      message_expiration_from_ms: self.message_expiration_from_ms,
       message_expiration_ms: self.message_expiration_ms,
     }
   }
@@ -161,6 +163,7 @@ impl Conversations {
       group_description: None,
       group_pinned_frame_url: None,
       custom_permission_policy_set: None,
+      message_expiration_from_ms: None,
       message_expiration_ms: None,
     });
 
@@ -177,8 +180,8 @@ impl Conversations {
     let metadata_options = options.clone().into_group_metadata_options();
 
     let group_permissions = match options.permissions {
-      Some(GroupPermissionsOptions::AllMembers) => {
-        Some(PreconfiguredPolicies::AllMembers.to_policy_set())
+      Some(GroupPermissionsOptions::Default) => {
+        Some(PreconfiguredPolicies::Default.to_policy_set())
       }
       Some(GroupPermissionsOptions::AdminOnly) => {
         Some(PreconfiguredPolicies::AdminsOnly.to_policy_set())

bindings_node/src/permissions.rs

@@ -14,7 +14,7 @@ use xmtp_mls::groups::{
 
 #[napi]
 pub enum GroupPermissionsOptions {
-  AllMembers,
+  Default,
   AdminOnly,
   CustomPolicy,
 }
@@ -167,7 +167,7 @@ pub struct PermissionPolicySet {
 impl From<PreconfiguredPolicies> for GroupPermissionsOptions {
   fn from(policy: PreconfiguredPolicies) -> Self {
     match policy {
-      PreconfiguredPolicies::AllMembers => GroupPermissionsOptions::AllMembers,
+      PreconfiguredPolicies::Default => GroupPermissionsOptions::Default,
       PreconfiguredPolicies::AdminsOnly => GroupPermissionsOptions::AdminOnly,
     }
   }

bindings_wasm/src/conversations.rs

@@ -129,20 +129,24 @@ pub struct CreateGroupOptions {
   pub group_pinned_frame_url: Option<String>,
   #[wasm_bindgen(js_name = customPermissionPolicySet)]
   pub custom_permission_policy_set: Option<PermissionPolicySet>,
+  #[wasm_bindgen(js_name = messageExpirationFromMillis)]
+  pub message_expiration_from_ms: Option<i64>,
   #[wasm_bindgen(js_name = messageExpirationMillis)]
   pub message_expiration_ms: Option<i64>,
 }
 
 #[wasm_bindgen]
 impl CreateGroupOptions {
   #[wasm_bindgen(constructor)]
+  #[allow(clippy::too_many_arguments)]
   pub fn new(
     permissions: Option<GroupPermissionsOptions>,
     group_name: Option<String>,
     group_image_url_square: Option<String>,
     group_description: Option<String>,
     group_pinned_frame_url: Option<String>,
     custom_permission_policy_set: Option<PermissionPolicySet>,
+    message_expiration_from_ms: Option<i64>,
     message_expiration_ms: Option<i64>,
   ) -> Self {
     Self {
@@ -152,6 +156,7 @@ impl CreateGroupOptions {
       group_description,
       group_pinned_frame_url,
       custom_permission_policy_set,
+      message_expiration_from_ms,
       message_expiration_ms,
     }
   }
@@ -164,6 +169,7 @@ impl CreateGroupOptions {
       image_url_square: self.group_image_url_square,
       description: self.group_description,
       pinned_frame_url: self.group_pinned_frame_url,
+      message_expiration_from_ms: self.message_expiration_from_ms,
       message_expiration_ms: self.message_expiration_ms,
     }
   }
@@ -195,6 +201,7 @@ impl Conversations {
       group_description: None,
       group_pinned_frame_url: None,
       custom_permission_policy_set: None,
+      message_expiration_from_ms: None,
       message_expiration_ms: None,
     });
 
@@ -209,8 +216,8 @@ impl Conversations {
     let metadata_options = options.clone().into_group_metadata_options();
 
     let group_permissions = match options.permissions {
-      Some(GroupPermissionsOptions::AllMembers) => {
-        Some(PreconfiguredPolicies::AllMembers.to_policy_set())
+      Some(GroupPermissionsOptions::Default) => {
+        Some(PreconfiguredPolicies::Default.to_policy_set())
       }
       Some(GroupPermissionsOptions::AdminOnly) => {
         Some(PreconfiguredPolicies::AdminsOnly.to_policy_set())

bindings_wasm/src/permissions.rs

@@ -14,7 +14,7 @@ use xmtp_mls::groups::{
 #[wasm_bindgen]
 #[derive(Clone)]
 pub enum GroupPermissionsOptions {
-  AllMembers,
+  Default,
   AdminOnly,
   CustomPolicy,
 }
@@ -206,7 +206,7 @@ impl PermissionPolicySet {
 impl From<PreconfiguredPolicies> for GroupPermissionsOptions {
   fn from(policy: PreconfiguredPolicies) -> Self {
     match policy {
-      PreconfiguredPolicies::AllMembers => GroupPermissionsOptions::AllMembers,
+      PreconfiguredPolicies::Default => GroupPermissionsOptions::Default,
       PreconfiguredPolicies::AdminsOnly => GroupPermissionsOptions::AdminOnly,
     }
   }

examples/cli/cli-client.rs

@@ -406,7 +406,7 @@ async fn main() -> color_eyre::eyre::Result<()> {
         }
         Commands::CreateGroup { permissions } => {
             let group_permissions = match permissions {
-                Permissions::EveryoneIsAdmin => xmtp_mls::groups::PreconfiguredPolicies::AllMembers,
+                Permissions::EveryoneIsAdmin => xmtp_mls::groups::PreconfiguredPolicies::Default,
                 Permissions::GroupCreatorIsAdmin => {
                     xmtp_mls::groups::PreconfiguredPolicies::AdminsOnly
                 }

xmtp_mls/src/configuration.rs

@@ -55,7 +55,6 @@ pub const DEFAULT_GROUP_NAME: &str = "";
 pub const DEFAULT_GROUP_DESCRIPTION: &str = "";
 pub const DEFAULT_GROUP_IMAGE_URL_SQUARE: &str = "";
 pub const DEFAULT_GROUP_PINNED_FRAME_URL: &str = "";
-pub const DEFAULT_MESSAGE_EXPIRATION_MS: i64 = 0;
 
 // If a metadata field name starts with this character,
 // and it does not have a policy set, it is a super admin only field

xmtp_mls/src/groups/group_mutable_metadata.rs

@@ -13,7 +13,7 @@ use xmtp_proto::xmtp::mls::message_contents::{
 
 use crate::configuration::{
     DEFAULT_GROUP_DESCRIPTION, DEFAULT_GROUP_IMAGE_URL_SQUARE, DEFAULT_GROUP_NAME,
-    DEFAULT_GROUP_PINNED_FRAME_URL, DEFAULT_MESSAGE_EXPIRATION_MS, MUTABLE_METADATA_EXTENSION_ID,
+    DEFAULT_GROUP_PINNED_FRAME_URL, MUTABLE_METADATA_EXTENSION_ID,
 };
 
 use super::GroupMetadataOptions;
@@ -47,6 +47,7 @@ pub enum MetadataField {
     Description,
     GroupImageUrlSquare,
     GroupPinnedFrameUrl,
+    MessageExpirationFromMillis,
     MessageExpirationMillis,
 }
 
@@ -58,6 +59,7 @@ impl MetadataField {
             MetadataField::Description => "description",
             MetadataField::GroupImageUrlSquare => "group_image_url_square",
             MetadataField::GroupPinnedFrameUrl => "group_pinned_frame_url",
+            MetadataField::MessageExpirationFromMillis => "message_expiration_from_ms",
             MetadataField::MessageExpirationMillis => "message_expiration_ms",
         }
     }
@@ -123,12 +125,20 @@ impl GroupMutableMetadata {
             opts.pinned_frame_url
                 .unwrap_or_else(|| DEFAULT_GROUP_PINNED_FRAME_URL.to_string()),
         );
-        attributes.insert(
-            MetadataField::MessageExpirationMillis.to_string(),
-            opts.message_expiration_ms
-                .unwrap_or(DEFAULT_MESSAGE_EXPIRATION_MS)
-                .to_string(),
-        );
+
+        if let Some(message_expiration_from_ms) = opts.message_expiration_from_ms {
+            attributes.insert(
+                MetadataField::MessageExpirationFromMillis.to_string(),
+                message_expiration_from_ms.to_string(),
+            );
+        }
+        if let Some(message_expiration_ms) = opts.message_expiration_ms {
+            attributes.insert(
+                MetadataField::MessageExpirationMillis.to_string(),
+                message_expiration_ms.to_string(),
+            );
+        }
+
         let admin_list = vec![];
         let super_admin_list = vec![creator_inbox_id.clone()];
         Self {
@@ -158,10 +168,6 @@ impl GroupMutableMetadata {
             MetadataField::GroupPinnedFrameUrl.to_string(),
             DEFAULT_GROUP_PINNED_FRAME_URL.to_string(),
         );
-        attributes.insert(
-            MetadataField::MessageExpirationMillis.to_string(),
-            DEFAULT_MESSAGE_EXPIRATION_MS.to_string(),
-        );
         let admin_list = vec![];
         let super_admin_list = vec![];
         Self {