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

Refactor parent_message

Browse Source
This commit is contained in:
Nico de Haen
2024-12-01 18:49:11 +01:00
parent 70fe196220
commit 7e8b5fe3d2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,21 +128,18 @@ impl MessageObject {
let file_bytes = message.get_filebytes(context).await?.unwrap_or_default(); let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
let override_sender_name = message.get_override_sender_name(); let override_sender_name = message.get_override_sender_name();
let parent_message = message.parent(context).await?;
let parent_msg_id = parent_message.as_ref().map(|m| m.get_id());
let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc { let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?) Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
} else if message.get_info_type() == deltachat::mimeparser::SystemMessage::WebxdcInfoMessage } else if let (deltachat::mimeparser::SystemMessage::WebxdcInfoMessage, Some(parent_msg)) =
&& parent_msg_id.is_some() (message.get_info_type(), message.parent(context).await?)
{ {
// get webcdx info from parent message // get webcdx info from parent message
Some(WebxdcMessageInfo::get_for_message(context, parent_msg_id.unwrap()).await?) Some(WebxdcMessageInfo::get_for_message(context, parent_msg.get_id()).await?)
} else { } else {
None None
}; };
let parent_id = parent_message.as_ref().map(|m| m.get_id().to_u32()); let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
let download_state = message.download_state().into(); let download_state = message.download_state().into();