Merge pull request #3187 from deltachat/adb/issue-2557

Send setup-changed messages only in the chats we share with the peer

src/chat.rs

@@ -445,6 +445,7 @@ impl ChatId {
                 cmd,
                 dc_create_smeared_timestamp(context).await,
                 None,
+                None,
             )
             .await?;
         }
@@ -3385,7 +3386,9 @@ pub(crate) async fn add_info_msg_with_cmd(
     chat_id: ChatId,
     text: &str,
     cmd: SystemMessage,
-    timestamp: i64,
+    timestamp_sort: i64,
+    // Timestamp to show to the user (if this is None, `timestamp_sort` will be shown to the user)
+    timestamp_sent_rcvd: Option<i64>,
     parent: Option<&Message>,
 ) -> Result<MsgId> {
     let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
@@ -3398,12 +3401,15 @@ pub(crate) async fn add_info_msg_with_cmd(
 
     let row_id =
     context.sql.insert(
-        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,type,state,txt,rfc724_mid,ephemeral_timer, param,mime_in_reply_to) VALUES (?,?,?, ?,?,?, ?,?,?, ?,?);",
+        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,timestamp_sent,timestamp_rcvd,type,state,txt,rfc724_mid,ephemeral_timer, param,mime_in_reply_to)
+        VALUES (?,?,?, ?,?,?,?,?, ?,?,?, ?,?);",
         paramsv![
             chat_id,
             ContactId::INFO,
             ContactId::INFO,
-            timestamp,
+            timestamp_sort,
+            timestamp_sent_rcvd.unwrap_or(0),
+            timestamp_sent_rcvd.unwrap_or(0),
             Viewtype::Text,
             MessageState::InNoticed,
             text,
@@ -3433,6 +3439,7 @@ pub(crate) async fn add_info_msg(
         SystemMessage::Unknown,
         timestamp,
         None,
+        None,
     )
     .await
 }
@@ -4519,6 +4526,7 @@ mod tests {
             SystemMessage::EphemeralTimerChanged,
             10000,
             None,
+            None,
         )
         .await?;