allow searching for unaccepted requests (#3694)

* let search_msgs() return unaccepted requests

unaccepted chat requests are shown in the chatlist,
it should be returned by search_msgs() an by the other search functions as well.

form the view of the user, the search acts like a filter,
so there is no reason to hide things additionally.

also, the user may remember a word in a chat request,
maybe even an archived one (there is no need to accept a request before archiving)
that one wants to search later on.

* test searching for unaccepted requests

* simplyfy expression; `c.blocked!=1` is also what is used in similar statements

CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Changes
 
 ### Fixes
+- `dc_search_msgs()` returns unaccepted requests #3694
 
 
 ## 1.98.0

src/context.rs

@@ -650,7 +650,7 @@ impl Context {
                         ON m.chat_id=c.id
                  WHERE m.chat_id>9
                    AND m.hidden=0
-                   AND c.blocked=0
+                   AND c.blocked!=1
                    AND ct.blocked=0
                    AND m.txt LIKE ?
                  ORDER BY m.id DESC LIMIT 1000",
@@ -703,6 +703,8 @@ mod tests {
     use crate::chat::{
         get_chat_contacts, get_chat_msgs, send_msg, set_muted, Chat, ChatId, MuteDuration,
     };
+    use crate::chatlist::Chatlist;
+    use crate::constants::Chattype;
     use crate::contact::ContactId;
     use crate::message::{Message, Viewtype};
     use crate::receive_imf::receive_imf;
@@ -1038,6 +1040,59 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_search_unaccepted_requests() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        receive_imf(
+            &t,
+            b"From: BobBar <bob@example.org>\n\
+                 To: alice@example.org\n\
+                 Subject: foo\n\
+                 Message-ID: <msg1234@example.org>\n\
+                 Chat-Version: 1.0\n\
+                 Date: Tue, 25 Oct 2022 13:37:00 +0000\n\
+                 \n\
+                 hello bob, foobar test!\n",
+            false,
+        )
+        .await?;
+        let chat_id = t.get_last_msg().await.get_chat_id();
+        let chat = Chat::load_from_db(&t, chat_id).await?;
+        assert_eq!(chat.get_type(), Chattype::Single);
+        assert!(chat.is_contact_request());
+
+        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
+        assert_eq!(
+            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
+            1
+        );
+        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
+        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
+
+        chat_id.block(&t).await?;
+
+        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 0);
+        assert_eq!(
+            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
+            0
+        );
+        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 0);
+        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 0);
+
+        let contact_ids = get_chat_contacts(&t, chat_id).await?;
+        Contact::unblock(&t, *contact_ids.first().unwrap()).await?;
+
+        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
+        assert_eq!(
+            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
+            1
+        );
+        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
+        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
+
+        Ok(())
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_limit_search_msgs() -> Result<()> {
         let alice = TestContext::new_alice().await;