zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: use preferred_username before using url

Browse source
This commit is contained in:
əlemi 2024-04-21 21:15:58 +02:00
parent cff4c827ca
commit cd9d3f9db4
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/model/user.rs
View file

@ -42,9 +42,11 @@ pub struct Model {
impl Model { impl Model {
pub fn new(object: &impl Actor) -> Result<Self, super::FieldError> { pub fn new(object: &impl Actor) -> Result<Self, super::FieldError> {
let ap_id = object.id().ok_or(super::FieldError("id"))?.to_string(); let ap_id = object.id().ok_or(super::FieldError("id"))?.to_string();
let (domain, preferred_username) = split_user_id(&ap_id); let (domain, fallback_preferred_username) = split_user_id(&ap_id);
Ok(Model { Ok(Model {
id: ap_id, preferred_username, domain, id: ap_id,
domain,
preferred_username: object.preferred_username().unwrap_or(&fallback_preferred_username).to_string(),
actor_type: object.actor_type().ok_or(super::FieldError("type"))?, actor_type: object.actor_type().ok_or(super::FieldError("type"))?,
name: object.name().map(|x| x.to_string()), name: object.name().map(|x| x.to_string()),
summary: object.summary().map(|x| x.to_string()), summary: object.summary().map(|x| x.to_string()),