FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Refactor update_actor() function, remove unwrap()

Browse source
This commit is contained in:
silverpill 2022-05-22 18:00:32 +00:00
parent f2e61dd9a3
commit 6863fba96e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/activitypub/inbox/update_person.rs
View file

@ -34,10 +34,7 @@ pub async fn update_actor(
actor: Actor, actor: Actor,
) -> Result<(), ImportError> { ) -> Result<(), ImportError> {
let profile = get_profile_by_actor_id(db_client, &actor.id).await?; let profile = get_profile_by_actor_id(db_client, &actor.id).await?;
let (avatar, banner) = fetch_avatar_and_banner(&actor, media_dir).await let actor_old = profile.actor_json.ok_or(ImportError::LocalObject)?;
.map_err(|_| ValidationError("failed to fetch image"))?;
let (identity_proofs, extra_fields) = actor.parse_attachments();
let actor_old = profile.actor_json.unwrap();
if actor_old.id != actor.id { if actor_old.id != actor.id {
log::warn!( log::warn!(
"actor ID changed from {} to {}", "actor ID changed from {} to {}",
@ -52,6 +49,8 @@ pub async fn update_actor(
actor.public_key.public_key_pem, actor.public_key.public_key_pem,
); );
}; };
let (avatar, banner) = fetch_avatar_and_banner(&actor, media_dir).await?;
let (identity_proofs, extra_fields) = actor.parse_attachments();
let mut profile_data = ProfileUpdateData { let mut profile_data = ProfileUpdateData {
display_name: actor.name.clone(), display_name: actor.name.clone(),
bio: actor.summary.clone(), bio: actor.summary.clone(),