From 900299b5e82a986bd16bf1836a76c9775ecf72e1 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Mon, 20 Dec 2021 23:07:02 +0000
Subject: [PATCH] Make "value" property optional on ActorProperty type

---
 src/activitypub/actor.rs    | 31 ++++++++++++++++++-------------
 src/activitypub/receiver.rs | 10 ++++++++--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/activitypub/actor.rs b/src/activitypub/actor.rs
index 86be4e7..b23fed6 100644
--- a/src/activitypub/actor.rs
+++ b/src/activitypub/actor.rs
@@ -46,7 +46,7 @@ pub struct ActorProperty {
     name: String,
     #[serde(rename = "type")]
     object_type: String,
-    value: String,
+    value: Option<String>,
 }
 
 #[derive(Deserialize, Serialize)]
@@ -96,18 +96,23 @@ pub struct Actor {
 impl Actor {
     /// Parse 'attachment' into ExtraField vector
     pub fn extra_fields(&self) -> Vec<ExtraField> {
-        match &self.attachment {
-            Some(properties) => {
-                properties.iter()
-                    .map(|prop| ExtraField {
-                        name: prop.name.clone(),
-                        value: prop.value.clone(),
+        let mut extra_fields = vec![];
+        if let Some(properties) = &self.attachment {
+            for property in properties {
+                if property.object_type != PROPERTY_VALUE {
+                    continue;
+                };
+                if let Some(property_value) = &property.value {
+                    let field = ExtraField {
+                        name: property.name.clone(),
+                        value: property_value.clone(),
                         value_source: None,
-                    })
-                    .collect()
-            },
-            None => vec![],
-        }
+                    };
+                    extra_fields.push(field);
+                };
+            };
+        };
+        extra_fields
     }
 }
 
@@ -191,7 +196,7 @@ pub fn get_local_actor(
             ActorProperty {
                 object_type: PROPERTY_VALUE.to_string(),
                 name: field.name,
-                value: field.value,
+                value: Some(field.value),
             }
         }).collect();
     let actor = Actor {
diff --git a/src/activitypub/receiver.rs b/src/activitypub/receiver.rs
index 9de96da..71c664f 100644
--- a/src/activitypub/receiver.rs
+++ b/src/activitypub/receiver.rs
@@ -127,7 +127,10 @@ async fn get_or_fetch_profile_by_actor_id(
                 instance, actor_id, media_dir,
             )
                 .await
-                .map_err(|_| ValidationError("failed to fetch actor"))?;
+                .map_err(|err| {
+                    log::warn!("{}", err);
+                    ValidationError("failed to fetch actor")
+                })?;
             let profile = create_profile(db_client, &profile_data).await?;
             profile
         },
@@ -183,7 +186,10 @@ pub async fn process_note(
             Some(object) => object,
             None => {
                 let object = fetch_object(&instance, &object_id).await
-                    .map_err(|_| ValidationError("failed to fetch object"))?;
+                    .map_err(|err| {
+                        log::warn!("{}", err);
+                        ValidationError("failed to fetch object")
+                    })?;
                 log::info!("fetched object {}", object.id);
                 object
             },