Remove prepare_signed_update_person() function
This commit is contained in:
parent
ab4d17a29d
commit
228299c5b7
|
@ -72,28 +72,12 @@ pub async fn prepare_update_person(
|
||||||
db_client: &impl GenericClient,
|
db_client: &impl GenericClient,
|
||||||
instance: &Instance,
|
instance: &Instance,
|
||||||
user: &User,
|
user: &User,
|
||||||
) -> Result<OutgoingActivity, DatabaseError> {
|
maybe_internal_activity_id: Option<Uuid>,
|
||||||
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,
|
|
||||||
) -> Result<OutgoingActivity, DatabaseError> {
|
) -> Result<OutgoingActivity, DatabaseError> {
|
||||||
let activity = build_update_person(
|
let activity = build_update_person(
|
||||||
&instance.url(),
|
&instance.url(),
|
||||||
user,
|
user,
|
||||||
Some(internal_activity_id),
|
maybe_internal_activity_id,
|
||||||
).map_err(|_| DatabaseTypeError)?;
|
).map_err(|_| DatabaseTypeError)?;
|
||||||
let recipients = get_update_person_recipients(db_client, &user.id).await?;
|
let recipients = get_update_person_recipients(db_client, &user.id).await?;
|
||||||
Ok(OutgoingActivity::new(
|
Ok(OutgoingActivity::new(
|
||||||
|
|
|
@ -18,7 +18,6 @@ use crate::activitypub::builders::{
|
||||||
update_person::{
|
update_person::{
|
||||||
build_update_person,
|
build_update_person,
|
||||||
prepare_update_person,
|
prepare_update_person,
|
||||||
prepare_signed_update_person,
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
|
@ -237,6 +236,7 @@ async fn update_credentials(
|
||||||
db_client,
|
db_client,
|
||||||
&config.instance(),
|
&config.instance(),
|
||||||
¤t_user,
|
¤t_user,
|
||||||
|
None,
|
||||||
).await?.enqueue(db_client).await?;
|
).await?.enqueue(db_client).await?;
|
||||||
|
|
||||||
let account = Account::from_user(current_user, &config.instance_url());
|
let account = Account::from_user(current_user, &config.instance_url());
|
||||||
|
@ -390,11 +390,11 @@ async fn send_signed_activity(
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
ActivityParams::Update { internal_activity_id } => {
|
ActivityParams::Update { internal_activity_id } => {
|
||||||
prepare_signed_update_person(
|
prepare_update_person(
|
||||||
db_client,
|
db_client,
|
||||||
&config.instance(),
|
&config.instance(),
|
||||||
¤t_user,
|
¤t_user,
|
||||||
*internal_activity_id,
|
Some(*internal_activity_id),
|
||||||
).await.map_err(|_| HttpError::InternalError)?
|
).await.map_err(|_| HttpError::InternalError)?
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -533,6 +533,7 @@ async fn create_identity_proof(
|
||||||
db_client,
|
db_client,
|
||||||
&config.instance(),
|
&config.instance(),
|
||||||
¤t_user,
|
¤t_user,
|
||||||
|
None,
|
||||||
).await?.enqueue(db_client).await?;
|
).await?.enqueue(db_client).await?;
|
||||||
|
|
||||||
let account = Account::from_user(current_user, &config.instance_url());
|
let account = Account::from_user(current_user, &config.instance_url());
|
||||||
|
|
|
@ -146,6 +146,7 @@ pub async fn register_subscription_option(
|
||||||
db_client,
|
db_client,
|
||||||
&config.instance(),
|
&config.instance(),
|
||||||
¤t_user,
|
¤t_user,
|
||||||
|
None,
|
||||||
).await?.enqueue(db_client).await?;
|
).await?.enqueue(db_client).await?;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue