From a3dd37b011140190ca16f7dbf6b57707ddf2c084 Mon Sep 17 00:00:00 2001
From: iequidoo <dgreshilov@gmail.com>
Date: Wed, 3 Jul 2024 21:53:08 -0300
Subject: [PATCH] feat(jsonrpc): Allow to set message quote text without
 referencing quoted message (#5695)

Bridge bots like matterdelta need to set a quoted text without referencing the quoted message, this
makes easier bridging messages from other platforms to Delta Chat or even bridging Delta Chat groups
in different accounts where you can not set a quoted message by the message id from another account.
---
 deltachat-jsonrpc/src/api/types/message.rs |  5 ++
 src/message.rs                             | 64 +++++++++++++---------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/deltachat-jsonrpc/src/api/types/message.rs b/deltachat-jsonrpc/src/api/types/message.rs
index cb6cb640b..db05eec03 100644
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -577,7 +577,9 @@ pub struct MessageData {
     pub file: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
+    /// Quoted message id. Takes preference over `quoted_text` (see below).
     pub quoted_message_id: Option<u32>,
+    pub quoted_text: Option<String>,
 }
 
 impl MessageData {
@@ -613,6 +615,9 @@ impl MessageData {
                     ),
                 )
                 .await?;
+        } else if let Some(text) = self.quoted_text {
+            let protect = false;
+            message.set_quote_text(Some((text, protect)));
         }
         Ok(message)
     }
diff --git a/src/message.rs b/src/message.rs
index fef41fce8..20890c414 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1157,6 +1157,27 @@ impl Message {
         Ok(())
     }
 
+    /// Sets message quote text.
+    ///
+    /// If `text` is `Some((text_str, protect))`, `protect` specifies whether `text_str` should only
+    /// be sent encrypted. If it should, but the message is unencrypted, `text_str` is replaced with
+    /// "...".
+    pub fn set_quote_text(&mut self, text: Option<(String, bool)>) {
+        let Some((text, protect)) = text else {
+            self.param.remove(Param::Quote);
+            self.param.remove(Param::ProtectQuote);
+            return;
+        };
+        self.param.set(Param::Quote, text);
+        self.param.set_optional(
+            Param::ProtectQuote,
+            match protect {
+                true => Some("1"),
+                false => None,
+            },
+        );
+    }
+
     /// Sets message quote.
     ///
     /// Message-Id is used to set Reply-To field, message text is used for quote.
@@ -1173,36 +1194,27 @@ impl Message {
             );
             self.in_reply_to = Some(quote.rfc724_mid.clone());
 
-            self.param.set_optional(
-                Param::ProtectQuote,
-                match quote
+            let text = quote.get_text();
+            let text = if text.is_empty() {
+                // Use summary, similar to "Image" to avoid sending empty quote.
+                quote
+                    .get_summary(context, None)
+                    .await?
+                    .truncated_text(500)
+                    .to_string()
+            } else {
+                text
+            };
+            self.set_quote_text(Some((
+                text,
+                quote
                     .param
                     .get_bool(Param::GuaranteeE2ee)
-                    .unwrap_or_default()
-                {
-                    true => Some("1"),
-                    false => None,
-                },
-            );
-
-            let text = quote.get_text();
-            self.param.set(
-                Param::Quote,
-                if text.is_empty() {
-                    // Use summary, similar to "Image" to avoid sending empty quote.
-                    quote
-                        .get_summary(context, None)
-                        .await?
-                        .truncated_text(500)
-                        .to_string()
-                } else {
-                    text
-                },
-            );
+                    .unwrap_or_default(),
+            )));
         } else {
             self.in_reply_to = None;
-            self.param.remove(Param::Quote);
-            self.param.remove(Param::ProtectQuote);
+            self.set_quote_text(None);
         }
 
         Ok(())