feat: Contact::lookup_id_by_addr_ex: Prefer returning accepted contacts

We don't want to prefer returning verified contacts because e.g. if a bot was reinstalled and its
key changed, it may not be verified, and we don't want to bring the user to the old chat if they
click on the bot email address. But trying to return accepted contacts increases security and
doesn't break the described scenario.

src/contact/contact_tests.rs

@@ -1035,8 +1035,7 @@ async fn test_was_seen_recently_event() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_lookup_id_by_addr_recent() -> Result<()> {
+async fn test_lookup_id_by_addr_recent_ex(accept_unencrypted_chat: bool) -> Result<()> {
     let mut tcm = TestContextManager::new();
     let bob = &tcm.bob().await;
 
@@ -1053,10 +1052,12 @@ Date: Thu, 24 Nov 2022 $TIME +0100
 
 Hi"#
     .to_string();
-    for (time, is_key_contact) in [("20:05:57", true), ("20:05:58", false)] {
+    for (time, is_key_contact) in [("20:05:57", true), ("20:05:58", !accept_unencrypted_chat)] {
         let raw = raw.replace("$TIME", time);
         let received_msg = receive_imf(bob, raw.as_bytes(), false).await?.unwrap();
-        received_msg.chat_id.accept(bob).await?;
+        if accept_unencrypted_chat {
+            received_msg.chat_id.accept(bob).await?;
+        }
         let contact_id = Contact::lookup_id_by_addr(bob, "alice@example.org", Origin::Unknown)
             .await?
             .unwrap();
@@ -1066,6 +1067,18 @@ Hi"#
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_lookup_id_by_addr_recent() -> Result<()> {
+    let accept_unencrypted_chat = true;
+    test_lookup_id_by_addr_recent_ex(accept_unencrypted_chat).await
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_lookup_id_by_addr_recent_accepted() -> Result<()> {
+    let accept_unencrypted_chat = false;
+    test_lookup_id_by_addr_recent_ex(accept_unencrypted_chat).await
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_verified_by_none() -> Result<()> {
     let mut tcm = TestContextManager::new();