Remove prepare_signed_update_person() function

src/activitypub/builders/update_person.rs

@@ -72,28 +72,12 @@ pub async fn prepare_update_person(
     db_client: &impl GenericClient,
     instance: &Instance,
     user: &User,
-) -> Result<OutgoingActivity, DatabaseError> {
-    let activity = build_update_person(&instance.url(), user, None)
-        .map_err(|_| DatabaseTypeError)?;
-    let recipients = get_update_person_recipients(db_client, &user.id).await?;
-    Ok(OutgoingActivity::new(
-        instance,
-        user,
-        activity,
-        recipients,
-    ))
-}
-
-pub async fn prepare_signed_update_person(
-    db_client: &impl GenericClient,
-    instance: &Instance,
-    user: &User,
-    internal_activity_id: Uuid,
+    maybe_internal_activity_id: Option<Uuid>,
 ) -> Result<OutgoingActivity, DatabaseError> {
     let activity = build_update_person(
         &instance.url(),
         user,
-        Some(internal_activity_id),
+        maybe_internal_activity_id,
     ).map_err(|_| DatabaseTypeError)?;
     let recipients = get_update_person_recipients(db_client, &user.id).await?;
     Ok(OutgoingActivity::new(

src/mastodon_api/accounts/views.rs

@@ -18,7 +18,6 @@ use crate::activitypub::builders::{
     update_person::{
         build_update_person,
         prepare_update_person,
-        prepare_signed_update_person,
     },
 };
 use crate::config::Config;
@@ -237,6 +236,7 @@ async fn update_credentials(
         db_client,
         &config.instance(),
         &current_user,
+        None,
     ).await?.enqueue(db_client).await?;
 
     let account = Account::from_user(current_user, &config.instance_url());
@@ -390,11 +390,11 @@ async fn send_signed_activity(
             )
         },
         ActivityParams::Update { internal_activity_id } => {
-            prepare_signed_update_person(
+            prepare_update_person(
                 db_client,
                 &config.instance(),
                 &current_user,
-                *internal_activity_id,
+                Some(*internal_activity_id),
             ).await.map_err(|_| HttpError::InternalError)?
         },
     };
@@ -533,6 +533,7 @@ async fn create_identity_proof(
         db_client,
         &config.instance(),
         &current_user,
+        None,
     ).await?.enqueue(db_client).await?;
 
     let account = Account::from_user(current_user, &config.instance_url());

src/mastodon_api/subscriptions/views.rs

@@ -146,6 +146,7 @@ pub async fn register_subscription_option(
             db_client,
             &config.instance(),
             &current_user,
+            None,
         ).await?.enqueue(db_client).await?;
     };