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

Always show the cause for which a msg landed in trash

Browse Source
This commit is contained in:
Hocuri
2020-10-25 17:10:11 +01:00
committed by holger krekel
parent 34af492afb
commit 31bf34890a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dc_receive_imf.rs
View File

@@ -387,6 +387,7 @@ async fn add_parts(
// this message is a classic email not a chat-message nor a reply to one // this message is a classic email not a chat-message nor a reply to one
match show_emails { match show_emails {
ShowEmails::Off => { ShowEmails::Off => {
info!(context, "Classical email not shown (TRASH)");
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
allow_creation = false; allow_creation = false;
} }
@@ -445,10 +446,7 @@ async fn add_parts(
// it might also be blocked and displayed in the deaddrop as a result // it might also be blocked and displayed in the deaddrop as a result
if chat_id.is_unset() && mime_parser.failure_report.is_some() { if chat_id.is_unset() && mime_parser.failure_report.is_some() {
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
info!( info!(context, "Message belongs to an NDN (TRASH)",);
context,
"Message belongs to an NDN and is not shown in a chat.",
);
} }
if chat_id.is_unset() { if chat_id.is_unset() {
@@ -489,7 +487,7 @@ async fn add_parts(
// check if the message belongs to a mailing list // check if the message belongs to a mailing list
if mime_parser.is_mailinglist_message() { if mime_parser.is_mailinglist_message() {
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
info!(context, "Message belongs to a mailing list and is ignored.",); info!(context, "Message belongs to a mailing list (TRASH)");
} }
} }
@@ -533,6 +531,7 @@ async fn add_parts(
if chat_id.is_unset() { if chat_id.is_unset() {
// maybe from_id is null or sth. else is suspicious, move message to trash // maybe from_id is null or sth. else is suspicious, move message to trash
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
info!(context, "No chat id for incoming msg (TRASH)")
} }
// if the chat_id is blocked, // if the chat_id is blocked,
@@ -642,13 +641,14 @@ async fn add_parts(
} }
if chat_id.is_unset() { if chat_id.is_unset() {
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
info!(context, "No chat id for outgoing message (TRASH)")
} }
} }
if fetching_existing_messages && mime_parser.decrypting_failed { if fetching_existing_messages && mime_parser.decrypting_failed {
*chat_id = ChatId::new(DC_CHAT_ID_TRASH); *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
// We are only gathering old messages on first start. We do not want to add loads of non-decryptable messages to the chats. // We are only gathering old messages on first start. We do not want to add loads of non-decryptable messages to the chats.
info!(context, "Dropping existing non-decipherable message."); info!(context, "Existing non-decipherable message. (TRASH)");
} }
// Extract ephemeral timer from the message. // Extract ephemeral timer from the message.
@@ -1266,6 +1266,7 @@ async fn create_or_lookup_group(
} else { } else {
// The message was decrypted successfully, but contains a late "quit" or otherwise // The message was decrypted successfully, but contains a late "quit" or otherwise
// unwanted message. // unwanted message.
info!(context, "message belongs to unwanted group (TRASH)");
return Ok((ChatId::new(DC_CHAT_ID_TRASH), chat_id_blocked)); return Ok((ChatId::new(DC_CHAT_ID_TRASH), chat_id_blocked));
} }
} }