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

output daymarker and message error

Browse Source
This commit is contained in:
Simon Laux
2020-11-26 02:39:10 +01:00
parent 9f2b5feda2
commit 850f7e1174
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/export_chat.rs
View File

@@ -20,7 +20,7 @@
//! ``` //! ```
//! [`SaveMimeHeaders`]: ../config/enum.Config.html#variant.SaveMimeHeaders //! [`SaveMimeHeaders`]: ../config/enum.Config.html#variant.SaveMimeHeaders
// use crate::dc_tools::*; use crate::constants::DC_GCM_ADDDAYMARKER;
use crate::chat::*; use crate::chat::*;
use crate::constants::Viewtype; use crate::constants::Viewtype;
use crate::contact::*; use crate::contact::*;
@@ -107,7 +107,7 @@ struct ChatJSON {
color: String, color: String,
profile_img: Option<String>, profile_img: Option<String>,
contacts: HashMap<u32, ContactJSON>, contacts: HashMap<u32, ContactJSON>,
messages: Vec<MessageJSON>, messages: Vec<ChatItemJSON>,
locations: Vec<Location>, locations: Vec<Location>,
} }
@@ -128,24 +128,34 @@ struct FileReference {
} }
#[derive(Serialize)] #[derive(Serialize)]
struct MessageJSON { #[serde(tag = "type")]
id: u32, enum ChatItemJSON {
author_id: u32, // from_id Message {
view_type: Viewtype, id: u32,
timestamp_sort: i64, author_id: u32, // from_id
timestamp_sent: i64, view_type: Viewtype,
timestamp_rcvd: i64, timestamp_sort: i64,
text: Option<String>, timestamp_sent: i64,
attachment: Option<FileReference>, timestamp_rcvd: i64,
location_id: Option<u32>, text: Option<String>,
is_info_message: bool, attachment: Option<FileReference>,
show_padlock: bool, location_id: Option<u32>,
is_info_message: bool,
show_padlock: bool,
},
MessageError {
id: u32,
error: String,
},
DayMarker {
timestamp: i64,
},
} }
impl MessageJSON { impl ChatItemJSON {
pub async fn from_message(message: &Message, context: &Context) -> MessageJSON { pub async fn from_message(message: &Message, context: &Context) -> ChatItemJSON {
let msg_id = message.get_id(); let msg_id = message.get_id();
MessageJSON { ChatItemJSON::Message {
id: msg_id.to_u32(), id: msg_id.to_u32(),
author_id: message.get_from_id(), // from_id author_id: message.get_from_id(), // from_id
view_type: message.get_viewtype(), view_type: message.get_viewtype(),
@@ -182,7 +192,7 @@ async fn export_chat_data(context: &Context, chat_id: ChatId) -> ExportChatResul
let mut blobs = Vec::new(); let mut blobs = Vec::new();
let mut chat_author_ids = Vec::new(); let mut chat_author_ids = Vec::new();
// get all messages // get all messages
let chat_items = get_chat_msgs(context, chat_id, 0, None).await; let chat_items = get_chat_msgs(context, chat_id, DC_GCM_ADDDAYMARKER, None).await;
let message_futures = chat_items let message_futures = chat_items
.clone() .clone()
.into_iter() .into_iter()
@@ -273,16 +283,24 @@ async fn export_chat_data(context: &Context, chat_id: ChatId) -> ExportChatResul
message_ids.push(msg.id); message_ids.push(msg.id);
} }
} }
// drop(messages); drop(messages);
let mut message_json: Vec<MessageJSON> = Vec::new(); let mut message_json: Vec<ChatItemJSON> = Vec::new();
for message in &messages { for item in chat_items {
if let Ok(msg) = &message { let json_item_result = match item {
let msg_json: MessageJSON = MessageJSON::from_message(msg, &context).await; ChatItem::Message { msg_id } => match Message::load_from_db(context, msg_id).await {
message_json.push(msg_json); Ok(message) => Some(ChatItemJSON::from_message(&message, &context).await),
} else { Err(error_message) => Some(ChatItemJSON::MessageError {
// todo id: msg_id.to_u32(),
error: error_message.to_string(),
}),
},
ChatItem::DayMarker { timestamp } => Some(ChatItemJSON::DayMarker { timestamp }),
ChatItem::Marker1 => None,
};
if let Some(json_item) = json_item_result {
message_json.push(json_item)
} }
} }