Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 05:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

make it more idiomatic:

Browse Source 
rename `ContactObject::from_dc_contact -> `ContactObject::try_from_dc_contact`
This commit is contained in:
Simon Laux
2022-06-30 15:07:41 +02:00
parent 40fa2d4120
commit 5ac347b7ae
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deltachat-jsonrpc/src/api/mod.rs
View File

@@ -370,7 +370,7 @@ impl CommandApi {
let ctx = self.get_context(account_id).await?; let ctx = self.get_context(account_id).await?;
let contact_id = ContactId::new(contact_id); let contact_id = ContactId::new(contact_id);
ContactObject::from_dc_contact( ContactObject::try_from_dc_contact(
&ctx, &ctx,
deltachat::contact::Contact::get_by_id(&ctx, contact_id).await?, deltachat::contact::Contact::get_by_id(&ctx, contact_id).await?,
) )
@@ -425,7 +425,7 @@ impl CommandApi {
let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len()); let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
for id in blocked_ids { for id in blocked_ids {
contacts.push( contacts.push(
ContactObject::from_dc_contact( ContactObject::try_from_dc_contact(
&ctx, &ctx,
deltachat::contact::Contact::get_by_id(&ctx, id).await?, deltachat::contact::Contact::get_by_id(&ctx, id).await?,
) )
@@ -459,7 +459,7 @@ impl CommandApi {
let mut contacts: Vec<ContactObject> = Vec::with_capacity(contact_ids.len()); let mut contacts: Vec<ContactObject> = Vec::with_capacity(contact_ids.len());
for id in contact_ids { for id in contact_ids {
contacts.push( contacts.push(
ContactObject::from_dc_contact( ContactObject::try_from_dc_contact(
&ctx, &ctx,
deltachat::contact::Contact::get_by_id(&ctx, id).await?, deltachat::contact::Contact::get_by_id(&ctx, id).await?,
) )
@@ -480,7 +480,7 @@ impl CommandApi {
for id in ids { for id in ids {
contacts.insert( contacts.insert(
id, id,
ContactObject::from_dc_contact( ContactObject::try_from_dc_contact(
&ctx, &ctx,
deltachat::contact::Contact::get_by_id(&ctx, ContactId::new(id)).await?, deltachat::contact::Contact::get_by_id(&ctx, ContactId::new(id)).await?,
) )

2
deltachat-jsonrpc/src/api/types/chat.rs
View File

@@ -45,7 +45,7 @@ impl FullChat {
for contact_id in &contact_ids { for contact_id in &contact_ids {
contacts.push( contacts.push(
ContactObject::from_dc_contact( ContactObject::try_from_dc_contact(
context, context,
Contact::load_from_db(context, *contact_id).await?, Contact::load_from_db(context, *contact_id).await?,
) )

2
deltachat-jsonrpc/src/api/types/contact.rs
View File

@@ -23,7 +23,7 @@ pub struct ContactObject {
} }
impl ContactObject { impl ContactObject {
pub async fn from_dc_contact( pub async fn try_from_dc_contact(
context: &Context, context: &Context,
contact: deltachat::contact::Contact, contact: deltachat::contact::Contact,
) -> Result<Self> { ) -> Result<Self> {

2
deltachat-jsonrpc/src/api/types/message.rs
View File

@@ -64,7 +64,7 @@ impl MessageObject {
.map(|m| m.get_id().to_u32()); .map(|m| m.get_id().to_u32());
let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?; 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 file_bytes = message.get_filebytes(context).await;
let override_sender_name = message.get_override_sender_name(); let override_sender_name = message.get_override_sender_name();