fix: Reset options that are not available for chatmail

We don't show these 3 options in the UI for chatmail profiles.

There were reports from users, who had these options set to something
else, and then couldn't change them.

They are not supposed to be something else for chatmail profiles.

fix https://github.com/chatmail/core/issues/7622

src/chat.rs

@@ -432,14 +432,18 @@ impl ChatId {
 
         match chat.typ {
             Chattype::Single | Chattype::Group | Chattype::OutBroadcast | Chattype::InBroadcast => {
-                // User has "created a chat" with all these contacts.
-                //
                 // Previously accepting a chat literally created a chat because unaccepted chats
                 // went to "contact requests" list rather than normal chatlist.
+                // But for groups we use lower origin because users don't always check all members
+                // before accepting a chat and may not want to have the group members mixed with
+                // existing contacts. `IncomingTo` fits here by its definition.
+                let origin = match chat.typ {
+                    Chattype::Group => Origin::IncomingTo,
+                    _ => Origin::CreateChat,
+                };
                 for contact_id in get_chat_contacts(context, self).await? {
                     if contact_id != ContactId::SELF {
-                        ContactId::scaleup_origin(context, &[contact_id], Origin::CreateChat)
-                            .await?;
+                        ContactId::scaleup_origin(context, &[contact_id], origin).await?;
                     }
                 }
             }

src/contact.rs

@@ -1144,7 +1144,7 @@ WHERE c.id>?
     AND c.origin>=?
     AND c.blocked=0
     AND (IFNULL(c.name_normalized,IIF(c.name='',c.authname,c.name)) LIKE ? OR c.addr LIKE ?)
-ORDER BY c.last_seen DESC, c.id DESC
+ORDER BY c.origin>=? DESC, c.last_seen DESC, c.id DESC
                     ",
                     (
                         ContactId::LAST_SPECIAL,
@@ -1152,6 +1152,7 @@ ORDER BY c.last_seen DESC, c.id DESC
                         minimal_origin,
                         &s3str_like_cmd,
                         &s3str_like_cmd,
+                        Origin::CreateChat,
                     ),
                     |row| {
                         let id: ContactId = row.get(0)?;
@@ -1201,8 +1202,13 @@ ORDER BY c.last_seen DESC, c.id DESC
                  AND (fingerprint='')=?
                  AND origin>=?
                  AND blocked=0
-                 ORDER BY last_seen DESC, id DESC;",
-                    (ContactId::LAST_SPECIAL, flag_address, minimal_origin),
+                 ORDER BY origin>=? DESC, last_seen DESC, id DESC",
+                    (
+                        ContactId::LAST_SPECIAL,
+                        flag_address,
+                        minimal_origin,
+                        Origin::CreateChat,
+                    ),
                     |row| {
                         let id: ContactId = row.get(0)?;
                         let addr: String = row.get(1)?;

src/receive_imf/receive_imf_tests.rs

@@ -3852,6 +3852,38 @@ async fn test_sync_member_list_on_rejoin() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_group_contacts_goto_bottom() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let bob = &tcm.bob().await;
+    let fiona = &tcm.fiona().await;
+
+    let bob_id = alice.add_or_lookup_contact_id(bob).await;
+    let fiona_id = alice.add_or_lookup_contact_id(fiona).await;
+
+    let alice_chat_id = create_group(alice, "Testing contact list").await?;
+    add_contact_to_chat(alice, alice_chat_id, bob_id).await?;
+    add_contact_to_chat(alice, alice_chat_id, fiona_id).await?;
+
+    send_text_msg(alice, alice_chat_id, "hello".to_string()).await?;
+    bob.recv_msg(&alice.pop_sent_msg().await).await;
+    let bob_chat_id = bob.get_last_msg().await.chat_id;
+    assert_eq!(get_chat_contacts(bob, bob_chat_id).await?.len(), 3);
+    assert_eq!(Contact::get_all(bob, 0, None).await?.len(), 0);
+    bob_chat_id.accept(bob).await?;
+    let contacts = Contact::get_all(bob, 0, None).await?;
+    assert_eq!(contacts.len(), 2);
+    let bob_fiona_id = bob.add_or_lookup_contact_id(fiona).await;
+    assert_eq!(contacts[1], bob_fiona_id);
+
+    ChatId::create_for_contact(bob, bob_fiona_id).await?;
+    let contacts = Contact::get_all(bob, 0, None).await?;
+    assert_eq!(contacts.len(), 2);
+    assert_eq!(contacts[0], bob_fiona_id);
+    Ok(())
+}
+
 /// Test for the bug when remote group membership changes from outdated messages overrode local
 /// ones. Especially that was a problem when a message is sent offline so that it doesn't
 /// incorporate recent group membership changes.

src/sql.rs

@@ -214,7 +214,7 @@ impl Sql {
         // this should be done before updates that use high-level objects that
         // rely themselves on the low-level structure.
 
-        let recode_avatar = migrations::run(context, self)
+        let (recode_avatar, update_email_configs) = migrations::run(context, self)
             .await
             .context("failed to run migrations")?;
 
@@ -242,6 +242,22 @@ impl Sql {
             }
         }
 
+        // Reset some options if IsChatmail is true,
+        // because there were reports from users who had these options set to something else,
+        // and then couldn't change them because they are hidden in the UI for chatmail profiles
+        if update_email_configs && context.get_config_bool(Config::IsChatmail).await? {
+            // The default for MvboxMove is actually "1", and it's usually set to "0" in `configure.rs`.
+            context
+                .set_config_internal(Config::MvboxMove, Some("0"))
+                .await?;
+            context
+                .set_config_internal(Config::OnlyFetchMvbox, None)
+                .await?;
+            context
+                .set_config_internal(Config::ShowEmails, None)
+                .await?;
+        }
+
         Ok(())
     }
 

src/sql/migrations.rs

@@ -31,7 +31,7 @@ tokio::task_local! {
     static STOP_MIGRATIONS_AT: i32;
 }
 
-pub async fn run(context: &Context, sql: &Sql) -> Result<bool> {
+pub async fn run(context: &Context, sql: &Sql) -> Result<(bool, bool)> {
     let mut exists_before_update = false;
     let mut dbversion_before_update = DBVERSION;
 
@@ -69,6 +69,7 @@ pub async fn run(context: &Context, sql: &Sql) -> Result<bool> {
 
     let dbversion = dbversion_before_update;
     let mut recode_avatar = false;
+    let mut update_email_configs = false;
 
     if dbversion < 1 {
         sql.execute_migration(
@@ -1466,6 +1467,12 @@ ALTER TABLE contacts ADD COLUMN name_normalized TEXT;
         .await?;
     }
 
+    inc_and_check(&mut migration_version, 144)?;
+    if dbversion < migration_version {
+        update_email_configs = true;
+        sql.set_db_version(migration_version).await?;
+    }
+
     let new_version = sql
         .get_raw_config_int(VERSION_CFG)
         .await?
@@ -1480,7 +1487,7 @@ ALTER TABLE contacts ADD COLUMN name_normalized TEXT;
     }
     info!(context, "Database version: v{new_version}.");
 
-    Ok(recode_avatar)
+    Ok((recode_avatar, update_email_configs))
 }
 
 fn migrate_key_contacts(