From 34c374de1a4ba56b26fee1eff6f8e3b953d09dcd Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 10 Jan 2022 22:20:10 +0900 Subject: [PATCH] Attach icon field to User activity only whene it has avatar --- plume-models/src/users.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs index 6d908661..1e27fb19 100644 --- a/plume-models/src/users.rs +++ b/plume-models/src/users.rs @@ -775,13 +775,13 @@ impl User { let mut ap_signature = ApSignature::default(); ap_signature.set_public_key_publickey(public_key)?; - let mut avatar = Image::default(); - avatar.object_props.set_url_string( - self.avatar_id - .and_then(|id| Media::get(conn, id).and_then(|m| m.url()).ok()) - .unwrap_or_default(), - )?; - actor.object_props.set_icon_object(avatar)?; + if let Some(avatar_id) = self.avatar_id { + let mut avatar = Image::default(); + avatar + .object_props + .set_url_string(Media::get(conn, avatar_id)?.url()?)?; + actor.object_props.set_icon_object(avatar)?; + } Ok(CustomPerson::new(actor, ap_signature)) }