diff --git a/deltachat-jsonrpc/src/api/mod.rs b/deltachat-jsonrpc/src/api/mod.rs index bf1cb122e..dba3ce9da 100644 --- a/deltachat-jsonrpc/src/api/mod.rs +++ b/deltachat-jsonrpc/src/api/mod.rs @@ -370,7 +370,7 @@ impl CommandApi { let ctx = self.get_context(account_id).await?; let contact_id = ContactId::new(contact_id); - ContactObject::from_dc_contact( + ContactObject::try_from_dc_contact( &ctx, deltachat::contact::Contact::get_by_id(&ctx, contact_id).await?, ) @@ -425,7 +425,7 @@ impl CommandApi { let mut contacts: Vec = Vec::with_capacity(blocked_ids.len()); for id in blocked_ids { contacts.push( - ContactObject::from_dc_contact( + ContactObject::try_from_dc_contact( &ctx, deltachat::contact::Contact::get_by_id(&ctx, id).await?, ) @@ -459,7 +459,7 @@ impl CommandApi { let mut contacts: Vec = Vec::with_capacity(contact_ids.len()); for id in contact_ids { contacts.push( - ContactObject::from_dc_contact( + ContactObject::try_from_dc_contact( &ctx, deltachat::contact::Contact::get_by_id(&ctx, id).await?, ) @@ -480,7 +480,7 @@ impl CommandApi { for id in ids { contacts.insert( id, - ContactObject::from_dc_contact( + ContactObject::try_from_dc_contact( &ctx, deltachat::contact::Contact::get_by_id(&ctx, ContactId::new(id)).await?, ) diff --git a/deltachat-jsonrpc/src/api/types/chat.rs b/deltachat-jsonrpc/src/api/types/chat.rs index 33a2d332e..1bc5920a0 100644 --- a/deltachat-jsonrpc/src/api/types/chat.rs +++ b/deltachat-jsonrpc/src/api/types/chat.rs @@ -45,7 +45,7 @@ impl FullChat { for contact_id in &contact_ids { contacts.push( - ContactObject::from_dc_contact( + ContactObject::try_from_dc_contact( context, Contact::load_from_db(context, *contact_id).await?, ) diff --git a/deltachat-jsonrpc/src/api/types/contact.rs b/deltachat-jsonrpc/src/api/types/contact.rs index 9e2bb9656..c34097723 100644 --- a/deltachat-jsonrpc/src/api/types/contact.rs +++ b/deltachat-jsonrpc/src/api/types/contact.rs @@ -23,7 +23,7 @@ pub struct ContactObject { } impl ContactObject { - pub async fn from_dc_contact( + pub async fn try_from_dc_contact( context: &Context, contact: deltachat::contact::Contact, ) -> Result { diff --git a/deltachat-jsonrpc/src/api/types/message.rs b/deltachat-jsonrpc/src/api/types/message.rs index ab6101674..5c860c74e 100644 --- a/deltachat-jsonrpc/src/api/types/message.rs +++ b/deltachat-jsonrpc/src/api/types/message.rs @@ -64,7 +64,7 @@ impl MessageObject { .map(|m| m.get_id().to_u32()); let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?; - let sender = ContactObject::from_dc_contact(context, sender_contact).await?; + let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?; let file_bytes = message.get_filebytes(context).await; let override_sender_name = message.get_override_sender_name();