Remove pinned frames url from metadata (#1534)

* remove pinned frames url from the code * fix up a test
xmtp · Feb 3, 2025 · 0a97f5c · 0a97f5c
1 parent 11eaf74
commit 0a97f5c
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 266 deletions.
diff --git 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<FfiPermissionPolicySet> 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<String>,
     pub group_image_url_square: Option<String>,
     pub group_description: Option<String>,
-    pub group_pinned_frame_url: Option<String>,
     pub custom_permission_policy_set: Option<FfiPermissionPolicySet>,
     pub message_disappearing_settings: Option<FfiMessageDisappearingSettings>,
 }
@@ -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<String, GenericError> {
-        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
@@ -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<String> {
-    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<StreamCloser> {
     let tsfn: ThreadsafeFunction<Message, ErrorStrategy::CalleeHandled> =

diff --git a/bindings_node/src/conversations.rs b/bindings_node/src/conversations.rs
@@ -121,7 +121,6 @@ pub struct CreateGroupOptions {
   pub group_name: Option<String>,
   pub group_image_url_square: Option<String>,
   pub group_description: Option<String>,
-  pub group_pinned_frame_url: Option<String>,
   pub custom_permission_policy_set: Option<PermissionPolicySet>,
   pub message_disappearing_settings: Option<MessageDisappearingSettings>,
 }
@@ -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
@@ -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<PermissionPolicySet> 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,
     }
   }
 }