Send Bob's verified message to the correct chat.

The reasoning is that both Alice and Bob will already get the group
chat opened and focussed.  Sending the verified messages to 1:1 chats
will create a lot of unused chats for Alice (when adding multiple
members) and also Bob to a lesser extend.  If they do start chatting
1:1 then the 1:1 chat will be created.

Author: flub

src/securejoin.rs

@@ -1133,14 +1133,16 @@ mod tests {
             .with_log_sink(log_tx)
             .build()
             .await;
+
+        // We start with empty chatlists.
         assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 0);
         assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
 
-        let chatid =
+        let alice_chatid =
             chat::create_group_chat(&alice.ctx, ProtectionStatus::Protected, "the chat").await?;
 
         // Step 1: Generate QR-code, secure-join implied by chatid
-        let qr = dc_get_securejoin_qr(&alice.ctx, Some(chatid))
+        let qr = dc_get_securejoin_qr(&alice.ctx, Some(alice_chatid))
             .await
             .unwrap();
 
@@ -1232,9 +1234,9 @@ mod tests {
         );
 
         {
-            // TODO: Check if Alice has a hidden 1:1 chat in which there is an info message
-            // saying bob is verified.  However currently this is purposefully sent to
-            // Alice's group chat by commit 3b7b8ea0f1f8b9c9d300388768eed069be59c8be?
+            // Now Alice's chat with Bob should still be hidden, the verified message should
+            // appear in the group chat.
+
             let chat = alice
                 .get_chat(&bob)
                 .await
@@ -1244,20 +1246,20 @@ mod tests {
                 Blocked::Yes,
                 "Alice's 1:1 chat with Bob is not hidden"
             );
-            // let msg_id = chat::get_chat_msgs(&alice.ctx, chat.get_id(), 0x1, None)
-            //     .await
-            //     .unwrap()
-            //     .into_iter()
-            //     .filter_map(|item| match item {
-            //         chat::ChatItem::Message { msg_id } => Some(msg_id),
-            //         _ => None,
-            //     })
-            //     .max()
-            //     .expect("No messages in Alice's 1:1 chat");
-            // let msg = Message::load_from_db(&alice.ctx, msg_id).await.unwrap();
-            // assert!(msg.is_info());
-            // let text = msg.get_text().unwrap();
-            // assert!(text.contains("[email protected] verified"));
+            let msg_id = chat::get_chat_msgs(&alice.ctx, alice_chatid, 0x1, None)
+                .await
+                .unwrap()
+                .into_iter()
+                .filter_map(|item| match item {
+                    chat::ChatItem::Message { msg_id } => Some(msg_id),
+                    _ => None,
+                })
+                .min()
+                .expect("No messages in Alice's group chat");
+            let msg = Message::load_from_db(&alice.ctx, msg_id).await.unwrap();
+            assert!(msg.is_info());
+            let text = msg.get_text().unwrap();
+            assert!(text.contains("[email protected] verified"));
         }
 
         // Bob should not yet have Alice verified
@@ -1274,10 +1276,56 @@ mod tests {
 
         // Step 7: Bob receives vg-member-added, sends vg-member-added-received
         bob.recv_msg(&sent).await;
-        assert_eq!(
-            contact_alice.is_verified(&bob.ctx).await?,
-            VerifiedStatus::BidirectVerified
-        );
+        {
+            // Bob has Alice verified, message shows up in the group chat.
+            assert_eq!(
+                contact_alice.is_verified(&bob.ctx).await?,
+                VerifiedStatus::BidirectVerified
+            );
+            let chat = bob
+                .get_chat(&alice)
+                .await
+                .expect("Bob has no 1:1 chat with Alice");
+            assert_eq!(
+                chat.blocked,
+                Blocked::Yes,
+                "Bob's 1:1 chat with Alice is not hidden"
+            );
+            for item in chat::get_chat_msgs(&bob.ctx, bob_chatid, 0x1, None)
+                .await
+                .unwrap()
+            {
+                match item {
+                    chat::ChatItem::Message { msg_id } => {
+                        let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
+                        let text = msg.get_text().unwrap();
+                        println!("msg {} text: {}", msg_id, text);
+                    }
+                    _ => (),
+                }
+            }
+            let mut msg_iter = chat::get_chat_msgs(&bob.ctx, bob_chatid, 0x1, None)
+                .await
+                .unwrap()
+                .into_iter();
+            loop {
+                match msg_iter.next() {
+                    Some(chat::ChatItem::Message { msg_id }) => {
+                        let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
+                        let text = msg.get_text().unwrap();
+                        match text.contains("[email protected] verified") {
+                            true => {
+                                assert!(msg.is_info());
+                                break;
+                            }
+                            false => continue,
+                        }
+                    }
+                    Some(_) => continue,
+                    None => panic!("Verified message not found in Bob's group chat"),
+                }
+            }
+        }
 
         let sent = bob.pop_sent_msg().await;
         let msg = alice.parse_msg(&sent).await;

src/securejoin/bob.rs

@@ -220,11 +220,11 @@ impl BobState {
 
     /// Notifies the user that the SecureJoin peer is verified.
     ///
-    /// This creates an info message in the 1:1 chat with the peer.
+    /// This creates an info message in the chat being joined.
     async fn notify_peer_verified(&self, context: &Context) -> Result<()> {
         let contact = Contact::get_by_id(context, self.invite().contact_id()).await?;
         let msg = stock_str::contact_verified(context, &contact).await;
-        let chat_id = self.alice_chat();
+        let chat_id = self.joining_chat_id(context).await?;
         chat::add_info_msg(context, chat_id, &msg, time()).await?;
         context.emit_event(EventType::ChatModified(chat_id));
         Ok(())