fix comment

test: Don't accept contact request group before leaving
feat: Allow leaving a 'Contact Request' group/channel
2026-05-17 22:06:33 +03:00 · 2025-08-05 16:53:44 +02:00 · 2025-08-05 16:52:36 +02:00 · 2025-08-05 16:52:35 +02:00 · 2025-08-05 15:58:43 +02:00 · 2025-08-04 23:53:05 +00:00
6 changed files with 47 additions and 19 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2557,9 +2557,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

 [[package]]
 name = "human-panic"
-version = "2.0.2"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
+checksum = "ac63a746b187e95d51fe16850eb04d1cfef203f6af98e6c405a6f262ad3df00a"
 dependencies = [
 "backtrace",
 "os_info",
@@ -5396,9 +5396,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
 dependencies = [
 "serde",
 ]
@@ -6176,14 +6176,17 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1"
 dependencies = [
+ "indexmap",
 "serde",
 "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.27",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.11",
 ]

 [[package]]
@@ -6191,6 +6194,12 @@ name = "toml_datetime"
 version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
 dependencies = [
 "serde",
 ]
@@ -6202,7 +6211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
 "indexmap",
- "toml_datetime",
+ "toml_datetime 0.6.11",
 "winnow 0.5.40",
 ]

@@ -6213,19 +6222,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
 "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
+ "toml_datetime 0.6.11",
 "toml_write",
 "winnow 0.7.11",
 ]

+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow 0.7.11",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"

+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tower"
 version = "0.5.2"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,7 +107,7 @@ tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-toml = "0.8"
+toml = "0.9"
 tracing = "0.1.41"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
--- a/deny.toml
+++ b/deny.toml
@@ -48,6 +48,7 @@ skip = [
     { name = "syn", version = "1.0.109" },
     { name = "thiserror-impl", version = "1.0.69" },
     { name = "thiserror", version = "1.0.69" },
+     { name = "toml_datetime", version = "0.6.11" },
     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
     { name = "windows" },
     { name = "windows_aarch64_gnullvm" },
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2905,9 +2905,12 @@ async fn prepare_send_msg(

    let skip_fn = |reason: &CantSendReason| match reason {
        CantSendReason::ContactRequest => {
-            // Allow securejoin messages, they are supposed to repair the verification.
-            // If the chat is a contact request, let the user accept it later.
-            msg.param.get_cmd() == SystemMessage::SecurejoinMessage
+            // If the chat is a contact request, allow securejoin messages and let the user accept it later.
+            // And allow leaving a contact request chat.
+            matches!(
+                msg.param.get_cmd(),
+                SystemMessage::SecurejoinMessage | SystemMessage::MemberRemovedFromGroup
+            )
        }
        // Allow to send "Member removed" messages so we can leave the group/broadcast.
        // Necessary checks should be made anyway before removing contact
--- a/src/chat/chat_tests.rs
+++ b/src/chat/chat_tests.rs
@@ -739,7 +739,6 @@ async fn test_leave_group() -> Result<()> {

    tcm.section("Bob leaves the group.");
    let bob_chat_id = bob_msg.chat_id;
-    bob_chat_id.accept(&bob).await?;
    remove_contact_from_chat(&bob, bob_chat_id, ContactId::SELF).await?;

    let leave_msg = bob.pop_sent_msg().await;
@@ -2975,7 +2974,6 @@ async fn test_leave_broadcast() -> Result<()> {

    tcm.section("Bob leaves the broadcast channel.");
    let bob_chat_id = bob_msg.chat_id;
-    bob_chat_id.accept(bob).await?;
    remove_contact_from_chat(bob, bob_chat_id, ContactId::SELF).await?;

    let leave_msg = bob.pop_sent_msg().await;
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -414,7 +414,11 @@ pub(crate) async fn send_msg_to_smtp(
                .await?;
        }
        SendResult::Failure(ref err) => {
-            if err.to_string().contains("Invalid unencrypted mail") {
+            if err
+                .to_string()
+                .to_lowercase()
+                .contains("invalid unencrypted mail")
+            {
                let res = context
                    .sql
                    .query_row_optional(
Author	SHA1	Message	Date
Hocuri	8ed2a220e7	fix comment	2025-08-05 16:53:44 +02:00
Hocuri	adeb2e0a61	test: Don't accept contact request group before leaving	2025-08-05 16:52:36 +02:00
Hocuri	ce83952b4f	feat: Allow leaving a 'Contact Request' group/channel	2025-08-05 16:52:35 +02:00
B. Petersen	aa452971a6	fix: ignore case when trying to detect 'invalid unencrypted mail' and add an info-message	2025-08-05 15:58:43 +02:00
dependabot[bot]	2d798f7cfe	Merge pull request #7066 from chatmail/dependabot/cargo/toml-0.9.4	2025-08-04 23:53:05 +00:00
iequidoo	4f1bf1f13c	chore(deny.toml): add exception for duplicate toml_datetime 0.6.11 dependency	2025-08-02 16:16:43 -03:00
iequidoo	2d0b7b5bd8	chore(cargo): bump human-panic from 2.0.2 to 2.0.3	2025-08-02 16:14:48 -03:00
dependabot[bot]	3977580426	chore(cargo): bump toml from 0.8.23 to 0.9.4 Bumps [toml](https://github.com/toml-rs/toml) from 0.8.23 to 0.9.4. - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.23...toml-v0.9.4) --- updated-dependencies: - dependency-name: toml dependency-version: 0.9.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-01 22:00:13 +00:00