show all call state in the same info-message

Author: r10s

src/calls.rs

@@ -13,7 +13,7 @@ use crate::mimeparser::{MimeMessage, SystemMessage};
 use crate::param::Param;
 use crate::sync::SyncData;
 use crate::tools::time;
-use anyhow::{anyhow, ensure, Result};
+use anyhow::{ensure, Result};
 use std::time::Duration;
 use tokio::task;
 use tokio::time::sleep;
@@ -188,7 +188,7 @@ impl Context {
                 }
             }
             SystemMessage::CallAccepted => {
-                let call = self.load_call_by_child_id(call_or_child_id).await?;
+                let call = self.load_call_by_root_id(call_or_child_id).await?;
                 self.emit_msgs_changed(call.msg.chat_id, call_or_child_id);
                 if call.incoming {
                     self.emit_event(EventType::IncomingCallAccepted {
@@ -202,7 +202,7 @@ impl Context {
                 }
             }
             SystemMessage::CallEnded => {
-                let call = self.load_call_by_child_id(call_or_child_id).await?;
+                let call = self.load_call_by_root_id(call_or_child_id).await?;
                 self.emit_msgs_changed(call.msg.chat_id, call_or_child_id);
                 self.emit_event(EventType::CallEnded {
                     msg_id: call.msg.id,
@@ -228,15 +228,6 @@ impl Context {
         self.load_call_by_message(call)
     }
 
-    async fn load_call_by_child_id(&self, child_id: MsgId) -> Result<CallInfo> {
-        let child = Message::load_from_db(self, child_id).await?;
-        if let Some(call) = child.parent(self).await? {
-            self.load_call_by_message(call)
-        } else {
-            Err(anyhow!("Call parent missing"))
-        }
-    }
-
     fn load_call_by_message(&self, call: Message) -> Result<CallInfo> {
         ensure!(
             call.get_info_type() == SystemMessage::IncomingCall

src/receive_imf.rs

@@ -624,10 +624,7 @@ pub(crate) async fn receive_imf_inner(
         }
     }
 
-    if mime_parser.is_system_message == SystemMessage::IncomingCall
-        || mime_parser.is_system_message == SystemMessage::CallAccepted
-        || mime_parser.is_system_message == SystemMessage::CallEnded
-    {
+    if mime_parser.is_system_message == SystemMessage::IncomingCall {
         context.handle_call_msg(&mime_parser, insert_msg_id).await?;
     } else if received_msg.hidden {
         // No need to emit an event about the changed message
@@ -1503,6 +1500,21 @@ async fn add_parts(
     if handle_edit_delete(context, mime_parser, from_id).await? {
         chat_id = DC_CHAT_ID_TRASH;
         info!(context, "Message edits/deletes existing message (TRASH).");
+    } else if mime_parser.is_system_message == SystemMessage::CallAccepted
+        || mime_parser.is_system_message == SystemMessage::CallEnded
+    {
+        // TODO: chat_id = DC_CHAT_ID_TRASH;
+        if let Some(field) = mime_parser.get_header(HeaderDef::InReplyTo) {
+            if let Some(call) =
+                message::get_by_rfc724_mids(context, &parse_message_ids(field)).await?
+            {
+                context.handle_call_msg(mime_parser, call.get_id()).await?;
+            } else {
+                warn!(context, "Call: Cannot load parent.")
+            }
+        } else {
+            warn!(context, "Call: Not a reply.")
+        }
     }
 
     let mut parts = mime_parser.parts.iter().peekable();