Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to async, set first subject to 'Message from <sender name>'

Browse Source
This commit is contained in:
Hocuri
2020-05-29 21:33:51 +02:00
committed by holger krekel
parent f8680724f8
commit 3e6cd3ff34
3 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/dc_receive_imf.rs
View File

@@ -749,24 +749,30 @@ async fn add_parts(
}
}
|| -> Result<()> {
let mut chat = Chat::load_from_db(context, *chat_id)?;
async fn update_last_subject(
context: &Context,
chat_id: ChatId,
mime_parser: &MimeMessage,
) -> Result<()> {
let mut chat = Chat::load_from_db(context, chat_id).await?;
chat.param.set(
Param::LastSubject,
mime_parser
.get_subject()
.ok_or_else(|| format_err!("No subject in email"))?,
);
chat.update_param(context)?;
chat.update_param(context).await?;
Ok(())
}()
.unwrap_or_else(|e| {
warn!(
context,
"Could not update LastSubject of chat: {}",
e.to_string()
)
});
}
update_last_subject(context, chat_id, mime_parser)
.await
.unwrap_or_else(|e| {
warn!(
context,
"Could not update LastSubject of chat: {}",
e.to_string()
)
});
Ok(())
}

101
src/mimefactory.rs
View File

@@ -374,16 +374,19 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
)
}
None => {
let raw = message::get_summarytext_by_raw(
self.msg.viewtype,
Some(""),
&self.msg.param,
32,
self.context,
)
.await;
let raw_subject = raw.lines().next().unwrap_or_default();
format!("Chat: {}", raw_subject)
let self_name =
match self.context.get_config(Config::Displayname).await {
Some(name) => Some(name),
None => self.context.get_config(Config::Displayname).await,
}
.unwrap_or_else(|| "Delta Chat".to_string());
self.context
.stock_string_repl_str(
StockMessage::SubjectForNewContact,
self_name,
)
.await
}
}
}
@@ -1262,20 +1265,25 @@ mod tests {
use crate::test_utils::{dummy_context, TestContext};
fn configured_offline_context() -> TestContext {
let t = dummy_context();
async fn configured_offline_context() -> TestContext {
let t = dummy_context().await;
t.ctx
.set_config(Config::Addr, Some("alice@example.org"))
.await
.unwrap();
t.ctx
.set_config(Config::ConfiguredAddr, Some("alice@example.org"))
.await
.unwrap();
t.ctx
.set_config(Config::Configured, Some("1"))
.await
.unwrap();
t.ctx.set_config(Config::Configured, Some("1")).unwrap();
t
}
#[test]
fn test_subject() {
#[async_std::test]
async fn test_subject() {
// 1.: Receive a mail from an MUA or Delta Chat
assert_eq!(
msg_to_subject_str(
@@ -1286,7 +1294,8 @@ mod tests {
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
\n\
hello\n"
),
)
.await,
"Re: Chat: hello"
);
@@ -1301,28 +1310,39 @@ mod tests {
Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
\n\
hello\n"
),
)
.await,
"Re: Chat: hello"
);
// 3. Send the first message to a new contact
let t = configured_offline_context();
t.ctx.set_config(Config::ShowEmails, Some("2")).unwrap();
let t = configured_offline_context().await;
t.ctx
.set_config(Config::ShowEmails, Some("2"))
.await
.unwrap();
let contact_id =
Contact::add_or_lookup(&t.ctx, "Dave", "dave@example.org", Origin::ManuallyCreated)
.await
.unwrap()
.0;
let chat_id = chat::create_by_contact_id(&t.ctx, contact_id).unwrap();
let chat_id = chat::create_by_contact_id(&t.ctx, contact_id)
.await
.unwrap();
let mut new_msg = Message::new(Viewtype::Text);
new_msg.set_text(Some("Hi".to_string()));
new_msg.chat_id = chat_id;
chat::prepare_msg(&t.ctx, chat_id, &mut new_msg).unwrap();
chat::prepare_msg(&t.ctx, chat_id, &mut new_msg)
.await
.unwrap();
let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false).unwrap();
assert_eq!(mf.subject_str(), "Chat: ");
let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
.await
.unwrap();
assert_eq!(mf.subject_str().await, "Chat: ");
// 4. Receive messages with unicode characters and make sure that we do not panic (we do not care about the result)
msg_to_subject_str(
@@ -1335,7 +1355,8 @@ mod tests {
\n\
hello\n"
.as_bytes(),
);
)
.await;
msg_to_subject_str(
"From: Charlie <charlie@example.org>\n\
@@ -1347,28 +1368,40 @@ mod tests {
\n\
hello\n"
.as_bytes(),
);
)
.await;
}
fn msg_to_subject_str(imf_raw: &[u8]) -> String {
async fn msg_to_subject_str(imf_raw: &[u8]) -> String {
use crate::chatlist::Chatlist;
use crate::dc_receive_imf::dc_receive_imf;
let t = configured_offline_context();
t.ctx.set_config(Config::ShowEmails, Some("2")).unwrap();
let t = configured_offline_context().await;
t.ctx
.set_config(Config::ShowEmails, Some("2"))
.await
.unwrap();
dc_receive_imf(&t.ctx, imf_raw, "INBOX", 1, false).unwrap();
dc_receive_imf(&t.ctx, imf_raw, "INBOX", 1, false)
.await
.unwrap();
let chats = Chatlist::try_load(&t.ctx, 0, None, None).unwrap();
let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
let chat_id = chat::create_by_msg_id(&t.ctx, chats.get_msg_id(0).unwrap()).unwrap();
let chat_id = chat::create_by_msg_id(&t.ctx, chats.get_msg_id(0).unwrap())
.await
.unwrap();
let mut new_msg = Message::new(Viewtype::Text);
new_msg.set_text(Some("Hi".to_string()));
new_msg.chat_id = chat_id;
chat::prepare_msg(&t.ctx, chat_id, &mut new_msg).unwrap();
chat::prepare_msg(&t.ctx, chat_id, &mut new_msg)
.await
.unwrap();
let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false).unwrap();
mf.subject_str()
let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
.await
.unwrap();
mf.subject_str().await
}
}

3
src/stock.rs
View File

@@ -179,6 +179,9 @@ pub enum StockMessage {
#[strum(props(fallback = "Unknown Sender for this chat. See 'info' for more details."))]
UnknownSenderForChat = 72,
#[strum(props(fallback = "Message from %1$s"))]
SubjectForNewContact = 73,
}
/*