From 6863fba96eb0ae133e28dce416ba6e7f7ac8f8ff Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Sun, 22 May 2022 18:00:32 +0000
Subject: [PATCH] Refactor update_actor() function, remove unwrap()

---
 src/activitypub/inbox/update_person.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/activitypub/inbox/update_person.rs b/src/activitypub/inbox/update_person.rs
index dbb7291..dfcd25c 100644
--- a/src/activitypub/inbox/update_person.rs
+++ b/src/activitypub/inbox/update_person.rs
@@ -34,10 +34,7 @@ pub async fn update_actor(
     actor: Actor,
 ) -> Result<(), ImportError> {
     let profile = get_profile_by_actor_id(db_client, &actor.id).await?;
-    let (avatar, banner) = fetch_avatar_and_banner(&actor, media_dir).await
-        .map_err(|_| ValidationError("failed to fetch image"))?;
-    let (identity_proofs, extra_fields) = actor.parse_attachments();
-    let actor_old = profile.actor_json.unwrap();
+    let actor_old = profile.actor_json.ok_or(ImportError::LocalObject)?;
     if actor_old.id != actor.id {
         log::warn!(
             "actor ID changed from {} to {}",
@@ -52,6 +49,8 @@ pub async fn update_actor(
             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 {
         display_name: actor.name.clone(),
         bio: actor.summary.clone(),