diff --git a/bindings_ffi/src/mls.rs b/bindings_ffi/src/mls.rs index a7032c8eb..e9f3494f0 100644 --- a/bindings_ffi/src/mls.rs +++ b/bindings_ffi/src/mls.rs @@ -790,7 +790,6 @@ pub struct FfiPermissionPolicySet { pub update_group_name_policy: FfiPermissionPolicy, pub update_group_description_policy: FfiPermissionPolicy, pub update_group_image_url_square_policy: FfiPermissionPolicy, - pub update_group_pinned_frame_url_policy: FfiPermissionPolicy, pub update_message_disappearing_policy: FfiPermissionPolicy, } @@ -819,10 +818,7 @@ impl TryFrom for PolicySet { MetadataField::GroupImageUrlSquare.to_string(), policy_set.update_group_image_url_square_policy.try_into()?, ); - metadata_permissions_map.insert( - MetadataField::GroupPinnedFrameUrl.to_string(), - policy_set.update_group_pinned_frame_url_policy.try_into()?, - ); + // MessageDisappearFromNS follows the same policy as MessageDisappearInNS metadata_permissions_map.insert( MetadataField::MessageDisappearFromNS.to_string(), @@ -852,7 +848,6 @@ pub enum FfiMetadataField { GroupName, Description, ImageUrlSquare, - PinnedFrameUrl, } impl From<&FfiMetadataField> for MetadataField { @@ -861,7 +856,6 @@ impl From<&FfiMetadataField> for MetadataField { FfiMetadataField::GroupName => MetadataField::GroupName, FfiMetadataField::Description => MetadataField::Description, FfiMetadataField::ImageUrlSquare => MetadataField::GroupImageUrlSquare, - FfiMetadataField::PinnedFrameUrl => MetadataField::GroupPinnedFrameUrl, } } } @@ -1486,7 +1480,6 @@ pub struct FfiCreateGroupOptions { pub group_name: Option, pub group_image_url_square: Option, pub group_description: Option, - pub group_pinned_frame_url: Option, pub custom_permission_policy_set: Option, pub message_disappearing_settings: Option, } @@ -1497,7 +1490,6 @@ impl FfiCreateGroupOptions { name: self.group_name, image_url_square: self.group_image_url_square, description: self.group_description, - pinned_frame_url: self.group_pinned_frame_url, message_disappearing_settings: self .message_disappearing_settings .map(|settings| settings.into()), @@ -1712,24 +1704,6 @@ impl FfiConversation { Ok(self.inner.group_description(&provider)?) } - pub async fn update_group_pinned_frame_url( - &self, - pinned_frame_url: String, - ) -> Result<(), GenericError> { - self.inner - .update_group_pinned_frame_url(pinned_frame_url) - .await?; - - Ok(()) - } - - pub fn group_pinned_frame_url(&self) -> Result { - let provider = self.inner.mls_provider()?; - self.inner - .group_pinned_frame_url(&provider) - .map_err(Into::into) - } - pub async fn update_conversation_message_disappearing_settings( &self, settings: FfiMessageDisappearingSettings, @@ -2284,9 +2258,6 @@ impl FfiGroupPermissions { update_group_image_url_square_policy: get_policy( MetadataField::GroupImageUrlSquare.as_str(), ), - update_group_pinned_frame_url_policy: get_policy( - MetadataField::GroupPinnedFrameUrl.as_str(), - ), update_message_disappearing_policy: get_policy( MetadataField::MessageDisappearInNS.as_str(), ), @@ -3018,7 +2989,6 @@ mod tests { group_name: Some("Group Name".to_string()), group_image_url_square: Some("url".to_string()), group_description: Some("group description".to_string()), - group_pinned_frame_url: Some("pinned frame".to_string()), custom_permission_policy_set: None, message_disappearing_settings: Some( conversation_message_disappearing_settings.clone(), @@ -3033,8 +3003,6 @@ mod tests { assert_eq!(group.group_name().unwrap(), "Group Name"); assert_eq!(group.group_image_url_square().unwrap(), "url"); assert_eq!(group.group_description().unwrap(), "group description"); - assert_eq!(group.group_pinned_frame_url().unwrap(), "pinned frame"); - assert_eq!(group.group_pinned_frame_url().unwrap(), "pinned frame"); assert_eq!( group .conversation_message_disappearing_settings() @@ -4720,7 +4688,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Admin, update_group_image_url_square_policy: FfiPermissionPolicy::Admin, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, update_message_disappearing_policy: FfiPermissionPolicy::Admin, }; assert_eq!(alix_permission_policy_set, expected_permission_policy_set); @@ -4750,7 +4717,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Allow, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Allow, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Allow, update_message_disappearing_policy: FfiPermissionPolicy::Admin, }; assert_eq!(alix_permission_policy_set, expected_permission_policy_set); @@ -4781,7 +4747,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Allow, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Allow, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Allow, update_message_disappearing_policy: FfiPermissionPolicy::Allow, }; assert_eq!(alix_permission_policy_set, expected_permission_policy_set); @@ -4811,7 +4776,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Allow, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Allow, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Allow, update_message_disappearing_policy: FfiPermissionPolicy::Admin, }; assert_eq!(alix_permission_policy_set, expected_permission_policy_set); @@ -4845,7 +4809,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Admin, update_group_image_url_square_policy: FfiPermissionPolicy::Admin, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, update_message_disappearing_policy: FfiPermissionPolicy::Admin, }; assert_eq!(alix_group_permissions, expected_permission_policy_set); @@ -4873,7 +4836,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Admin, update_group_image_url_square_policy: FfiPermissionPolicy::Allow, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, update_message_disappearing_policy: FfiPermissionPolicy::Admin, }; assert_eq!(alix_group_permissions, new_expected_permission_policy_set); @@ -5036,7 +4998,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Admin, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, add_member_policy: FfiPermissionPolicy::Allow, remove_member_policy: FfiPermissionPolicy::Deny, update_message_disappearing_policy: FfiPermissionPolicy::Admin, @@ -5047,7 +5008,6 @@ mod tests { 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), message_disappearing_settings: None, }; @@ -5084,10 +5044,7 @@ mod tests { group_permissions_policy_set.update_group_image_url_square_policy, FfiPermissionPolicy::Admin ); - assert_eq!( - group_permissions_policy_set.update_group_pinned_frame_url_policy, - FfiPermissionPolicy::Admin - ); + assert_eq!( group_permissions_policy_set.update_message_disappearing_policy, FfiPermissionPolicy::Admin @@ -5152,7 +5109,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Admin, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, add_member_policy: FfiPermissionPolicy::Allow, remove_member_policy: FfiPermissionPolicy::Deny, update_message_disappearing_policy: FfiPermissionPolicy::Admin, @@ -5164,7 +5120,6 @@ mod tests { update_group_name_policy: FfiPermissionPolicy::Admin, update_group_description_policy: FfiPermissionPolicy::Allow, update_group_image_url_square_policy: FfiPermissionPolicy::Admin, - update_group_pinned_frame_url_policy: FfiPermissionPolicy::Admin, add_member_policy: FfiPermissionPolicy::Allow, remove_member_policy: FfiPermissionPolicy::Deny, update_message_disappearing_policy: FfiPermissionPolicy::Admin, @@ -5175,7 +5130,6 @@ mod tests { 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_invalid_1), message_disappearing_settings: None, }; @@ -5195,7 +5149,6 @@ mod tests { 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_disappearing_settings: None, }; @@ -5215,7 +5168,6 @@ mod tests { 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_disappearing_settings: None, }; @@ -5235,7 +5187,6 @@ mod tests { 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), message_disappearing_settings: None, }; diff --git a/bindings_node/src/conversation.rs b/bindings_node/src/conversation.rs index 9afcf16e1..83577ceba 100644 --- a/bindings_node/src/conversation.rs +++ b/bindings_node/src/conversation.rs @@ -548,37 +548,6 @@ impl Conversation { Ok(group_description) } - #[napi] - pub async fn update_group_pinned_frame_url(&self, pinned_frame_url: String) -> Result<()> { - let group = MlsGroup::new( - self.inner_client.clone(), - self.group_id.clone(), - self.created_at_ns, - ); - - group - .update_group_pinned_frame_url(pinned_frame_url) - .await - .map_err(ErrorWrapper::from)?; - - Ok(()) - } - - #[napi] - pub fn group_pinned_frame_url(&self) -> Result { - let group = MlsGroup::new( - self.inner_client.clone(), - self.group_id.clone(), - self.created_at_ns, - ); - - let group_pinned_frame_url = group - .group_pinned_frame_url(&group.mls_provider().map_err(ErrorWrapper::from)?) - .map_err(ErrorWrapper::from)?; - - Ok(group_pinned_frame_url) - } - #[napi(ts_args_type = "callback: (err: null | Error, result: Message | undefined) => void")] pub fn stream(&self, callback: JsFunction) -> Result { let tsfn: ThreadsafeFunction = diff --git a/bindings_node/src/conversations.rs b/bindings_node/src/conversations.rs index 525e7fd70..cb0544bd0 100644 --- a/bindings_node/src/conversations.rs +++ b/bindings_node/src/conversations.rs @@ -121,7 +121,6 @@ pub struct CreateGroupOptions { pub group_name: Option, pub group_image_url_square: Option, pub group_description: Option, - pub group_pinned_frame_url: Option, pub custom_permission_policy_set: Option, pub message_disappearing_settings: Option, } @@ -132,7 +131,6 @@ impl CreateGroupOptions { name: self.group_name, image_url_square: self.group_image_url_square, description: self.group_description, - pinned_frame_url: self.group_pinned_frame_url, message_disappearing_settings: self .message_disappearing_settings .map(|settings| settings.into()), @@ -162,7 +160,6 @@ impl Conversations { group_name: None, group_image_url_square: None, group_description: None, - group_pinned_frame_url: None, custom_permission_policy_set: None, message_disappearing_settings: None, }); diff --git a/bindings_node/src/permissions.rs b/bindings_node/src/permissions.rs index e3077dd81..ddc820263 100644 --- a/bindings_node/src/permissions.rs +++ b/bindings_node/src/permissions.rs @@ -160,7 +160,6 @@ pub struct PermissionPolicySet { pub update_group_name_policy: PermissionPolicy, pub update_group_description_policy: PermissionPolicy, pub update_group_image_url_square_policy: PermissionPolicy, - pub update_group_pinned_frame_url_policy: PermissionPolicy, pub update_message_disappearing_policy: PermissionPolicy, } @@ -213,9 +212,6 @@ impl GroupPermissions { update_group_image_url_square_policy: get_policy( XmtpMetadataField::GroupImageUrlSquare.as_str(), ), - update_group_pinned_frame_url_policy: get_policy( - XmtpMetadataField::GroupPinnedFrameUrl.as_str(), - ), update_message_disappearing_policy: get_policy( XmtpMetadataField::MessageDisappearInNS.as_str(), ), @@ -241,10 +237,6 @@ impl TryFrom for PolicySet { XmtpMetadataField::GroupImageUrlSquare.to_string(), policy_set.update_group_image_url_square_policy.try_into()?, ); - metadata_permissions_map.insert( - XmtpMetadataField::GroupPinnedFrameUrl.to_string(), - policy_set.update_group_pinned_frame_url_policy.try_into()?, - ); metadata_permissions_map.insert( XmtpMetadataField::MessageDisappearInNS.to_string(), policy_set.update_message_disappearing_policy.try_into()?, @@ -266,7 +258,6 @@ pub enum MetadataField { GroupName, Description, ImageUrlSquare, - PinnedFrameUrl, } impl From<&MetadataField> for XmtpMetadataField { @@ -275,7 +266,6 @@ impl From<&MetadataField> for XmtpMetadataField { MetadataField::GroupName => XmtpMetadataField::GroupName, MetadataField::Description => XmtpMetadataField::Description, MetadataField::ImageUrlSquare => XmtpMetadataField::GroupImageUrlSquare, - MetadataField::PinnedFrameUrl => XmtpMetadataField::GroupPinnedFrameUrl, } } } diff --git a/bindings_node/test/Conversations.test.ts b/bindings_node/test/Conversations.test.ts index fa388ca04..e3ce37d9f 100644 --- a/bindings_node/test/Conversations.test.ts +++ b/bindings_node/test/Conversations.test.ts @@ -51,7 +51,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 0, updateGroupDescriptionPolicy: 0, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 0, updateMessageDisappearingPolicy: 2, }) expect(group.addedByInboxId()).toBe(client1.inboxId()) @@ -103,7 +102,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 2, updateGroupDescriptionPolicy: 1, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 3, updateMessageDisappearingPolicy: 2, }, }) @@ -119,7 +117,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 2, updateGroupDescriptionPolicy: 1, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 3, updateMessageDisappearingPolicy: 2, }) }) @@ -141,7 +138,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 0, updateGroupDescriptionPolicy: 0, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 0, updateMessageDisappearingPolicy: 2, }) @@ -158,7 +154,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 0, updateGroupDescriptionPolicy: 0, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 0, updateMessageDisappearingPolicy: 2, }) @@ -176,7 +171,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 1, updateGroupDescriptionPolicy: 0, updateGroupImageUrlSquarePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 0, updateMessageDisappearingPolicy: 2, }) }) @@ -203,7 +197,6 @@ describe('Conversations', () => { updateGroupDescriptionPolicy: 0, updateGroupImageUrlSquarePolicy: 0, updateGroupNamePolicy: 0, - updateGroupPinnedFrameUrlPolicy: 0, updateMessageDisappearingPolicy: 0, }) expect(group.addedByInboxId()).toBe(client1.inboxId()) @@ -341,7 +334,6 @@ describe('Conversations', () => { updateGroupNamePolicy: 2, updateGroupDescriptionPolicy: 2, updateGroupImageUrlSquarePolicy: 2, - updateGroupPinnedFrameUrlPolicy: 2, updateMessageDisappearingPolicy: 2, }) @@ -354,19 +346,6 @@ describe('Conversations', () => { expect(groupWithDescription.groupName()).toBe('') expect(groupWithDescription.groupImageUrlSquare()).toBe('') expect(groupWithDescription.groupDescription()).toBe('foo') - - const groupWithPinnedFrameUrl = await client1 - .conversations() - .createGroup([user2.account.address], { - groupPinnedFrameUrl: 'https://frameurl.xyz', - }) - expect(groupWithPinnedFrameUrl).toBeDefined() - expect(groupWithPinnedFrameUrl.groupName()).toBe('') - expect(groupWithPinnedFrameUrl.groupImageUrlSquare()).toBe('') - expect(groupWithPinnedFrameUrl.groupDescription()).toBe('') - expect(groupWithPinnedFrameUrl.groupPinnedFrameUrl()).toBe( - 'https://frameurl.xyz' - ) }) it('should update group metadata', async () => { @@ -386,9 +365,6 @@ describe('Conversations', () => { await group.updateGroupDescription('bar') expect(group.groupDescription()).toBe('bar') - - await group.updateGroupPinnedFrameUrl('https://frameurl.xyz') - expect(group.groupPinnedFrameUrl()).toBe('https://frameurl.xyz') }) it('should stream all groups', async () => { diff --git a/bindings_wasm/src/conversation.rs b/bindings_wasm/src/conversation.rs index e05b45dde..6e18ae972 100644 --- a/bindings_wasm/src/conversation.rs +++ b/bindings_wasm/src/conversation.rs @@ -492,36 +492,6 @@ impl Conversation { Ok(group_description) } - #[wasm_bindgen(js_name = updateGroupPinnedFrameUrl)] - pub async fn update_group_pinned_frame_url( - &self, - pinned_frame_url: String, - ) -> Result<(), JsError> { - let group = self.to_mls_group(); - - group - .update_group_pinned_frame_url(pinned_frame_url) - .await - .map_err(|e| JsError::new(&format!("{e}")))?; - - Ok(()) - } - - #[wasm_bindgen(js_name = groupPinnedFrameUrl)] - pub fn group_pinned_frame_url(&self) -> Result { - let group = self.to_mls_group(); - - let group_pinned_frame_url = group - .group_pinned_frame_url( - &group - .mls_provider() - .map_err(|e| JsError::new(&format!("{e}")))?, - ) - .map_err(|e| JsError::new(&format!("{e}")))?; - - Ok(group_pinned_frame_url) - } - #[wasm_bindgen(js_name = stream)] pub fn stream(&self, callback: StreamCallback) -> Result { let stream_closer = MlsGroup::stream_with_callback( diff --git a/bindings_wasm/src/conversations.rs b/bindings_wasm/src/conversations.rs index 7c799df22..a3b5d81bb 100644 --- a/bindings_wasm/src/conversations.rs +++ b/bindings_wasm/src/conversations.rs @@ -128,8 +128,6 @@ pub struct CreateGroupOptions { pub group_image_url_square: Option, #[wasm_bindgen(js_name = groupDescription)] pub group_description: Option, - #[wasm_bindgen(js_name = groupPinnedFrameUrl)] - pub group_pinned_frame_url: Option, #[wasm_bindgen(js_name = customPermissionPolicySet)] pub custom_permission_policy_set: Option, #[wasm_bindgen(js_name = messageDisappearingSettings)] @@ -145,7 +143,6 @@ impl CreateGroupOptions { group_name: Option, group_image_url_square: Option, group_description: Option, - group_pinned_frame_url: Option, custom_permission_policy_set: Option, message_disappearing_settings: Option, ) -> Self { @@ -154,7 +151,6 @@ impl CreateGroupOptions { group_name, group_image_url_square, group_description, - group_pinned_frame_url, custom_permission_policy_set, message_disappearing_settings, } @@ -167,7 +163,6 @@ impl CreateGroupOptions { name: self.group_name, image_url_square: self.group_image_url_square, description: self.group_description, - pinned_frame_url: self.group_pinned_frame_url, message_disappearing_settings: self .message_disappearing_settings .map(|settings| settings.into()), @@ -215,7 +210,6 @@ impl Conversations { group_name: None, group_image_url_square: None, group_description: None, - group_pinned_frame_url: None, custom_permission_policy_set: None, message_disappearing_settings: None, }); diff --git a/bindings_wasm/src/permissions.rs b/bindings_wasm/src/permissions.rs index 3256b9eeb..8622586f8 100644 --- a/bindings_wasm/src/permissions.rs +++ b/bindings_wasm/src/permissions.rs @@ -168,8 +168,6 @@ pub struct PermissionPolicySet { pub update_group_description_policy: PermissionPolicy, #[wasm_bindgen(js_name = updateGroupImageUrlSquarePolicy)] pub update_group_image_url_square_policy: PermissionPolicy, - #[wasm_bindgen(js_name = updateGroupPinnedFrameUrlPolicy)] - pub update_group_pinned_frame_url_policy: PermissionPolicy, #[wasm_bindgen(js_name = updateMessageDisappearingPolicy)] pub update_message_disappearing_policy: PermissionPolicy, } @@ -186,7 +184,6 @@ impl PermissionPolicySet { update_group_name_policy: PermissionPolicy, update_group_description_policy: PermissionPolicy, update_group_image_url_square_policy: PermissionPolicy, - update_group_pinned_frame_url_policy: PermissionPolicy, update_message_disappearing_policy: PermissionPolicy, ) -> Self { Self { @@ -197,7 +194,6 @@ impl PermissionPolicySet { update_group_name_policy, update_group_description_policy, update_group_image_url_square_policy, - update_group_pinned_frame_url_policy, update_message_disappearing_policy, } } @@ -254,9 +250,6 @@ impl GroupPermissions { update_group_image_url_square_policy: get_policy( XmtpMetadataField::GroupImageUrlSquare.as_str(), ), - update_group_pinned_frame_url_policy: get_policy( - XmtpMetadataField::GroupPinnedFrameUrl.as_str(), - ), update_message_disappearing_policy: get_policy( XmtpMetadataField::MessageDisappearInNS.as_str(), ), @@ -280,10 +273,6 @@ impl TryFrom for PolicySet { XmtpMetadataField::GroupImageUrlSquare.to_string(), policy_set.update_group_image_url_square_policy.try_into()?, ); - metadata_permissions_map.insert( - XmtpMetadataField::GroupPinnedFrameUrl.to_string(), - policy_set.update_group_pinned_frame_url_policy.try_into()?, - ); metadata_permissions_map.insert( XmtpMetadataField::MessageDisappearInNS.to_string(), policy_set.update_message_disappearing_policy.try_into()?, @@ -305,7 +294,6 @@ pub enum MetadataField { GroupName, Description, ImageUrlSquare, - PinnedFrameUrl, MessageExpirationFromMS, MessageExpirationMS, } @@ -316,7 +304,6 @@ impl From<&MetadataField> for XmtpMetadataField { MetadataField::GroupName => XmtpMetadataField::GroupName, MetadataField::Description => XmtpMetadataField::Description, MetadataField::ImageUrlSquare => XmtpMetadataField::GroupImageUrlSquare, - MetadataField::PinnedFrameUrl => XmtpMetadataField::GroupPinnedFrameUrl, MetadataField::MessageExpirationFromMS => XmtpMetadataField::MessageDisappearFromNS, MetadataField::MessageExpirationMS => XmtpMetadataField::MessageDisappearInNS, } diff --git a/xmtp_mls/src/configuration.rs b/xmtp_mls/src/configuration.rs index a65805afe..7bfa50362 100644 --- a/xmtp_mls/src/configuration.rs +++ b/xmtp_mls/src/configuration.rs @@ -55,7 +55,6 @@ pub const GROUP_PERMISSIONS_EXTENSION_ID: u16 = 0xff02; 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 = ""; // If a metadata field name starts with this character, // and it does not have a policy set, it is a super admin only field diff --git a/xmtp_mls/src/groups/group_mutable_metadata.rs b/xmtp_mls/src/groups/group_mutable_metadata.rs index d9f51d396..9d6bf3cd4 100644 --- a/xmtp_mls/src/groups/group_mutable_metadata.rs +++ b/xmtp_mls/src/groups/group_mutable_metadata.rs @@ -13,7 +13,7 @@ use xmtp_proto::xmtp::mls::message_contents::{ use super::GroupMetadataOptions; use crate::configuration::{ DEFAULT_GROUP_DESCRIPTION, DEFAULT_GROUP_IMAGE_URL_SQUARE, DEFAULT_GROUP_NAME, - DEFAULT_GROUP_PINNED_FRAME_URL, MUTABLE_METADATA_EXTENSION_ID, + MUTABLE_METADATA_EXTENSION_ID, }; /// Errors that can occur when working with GroupMutableMetadata. @@ -44,7 +44,6 @@ pub enum MetadataField { GroupName, Description, GroupImageUrlSquare, - GroupPinnedFrameUrl, MessageDisappearFromNS, MessageDisappearInNS, } @@ -56,7 +55,6 @@ impl MetadataField { MetadataField::GroupName => "group_name", MetadataField::Description => "description", MetadataField::GroupImageUrlSquare => "group_image_url_square", - MetadataField::GroupPinnedFrameUrl => "group_pinned_frame_url", MetadataField::MessageDisappearFromNS => "message_disappear_from_ns", MetadataField::MessageDisappearInNS => "message_disappear_in_ns", } @@ -136,11 +134,6 @@ impl GroupMutableMetadata { opts.image_url_square .unwrap_or_else(|| DEFAULT_GROUP_IMAGE_URL_SQUARE.to_string()), ); - attributes.insert( - MetadataField::GroupPinnedFrameUrl.to_string(), - opts.pinned_frame_url - .unwrap_or_else(|| DEFAULT_GROUP_PINNED_FRAME_URL.to_string()), - ); if let Some(message_disappearing_settings) = opts.message_disappearing_settings { attributes.insert( @@ -178,10 +171,6 @@ impl GroupMutableMetadata { MetadataField::GroupImageUrlSquare.to_string(), DEFAULT_GROUP_IMAGE_URL_SQUARE.to_string(), ); - attributes.insert( - MetadataField::GroupPinnedFrameUrl.to_string(), - DEFAULT_GROUP_PINNED_FRAME_URL.to_string(), - ); let admin_list = vec![]; let super_admin_list = vec![]; Self { @@ -199,7 +188,6 @@ impl GroupMutableMetadata { MetadataField::GroupName, MetadataField::Description, MetadataField::GroupImageUrlSquare, - MetadataField::GroupPinnedFrameUrl, MetadataField::MessageDisappearFromNS, MetadataField::MessageDisappearInNS, ] diff --git a/xmtp_mls/src/groups/intents.rs b/xmtp_mls/src/groups/intents.rs index 00e28fd86..bbba948d4 100644 --- a/xmtp_mls/src/groups/intents.rs +++ b/xmtp_mls/src/groups/intents.rs @@ -234,13 +234,6 @@ impl UpdateMetadataIntentData { } } - pub fn new_update_group_pinned_frame_url(pinned_frame_url: String) -> Self { - Self { - field_name: MetadataField::GroupPinnedFrameUrl.to_string(), - field_value: pinned_frame_url, - } - } - pub fn new_update_conversation_message_disappear_from_ns(from_ns: i64) -> Self { Self { field_name: MetadataField::MessageDisappearFromNS.to_string(), diff --git a/xmtp_mls/src/groups/mod.rs b/xmtp_mls/src/groups/mod.rs index 105582d5d..a5dd9085a 100644 --- a/xmtp_mls/src/groups/mod.rs +++ b/xmtp_mls/src/groups/mod.rs @@ -287,7 +287,6 @@ pub struct GroupMetadataOptions { pub name: Option, pub image_url_square: Option, pub description: Option, - pub pinned_frame_url: Option, pub message_disappearing_settings: Option, } @@ -1106,37 +1105,6 @@ impl MlsGroup { } } - pub async fn update_group_pinned_frame_url( - &self, - pinned_frame_url: String, - ) -> Result<(), GroupError> { - let provider = self.client.mls_provider()?; - if self.metadata(&provider).await?.conversation_type == ConversationType::Dm { - return Err(GroupError::DmGroupMetadataForbidden); - } - let intent_data: Vec = - UpdateMetadataIntentData::new_update_group_pinned_frame_url(pinned_frame_url).into(); - let intent = self.queue_intent(&provider, IntentKind::MetadataUpdate, intent_data)?; - - self.sync_until_intent_resolved(&provider, intent.id).await - } - - pub fn group_pinned_frame_url( - &self, - provider: &XmtpOpenMlsProvider, - ) -> Result { - let mutable_metadata = self.mutable_metadata(provider)?; - match mutable_metadata - .attributes - .get(&MetadataField::GroupPinnedFrameUrl.to_string()) - { - Some(pinned_frame_url) => Ok(pinned_frame_url.clone()), - None => Err(GroupError::GroupMutableMetadata( - GroupMutableMetadataError::MissingExtension, - )), - } - } - pub async fn update_conversation_message_disappearing_settings( &self, settings: MessageDisappearingSettings, @@ -2678,7 +2646,6 @@ pub(crate) mod tests { name: Some("Group Name".to_string()), image_url_square: Some("url".to_string()), description: Some("group description".to_string()), - pinned_frame_url: Some("pinned frame".to_string()), message_disappearing_settings: Some( expected_group_message_disappearing_settings.clone(), ), @@ -2701,10 +2668,6 @@ pub(crate) mod tests { .attributes .get(&MetadataField::Description.to_string()) .unwrap(); - let amal_group_pinned_frame_url: &String = binding - .attributes - .get(&MetadataField::GroupPinnedFrameUrl.to_string()) - .unwrap(); let amal_group_message_disappear_from_ns = binding .attributes .get(&MetadataField::MessageDisappearFromNS.to_string()) @@ -2716,7 +2679,6 @@ pub(crate) mod tests { assert_eq!(amal_group_name, "Group Name"); assert_eq!(amal_group_image_url, "url"); assert_eq!(amal_group_description, "group description"); - assert_eq!(amal_group_pinned_frame_url, "pinned frame"); assert_eq!( amal_group_message_disappear_from_ns.clone(), expected_group_message_disappearing_settings @@ -2771,7 +2733,7 @@ pub(crate) mod tests { let group_mutable_metadata = amal_group .mutable_metadata(&amal_group.mls_provider().unwrap()) .unwrap(); - assert!(group_mutable_metadata.attributes.len().eq(&4)); + assert!(group_mutable_metadata.attributes.len().eq(&3)); assert!(group_mutable_metadata .attributes .get(&MetadataField::GroupName.to_string()) @@ -2953,44 +2915,6 @@ pub(crate) mod tests { assert_eq!(amal_group_image_url, "a url"); } - #[wasm_bindgen_test(unsupported = tokio::test(flavor = "current_thread"))] - async fn test_update_group_pinned_frame_url() { - let amal = ClientBuilder::new_test_client(&generate_local_wallet()).await; - - // Create a group and verify it has the default group name - let policy_set = Some(PreconfiguredPolicies::AdminsOnly.to_policy_set()); - let amal_group = amal - .create_group(policy_set, GroupMetadataOptions::default()) - .unwrap(); - amal_group.sync().await.unwrap(); - - let group_mutable_metadata = amal_group - .mutable_metadata(&amal_group.mls_provider().unwrap()) - .unwrap(); - assert!(group_mutable_metadata - .attributes - .get(&MetadataField::GroupPinnedFrameUrl.to_string()) - .unwrap() - .is_empty()); - - // Update group name - amal_group - .update_group_pinned_frame_url("a frame url".to_string()) - .await - .unwrap(); - - // Verify amal group sees update - amal_group.sync().await.unwrap(); - let binding = amal_group - .mutable_metadata(&amal_group.mls_provider().unwrap()) - .expect("msg"); - let amal_group_pinned_frame_url: &String = binding - .attributes - .get(&MetadataField::GroupPinnedFrameUrl.to_string()) - .unwrap(); - assert_eq!(amal_group_pinned_frame_url, "a frame url"); - } - #[wasm_bindgen_test(unsupported = tokio::test(flavor = "current_thread"))] async fn test_update_group_message_expiration_settings() { let amal = ClientBuilder::new_test_client(&generate_local_wallet()).await;