mirror of
https://github.com/chatmail/core.git
synced 2026-05-01 20:36:31 +03:00
feat: pre-messages / next version of download on demand (#7371)
Closes <https://github.com/chatmail/core/issues/7367> Co-authored-by: iequidoo <dgreshilov@gmail.com> Co-authored-by: Hocuri <hocuri@gmx.de>
This commit is contained in:
@@ -21,6 +21,7 @@ use crate::constants::{ASM_SUBJECT, BROADCAST_INCOMPATIBILITY_MSG};
|
||||
use crate::constants::{Chattype, DC_FROM_HANDSHAKE};
|
||||
use crate::contact::{Contact, ContactId, Origin};
|
||||
use crate::context::Context;
|
||||
use crate::download::PostMsgMetadata;
|
||||
use crate::e2ee::EncryptHelper;
|
||||
use crate::ensure_and_debug_assert;
|
||||
use crate::ephemeral::Timer as EphemeralTimer;
|
||||
@@ -59,6 +60,17 @@ pub enum Loaded {
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum PreMessageMode {
|
||||
/// adds the Chat-Is-Post-Message header in unprotected part
|
||||
Post,
|
||||
/// adds the Chat-Post-Message-ID header to protected part
|
||||
/// also adds metadata and explicitly excludes attachment
|
||||
Pre { post_msg_rfc724_mid: String },
|
||||
/// Atomic ("normal") message.
|
||||
None,
|
||||
}
|
||||
|
||||
/// Helper to construct mime messages.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct MimeFactory {
|
||||
@@ -146,6 +158,9 @@ pub struct MimeFactory {
|
||||
|
||||
/// This field is used to sustain the topic id of webxdcs needed for peer channels.
|
||||
webxdc_topic: Option<TopicId>,
|
||||
|
||||
/// Pre-message / post-message / atomic message.
|
||||
pre_message_mode: PreMessageMode,
|
||||
}
|
||||
|
||||
/// Result of rendering a message, ready to be submitted to a send job.
|
||||
@@ -500,6 +515,7 @@ impl MimeFactory {
|
||||
sync_ids_to_delete: None,
|
||||
attach_selfavatar,
|
||||
webxdc_topic,
|
||||
pre_message_mode: PreMessageMode::None,
|
||||
};
|
||||
Ok(factory)
|
||||
}
|
||||
@@ -548,6 +564,7 @@ impl MimeFactory {
|
||||
sync_ids_to_delete: None,
|
||||
attach_selfavatar: false,
|
||||
webxdc_topic: None,
|
||||
pre_message_mode: PreMessageMode::None,
|
||||
};
|
||||
|
||||
Ok(res)
|
||||
@@ -779,7 +796,10 @@ impl MimeFactory {
|
||||
headers.push(("Date", mail_builder::headers::raw::Raw::new(date).into()));
|
||||
|
||||
let rfc724_mid = match &self.loaded {
|
||||
Loaded::Message { msg, .. } => msg.rfc724_mid.clone(),
|
||||
Loaded::Message { msg, .. } => match &self.pre_message_mode {
|
||||
PreMessageMode::Pre { .. } => create_outgoing_rfc724_mid(),
|
||||
_ => msg.rfc724_mid.clone(),
|
||||
},
|
||||
Loaded::Mdn { .. } => create_outgoing_rfc724_mid(),
|
||||
};
|
||||
headers.push((
|
||||
@@ -893,7 +913,7 @@ impl MimeFactory {
|
||||
));
|
||||
}
|
||||
|
||||
let is_encrypted = self.encryption_pubkeys.is_some();
|
||||
let is_encrypted = self.will_be_encrypted();
|
||||
|
||||
// Add ephemeral timer for non-MDN messages.
|
||||
// For MDNs it does not matter because they are not visible
|
||||
@@ -978,6 +998,23 @@ impl MimeFactory {
|
||||
"MIME-Version",
|
||||
mail_builder::headers::raw::Raw::new("1.0").into(),
|
||||
));
|
||||
|
||||
if self.pre_message_mode == PreMessageMode::Post {
|
||||
unprotected_headers.push((
|
||||
"Chat-Is-Post-Message",
|
||||
mail_builder::headers::raw::Raw::new("1").into(),
|
||||
));
|
||||
} else if let PreMessageMode::Pre {
|
||||
post_msg_rfc724_mid,
|
||||
} = &self.pre_message_mode
|
||||
{
|
||||
protected_headers.push((
|
||||
"Chat-Post-Message-ID",
|
||||
mail_builder::headers::message_id::MessageId::new(post_msg_rfc724_mid.clone())
|
||||
.into(),
|
||||
));
|
||||
}
|
||||
|
||||
for header @ (original_header_name, _header_value) in &headers {
|
||||
let header_name = original_header_name.to_lowercase();
|
||||
if header_name == "message-id" {
|
||||
@@ -1119,6 +1156,10 @@ impl MimeFactory {
|
||||
for (addr, key) in &encryption_pubkeys {
|
||||
let fingerprint = key.dc_fingerprint().hex();
|
||||
let cmd = msg.param.get_cmd();
|
||||
if self.pre_message_mode == PreMessageMode::Post {
|
||||
continue;
|
||||
}
|
||||
|
||||
let should_do_gossip = cmd == SystemMessage::MemberAddedToGroup
|
||||
|| cmd == SystemMessage::SecurejoinMessage
|
||||
|| multiple_recipients && {
|
||||
@@ -1875,8 +1916,19 @@ impl MimeFactory {
|
||||
|
||||
// add attachment part
|
||||
if msg.viewtype.has_file() {
|
||||
let file_part = build_body_file(context, &msg).await?;
|
||||
parts.push(file_part);
|
||||
if let PreMessageMode::Pre { .. } = self.pre_message_mode {
|
||||
let Some(metadata) = PostMsgMetadata::from_msg(context, &msg).await? else {
|
||||
bail!("Failed to generate metadata for pre-message")
|
||||
};
|
||||
|
||||
headers.push((
|
||||
HeaderDef::ChatPostMessageMetadata.into(),
|
||||
mail_builder::headers::raw::Raw::new(metadata.to_header_value()?).into(),
|
||||
));
|
||||
} else {
|
||||
let file_part = build_body_file(context, &msg).await?;
|
||||
parts.push(file_part);
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(msg_kml_part) = self.get_message_kml_part() {
|
||||
@@ -1921,6 +1973,8 @@ impl MimeFactory {
|
||||
}
|
||||
}
|
||||
|
||||
self.attach_selfavatar =
|
||||
self.attach_selfavatar && self.pre_message_mode != PreMessageMode::Post;
|
||||
if self.attach_selfavatar {
|
||||
match context.get_config(Config::Selfavatar).await? {
|
||||
Some(path) => match build_avatar_file(context, &path).await {
|
||||
@@ -1990,6 +2044,20 @@ impl MimeFactory {
|
||||
|
||||
Ok(message)
|
||||
}
|
||||
|
||||
pub fn will_be_encrypted(&self) -> bool {
|
||||
self.encryption_pubkeys.is_some()
|
||||
}
|
||||
|
||||
pub fn set_as_post_message(&mut self) {
|
||||
self.pre_message_mode = PreMessageMode::Post;
|
||||
}
|
||||
|
||||
pub fn set_as_pre_message_for(&mut self, post_message: &RenderedEmail) {
|
||||
self.pre_message_mode = PreMessageMode::Pre {
|
||||
post_msg_rfc724_mid: post_message.rfc724_mid.clone(),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
fn hidden_recipients() -> Address<'static> {
|
||||
|
||||
Reference in New Issue
Block a user