Fix detection of Trash, Junk, All etc. folders

imap_proto has been updated, so attributes like `\All`,
`\Junk` from RFC 3501 and RFC 6154 are no longer considered
extensions.

.cargo/config.toml

@@ -0,0 +1,11 @@
+[env]
+# In unoptimised builds tokio tends to use a lot of stack space when
+# creating some complicated futures, tokio has an open issue for this:
+# https://github.com/tokio-rs/tokio/issues/2055.  Some of our tests
+# manage to not fit in the default 2MiB stack anymore due to this, so
+# while the issue is not resolved we want to work around this.
+# Because compiling optimised builds takes a very long time we prefer
+# to avoid that.  Setting this environment variable ensures that when
+# invoking `cargo test` threads are allowed to have a large enough
+# stack size without needing to use an optimised build.
+RUST_MIN_STACK = "8388608"

.github/workflows/ci.yml

@@ -83,13 +83,13 @@ jobs:
             rust: 1.61.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.56.1
+          # Minimum Supported Rust Version = 1.57.0
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.57.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/jsonrpc.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUST_MIN_STACK: "8388608"
 
 jobs:
   build_and_test:

CHANGELOG.md

@@ -2,8 +2,96 @@
 
 ## Unreleased
 
+### Changes
+
 ### API-Changes
+
+### Fixes
+- fix detection of "All mail", "Trash", "Junk" etc folders. #3760
+
+
+## 1.101.0
+
+### Changes
+- add `configured_inbox_folder` to account info #3748
+- `dc_delete_contact()` hides contacts if referenced #3751
+- add IMAP UIDs to message info #3755
+
+### Fixes
+- improve IMAP logging, in particular fix incorrect "IMAP IDLE protocol
+  timed out" message on network error during IDLE #3749
+- pop Recently Seen Loop event out of the queue when it is in the past
+  to avoid busy looping #3753
+- fix build failures by going back to standard `async_zip` #3747
+
+
+## 1.100.0
+
+### API-Changes
+- jsonrpc: add `miscSaveSticker` method
+
+### Changes
+- add JSON-RPC stdio server `deltachat-rpc-server` and use it for JSON-RPC tests #3695
+- update rPGP from 0.8 to 0.9 #3737
+- jsonrpc: typescript client: use npm released deltachat fork of the tiny emitter package #3741
+- jsonrpc: show sticker image in quote #3744
+
+
+
+## 1.99.0
+
+### API-Changes
+- breaking jsonrpc: changed function naming
+  - `autocryptInitiateKeyTransfer` -> `initiateAutocryptKeyTransfer`
+  - `autocryptContinueKeyTransfer` -> `continueAutocryptKeyTransfer`
+  - `chatlistGetFullChatById` -> `getFullChatById`
+  - `messageGetMessage` -> `getMessage`
+  - `messageGetMessages` -> `getMessages`
+  - `messageGetNotificationInfo` -> `getMessageNotificationInfo`
+  - `contactsGetContact` -> `getContact`
+  - `contactsCreateContact` -> `createContact`
+  - `contactsCreateChatByContactId` -> `createChatByContactId`
+  - `contactsBlock` -> `blockContact`
+  - `contactsUnblock` -> `unblockContact`
+  - `contactsGetBlocked` -> `getBlockedContacts`
+  - `contactsGetContactIds` -> `getContactIds`
+  - `contactsGetContacts` -> `getContacts`
+  - `contactsGetContactsByIds` -> `getContactsByIds`
+  - `chatGetMedia` -> `getChatMedia`
+  - `chatGetNeighboringMedia` -> `getNeighboringChatMedia`
+  - `webxdcSendStatusUpdate` -> `sendWebxdcStatusUpdate`
+  - `webxdcGetStatusUpdates` -> `getWebxdcStatusUpdates`
+  - `messageGetWebxdcInfo` -> `getWebxdcInfo`
+- jsonrpc: changed method signature
+  - `miscSendTextMessage(accountId, text, chatId)` -> `miscSendTextMessage(accountId, chatId, text)`
+- jsonrpc: add `SystemMessageType` to `Message`
+- cffi: add missing `DC_INFO_` constants
+- Add DC_EVENT_INCOMING_MSG_BUNCH event #3643
+- Python bindings: Make get_matching() only match the
+  whole event name, e.g. events.get_matching("DC_EVENT_INCOMING_MSG")
+  won't match DC_EVENT_INCOMING_MSG_BUNCH anymore #3643
+
+
+- Rust: Introduce a ContextBuilder #3698
+
+### Changes
+- allow sender timestamp to be in the future, but not too much
+- Disable the new "Authentication-Results/DKIM checking" security feature
+  until we have tested it a bit #3728
+- refactorings #3706
+
+### Fixes
+- `dc_search_msgs()` returns unaccepted requests #3694
+- emit "contacts changed" event when the contact is no longer "seen recently" #3703
+- do not allow peerstate reset if DKIM check failed #3731
+
+
+## 1.98.0
+
+### API-Changes
+- jsonrpc: typescript client: export constants under `C` enum, similar to how its exported from `deltachat-node` #3681
 - added reactions support #3644
+- jsonrpc: reactions: added reactions to `Message` type and the `sendReaction()` method #3686
 
 ### Changes
 - simplify `UPSERT` queries #3676
@@ -54,6 +142,9 @@
 
 
 ### Changes
+- Look at Authentication-Results. Don't accept Autocrypt key changes
+  if they come with negative authentiation results while this contact
+  sent emails with positive authentication results in the past. #3583
 - jsonrpc in cffi also sends events now #3662
 - jsonrpc: new format for events and better typescript autocompletion
 - Join all "[migration] vXX" log messages into one

Cargo.toml

@@ -1,16 +1,19 @@
 [package]
 name = "deltachat"
-version = "1.97.0"
+version = "1.101.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.56"
+rust-version = "1.57"
 
 [profile.dev]
 debug = 0
 panic = 'abort'
 opt-level = 1
 
+[profile.test]
+opt-level = 0
+
 [profile.release]
 lto = true
 panic = 'abort'
@@ -46,9 +49,9 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.15.0"
+once_cell = "1.16.0"
 percent-encoding = "2.2"
-pgp = { version = "0.8", default-features = false }
+pgp = { version = "0.9", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
 quick-xml = "0.23"
 r2d2 = "0.8"
@@ -74,12 +77,12 @@ fast-socks5 = "0.8"
 humansize = "1"
 qrcodegen = "1.7.0"
 tagger = "4.3.3"
-textwrap = "0.15.1"
+textwrap = "0.16.0"
 async-channel = "1.6.1"
 futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.10", features = ["fs"] }
+tokio-stream = { version = "0.1.11", features = ["fs"] }
 reqwest = { version = "0.11.12", features = ["json"] }
-async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
+async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
@@ -95,7 +98,8 @@ tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc"
+  "deltachat-jsonrpc",
+  "deltachat-rpc-server"
 ]
 
 [[example]]

README.md

@@ -125,10 +125,12 @@ $ cargo test -- --ignored
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+- **Node.js** 
+  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 
 The following "frontend" projects make use of the Rust-library
@@ -140,3 +142,5 @@ or its language bindings:
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**
+
+[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.97.0"
+version = "1.101.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -25,7 +25,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.15.0"
+once_cell = "1.16.0"
 
 [features]
 default = ["vendored"]

deltachat-ffi/deltachat.h

@@ -1016,8 +1016,6 @@ uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reactio
  * @param context The context object.
  * @param msg_id The message ID to get reactions for.
  * @return A structure with all reactions to the message.
- *    If there are no reactions, still a structure is returned and dc_reactions_get_contacts() will return an empty array.
- *    On errors, NULL is returned.
  */
 dc_reactions_t* dc_get_msg_reactions (dc_context_t *context, int msg_id);
 
@@ -2058,8 +2056,9 @@ char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t co
 
 
 /**
- * Delete a contact. The contact is deleted from the local device. It may happen that this is not
- * possible as the contact is in use. In this case, the contact can be blocked.
+ * Delete a contact so that it disappears from the corresponding lists.
+ * Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
+ * The contact is deleted from the local device.
  *
  * May result in a #DC_EVENT_CONTACTS_CHANGED event.
  *
@@ -4099,9 +4098,19 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 
 
 // DC_INFO* uses the same values as SystemMessage in rust-land
-#define         DC_INFO_PROTECTION_ENABLED     11
-#define         DC_INFO_PROTECTION_DISABLED    12
-
+#define         DC_INFO_UNKNOWN                    0
+#define         DC_INFO_GROUP_NAME_CHANGED         2
+#define         DC_INFO_GROUP_IMAGE_CHANGED        3
+#define         DC_INFO_MEMBER_ADDED_TO_GROUP      4
+#define         DC_INFO_MEMBER_REMOVED_FROM_GROUP  5
+#define         DC_INFO_AUTOCRYPT_SETUP_MESSAGE    6
+#define         DC_INFO_SECURE_JOIN_MESSAGE        7
+#define         DC_INFO_LOCATIONSTREAMING_ENABLED  8
+#define         DC_INFO_LOCATION_ONLY              9
+#define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
+#define         DC_INFO_PROTECTION_ENABLED        11
+#define         DC_INFO_PROTECTION_DISABLED       12
+#define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 
 /**
  * Check if a message is still in creation. A message is in creation between
@@ -4929,8 +4938,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
  * @param reactions The object containing message reactions.
  * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
  *         dc_array_get_id() to get the IDs. Should be freed using `dc_array_unref()` after usage.
- *         If there are no reactions, the returned array will be empty.
- *         On errors, NULL is returned.
  */
 dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
 
@@ -5628,6 +5635,17 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_INCOMING_MSG             2005
 
+/**
+ * Downloading a bunch of messages just finished. This is an experimental
+ * event to allow the UI to only show one notification per message bunch,
+ * instead of cluttering the user with many notifications.
+ * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
+ * 
+ * @param data1 0
+ * @param data2 (char*) msg_ids, a json object with the message ids.
+ */
+#define DC_EVENT_INCOMING_MSG_BUNCH       2006
+
 
 /**
  * Messages were marked noticed or seen.

deltachat-ffi/src/lib.rs

@@ -503,6 +503,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::MsgsChanged { .. } => 2000,
         EventType::ReactionsChanged { .. } => 2001,
         EventType::IncomingMsg { .. } => 2005,
+        EventType::IncomingMsgBunch { .. } => 2006,
         EventType::MsgsNoticed { .. } => 2008,
         EventType::MsgDelivered { .. } => 2010,
         EventType::MsgFailed { .. } => 2012,
@@ -544,6 +545,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::Error(_)
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
+        | EventType::IncomingMsgBunch { .. }
         | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
         | EventType::ReactionsChanged { chat_id, .. }
@@ -600,6 +602,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
         | EventType::WebxdcInstanceDeleted { .. }
+        | EventType::IncomingMsgBunch { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
@@ -671,6 +674,11 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = file.to_c_string().unwrap_or_default();
             data2.into_raw()
         }
+        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
+            .unwrap_or_default()
+            .to_c_string()
+            .unwrap_or_default()
+            .into_raw(),
     }
 }
 
@@ -2136,7 +2144,10 @@ pub unsafe extern "C" fn dc_delete_contact(
     block_on(async move {
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
-            Err(_) => 0,
+            Err(err) => {
+                error!(ctx, "cannot delete contact: {}", err);
+                0
+            }
         }
     })
 }
@@ -2852,7 +2863,11 @@ pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *
         return "".strdup();
     }
     let ffi_chat = &*chat;
-    ffi_chat.chat.get_mailinglist_addr().strdup()
+    ffi_chat
+        .chat
+        .get_mailinglist_addr()
+        .unwrap_or_default()
+        .strdup()
 }
 
 #[no_mangle]

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.97.0"
+version = "1.101.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
@@ -20,16 +20,17 @@ serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.3.0"
 log = "0.4"
 async-channel = { version = "1.6.1" }
-futures = { version = "0.3.24" }
-serde_json = "1.0.85"
+futures = { version = "0.3.25" }
+serde_json = "1.0.87"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.3", features = ["json_value"] }
 tokio = { version = "1.21.2" }
+sanitize-filename = "0.4"
+walkdir = "2.3.2"
 
 # optional dependencies
-axum = { version = "0.5.16", optional = true, features = ["ws"] }
+axum = { version = "0.5.17", optional = true, features = ["ws"] }
 env_logger = { version = "0.9.1", optional = true }
-walkdir = "2.3.2"
 
 [dev-dependencies]
 tokio = { version = "1.21.2", features = ["full", "rt-multi-thread"] }

deltachat-jsonrpc/src/api/events.rs

@@ -120,6 +120,16 @@ pub enum JSONRPCEventType {
         msg_id: u32,
     },
 
+    /// Downloading a bunch of messages just finished. This is an experimental
+    /// event to allow the UI to only show one notification per message bunch,
+    /// instead of cluttering the user with many notifications.
+    ///
+    /// msg_ids contains the message ids.
+    #[serde(rename_all = "camelCase")]
+    IncomingMsgBunch {
+        msg_ids: Vec<u32>,
+    },
+
     /// Messages were seen or noticed.
     /// chat id is always set.
     #[serde(rename_all = "camelCase")]
@@ -305,6 +315,9 @@ impl From<EventType> for JSONRPCEventType {
                 chat_id: chat_id.to_u32(),
                 msg_id: msg_id.to_u32(),
             },
+            EventType::IncomingMsgBunch { msg_ids } => IncomingMsgBunch {
+                msg_ids: msg_ids.into_iter().map(|id| id.to_u32()).collect(),
+            },
             EventType::MsgsNoticed(chat_id) => MsgsNoticed {
                 chat_id: chat_id.to_u32(),
             },

deltachat-jsonrpc/src/api/mod.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{anyhow, bail, ensure, Context, Result};
 use deltachat::{
     chat::{
         self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
@@ -17,10 +17,12 @@ use deltachat::{
     provider::get_provider_info,
     qr,
     qr_code_generator::get_securejoin_qr_svg,
+    reaction::send_reaction,
     securejoin,
     stock_str::StockMessage,
     webxdc::StatusUpdateSerial,
 };
+use sanitize_filename::is_sanitized;
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::{collections::HashMap, str::FromStr};
@@ -34,7 +36,7 @@ pub mod events;
 pub mod types;
 
 use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::QrObject;
+use crate::api::types::qr::QrObject;
 
 use types::account::Account;
 use types::chat::FullChat;
@@ -399,12 +401,12 @@ impl CommandApi {
     //  autocrypt
     // ---------------------------------------------
 
-    async fn autocrypt_initiate_key_transfer(&self, account_id: u32) -> Result<String> {
+    async fn initiate_autocrypt_key_transfer(&self, account_id: u32) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
         deltachat::imex::initiate_key_transfer(&ctx).await
     }
 
-    async fn autocrypt_continue_key_transfer(
+    async fn continue_autocrypt_key_transfer(
         &self,
         account_id: u32,
         message_id: u32,
@@ -471,11 +473,7 @@ impl CommandApi {
     //  chat
     // ---------------------------------------------
 
-    async fn chatlist_get_full_chat_by_id(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-    ) -> Result<FullChat> {
+    async fn get_full_chat_by_id(&self, account_id: u32, chat_id: u32) -> Result<FullChat> {
         let ctx = self.get_context(account_id).await?;
         FullChat::try_from_dc_chat_id(&ctx, chat_id).await
     }
@@ -910,7 +908,7 @@ impl CommandApi {
             .collect::<Vec<JSONRPCMessageListItem>>())
     }
 
-    async fn message_get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
+    async fn get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
         let ctx = self.get_context(account_id).await?;
         MessageObject::from_message_id(&ctx, message_id).await
     }
@@ -920,7 +918,7 @@ impl CommandApi {
         MsgId::new(message_id).get_html(&ctx).await
     }
 
-    async fn message_get_messages(
+    async fn get_messages(
         &self,
         account_id: u32,
         message_ids: Vec<u32>,
@@ -937,7 +935,7 @@ impl CommandApi {
     }
 
     /// Fetch info desktop needs for creating a notification for a message
-    async fn message_get_notification_info(
+    async fn get_message_notification_info(
         &self,
         account_id: u32,
         message_id: u32,
@@ -1028,11 +1026,7 @@ impl CommandApi {
     // ---------------------------------------------
 
     /// Get a single contact options by ID.
-    async fn contacts_get_contact(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<ContactObject> {
+    async fn get_contact(&self, account_id: u32, contact_id: u32) -> Result<ContactObject> {
         let ctx = self.get_context(account_id).await?;
         let contact_id = ContactId::new(contact_id);
 
@@ -1046,7 +1040,7 @@ impl CommandApi {
     /// Add a single contact as a result of an explicit user action.
     ///
     /// Returns contact id of the created or existing contact
-    async fn contacts_create_contact(
+    async fn create_contact(
         &self,
         account_id: u32,
         email: String,
@@ -1063,11 +1057,7 @@ impl CommandApi {
     }
 
     /// Returns contact id of the created or existing DM chat with that contact
-    async fn contacts_create_chat_by_contact_id(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<u32> {
+    async fn create_chat_by_contact_id(&self, account_id: u32, contact_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         let contact = Contact::get_by_id(&ctx, ContactId::new(contact_id)).await?;
         ChatId::create_for_contact(&ctx, contact.id)
@@ -1075,17 +1065,17 @@ impl CommandApi {
             .map(|id| id.to_u32())
     }
 
-    async fn contacts_block(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn block_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         Contact::block(&ctx, ContactId::new(contact_id)).await
     }
 
-    async fn contacts_unblock(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn unblock_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         Contact::unblock(&ctx, ContactId::new(contact_id)).await
     }
 
-    async fn contacts_get_blocked(&self, account_id: u32) -> Result<Vec<ContactObject>> {
+    async fn get_blocked_contacts(&self, account_id: u32) -> Result<Vec<ContactObject>> {
         let ctx = self.get_context(account_id).await?;
         let blocked_ids = Contact::get_all_blocked(&ctx).await?;
         let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
@@ -1101,7 +1091,7 @@ impl CommandApi {
         Ok(contacts)
     }
 
-    async fn contacts_get_contact_ids(
+    async fn get_contact_ids(
         &self,
         account_id: u32,
         list_flags: u32,
@@ -1114,7 +1104,7 @@ impl CommandApi {
 
     /// Get a list of contacts.
     /// (formerly called getContacts2 in desktop)
-    async fn contacts_get_contacts(
+    async fn get_contacts(
         &self,
         account_id: u32,
         list_flags: u32,
@@ -1135,7 +1125,7 @@ impl CommandApi {
         Ok(contacts)
     }
 
-    async fn contacts_get_contacts_by_ids(
+    async fn get_contacts_by_ids(
         &self,
         account_id: u32,
         ids: Vec<u32>,
@@ -1218,7 +1208,7 @@ impl CommandApi {
     ///
     /// Setting `chat_id` to `None` (`null` in typescript) means get messages with media
     /// from any chat of the currently used account.
-    async fn chat_get_media(
+    async fn get_chat_media(
         &self,
         account_id: u32,
         chat_id: Option<u32>,
@@ -1246,7 +1236,7 @@ impl CommandApi {
     ///
     /// one combined call for getting chat::get_next_media for both directions
     /// the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-    async fn chat_get_neighboring_media(
+    async fn get_neighboring_chat_media(
         &self,
         account_id: u32,
         msg_id: u32,
@@ -1398,7 +1388,7 @@ impl CommandApi {
     //                   webxdc
     // ---------------------------------------------
 
-    async fn webxdc_send_status_update(
+    async fn send_webxdc_status_update(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -1410,7 +1400,7 @@ impl CommandApi {
             .await
     }
 
-    async fn webxdc_get_status_updates(
+    async fn get_webxdc_status_updates(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -1425,7 +1415,7 @@ impl CommandApi {
     }
 
     /// Get info from a webxdc message
-    async fn message_get_webxdc_info(
+    async fn get_webxdc_info(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -1466,6 +1456,23 @@ impl CommandApi {
         Ok(message_id.to_u32())
     }
 
+    /// Send a reaction to message.
+    ///
+    /// Reaction is a string of emojis separated by spaces. Reaction to a
+    /// single message can be sent multiple times. The last reaction
+    /// received overrides all previously received reactions. It is
+    /// possible to remove all reactions by sending an empty string.
+    async fn send_reaction(
+        &self,
+        account_id: u32,
+        message_id: u32,
+        reaction: Vec<String>,
+    ) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        let message_id = send_reaction(&ctx, MsgId::new(message_id), &reaction.join(" ")).await?;
+        Ok(message_id.to_u32())
+    }
+
     // ---------------------------------------------
     //           functions for the composer
     //    the composer is the message input field
@@ -1506,7 +1513,7 @@ impl CommandApi {
             .get_dbfile()
             .parent()
             .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
+        let sticker_folder_path = account_folder.join("stickers");
         fs::create_dir_all(&sticker_folder_path).await?;
         sticker_folder_path
             .to_str()
@@ -1514,15 +1521,55 @@ impl CommandApi {
             .context("path conversion to string failed")
     }
 
+    /// save a sticker to a collection/folder in the account's sticker folder
+    async fn misc_save_sticker(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        collection: String,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
+        ensure!(
+            message.get_viewtype() == Viewtype::Sticker,
+            "message {} is not a sticker",
+            msg_id
+        );
+        let account_folder = ctx
+            .get_dbfile()
+            .parent()
+            .context("account folder not found")?;
+        ensure!(
+            is_sanitized(&collection),
+            "illegal characters in collection name"
+        );
+        let destination_path = account_folder.join("stickers").join(collection);
+        fs::create_dir_all(&destination_path).await?;
+        let file = message.get_file(&ctx).context("no file")?;
+        fs::copy(
+            &file,
+            destination_path.join(format!(
+                "{}.{}",
+                msg_id,
+                file.extension()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+            )),
+        )
+        .await?;
+        Ok(())
+    }
+
     /// for desktop, get stickers from stickers folder,
-    /// grouped by the folder they are in.
+    /// grouped by the collection/folder they are in.
     async fn misc_get_stickers(&self, account_id: u32) -> Result<HashMap<String, Vec<String>>> {
         let ctx = self.get_context(account_id).await?;
         let account_folder = ctx
             .get_dbfile()
             .parent()
             .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
+        let sticker_folder_path = account_folder.join("stickers");
         fs::create_dir_all(&sticker_folder_path).await?;
         let mut result = HashMap::new();
 
@@ -1561,8 +1608,8 @@ impl CommandApi {
     async fn misc_send_text_message(
         &self,
         account_id: u32,
-        text: String,
         chat_id: u32,
+        text: String,
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
 
@@ -1668,8 +1715,11 @@ async fn set_config(
     if key.starts_with("ui.") {
         ctx.set_ui_config(key, value).await?;
     } else {
-        ctx.set_config(Config::from_str(key).context("unknown key")?, value)
-            .await?;
+        ctx.set_config(
+            Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?,
+            value,
+        )
+        .await?;
 
         match key {
             "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
@@ -1688,7 +1738,7 @@ async fn get_config(
     if key.starts_with("ui.") {
         ctx.get_ui_config(key).await
     } else {
-        ctx.get_config(Config::from_str(key).context("unknown key")?)
+        ctx.get_config(Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?)
             .await
     }
 }

deltachat-jsonrpc/src/api/types/chat.rs

@@ -37,7 +37,7 @@ pub struct FullChat {
     ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
     can_send: bool,
     was_seen_recently: bool,
-    mailing_list_address: String,
+    mailing_list_address: Option<String>,
 }
 
 impl FullChat {
@@ -81,7 +81,7 @@ impl FullChat {
             false
         };
 
-        let mailing_list_address = chat.get_mailinglist_addr().to_string();
+        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
 
         Ok(FullChat {
             id: chat_id,

deltachat-jsonrpc/src/api/types/message.rs

@@ -8,6 +8,7 @@ use deltachat::download;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
 use deltachat::message::Viewtype;
+use deltachat::reaction::get_msg_reactions;
 use num_traits::cast::ToPrimitive;
 use serde::Deserialize;
 use serde::Serialize;
@@ -15,6 +16,7 @@ use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
+use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;
 
 #[derive(Serialize, TypeDef)]
@@ -43,6 +45,8 @@ pub struct MessageObject {
     is_setupmessage: bool,
     is_info: bool,
     is_forwarded: bool,
+    /// when is_info is true this describes what type of system message it is
+    system_message_type: SystemMessageType,
 
     duration: i32,
     dimensions_height: i32,
@@ -64,6 +68,8 @@ pub struct MessageObject {
     webxdc_info: Option<WebxdcMessageInfo>,
 
     download_state: DownloadState,
+
+    reactions: Option<JSONRPCReactions>,
 }
 
 #[derive(Serialize, TypeDef)]
@@ -121,6 +127,7 @@ impl MessageObject {
                         override_sender_name: quote.get_override_sender_name(),
                         image: if quote.get_viewtype() == Viewtype::Image
                             || quote.get_viewtype() == Viewtype::Gif
+                            || quote.get_viewtype() == Viewtype::Sticker
                         {
                             match quote.get_file(context) {
                                 Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
@@ -139,6 +146,13 @@ impl MessageObject {
             None
         };
 
+        let reactions = get_msg_reactions(context, msg_id).await?;
+        let reactions = if reactions.is_empty() {
+            None
+        } else {
+            Some(reactions.into())
+        };
+
         Ok(MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
@@ -164,6 +178,7 @@ impl MessageObject {
             is_setupmessage: message.is_setupmessage(),
             is_info: message.is_info(),
             is_forwarded: message.is_forwarded(),
+            system_message_type: message.get_info_type().into(),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -193,6 +208,8 @@ impl MessageObject {
             webxdc_info,
 
             download_state,
+
+            reactions,
         })
     }
 }
@@ -205,9 +222,6 @@ pub enum MessageViewtype {
     /// Text message.
     Text,
 
-    /// Reaction emoji.
-    Reaction,
-
     /// Image message.
     /// If the image is an animated GIF, the type `Viewtype.Gif` should be used.
     Image,
@@ -245,7 +259,6 @@ impl From<Viewtype> for MessageViewtype {
         match viewtype {
             Viewtype::Unknown => MessageViewtype::Unknown,
             Viewtype::Text => MessageViewtype::Text,
-            Viewtype::Reaction => MessageViewtype::Reaction,
             Viewtype::Image => MessageViewtype::Image,
             Viewtype::Gif => MessageViewtype::Gif,
             Viewtype::Sticker => MessageViewtype::Sticker,
@@ -264,7 +277,6 @@ impl From<MessageViewtype> for Viewtype {
         match viewtype {
             MessageViewtype::Unknown => Viewtype::Unknown,
             MessageViewtype::Text => Viewtype::Text,
-            MessageViewtype::Reaction => Viewtype::Reaction,
             MessageViewtype::Image => Viewtype::Image,
             MessageViewtype::Gif => Viewtype::Gif,
             MessageViewtype::Sticker => Viewtype::Sticker,
@@ -297,6 +309,61 @@ impl From<download::DownloadState> for DownloadState {
     }
 }
 
+#[derive(Serialize, TypeDef)]
+pub enum SystemMessageType {
+    Unknown,
+    GroupNameChanged,
+    GroupImageChanged,
+    MemberAddedToGroup,
+    MemberRemovedFromGroup,
+    AutocryptSetupMessage,
+    SecurejoinMessage,
+    LocationStreamingEnabled,
+    LocationOnly,
+
+    /// Chat ephemeral message timer is changed.
+    EphemeralTimerChanged,
+
+    // Chat protection state changed
+    ChatProtectionEnabled,
+    ChatProtectionDisabled,
+
+    /// Self-sent-message that contains only json used for multi-device-sync;
+    /// if possible, we attach that to other messages as for locations.
+    MultiDeviceSync,
+
+    // Sync message that contains a json payload
+    // sent to the other webxdc instances
+    // These messages are not shown in the chat.
+    WebxdcStatusUpdate,
+
+    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
+    WebxdcInfoMessage,
+}
+
+impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
+    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
+        use deltachat::mimeparser::SystemMessage;
+        match system_message_type {
+            SystemMessage::Unknown => SystemMessageType::Unknown,
+            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
+            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
+            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
+            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
+            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
+            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
+            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
+            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
+            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
+            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
+            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
+            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
+            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
+            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
+        }
+    }
+}
+
 #[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageNotificationInfo {

deltachat-jsonrpc/src/api/types/mod.rs

@@ -1,7 +1,3 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
 pub mod account;
 pub mod chat;
 pub mod chat_list;
@@ -9,6 +5,8 @@ pub mod contact;
 pub mod location;
 pub mod message;
 pub mod provider_info;
+pub mod qr;
+pub mod reactions;
 pub mod webxdc;
 
 pub fn color_int_to_hex_string(color: u32) -> String {
@@ -22,213 +20,3 @@ fn maybe_empty_string_to_option(string: String) -> Option<String> {
         Some(string)
     }
 }
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    Login {
-        address: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/qr.rs

@@ -0,0 +1,213 @@
+use deltachat::qr::Qr;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
+#[derive(Serialize, TypeDef)]
+#[serde(rename = "Qr", rename_all = "camelCase")]
+#[serde(tag = "type")]
+pub enum QrObject {
+    AskVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    AskVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    FprOk {
+        contact_id: u32,
+    },
+    FprMismatch {
+        contact_id: Option<u32>,
+    },
+    FprWithoutAddr {
+        fingerprint: String,
+    },
+    Account {
+        domain: String,
+    },
+    WebrtcInstance {
+        domain: String,
+        instance_pattern: String,
+    },
+    Addr {
+        contact_id: u32,
+        draft: Option<String>,
+    },
+    Url {
+        url: String,
+    },
+    Text {
+        text: String,
+    },
+    WithdrawVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    WithdrawVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    ReviveVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    ReviveVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    Login {
+        address: String,
+    },
+}
+
+impl From<Qr> for QrObject {
+    fn from(qr: Qr) -> Self {
+        match qr {
+            Qr::AskVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::AskVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::AskVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::AskVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::FprOk { contact_id } => {
+                let contact_id = contact_id.to_u32();
+                QrObject::FprOk { contact_id }
+            }
+            Qr::FprMismatch { contact_id } => {
+                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
+                QrObject::FprMismatch { contact_id }
+            }
+            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
+            Qr::Account { domain } => QrObject::Account { domain },
+            Qr::WebrtcInstance {
+                domain,
+                instance_pattern,
+            } => QrObject::WebrtcInstance {
+                domain,
+                instance_pattern,
+            },
+            Qr::Addr { contact_id, draft } => {
+                let contact_id = contact_id.to_u32();
+                QrObject::Addr { contact_id, draft }
+            }
+            Qr::Url { url } => QrObject::Url { url },
+            Qr::Text { text } => QrObject::Text { text },
+            Qr::WithdrawVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::WithdrawVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::WithdrawVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::WithdrawVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::ReviveVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::ReviveVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::ReviveVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::ReviveVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::Login { address, .. } => QrObject::Login { address },
+        }
+    }
+}

deltachat-jsonrpc/src/api/types/reactions.rs

@@ -0,0 +1,47 @@
+use std::collections::BTreeMap;
+
+use deltachat::reaction::Reactions;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
+/// Structure representing all reactions to a particular message.
+#[derive(Serialize, TypeDef)]
+#[serde(rename = "Reactions", rename_all = "camelCase")]
+pub struct JSONRPCReactions {
+    /// Map from a contact to it's reaction to message.
+    reactions_by_contact: BTreeMap<u32, Vec<String>>,
+    /// Unique reactions and their count
+    reactions: BTreeMap<String, u32>,
+}
+
+impl From<Reactions> for JSONRPCReactions {
+    fn from(reactions: Reactions) -> Self {
+        let mut reactions_by_contact: BTreeMap<u32, Vec<String>> = BTreeMap::new();
+        let mut unique_reactions: BTreeMap<String, u32> = BTreeMap::new();
+
+        for contact_id in reactions.contacts() {
+            let reaction = reactions.get(contact_id);
+            if reaction.is_empty() {
+                continue;
+            }
+            let emojis: Vec<String> = reaction
+                .emojis()
+                .into_iter()
+                .map(|emoji| emoji.to_owned())
+                .collect();
+            reactions_by_contact.insert(contact_id.to_u32(), emojis.clone());
+            for emoji in emojis {
+                if let Some(x) = unique_reactions.get_mut(&emoji) {
+                    *x += 1;
+                } else {
+                    unique_reactions.insert(emoji, 1);
+                }
+            }
+        }
+
+        JSONRPCReactions {
+            reactions_by_contact,
+            reactions: unique_reactions,
+        }
+    }
+}

deltachat-jsonrpc/typescript/example/example.ts

@@ -68,7 +68,7 @@ async function run() {
       null
     );
     for (const [chatId, _messageId] of chats) {
-      const chat = await client.rpc.chatlistGetFullChatById(
+      const chat = await client.rpc.getFullChatById(
         selectedAccount,
         chatId
       );
@@ -78,7 +78,7 @@ async function run() {
         chatId,
         0
       );
-      const messages = await client.rpc.messageGetMessages(
+      const messages = await client.rpc.getMessages(
         selectedAccount,
         messageIds
       );

deltachat-jsonrpc/typescript/generated/client.ts

@@ -232,13 +232,13 @@ export class RawClient {
   }
 
 
-  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
-    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
+  public initiateAutocryptKeyTransfer(accountId: T.U32): Promise<string> {
+    return (this._transport.request('initiate_autocrypt_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
   }
 
 
-  public autocryptContinueKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
-    return (this._transport.request('autocrypt_continue_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
+  public continueAutocryptKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
+    return (this._transport.request('continue_autocrypt_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
   }
 
 
@@ -252,8 +252,8 @@ export class RawClient {
   }
 
 
-  public chatlistGetFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
-    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
+  public getFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
+    return (this._transport.request('get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
   }
 
   /**
@@ -593,8 +593,8 @@ export class RawClient {
   }
 
 
-  public messageGetMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
-    return (this._transport.request('message_get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
+  public getMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
+    return (this._transport.request('get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
   }
 
 
@@ -603,15 +603,15 @@ export class RawClient {
   }
 
 
-  public messageGetMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
-    return (this._transport.request('message_get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
+  public getMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
+    return (this._transport.request('get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
   }
 
   /**
    * Fetch info desktop needs for creating a notification for a message
    */
-  public messageGetNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
-    return (this._transport.request('message_get_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
+  public getMessageNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
+    return (this._transport.request('get_message_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
   }
 
   /**
@@ -676,8 +676,8 @@ export class RawClient {
   /**
    * Get a single contact options by ID.
    */
-  public contactsGetContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
-    return (this._transport.request('contacts_get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
+  public getContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
+    return (this._transport.request('get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
   }
 
   /**
@@ -685,48 +685,48 @@ export class RawClient {
    *
    * Returns contact id of the created or existing contact
    */
-  public contactsCreateContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
-    return (this._transport.request('contacts_create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
+  public createContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
+    return (this._transport.request('create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
   }
 
   /**
    * Returns contact id of the created or existing DM chat with that contact
    */
-  public contactsCreateChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
-    return (this._transport.request('contacts_create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
+  public createChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
+    return (this._transport.request('create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
   }
 
 
-  public contactsBlock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_block', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  public blockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('block_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
   }
 
 
-  public contactsUnblock(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('contacts_unblock', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  public unblockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('unblock_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
   }
 
 
-  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
+  public getBlockedContacts(accountId: T.U32): Promise<(T.Contact)[]> {
+    return (this._transport.request('get_blocked_contacts', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
   }
 
 
-  public contactsGetContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('contacts_get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
+  public getContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
   }
 
   /**
    * Get a list of contacts.
    * (formerly called getContacts2 in desktop)
    */
-  public contactsGetContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
-    return (this._transport.request('contacts_get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
+  public getContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
+    return (this._transport.request('get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
   }
 
 
-  public contactsGetContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
-    return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
+  public getContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
+    return (this._transport.request('get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
   }
 
 
@@ -770,8 +770,8 @@ export class RawClient {
    * Setting `chat_id` to `None` (`null` in typescript) means get messages with media
    * from any chat of the currently used account.
    */
-  public chatGetMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
+  public getChatMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('get_chat_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
   }
 
   /**
@@ -782,8 +782,8 @@ export class RawClient {
    * one combined call for getting chat::get_next_media for both directions
    * the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
    */
-  public chatGetNeighboringMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
-    return (this._transport.request('chat_get_neighboring_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
+  public getNeighboringChatMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
+    return (this._transport.request('get_neighboring_chat_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
   }
 
 
@@ -845,20 +845,20 @@ export class RawClient {
   }
 
 
-  public webxdcSendStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('webxdc_send_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
+  public sendWebxdcStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
+    return (this._transport.request('send_webxdc_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
   }
 
 
-  public webxdcGetStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
-    return (this._transport.request('webxdc_get_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
+  public getWebxdcStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
+    return (this._transport.request('get_webxdc_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
   }
 
   /**
    * Get info from a webxdc message
    */
-  public messageGetWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
-    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
+  public getWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
+    return (this._transport.request('get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
   }
 
   /**
@@ -878,6 +878,18 @@ export class RawClient {
     return (this._transport.request('send_sticker', [accountId, chatId, stickerPath] as RPC.Params)) as Promise<T.U32>;
   }
 
+  /**
+   * Send a reaction to message.
+   *
+   * Reaction is a string of emojis separated by spaces. Reaction to a
+   * single message can be sent multiple times. The last reaction
+   * received overrides all previously received reactions. It is
+   * possible to remove all reactions by sending an empty string.
+   */
+  public sendReaction(accountId: T.U32, messageId: T.U32, reaction: (string)[]): Promise<T.U32> {
+    return (this._transport.request('send_reaction', [accountId, messageId, reaction] as RPC.Params)) as Promise<T.U32>;
+  }
+
 
   public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
     return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -900,9 +912,16 @@ export class RawClient {
     return (this._transport.request('misc_get_sticker_folder', [accountId] as RPC.Params)) as Promise<string>;
   }
 
+  /**
+   * save a sticker to a collection/folder in the account's sticker folder
+   */
+  public miscSaveSticker(accountId: T.U32, msgId: T.U32, collection: string): Promise<null> {
+    return (this._transport.request('misc_save_sticker', [accountId, msgId, collection] as RPC.Params)) as Promise<null>;
+  }
+
   /**
    * for desktop, get stickers from stickers folder,
-   * grouped by the folder they are in.
+   * grouped by the collection/folder they are in.
    */
   public miscGetStickers(accountId: T.U32): Promise<Record<string,(string)[]>> {
     return (this._transport.request('misc_get_stickers', [accountId] as RPC.Params)) as Promise<Record<string,(string)[]>>;
@@ -911,8 +930,8 @@ export class RawClient {
   /**
    * Returns the messageid of the sent message
    */
-  public miscSendTextMessage(accountId: T.U32, text: string, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('misc_send_text_message', [accountId, text, chatId] as RPC.Params)) as Promise<T.U32>;
+  public miscSendTextMessage(accountId: T.U32, chatId: T.U32, text: string): Promise<T.U32> {
+    return (this._transport.request('misc_send_text_message', [accountId, chatId, text] as RPC.Params)) as Promise<T.U32>;
   }
 
 

deltachat-jsonrpc/typescript/generated/constants.ts

@@ -0,0 +1,199 @@
+// Generated!
+
+export enum C {
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
+  DC_CERTCK_AUTO = 0,
+  DC_CERTCK_STRICT = 1,
+  DC_CHAT_ID_ALLDONE_HINT = 7,
+  DC_CHAT_ID_ARCHIVED_LINK = 6,
+  DC_CHAT_ID_LAST_SPECIAL = 9,
+  DC_CHAT_ID_TRASH = 3,
+  DC_CHAT_TYPE_BROADCAST = 160,
+  DC_CHAT_TYPE_GROUP = 120,
+  DC_CHAT_TYPE_MAILINGLIST = 140,
+  DC_CHAT_TYPE_SINGLE = 100,
+  DC_CHAT_TYPE_UNDEFINED = 0,
+  DC_CONNECTIVITY_CONNECTED = 4000,
+  DC_CONNECTIVITY_CONNECTING = 2000,
+  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
+  DC_CONNECTIVITY_WORKING = 3000,
+  DC_CONTACT_ID_DEVICE = 5,
+  DC_CONTACT_ID_INFO = 2,
+  DC_CONTACT_ID_LAST_SPECIAL = 9,
+  DC_CONTACT_ID_SELF = 1,
+  DC_GCL_ADD_ALLDONE_HINT = 4,
+  DC_GCL_ADD_SELF = 2,
+  DC_GCL_ARCHIVED_ONLY = 1,
+  DC_GCL_FOR_FORWARDING = 8,
+  DC_GCL_NO_SPECIALS = 2,
+  DC_GCL_VERIFIED_ONLY = 1,
+  DC_GCM_ADDDAYMARKER = 1,
+  DC_GCM_INFO_ONLY = 2,
+  DC_KEY_GEN_DEFAULT = 0,
+  DC_KEY_GEN_ED25519 = 2,
+  DC_KEY_GEN_RSA2048 = 1,
+  DC_LP_AUTH_NORMAL = 4,
+  DC_LP_AUTH_OAUTH2 = 2,
+  DC_MEDIA_QUALITY_BALANCED = 0,
+  DC_MEDIA_QUALITY_WORSE = 1,
+  DC_MSG_ID_DAYMARKER = 9,
+  DC_MSG_ID_LAST_SPECIAL = 9,
+  DC_MSG_ID_MARKER1 = 1,
+  DC_PROVIDER_STATUS_BROKEN = 3,
+  DC_PROVIDER_STATUS_OK = 1,
+  DC_PROVIDER_STATUS_PREPARATION = 2,
+  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
+  DC_SHOW_EMAILS_ALL = 2,
+  DC_SHOW_EMAILS_OFF = 0,
+  DC_SOCKET_AUTO = 0,
+  DC_SOCKET_PLAIN = 3,
+  DC_SOCKET_SSL = 1,
+  DC_SOCKET_STARTTLS = 2,
+  DC_STATE_IN_FRESH = 10,
+  DC_STATE_IN_NOTICED = 13,
+  DC_STATE_IN_SEEN = 16,
+  DC_STATE_OUT_DELIVERED = 26,
+  DC_STATE_OUT_DRAFT = 19,
+  DC_STATE_OUT_FAILED = 24,
+  DC_STATE_OUT_MDN_RCVD = 28,
+  DC_STATE_OUT_PENDING = 20,
+  DC_STATE_OUT_PREPARING = 18,
+  DC_STATE_UNDEFINED = 0,
+  DC_STR_AC_SETUP_MSG_BODY = 43,
+  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
+  DC_STR_ADD_MEMBER_BY_OTHER = 129,
+  DC_STR_ADD_MEMBER_BY_YOU = 128,
+  DC_STR_AEAP_ADDR_CHANGED = 122,
+  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
+  DC_STR_ARCHIVEDCHATS = 40,
+  DC_STR_AUDIO = 11,
+  DC_STR_BAD_TIME_MSG_BODY = 85,
+  DC_STR_BROADCAST_LIST = 115,
+  DC_STR_CANNOT_LOGIN = 60,
+  DC_STR_CANTDECRYPT_MSG_BODY = 29,
+  DC_STR_CONFIGURATION_FAILED = 84,
+  DC_STR_CONNECTED = 107,
+  DC_STR_CONNTECTING = 108,
+  DC_STR_CONTACT_NOT_VERIFIED = 36,
+  DC_STR_CONTACT_SETUP_CHANGED = 37,
+  DC_STR_CONTACT_VERIFIED = 35,
+  DC_STR_DEVICE_MESSAGES = 68,
+  DC_STR_DEVICE_MESSAGES_HINT = 70,
+  DC_STR_DOWNLOAD_AVAILABILITY = 100,
+  DC_STR_DRAFT = 3,
+  DC_STR_E2E_AVAILABLE = 25,
+  DC_STR_E2E_PREFERRED = 34,
+  DC_STR_ENCRYPTEDMSG = 24,
+  DC_STR_ENCR_NONE = 28,
+  DC_STR_ENCR_TRANSP = 27,
+  DC_STR_EPHEMERAL_DAY = 79,
+  DC_STR_EPHEMERAL_DAYS = 95,
+  DC_STR_EPHEMERAL_DISABLED = 75,
+  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
+  DC_STR_EPHEMERAL_HOUR = 78,
+  DC_STR_EPHEMERAL_HOURS = 94,
+  DC_STR_EPHEMERAL_MINUTE = 77,
+  DC_STR_EPHEMERAL_MINUTES = 93,
+  DC_STR_EPHEMERAL_SECONDS = 76,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
+  DC_STR_EPHEMERAL_WEEK = 80,
+  DC_STR_EPHEMERAL_WEEKS = 96,
+  DC_STR_ERROR = 112,
+  DC_STR_ERROR_NO_NETWORK = 87,
+  DC_STR_FAILED_SENDING_TO = 74,
+  DC_STR_FILE = 12,
+  DC_STR_FINGERPRINTS = 30,
+  DC_STR_FORWARDED = 97,
+  DC_STR_GIF = 23,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
+  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
+  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
+  DC_STR_GROUP_LEFT_BY_OTHER = 133,
+  DC_STR_GROUP_LEFT_BY_YOU = 132,
+  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
+  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
+  DC_STR_IMAGE = 9,
+  DC_STR_INCOMING_MESSAGES = 103,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
+  DC_STR_LOCATION = 66,
+  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
+  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
+  DC_STR_MESSAGES = 114,
+  DC_STR_MSGACTIONBYME = 63,
+  DC_STR_MSGACTIONBYUSER = 62,
+  DC_STR_MSGADDMEMBER = 17,
+  DC_STR_MSGDELMEMBER = 18,
+  DC_STR_MSGGROUPLEFT = 19,
+  DC_STR_MSGGRPIMGCHANGED = 16,
+  DC_STR_MSGGRPIMGDELETED = 33,
+  DC_STR_MSGGRPNAME = 15,
+  DC_STR_MSGLOCATIONDISABLED = 65,
+  DC_STR_MSGLOCATIONENABLED = 64,
+  DC_STR_NOMESSAGES = 1,
+  DC_STR_NOT_CONNECTED = 121,
+  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
+  DC_STR_ONE_MOMENT = 106,
+  DC_STR_OUTGOING_MESSAGES = 104,
+  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
+  DC_STR_PART_OF_TOTAL_USED = 116,
+  DC_STR_PROTECTION_DISABLED = 89,
+  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
+  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
+  DC_STR_PROTECTION_ENABLED = 88,
+  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
+  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
+  DC_STR_READRCPT = 31,
+  DC_STR_READRCPT_MAILBODY = 32,
+  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
+  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
+  DC_STR_REPLY_NOUN = 90,
+  DC_STR_SAVED_MESSAGES = 69,
+  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
+  DC_STR_SECURE_JOIN_REPLIES = 118,
+  DC_STR_SECURE_JOIN_STARTED = 117,
+  DC_STR_SELF = 2,
+  DC_STR_SELF_DELETED_MSG_BODY = 91,
+  DC_STR_SENDING = 110,
+  DC_STR_SERVER_TURNED_OFF = 92,
+  DC_STR_SETUP_CONTACT_QR_DESC = 119,
+  DC_STR_STICKER = 67,
+  DC_STR_STORAGE_ON_DOMAIN = 105,
+  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
+  DC_STR_SYNC_MSG_BODY = 102,
+  DC_STR_SYNC_MSG_SUBJECT = 101,
+  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
+  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
+  DC_STR_UPDATING = 109,
+  DC_STR_VIDEO = 10,
+  DC_STR_VIDEOCHAT_INVITATION = 82,
+  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
+  DC_STR_VOICEMESSAGE = 7,
+  DC_STR_WELCOME_MESSAGE = 71,
+  DC_TEXT1_DRAFT = 1,
+  DC_TEXT1_SELF = 3,
+  DC_TEXT1_USERNAME = 2,
+  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
+  DC_VIDEOCHATTYPE_JITSI = 2,
+  DC_VIDEOCHATTYPE_UNKNOWN = 0,
+}

deltachat-jsonrpc/typescript/generated/events.ts

@@ -77,6 +77,10 @@ export type Event=(({
  * `msgId` is set if only a single message is affected by the changes, otherwise 0.
  */
 "type":"MsgsChanged";}&{"chatId":U32;"msgId":U32;})|({
+/**
+ * Reactions for the message changed.
+ */
+"type":"ReactionsChanged";}&{"chatId":U32;"msgId":U32;"contactId":U32;})|({
 /**
  * There is a fresh message. Typically, the user will show an notification
  * when receiving this message.
@@ -84,6 +88,14 @@ export type Event=(({
  * There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
  */
 "type":"IncomingMsg";}&{"chatId":U32;"msgId":U32;})|({
+/**
+ * Downloading a bunch of messages just finished. This is an experimental
+ * event to allow the UI to only show one notification per message bunch,
+ * instead of cluttering the user with many notifications.
+ * 
+ * msg_ids contains the message ids.
+ */
+"type":"IncomingMsgBunch";}&{"msgIds":(U32)[];})|({
 /**
  * Messages were seen or noticed.
  * chat id is always set.

deltachat-jsonrpc/typescript/generated/types.ts

@@ -22,7 +22,7 @@ export type Contact={"address":string;"color":string;"authName":string;"status":
  * the contact's last seen timestamp
  */
 "lastSeen":I64;"wasSeenRecently":boolean;};
-export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;"mailingListAddress":string;};
+export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;"mailingListAddress":(string|null);};
 
 /**
  * cheaper version of fullchat, omits:
@@ -108,6 +108,20 @@ export type Viewtype=("Unknown"|
  */
 "Webxdc");
 export type MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;"viewType":Viewtype;}));
+export type SystemMessageType=("Unknown"|"GroupNameChanged"|"GroupImageChanged"|"MemberAddedToGroup"|"MemberRemovedFromGroup"|"AutocryptSetupMessage"|"SecurejoinMessage"|"LocationStreamingEnabled"|"LocationOnly"|
+/**
+ * Chat ephemeral message timer is changed.
+ */
+"EphemeralTimerChanged"|"ChatProtectionEnabled"|"ChatProtectionDisabled"|
+/**
+ * Self-sent-message that contains only json used for multi-device-sync;
+ * if possible, we attach that to other messages as for locations.
+ */
+"MultiDeviceSync"|"WebxdcStatusUpdate"|
+/**
+ * Webxdc info added with `info` set in `send_webxdc_status_update()`.
+ */
+"WebxdcInfoMessage");
 export type I32=number;
 export type WebxdcMessageInfo={
 /**
@@ -147,7 +161,28 @@ export type WebxdcMessageInfo={
  */
 "internetAccess":boolean;};
 export type DownloadState=("Done"|"Available"|"Failure"|"InProgress");
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);"downloadState":DownloadState;};
+
+/**
+ * Structure representing all reactions to a particular message.
+ */
+export type Reactions=
+/**
+ * Structure representing all reactions to a particular message.
+ */
+{
+/**
+ * Map from a contact to it's reaction to message.
+ */
+"reactionsByContact":Record<U32,(string)[]>;
+/**
+ * Unique reactions and their count
+ */
+"reactions":Record<string,U32>;};
+export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;
+/**
+ * when is_info is true this describes what type of system message it is
+ */
+"systemMessageType":SystemMessageType;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);"downloadState":DownloadState;"reactions":(Reactions|null);};
 export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"image":(string|null);"imageMimeType":(string|null);"chatName":string;"chatProfileImage":(string|null);
 /**
  * also known as summary_text1
@@ -160,4 +195,4 @@ export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"imag
 export type MessageSearchResult={"id":U32;"authorProfileImage":(string|null);"authorName":string;"authorColor":string;"chatName":(string|null);"message":string;"timestamp":I64;};
 export type F64=number;
 export type Location={"locationId":U32;"isIndependent":boolean;"latitude":F64;"longitude":F64;"accuracy":F64;"timestamp":I64;"contactId":U32;"msgId":U32;"chatId":U32;"marker":(string|null);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,boolean,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,Record<string,(string)[]>,U32,string,U32,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,boolean,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,U32,string,null,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];

deltachat-jsonrpc/typescript/package.json

@@ -1,8 +1,8 @@
 {
   "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
   "dependencies": {
+    "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "tiny-emitter": "git+https://github.com/Simon-Laux/tiny-emitter.git",
     "yerpc": "^0.3.3"
   },
   "devDependencies": {
@@ -28,7 +28,7 @@
   "main": "dist/deltachat.js",
   "name": "@deltachat/jsonrpc-client",
   "scripts": {
-    "build": "run-s generate-bindings build:tsc build:bundle",
+    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
     "build:tsc": "tsc",
     "docs": "typedoc --out docs deltachat.ts",
@@ -36,16 +36,17 @@
     "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
     "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
     "example:start": "http-server .",
+    "extract-constants": "node ./scripts/generate-constants.js",
     "generate-bindings": "cargo test",
     "prettier:check": "prettier --check **.ts",
     "prettier:fix": "prettier --write **.ts",
     "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
+    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
     "test:report-coverage": "node report_api_coverage.mjs",
     "test:run": "mocha dist/test",
     "test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.97.0"
+  "version": "1.101.0"
 }

deltachat-jsonrpc/typescript/scripts/generate-constants.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+import { readFileSync, writeFileSync } from "fs";
+import { resolve } from "path";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const data = [];
+const header = resolve(__dirname, "../../../deltachat-ffi/deltachat.h");
+
+console.log("Generating constants...");
+
+const header_data = readFileSync(header, "UTF-8");
+const regex = /^#define\s+(\w+)\s+(\w+)/gm;
+let match;
+while (null != (match = regex.exec(header_data))) {
+  const key = match[1];
+  const value = parseInt(match[2]);
+  if (!isNaN(value)) {
+    data.push({ key, value });
+  }
+}
+
+const constants = data
+  .filter(
+    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
+  )
+  .sort((lhs, rhs) => {
+    if (lhs.key < rhs.key) return -1;
+    else if (lhs.key > rhs.key) return 1;
+    return 0;
+  })
+  .filter(({ key }) => {
+    // filter out what we don't need it
+    return !(
+      key.startsWith("DC_EVENT_") ||
+      key.startsWith("DC_IMEX_") ||
+      key.startsWith("DC_CHAT_VISIBILITY") ||
+      key.startsWith("DC_DOWNLOAD") ||
+      key.startsWith("DC_INFO_") ||
+      (key.startsWith("DC_MSG") && !key.startsWith("DC_MSG_ID")) ||
+      key.startsWith("DC_QR_")
+    );
+  })
+  .map((row) => {
+    return `  ${row.key}: ${row.value}`;
+  })
+  .join(",\n");
+
+writeFileSync(
+  resolve(__dirname, "../generated/constants.ts"),
+  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
+);

deltachat-jsonrpc/typescript/src/client.ts

@@ -3,7 +3,7 @@ import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
 import { Event } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "tiny-emitter";
+import { TinyEmitter } from "@deltachat/tiny-emitter";
 
 type DCWireEvent<T extends Event> = {
   event: T;
@@ -28,14 +28,14 @@ type ContextEvents = { ALL: (event: Event) => void } & {
 };
 
 export type DcEvent = Event;
-export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>
+export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>;
 
 export class BaseDeltaChat<
   Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
   rpc: RawClient;
   account?: T.Account;
-  private contextEmitters: TinyEmitter<ContextEvents>[] = [];
+  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
   constructor(public transport: Transport) {
     super();
     this.rpc = new RawClient(this.transport);
@@ -92,3 +92,34 @@ export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
     this.opts = opts;
   }
 }
+
+export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
+  close() {}
+  constructor(input: any, output: any) {
+    const transport = new StdioTransport(input, output);
+    super(transport);
+  }
+}
+
+export class StdioTransport extends BaseTransport {
+  constructor(public input: any, public output: any) {
+    super();
+
+    var buffer = "";
+    this.output.on("data", (data: any) => {
+      buffer += data.toString();
+      while (buffer.includes("\n")) {
+        const n = buffer.indexOf("\n");
+        const line = buffer.substring(0, n);
+        const message = JSON.parse(line);
+        this._onmessage(message);
+        buffer = buffer.substring(n + 1);
+      }
+    });
+  }
+
+  _send(message: RPC.Message): void {
+    const serialized = JSON.stringify(message);
+    this.input.write(serialized + "\n");
+  }
+}

deltachat-jsonrpc/typescript/src/lib.ts

@@ -4,3 +4,4 @@ export * from "../generated/events.js";
 export { RawClient } from "../generated/client.js";
 export * from "./client.js";
 export * as yerpc from "yerpc";
+export { C } from "../generated/constants.js";

deltachat-jsonrpc/typescript/test/basic.ts

@@ -2,7 +2,7 @@ import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
-import { DeltaChat } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat } from "../deltachat.js";
 
 import {
   RpcServerHandle,
@@ -15,9 +15,7 @@ describe("basic tests", () => {
 
   before(async () => {
     serverHandle = await startServer();
-    // make sure server is up by the time we continue
-    await new Promise((res) => setTimeout(res, 100));
-    dc = new DeltaChat(serverHandle.url)
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout)
     // dc.on("ALL", (event) => {
       //console.log("event", event);
     // });
@@ -84,21 +82,21 @@ describe("basic tests", () => {
       accountId = await dc.rpc.addAccount();
     });
     it("should block and unblock contact", async function () {
-      const contactId = await dc.rpc.contactsCreateContact(
+      const contactId = await dc.rpc.createContact(
         accountId,
         "example@delta.chat",
         null
       );
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
+      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
         .false;
-      await dc.rpc.contactsBlock(accountId, contactId);
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
+      await dc.rpc.blockContact(accountId, contactId);
+      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
         .true;
-      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(1);
-      await dc.rpc.contactsUnblock(accountId, contactId);
-      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
+      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(1);
+      await dc.rpc.unblockContact(accountId, contactId);
+      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
         .false;
-      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(0);
+      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(0);
     });
   });
 

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,5 +1,5 @@
 import { assert, expect } from "chai";
-import { DeltaChat, DcEvent } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
 import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
 
 const EVENT_TIMEOUT = 20000;
@@ -27,7 +27,7 @@ describe("online tests", function () {
       this.skip();
     }
     serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url);
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
 
     dc.on("ALL", (contextId, { type }) => {
       if (type !== "Info") console.log(contextId, type);
@@ -80,21 +80,18 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const contactId = await dc.rpc.contactsCreateContact(
+    const contactId = await dc.rpc.createContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(
-      accountId1,
-      contactId
-    );
+    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
 
-    await dc.rpc.miscSendTextMessage(accountId1, "Hello", chatId);
+    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
     const { chatId: chatIdOnAccountB } = await eventPromise;
     await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
     const messageList = await dc.rpc.getMessageIds(
@@ -104,7 +101,7 @@ describe("online tests", function () {
     );
 
     expect(messageList).have.length(1);
-    const message = await dc.rpc.messageGetMessage(accountId2, messageList[0]);
+    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
     expect(message.text).equal("Hello");
   });
 
@@ -115,20 +112,17 @@ describe("online tests", function () {
     this.timeout(10000);
 
     // send message from A to B
-    const contactId = await dc.rpc.contactsCreateContact(
+    const contactId = await dc.rpc.createContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(
-      accountId1,
-      contactId
-    );
+    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
-    dc.rpc.miscSendTextMessage(accountId1, "Hello2", chatId);
+    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
     // wait for message from A
     console.log("wait for message from A");
 
@@ -141,7 +135,7 @@ describe("online tests", function () {
       chatIdOnAccountB,
       0
     );
-    const message = await dc.rpc.messageGetMessage(
+    const message = await dc.rpc.getMessage(
       accountId2,
       messageList.reverse()[0]
     );
@@ -151,14 +145,14 @@ describe("online tests", function () {
       waitForEvent(dc, "MsgsChanged", accountId1),
       waitForEvent(dc, "IncomingMsg", accountId1),
     ]);
-    dc.rpc.miscSendTextMessage(accountId2, "super secret message", chatId);
+    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
     // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (
       await dc.rpc.getMessageIds(accountId1, chatId, 0)
     ).reverse()[0];
-    const message2 = await dc.rpc.messageGetMessage(accountId1, messageId);
+    const message2 = await dc.rpc.getMessage(accountId1, messageId);
     expect(message2.text).equal("super secret message");
     expect(message2.showPadlock).equal(true);
   });

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -1,38 +1,38 @@
 import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { mkdtemp, rm } from "fs/promises";
-import { existsSync } from "fs";
 import { spawn, exec } from "child_process";
 import fetch from "node-fetch";
-
-export const RPC_SERVER_PORT = 20808;
+import { Readable, Writable } from "node:stream";
 
 export type RpcServerHandle = {
-  url: string,
-  close: () => Promise<void>
-}
+  stdin: Writable;
+  stdout: Readable;
+  close: () => Promise<void>;
+};
 
-export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcServerHandle> {
+export async function startServer(): Promise<RpcServerHandle> {
   const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
 
-  const pathToServerBinary = resolve(join(await getTargetDir(), "debug/deltachat-jsonrpc-server"));
-  console.log('using server binary: ' + pathToServerBinary);
-
-  if (!existsSync(pathToServerBinary)) {
-    throw new Error(
-      "server executable does not exist, you need to build it first" +
-        "\nserver executable not found at " +
-        pathToServerBinary
-    );
-  }
+  const pathToServerBinary = resolve(
+    join(await getTargetDir(), "debug/deltachat-rpc-server")
+  );
 
   const server = spawn(pathToServerBinary, {
     cwd: tmpDir,
     env: {
       RUST_LOG: process.env.RUST_LOG || "info",
-      DC_PORT: '' + port
+      RUST_MIN_STACK: "8388608",
     },
   });
+
+  server.on("error", (err) => {
+    throw new Error(
+      "Failed to start server executable " +
+        pathToServerBinary +
+        ", make sure you built it first."
+    );
+  });
   let shouldClose = false;
 
   server.on("exit", () => {
@@ -43,12 +43,10 @@ export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcSe
   });
 
   server.stderr.pipe(process.stderr);
-  server.stdout.pipe(process.stdout)
-
-  const url = `ws://localhost:${port}/ws`
 
   return {
-    url,
+    stdin: server.stdin,
+    stdout: server.stdout,
     close: async () => {
       shouldClose = true;
       if (!server.kill()) {

deltachat-rpc-server/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "deltachat-rpc-server"
+version = "1.101.0"
+description = "DeltaChat JSON-RPC server"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+edition = "2021"
+readme = "README.md"
+license = "MPL-2.0"
+
+keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
+categories = ["cryptography", "std", "email"]
+
+[[bin]]
+name = "deltachat-rpc-server"
+
+[dependencies]
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc" }
+
+anyhow = "1"
+env_logger = { version = "0.9.1" }
+futures-lite = "1.12.0"
+log = "0.4"
+serde_json = "1.0.85"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.21.2", features = ["io-std"] }
+yerpc = { version = "0.3.1", features = ["anyhow_expose"] }

deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs

@@ -0,0 +1,68 @@
+///! Delta Chat core RPC server.
+///!
+///! It speaks JSON Lines over stdio.
+use std::path::PathBuf;
+
+use anyhow::Result;
+use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
+use deltachat_jsonrpc::api::{Accounts, CommandApi};
+use futures_lite::stream::StreamExt;
+use tokio::io::{self, AsyncBufReadExt, BufReader};
+use tokio::task::JoinHandle;
+use yerpc::{RpcClient, RpcSession};
+
+#[tokio::main(flavor = "multi_thread")]
+async fn main() -> Result<()> {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
+    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
+    log::info!("Starting with accounts directory `{}`.", path);
+    let accounts = Accounts::new(PathBuf::from(&path)).await?;
+    let events = accounts.get_event_emitter();
+
+    log::info!("Creating JSON-RPC API.");
+    let state = CommandApi::new(accounts);
+
+    let (client, mut out_receiver) = RpcClient::new();
+    let session = RpcSession::new(client.clone(), state);
+
+    // Events task converts core events to JSON-RPC notifications.
+    let events_task: JoinHandle<Result<()>> = tokio::spawn(async move {
+        while let Some(event) = events.recv().await {
+            let event = event_to_json_rpc_notification(event);
+            client.send_notification("event", Some(event)).await?;
+        }
+        Ok(())
+    });
+
+    // Send task prints JSON responses to stdout.
+    let send_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
+        while let Some(message) = out_receiver.next().await {
+            let message = serde_json::to_string(&message)?;
+            log::trace!("RPC send {}", message);
+            println!("{}", message);
+        }
+        Ok(())
+    });
+
+    // Receiver task reads JSON requests from stdin.
+    let recv_task: JoinHandle<anyhow::Result<()>> = tokio::spawn(async move {
+        let stdin = io::stdin();
+        let mut lines = BufReader::new(stdin).lines();
+        while let Some(message) = lines.next_line().await? {
+            log::trace!("RPC recv {}", message);
+            session.handle_incoming(&message).await;
+        }
+        log::info!("EOF reached on stdin");
+        Ok(())
+    });
+
+    // Wait for the end of stdin.
+    recv_task.await??;
+
+    // Shutdown the server.
+    send_task.abort();
+    events_task.abort();
+
+    Ok(())
+}

examples/repl/cmdline.rs

@@ -554,7 +554,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
+            let listflags = if arg0 == "listarchived" {
+                DC_GCL_ARCHIVED_ONLY
+            } else {
+                0
+            };
             let time_start = std::time::SystemTime::now();
             let chatlist = Chatlist::try_load(
                 &context,

examples/repl/main.rs

@@ -446,7 +446,7 @@ async fn handle_cmd(
                 }
                 println!("{}", qr);
                 let output = Command::new("qrencode")
-                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                     .output()
                     .expect("failed to execute process");
                 io::stdout().write_all(&output.stdout).unwrap();

node/constants.js

@@ -42,6 +42,7 @@ module.exports = {
   DC_EVENT_IMEX_FILE_WRITTEN: 2052,
   DC_EVENT_IMEX_PROGRESS: 2051,
   DC_EVENT_INCOMING_MSG: 2005,
+  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
   DC_EVENT_INFO: 100,
   DC_EVENT_LOCATION_CHANGED: 2035,
   DC_EVENT_MSGS_CHANGED: 2000,
@@ -71,8 +72,19 @@ module.exports = {
   DC_IMEX_EXPORT_SELF_KEYS: 1,
   DC_IMEX_IMPORT_BACKUP: 12,
   DC_IMEX_IMPORT_SELF_KEYS: 2,
+  DC_INFO_AUTOCRYPT_SETUP_MESSAGE: 6,
+  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
+  DC_INFO_GROUP_IMAGE_CHANGED: 3,
+  DC_INFO_GROUP_NAME_CHANGED: 2,
+  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
+  DC_INFO_LOCATION_ONLY: 9,
+  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
+  DC_INFO_MEMBER_REMOVED_FROM_GROUP: 5,
   DC_INFO_PROTECTION_DISABLED: 12,
   DC_INFO_PROTECTION_ENABLED: 11,
+  DC_INFO_SECURE_JOIN_MESSAGE: 7,
+  DC_INFO_UNKNOWN: 0,
+  DC_INFO_WEBXDC_INFO_MESSAGE: 32,
   DC_KEY_GEN_DEFAULT: 0,
   DC_KEY_GEN_ED25519: 2,
   DC_KEY_GEN_RSA2048: 1,

node/events.js

@@ -16,6 +16,7 @@ module.exports = {
   2000: 'DC_EVENT_MSGS_CHANGED',
   2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
+  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',

node/lib/constants.ts

@@ -42,6 +42,7 @@ export enum C {
   DC_EVENT_IMEX_FILE_WRITTEN = 2052,
   DC_EVENT_IMEX_PROGRESS = 2051,
   DC_EVENT_INCOMING_MSG = 2005,
+  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
   DC_EVENT_INFO = 100,
   DC_EVENT_LOCATION_CHANGED = 2035,
   DC_EVENT_MSGS_CHANGED = 2000,
@@ -71,8 +72,19 @@ export enum C {
   DC_IMEX_EXPORT_SELF_KEYS = 1,
   DC_IMEX_IMPORT_BACKUP = 12,
   DC_IMEX_IMPORT_SELF_KEYS = 2,
+  DC_INFO_AUTOCRYPT_SETUP_MESSAGE = 6,
+  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
+  DC_INFO_GROUP_IMAGE_CHANGED = 3,
+  DC_INFO_GROUP_NAME_CHANGED = 2,
+  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
+  DC_INFO_LOCATION_ONLY = 9,
+  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
+  DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5,
   DC_INFO_PROTECTION_DISABLED = 12,
   DC_INFO_PROTECTION_ENABLED = 11,
+  DC_INFO_SECURE_JOIN_MESSAGE = 7,
+  DC_INFO_UNKNOWN = 0,
+  DC_INFO_WEBXDC_INFO_MESSAGE = 32,
   DC_KEY_GEN_DEFAULT = 0,
   DC_KEY_GEN_ED25519 = 2,
   DC_KEY_GEN_RSA2048 = 1,
@@ -285,6 +297,7 @@ export const EventId2EventName: { [key: number]: string } = {
   2000: 'DC_EVENT_MSGS_CHANGED',
   2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
+  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',

package.json

@@ -60,5 +60,5 @@
     "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.97.0"
+  "version": "1.101.0"
 }

python/src/deltachat/events.py

@@ -105,7 +105,7 @@ class FFIEventTracker:
             yield self.get(timeout=timeout, check_error=check_error)
 
     def get_matching(self, event_name_regex, check_error=True, timeout=None):
-        rex = re.compile("(?:{}).*".format(event_name_regex))
+        rex = re.compile("^(?:{})$".format(event_name_regex))
         for ev in self.iter_events(timeout=timeout, check_error=check_error):
             if rex.match(ev.name):
                 return ev

python/tests/test_3_offline.py

@@ -200,11 +200,11 @@ class TestOfflineContact:
         assert ac1.delete_contact(contact1)
         assert contact1 not in ac1.get_contacts()
 
-    def test_get_contacts_and_delete_fails(self, acfactory):
+    def test_delete_referenced_contact_hides_contact(self, acfactory):
         ac1 = acfactory.get_pseudo_configured_account()
         contact1 = ac1.create_contact("some1@example.com", name="some1")
         msg = contact1.create_chat().send_text("one message")
-        assert not ac1.delete_contact(contact1)
+        assert ac1.delete_contact(contact1)
         assert not msg.filemime
 
     def test_create_chat_flexibility(self, acfactory):

python/tox.ini

@@ -10,6 +10,9 @@ envlist =
 commands = 
     pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
     pip wheel . -w {toxworkdir}/wheelhouse --no-deps
+setenv =
+# Avoid stack overflow when Rust core is built without optimizations.
+    RUST_MIN_STACK=8388608
 passenv = 
     DCC_RS_DEV
     DCC_RS_TARGET

scripts/set_core_version.py

@@ -63,8 +63,13 @@ def main():
     parser = ArgumentParser(prog="set_core_version")
     parser.add_argument("newversion")
 
-    toml_list = ["Cargo.toml", "deltachat-ffi/Cargo.toml",  "deltachat-jsonrpc/Cargo.toml"]
     json_list = ["package.json",  "deltachat-jsonrpc/typescript/package.json"]
+    toml_list = [
+        "Cargo.toml",
+        "deltachat-ffi/Cargo.toml",
+        "deltachat-jsonrpc/Cargo.toml",
+        "deltachat-rpc-server/Cargo.toml",
+    ]
     try:
         opts = parser.parse_args()
     except SystemExit:

spec.md

@@ -450,6 +450,16 @@ This allows the receiver to show the time without knowing the file format.
     Chat-Duration: 10000
 
 
+# Reactions
+
+Messengers MAY implement [RFC 9078](https://tools.ietf.org/html/rfc9078) reactions.
+Received reaction should be interpreted as overwriting all previous reactions
+received from the same contact.
+This semantics is compatible to [XEP-0444](https://xmpp.org/extensions/xep-0444.html).
+As an extension to RFC 9078, it is allowed to send empty reaction message,
+in which case all previously sent reactions are retracted.
+
+
 # Miscellaneous
 
 Messengers SHOULD use the header `In-Reply-To` as usual.

src/authres.rs

@@ -0,0 +1,753 @@
+//! Parsing and handling of the Authentication-Results header.
+//! See the comment on [`handle_authres`] for more.
+
+use std::borrow::Cow;
+use std::collections::BTreeSet;
+use std::fmt;
+
+use anyhow::Result;
+use mailparse::MailHeaderMap;
+use mailparse::ParsedMail;
+use once_cell::sync::Lazy;
+
+use crate::config::Config;
+use crate::context::Context;
+use crate::headerdef::HeaderDef;
+use crate::tools::time;
+use crate::tools::EmailAddress;
+
+/// `authres` is short for the Authentication-Results header, defined in
+/// <https://datatracker.ietf.org/doc/html/rfc8601>, which contains info
+/// about whether DKIM and SPF passed.
+///
+/// To mitigate From forgery, we remember for each sending domain whether it is known
+/// to have valid DKIM. If an email from such a domain comes with invalid DKIM,
+/// we don't allow changing the autocrypt key.
+///
+/// See <https://github.com/deltachat/deltachat-core-rust/issues/3507>.
+pub(crate) async fn handle_authres(
+    context: &Context,
+    mail: &ParsedMail<'_>,
+    from: &str,
+    message_time: i64,
+) -> Result<DkimResults> {
+    let from_domain = match EmailAddress::new(from) {
+        Ok(email) => email.domain,
+        Err(e) => {
+            warn!(context, "invalid email {:#}", e);
+            // This email is invalid, but don't return an error, we still want to
+            // add a stub to the database so that it's not downloaded again
+            return Ok(DkimResults::default());
+        }
+    };
+
+    let authres = parse_authres_headers(&mail.get_headers(), &from_domain);
+    update_authservid_candidates(context, &authres).await?;
+    compute_dkim_results(context, authres, &from_domain, message_time).await
+}
+
+#[derive(Default, Debug)]
+pub(crate) struct DkimResults {
+    /// Whether DKIM passed for this particular e-mail.
+    pub dkim_passed: bool,
+    /// Whether DKIM is known to work for e-mails coming from the sender's domain,
+    /// i.e. whether we expect DKIM to work.
+    pub dkim_should_work: bool,
+    /// Whether changing the public Autocrypt key should be allowed.
+    /// This is false if we expected DKIM to work (dkim_works=true),
+    /// but it failed now (dkim_passed=false).
+    pub allow_keychange: bool,
+}
+
+impl fmt::Display for DkimResults {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            fmt,
+            "DKIM Results: Passed={}, Works={}, Allow_Keychange={}",
+            self.dkim_passed, self.dkim_should_work, self.allow_keychange
+        )?;
+        if !self.allow_keychange {
+            write!(fmt, " KEYCHANGES NOT ALLOWED!!!!")?;
+        }
+        Ok(())
+    }
+}
+
+type AuthservId = String;
+
+#[derive(Debug, PartialEq)]
+enum DkimResult {
+    /// The header explicitly said that DKIM passed
+    Passed,
+    /// The header explicitly said that DKIM failed
+    Failed,
+    /// The header didn't say anything about DKIM; this might mean that it wasn't
+    /// checked, but it might also mean that it failed. This is because some providers
+    /// (e.g. ik.me, mail.ru, posteo.de) don't add `dkim=none` to their
+    /// Authentication-Results if there was no DKIM.
+    Nothing,
+}
+
+type ParsedAuthresHeaders = Vec<(AuthservId, DkimResult)>;
+
+fn parse_authres_headers(
+    headers: &mailparse::headers::Headers<'_>,
+    from_domain: &str,
+) -> ParsedAuthresHeaders {
+    let mut res = Vec::new();
+    for header_value in headers.get_all_values(HeaderDef::AuthenticationResults.into()) {
+        let header_value = remove_comments(&header_value);
+
+        if let Some(mut authserv_id) = header_value.split(';').next() {
+            if authserv_id.contains(char::is_whitespace) || authserv_id.is_empty() {
+                // Outlook violates the RFC by not adding an authserv-id at all, which we notice
+                // because there is whitespace in the first identifier before the ';'.
+                // Authentication-Results-parsing still works securely because they remove incoming
+                // Authentication-Results headers.
+                // We just use an arbitrary authserv-id, it will work for Outlook, and in general,
+                // with providers not implementing the RFC correctly, someone can trick us
+                // into thinking that an incoming email is DKIM-correct, anyway.
+                // The most important thing here is that we have some valid `authserv_id`.
+                authserv_id = "invalidAuthservId";
+            }
+            let dkim_passed = parse_one_authres_header(&header_value, from_domain);
+            res.push((authserv_id.to_string(), dkim_passed));
+        }
+    }
+
+    res
+}
+
+/// The headers can contain comments that look like this:
+/// ```text
+/// Authentication-Results: (this is a comment) gmx.net; (another; comment) dkim=pass;
+/// ```
+fn remove_comments(header: &str) -> Cow<'_, str> {
+    // In Pomsky, this is:
+    //     "(" Codepoint* lazy ")"
+    // See https://playground.pomsky-lang.org/?text=%22(%22%20Codepoint*%20lazy%20%22)%22
+    static RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"\([\s\S]*?\)").unwrap());
+
+    RE.replace_all(header, " ")
+}
+
+/// Parses a single Authentication-Results header, like:
+///
+/// ```text
+/// Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com
+/// ```
+fn parse_one_authres_header(header_value: &str, from_domain: &str) -> DkimResult {
+    if let Some((before_dkim_part, dkim_to_end)) = header_value.split_once("dkim=") {
+        // Check that the character right before `dkim=` is a space or a tab
+        // so that we wouldn't e.g. mistake `notdkim=pass` for `dkim=pass`
+        if before_dkim_part.ends_with(' ') || before_dkim_part.ends_with('\t') {
+            let dkim_part = dkim_to_end.split(';').next().unwrap_or_default();
+            let dkim_parts: Vec<_> = dkim_part.split_whitespace().collect();
+            if let Some(&"pass") = dkim_parts.first() {
+                // DKIM headers contain a header.d or header.i field
+                // that says which domain signed. We have to check ourselves
+                // that this is the same domain as in the From header.
+                let header_d: &str = &format!("header.d={}", &from_domain);
+                let header_i: &str = &format!("header.i=@{}", &from_domain);
+
+                if dkim_parts.contains(&header_d) || dkim_parts.contains(&header_i) {
+                    // We have found a `dkim=pass` header!
+                    return DkimResult::Passed;
+                }
+            } else {
+                // dkim=fail, dkim=none, ...
+                return DkimResult::Failed;
+            }
+        }
+    }
+
+    DkimResult::Nothing
+}
+
+/// ## About authserv-ids
+///
+/// After having checked DKIM, our email server adds an Authentication-Results header.
+///
+/// Now, an attacker could just add an Authentication-Results header that says dkim=pass
+/// in order to make us think that DKIM was correct in their From-forged email.
+///
+/// In order to prevent this, each email server adds its authserv-id to the
+/// Authentication-Results header, e.g. Testrun's authserv-id is `testrun.org`, Gmail's
+/// is `mx.google.com`. When Testrun gets a mail delivered from outside, it will then
+/// remove any Authentication-Results headers whose authserv-id is also `testrun.org`.
+///
+/// We need to somehow find out the authserv-id(s) of our email server, so that
+/// we can use the Authentication-Results with the right authserv-id.
+///
+/// ## What this function does
+///
+/// When receiving an email, this function is called and updates the candidates for
+/// our server's authserv-id, i.e. what we think our server's authserv-id is.
+///
+/// Usually, every incoming email has Authentication-Results  with our server's
+/// authserv-id, so, the intersection of the existing authserv-ids and the incoming
+/// authserv-ids for our server's authserv-id is a good guess for our server's
+/// authserv-id. When this intersection is empty, we assume that the authserv-id has
+/// changed and start over with the new authserv-ids.
+///
+/// See [`handle_authres`].
+async fn update_authservid_candidates(
+    context: &Context,
+    authres: &ParsedAuthresHeaders,
+) -> Result<()> {
+    let mut new_ids: BTreeSet<&str> = authres
+        .iter()
+        .map(|(authserv_id, _dkim_passed)| authserv_id.as_str())
+        .collect();
+    if new_ids.is_empty() {
+        // The incoming message doesn't contain any authentication results, maybe it's a
+        // self-sent or a mailer-daemon message
+        return Ok(());
+    }
+
+    let old_config = context.get_config(Config::AuthservIdCandidates).await?;
+    let old_ids = parse_authservid_candidates_config(&old_config);
+    let intersection: BTreeSet<&str> = old_ids.intersection(&new_ids).copied().collect();
+    if !intersection.is_empty() {
+        new_ids = intersection;
+    }
+    // If there were no AuthservIdCandidates previously, just start with
+    // the ones from the incoming email
+
+    if old_ids != new_ids {
+        let new_config = new_ids.into_iter().collect::<Vec<_>>().join(" ");
+        context
+            .set_config(Config::AuthservIdCandidates, Some(&new_config))
+            .await?;
+        // Updating the authservid candidates may mean that we now consider
+        // emails as "failed" which "passed" previously, so we need to
+        // reset our expectation which DKIMs work.
+        clear_dkim_works(context).await?
+    }
+    Ok(())
+}
+
+/// Use the parsed authres and the authservid candidates to compute whether DKIM passed
+/// and whether a keychange should be allowed.
+///
+/// We track in the `sending_domains` table whether we get positive Authentication-Results
+/// for mails from a contact (meaning that their provider properly authenticates against
+/// our provider).
+///
+/// Once a contact is known to come with positive Authentication-Resutls (dkim: pass),
+/// we don't accept Autocrypt key changes if they come with negative Authentication-Results.
+async fn compute_dkim_results(
+    context: &Context,
+    mut authres: ParsedAuthresHeaders,
+    from_domain: &str,
+    message_time: i64,
+) -> Result<DkimResults> {
+    let mut dkim_passed = false;
+
+    let ids_config = context.get_config(Config::AuthservIdCandidates).await?;
+    let ids = parse_authservid_candidates_config(&ids_config);
+
+    // Remove all foreign authentication results
+    authres.retain(|(authserv_id, _dkim_passed)| ids.contains(authserv_id.as_str()));
+
+    if authres.is_empty() {
+        // If the authentication results are empty, then our provider doesn't add them
+        // and an attacker could just add their own Authentication-Results, making us
+        // think that DKIM passed. So, in this case, we can as well assume that DKIM passed.
+        dkim_passed = true;
+    } else {
+        for (_authserv_id, current_dkim_passed) in authres {
+            match current_dkim_passed {
+                DkimResult::Passed => {
+                    dkim_passed = true;
+                    break;
+                }
+                DkimResult::Failed => {
+                    dkim_passed = false;
+                    break;
+                }
+                DkimResult::Nothing => {
+                    // Continue looking for an Authentication-Results header
+                }
+            }
+        }
+    }
+
+    let last_working_timestamp = dkim_works_timestamp(context, from_domain).await?;
+    let mut dkim_should_work = dkim_should_work(last_working_timestamp)?;
+    if message_time > last_working_timestamp && dkim_passed {
+        set_dkim_works_timestamp(context, from_domain, message_time).await?;
+        dkim_should_work = true;
+    }
+
+    Ok(DkimResults {
+        dkim_passed,
+        dkim_should_work,
+        allow_keychange: dkim_passed || !dkim_should_work,
+    })
+}
+
+/// Whether DKIM in emails from this domain should be considered to work.
+fn dkim_should_work(last_working_timestamp: i64) -> Result<bool> {
+    // When we get an email with valid DKIM-Authentication-Results,
+    // then we assume that DKIM works for 30 days from this time on.
+    let should_work_until = last_working_timestamp + 3600 * 24 * 30;
+
+    let dkim_ever_worked = last_working_timestamp > 0;
+
+    // We're using time() here and not the time when the message
+    // claims to have been sent (passed around as `message_time`)
+    // because otherwise an attacker could just put a time way
+    // in the future into the `Date` header and then we would
+    // assume that DKIM doesn't have to be valid anymore.
+    let dkim_should_work_now = should_work_until > time();
+    Ok(dkim_ever_worked && dkim_should_work_now)
+}
+
+async fn dkim_works_timestamp(context: &Context, from_domain: &str) -> Result<i64, anyhow::Error> {
+    let last_working_timestamp: i64 = context
+        .sql
+        .query_get_value(
+            "SELECT dkim_works FROM sending_domains WHERE domain=?",
+            paramsv![from_domain],
+        )
+        .await?
+        .unwrap_or(0);
+    Ok(last_working_timestamp)
+}
+
+async fn set_dkim_works_timestamp(
+    context: &Context,
+    from_domain: &str,
+    timestamp: i64,
+) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "INSERT INTO sending_domains (domain, dkim_works) VALUES (?,?)
+                ON CONFLICT(domain) DO UPDATE SET dkim_works=excluded.dkim_works",
+            paramsv![from_domain, timestamp],
+        )
+        .await?;
+    Ok(())
+}
+
+async fn clear_dkim_works(context: &Context) -> Result<()> {
+    context
+        .sql
+        .execute("DELETE FROM sending_domains", paramsv![])
+        .await?;
+    Ok(())
+}
+
+fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str> {
+    config
+        .as_deref()
+        .map(|c| c.split_whitespace().collect())
+        .unwrap_or_default()
+}
+
+#[cfg(test)]
+mod tests {
+    #![allow(clippy::indexing_slicing)]
+    use std::time::Duration;
+
+    use tokio::fs;
+    use tokio::io::AsyncReadExt;
+
+    use super::*;
+
+    use crate::aheader::EncryptPreference;
+    use crate::e2ee;
+    use crate::mimeparser;
+    use crate::peerstate::Peerstate;
+    use crate::securejoin::get_securejoin_qr;
+    use crate::securejoin::join_securejoin;
+    use crate::test_utils;
+    use crate::test_utils::TestContext;
+    use crate::test_utils::TestContextManager;
+    use crate::tools;
+
+    #[test]
+    fn test_remove_comments() {
+        let header = "Authentication-Results: mx3.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=riseup.net;"
+            .to_string();
+        assert_eq!(
+            remove_comments(&header),
+            "Authentication-Results: mx3.messagingengine.com;
+    dkim=pass   header.d=riseup.net;"
+        );
+
+        let header = ") aaa (".to_string();
+        assert_eq!(remove_comments(&header), ") aaa (");
+
+        let header = "((something weird) no comment".to_string();
+        assert_eq!(remove_comments(&header), "  no comment");
+
+        let header = "🎉(🎉(🎉))🎉(".to_string();
+        assert_eq!(remove_comments(&header), "🎉 )🎉(");
+
+        // Comments are allowed to include whitespace
+        let header = "(com\n\t\r\nment) no comment (comment)".to_string();
+        assert_eq!(remove_comments(&header), "  no comment  ");
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_parse_authentication_results() -> Result<()> {
+        let t = TestContext::new().await;
+        t.configure_addr("alice@gmx.net").await;
+        let bytes = b"Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com
+Authentication-Results:  gmx.net; dkim=pass header.i=@amazonses.com";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
+        assert_eq!(
+            actual,
+            vec![
+                ("gmx.net".to_string(), DkimResult::Passed),
+                ("gmx.net".to_string(), DkimResult::Nothing)
+            ]
+        );
+
+        let bytes = b"Authentication-Results:  gmx.net; notdkim=pass header.i=@slack.com
+Authentication-Results:  gmx.net; notdkim=pass header.i=@amazonses.com";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
+        assert_eq!(
+            actual,
+            vec![
+                ("gmx.net".to_string(), DkimResult::Nothing),
+                ("gmx.net".to_string(), DkimResult::Nothing)
+            ]
+        );
+
+        let bytes = b"Authentication-Results:  gmx.net; dkim=pass header.i=@amazonses.com";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
+        assert_eq!(actual, vec![("gmx.net".to_string(), DkimResult::Nothing)],);
+
+        // Weird Authentication-Results from Outlook without an authserv-id
+        let bytes = b"Authentication-Results: spf=pass (sender IP is 40.92.73.85)
+    smtp.mailfrom=hotmail.com; dkim=pass (signature was verified)
+    header.d=hotmail.com;dmarc=pass action=none
+    header.from=hotmail.com;compauth=pass reason=100";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "hotmail.com");
+        // At this point, the most important thing to test is that there are no
+        // authserv-ids with whitespace in them.
+        assert_eq!(
+            actual,
+            vec![("invalidAuthservId".to_string(), DkimResult::Passed)]
+        );
+
+        let bytes = b"Authentication-Results:  gmx.net; dkim=none header.i=@slack.com
+Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
+        assert_eq!(
+            actual,
+            vec![
+                ("gmx.net".to_string(), DkimResult::Failed),
+                ("gmx.net".to_string(), DkimResult::Passed)
+            ]
+        );
+
+        // ';' in comments
+        let bytes = b"Authentication-Results: mx1.riseup.net;
+	dkim=pass (1024-bit key; unprotected) header.d=yandex.ru header.i=@yandex.ru header.a=rsa-sha256 header.s=mail header.b=avNJu6sw;
+	dkim-atps=neutral";
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "yandex.ru");
+        assert_eq!(
+            actual,
+            vec![("mx1.riseup.net".to_string(), DkimResult::Passed)]
+        );
+
+        let bytes = br#"Authentication-Results: box.hispanilandia.net;
+	dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.b="kqh3WUKq";
+	dkim-atps=neutral
+Authentication-Results: box.hispanilandia.net; dmarc=pass (p=quarantine dis=none) header.from=disroot.org
+Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@disroot.org"#;
+        let mail = mailparse::parse_mail(bytes)?;
+        let actual = parse_authres_headers(&mail.get_headers(), "disroot.org");
+        assert_eq!(
+            actual,
+            vec![
+                ("box.hispanilandia.net".to_string(), DkimResult::Failed),
+                ("box.hispanilandia.net".to_string(), DkimResult::Nothing),
+                ("box.hispanilandia.net".to_string(), DkimResult::Nothing),
+            ]
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_update_authservid_candidates() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        update_authservid_candidates_test(&t, &["mx3.messagingengine.com"]).await;
+        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
+        assert_eq!(candidates, "mx3.messagingengine.com");
+
+        // "mx4.messagingengine.com" seems to be the new authserv-id, DC should accept it
+        update_authservid_candidates_test(&t, &["mx4.messagingengine.com"]).await;
+        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
+        assert_eq!(candidates, "mx4.messagingengine.com");
+
+        // A message without any Authentication-Results headers shouldn't remove all
+        // candidates since it could be a mailer-daemon message or so
+        update_authservid_candidates_test(&t, &[]).await;
+        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
+        assert_eq!(candidates, "mx4.messagingengine.com");
+
+        update_authservid_candidates_test(&t, &["mx4.messagingengine.com", "someotherdomain.com"])
+            .await;
+        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
+        assert_eq!(candidates, "mx4.messagingengine.com");
+
+        Ok(())
+    }
+
+    /// Calls update_authservid_candidates(), meant for using in a test.
+    ///
+    /// update_authservid_candidates() only looks at the keys of its
+    /// `authentication_results` parameter. So, this function takes `incoming_ids`
+    /// and adds some AuthenticationResults to get the HashMap we need.
+    async fn update_authservid_candidates_test(context: &Context, incoming_ids: &[&str]) {
+        let v = incoming_ids
+            .iter()
+            .map(|id| (id.to_string(), DkimResult::Passed))
+            .collect();
+        update_authservid_candidates(context, &v).await.unwrap()
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_realworld_authentication_results() -> Result<()> {
+        let mut test_failed = false;
+
+        let dir = tools::read_dir("test-data/message/dkimchecks-2022-09-28/".as_ref())
+            .await
+            .unwrap();
+        let mut bytes = Vec::new();
+        for entry in dir {
+            if !entry.file_type().await.unwrap().is_dir() {
+                continue;
+            }
+            let self_addr = entry.file_name().into_string().unwrap();
+            let self_domain = EmailAddress::new(&self_addr).unwrap().domain;
+            let authres_parsing_works = [
+                "ik.me",
+                "web.de",
+                "posteo.de",
+                "gmail.com",
+                "hotmail.com",
+                "mail.ru",
+                "aol.com",
+                "yahoo.com",
+                "icloud.com",
+                "fastmail.com",
+                "mail.de",
+                "outlook.com",
+                "gmx.de",
+                "testrun.org",
+            ]
+            .contains(&self_domain.as_str());
+
+            let t = TestContext::new().await;
+            t.configure_addr(&self_addr).await;
+            if !authres_parsing_works {
+                println!("========= Receiving as {} =========", &self_addr);
+            }
+
+            // Simulate receiving all emails once, so that we have the correct authserv-ids
+            let mut dir = tools::read_dir(&entry.path()).await.unwrap();
+
+            // The ordering in which the emails are received can matter;
+            // the test _should_ pass for every ordering.
+            dir.sort_by_key(|d| d.file_name());
+            //rand::seq::SliceRandom::shuffle(&mut dir[..], &mut rand::thread_rng());
+
+            for entry in &dir {
+                let mut file = fs::File::open(entry.path()).await?;
+                bytes.clear();
+                file.read_to_end(&mut bytes).await.unwrap();
+
+                let mail = mailparse::parse_mail(&bytes)?;
+                let from = &mimeparser::get_from(&mail.headers)[0].addr;
+
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                assert!(res.allow_keychange);
+            }
+
+            for entry in &dir {
+                let mut file = fs::File::open(entry.path()).await?;
+                bytes.clear();
+                file.read_to_end(&mut bytes).await.unwrap();
+
+                let mail = mailparse::parse_mail(&bytes)?;
+                let from = &mimeparser::get_from(&mail.headers)[0].addr;
+
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                if !res.allow_keychange {
+                    println!(
+                        "!!!!!! FAILURE Receiving {:?}, keychange is not allowed !!!!!!",
+                        entry.path()
+                    );
+                    test_failed = true;
+                }
+
+                let from_domain = EmailAddress::new(from).unwrap().domain;
+                assert_eq!(
+                    res.dkim_should_work,
+                    dkim_should_work(dkim_works_timestamp(&t, &from_domain).await?)?
+                );
+                assert_eq!(res.dkim_passed, res.dkim_should_work);
+
+                // delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail
+                let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de")
+                    // These are (fictional) forged emails where the attacker added a fake
+                    // Authentication-Results before sending the email
+                    && from != "forged-authres-added@example.com"
+                    // Other forged emails
+                    && !from.starts_with("forged");
+
+                if res.dkim_passed != expected_result {
+                    if authres_parsing_works {
+                        println!(
+                            "!!!!!! FAILURE Receiving {:?}, order {:#?} wrong result: !!!!!!",
+                            entry.path(),
+                            dir.iter().map(|e| e.file_name()).collect::<Vec<_>>()
+                        );
+                        test_failed = true;
+                    }
+                    println!("From {}: {}", from_domain, res.dkim_passed);
+                }
+            }
+        }
+
+        assert!(!test_failed);
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_handle_authres() {
+        let t = TestContext::new().await;
+
+        // Even if the format is wrong and parsing fails, handle_authres() shouldn't
+        // return an Err because this would prevent the message from being added
+        // to the database and downloaded again and again
+        let bytes = b"Authentication-Results: dkim=";
+        let mail = mailparse::parse_mail(bytes).unwrap();
+        handle_authres(&t, &mail, "invalidfrom.com", time())
+            .await
+            .unwrap();
+    }
+
+    #[ignore = "Disallowing keychanges is disabled for now"]
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_handle_authres_fails() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+
+        // Bob sends Alice a message, so she gets his key
+        tcm.send_recv_accept(&bob, &alice, "Hi").await;
+
+        // We don't need bob anymore, let's make sure it's not accidentally used
+        drop(bob);
+
+        // Assume Alice receives an email from bob@example.net with
+        // correct DKIM -> `set_dkim_works()` was called
+        set_dkim_works_timestamp(&alice, "example.net", time()).await?;
+        // And Alice knows her server's authserv-id
+        alice
+            .set_config(Config::AuthservIdCandidates, Some("example.org"))
+            .await?;
+
+        tcm.section("An attacker, bob2, sends a from-forged email to Alice!");
+
+        // Sleep to make sure key reset is ignored because of DKIM failure
+        // and not because reordering is suspected.
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
+        let bob2 = tcm.unconfigured().await;
+        bob2.configure_addr("bob@example.net").await;
+        e2ee::ensure_secret_key_exists(&bob2).await?;
+
+        let chat = bob2.create_chat(&alice).await;
+        let mut sent = bob2
+            .send_text(chat.id, "Please send me lots of money")
+            .await;
+
+        sent.payload
+            .insert_str(0, "Authentication-Results: example.org; dkim=fail");
+
+        let received = alice.recv_msg(&sent).await;
+
+        // Assert that the error tells the user about the problem
+        assert!(received.error.unwrap().contains("DKIM failed"));
+
+        let bob_state = Peerstate::from_addr(&alice, "bob@example.net")
+            .await?
+            .unwrap();
+
+        // Encryption preference is still mutual.
+        assert_eq!(bob_state.prefer_encrypt, EncryptPreference::Mutual);
+
+        // Also check that the keypair was not changed
+        assert_eq!(
+            bob_state.public_key.unwrap(),
+            test_utils::bob_keypair().public
+        );
+
+        // Since Alice didn't change the key, Bob can't read her message
+        let received = tcm
+            .try_send_recv(&alice, &bob2, "My credit card number is 1234")
+            .await;
+        assert!(!received.text.as_ref().unwrap().contains("1234"));
+        assert!(received.error.is_some());
+
+        tcm.section("Turns out bob2 wasn't an attacker at all, Bob just has a new phone and DKIM just stopped working.");
+        tcm.section("To fix the key problems, Bob scans Alice's QR code.");
+
+        let qr = get_securejoin_qr(&alice.ctx, None).await.unwrap();
+        join_securejoin(&bob2.ctx, &qr).await.unwrap();
+
+        loop {
+            if let Some(mut sent) = bob2.pop_sent_msg_opt(Duration::ZERO).await {
+                sent.payload
+                    .insert_str(0, "Authentication-Results: example.org; dkim=fail");
+                alice.recv_msg(&sent).await;
+            } else if let Some(sent) = alice.pop_sent_msg_opt(Duration::ZERO).await {
+                bob2.recv_msg(&sent).await;
+            } else {
+                break;
+            }
+        }
+
+        // Unfortunately, securejoin currently doesn't work with authres-checking,
+        // so these checks would fail:
+
+        // let contact_bob = alice.add_or_lookup_contact(&bob2).await;
+        // assert_eq!(
+        //     contact_bob.is_verified(&alice.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // let contact_alice = bob2.add_or_lookup_contact(&alice).await;
+        // assert_eq!(
+        //     contact_alice.is_verified(&bob2.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // // Bob can read Alice's messages again
+        // let received = tcm
+        //     .try_send_recv(&alice, &bob2, "Can you read this again?")
+        //     .await;
+        // assert_eq!(received.text.as_ref().unwrap(), "Can you read this again?");
+        // assert!(received.error.is_none());
+
+        Ok(())
+    }
+}

src/chat.rs

@@ -1130,8 +1130,8 @@ impl Chat {
     }
 
     /// Returns mailing list address where messages are sent to.
-    pub fn get_mailinglist_addr(&self) -> &str {
-        self.param.get(Param::ListPost).unwrap_or_default()
+    pub fn get_mailinglist_addr(&self) -> Option<&str> {
+        self.param.get(Param::ListPost)
     }
 
     /// Returns profile image path for the chat.
@@ -1812,10 +1812,7 @@ pub async fn prepare_msg(context: &Context, chat_id: ChatId, msg: &mut Message)
 }
 
 async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
-    if msg.viewtype == Viewtype::Text
-        || msg.viewtype == Viewtype::VideochatInvitation
-        || msg.viewtype == Viewtype::Reaction
-    {
+    if msg.viewtype == Viewtype::Text || msg.viewtype == Viewtype::VideochatInvitation {
         // the caller should check if the message text is empty
     } else if msg.viewtype.has_file() {
         let blob = msg
@@ -2442,7 +2439,7 @@ pub async fn get_chat_media(
                 AND hidden=0
               ORDER BY timestamp, id;",
             paramsv![
-                if chat_id.is_none() { 1i32 } else { 0i32 },
+                chat_id.is_none(),
                 chat_id.unwrap_or_else(|| ChatId::new(0)),
                 msg_type,
                 if msg_type2 != Viewtype::Unknown {
@@ -3705,11 +3702,11 @@ mod tests {
 
         // create group and sync it to the second device
         let a1_chat_id = create_group_chat(&a1, ProtectionStatus::Unprotected, "foo").await?;
-        a1.send_text(a1_chat_id, "ho!").await;
+        let sent = a1.send_text(a1_chat_id, "ho!").await;
         let a1_msg = a1.get_last_msg().await;
         let a1_chat = Chat::load_from_db(&a1, a1_chat_id).await?;
 
-        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
+        let a2_msg = a2.recv_msg(&sent).await;
         let a2_chat_id = a2_msg.chat_id;
         let a2_chat = Chat::load_from_db(&a2, a2_chat_id).await?;
 

src/config.rs

@@ -184,6 +184,12 @@ pub enum Config {
     /// In a future versions, this switch may be removed.
     #[strum(props(default = "0"))]
     SendSyncMsgs,
+
+    /// Space-separated list of all the authserv-ids which we believe
+    /// may be the one of our email server.
+    ///
+    /// See `crate::authres::update_authservid_candidates`.
+    AuthservIdCandidates,
 }
 
 impl Context {

src/contact.rs

@@ -1,14 +1,20 @@
 //! Contacts module
 
+use std::cmp::Reverse;
+use std::collections::BinaryHeap;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::path::PathBuf;
+use std::time::{SystemTime, UNIX_EPOCH};
 
 use anyhow::{bail, ensure, Context as _, Result};
+use async_channel::{self as channel, Receiver, Sender};
 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
+use tokio::task;
+use tokio::time::{timeout, Duration};
 
 use crate::aheader::EncryptPreference;
 use crate::chat::ChatId;
@@ -24,7 +30,7 @@ use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::sql::{self, params_iter};
-use crate::tools::{get_abs_path, improve_single_line_input, time, EmailAddress};
+use crate::tools::{duration_to_str, get_abs_path, improve_single_line_input, time, EmailAddress};
 use crate::{chat, stock_str};
 
 /// Time during which a contact is considered as seen recently.
@@ -223,7 +229,7 @@ pub enum Origin {
     /// set on Bob's side for contacts scanned and verified from a QR code. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling contact_is_verified() !
     SecurejoinJoined = 0x0200_0000,
 
-    /// contact added mannually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
+    /// contact added manually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
     ManuallyCreated = 0x0400_0000,
 }
 
@@ -449,7 +455,7 @@ impl Contact {
     /// - "row_authname": name as authorized from a contact, set only through a From-header
     /// Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
     ///
-    /// Returns the contact_id and a `Modifier` value indicating if a modification occured.
+    /// Returns the contact_id and a `Modifier` value indicating if a modification occurred.
     pub(crate) async fn add_or_lookup(
         context: &Context,
         name: &str,
@@ -938,43 +944,36 @@ impl Contact {
         Ok(ret)
     }
 
-    /// Delete a contact. The contact is deleted from the local device. It may happen that this is not
-    /// possible as the contact is in use. In this case, the contact can be blocked.
+    /// Delete a contact so that it disappears from the corresponding lists.
+    /// Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
+    /// The contact is deleted from the local device.
     ///
     /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
     pub async fn delete(context: &Context, contact_id: ContactId) -> Result<()> {
         ensure!(!contact_id.is_special(), "Can not delete special contact");
 
-        let count_chats = context
+        context
             .sql
-            .count(
-                "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
-                paramsv![contact_id],
-            )
+            .transaction(move |transaction| {
+                // make sure, the transaction starts with a write command and becomes EXCLUSIVE by that -
+                // upgrading later may be impossible by races.
+                let deleted_contacts = transaction.execute(
+                    "DELETE FROM contacts WHERE id=?
+                     AND (SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?)=0;",
+                    paramsv![contact_id, contact_id],
+                )?;
+                if deleted_contacts == 0 {
+                    transaction.execute(
+                        "UPDATE contacts SET origin=? WHERE id=?;",
+                        paramsv![Origin::Hidden, contact_id],
+                    )?;
+                }
+                Ok(())
+            })
             .await?;
 
-        if count_chats == 0 {
-            match context
-                .sql
-                .execute("DELETE FROM contacts WHERE id=?;", paramsv![contact_id])
-                .await
-            {
-                Ok(_) => {
-                    context.emit_event(EventType::ContactsChanged(None));
-                    return Ok(());
-                }
-                Err(err) => {
-                    error!(context, "delete_contact {} failed ({})", contact_id, err);
-                    return Err(err);
-                }
-            }
-        }
-
-        info!(
-            context,
-            "could not delete contact {}, there are {} chats with it", contact_id, count_chats
-        );
-        bail!("Could not delete contact with ongoing chats");
+        context.emit_event(EventType::ContactsChanged(None));
+        Ok(())
     }
 
     /// Get a single contact object.  For a list, see eg. get_contacts().
@@ -1370,13 +1369,17 @@ pub(crate) async fn update_last_seen(
         "Can not update special contact last seen timestamp"
     );
 
-    context
+    if context
         .sql
         .execute(
             "UPDATE contacts SET last_seen = ?1 WHERE last_seen < ?1 AND id = ?2",
             paramsv![timestamp, contact_id],
         )
-        .await?;
+        .await?
+        > 0
+    {
+        context.interrupt_recently_seen(contact_id, timestamp).await;
+    }
     Ok(())
 }
 
@@ -1443,6 +1446,132 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
         .collect()
 }
 
+#[derive(Debug)]
+pub(crate) struct RecentlySeenInterrupt {
+    contact_id: ContactId,
+    timestamp: i64,
+}
+
+#[derive(Debug)]
+pub(crate) struct RecentlySeenLoop {
+    /// Task running "recently seen" loop.
+    handle: task::JoinHandle<()>,
+
+    interrupt_send: Sender<RecentlySeenInterrupt>,
+}
+
+impl RecentlySeenLoop {
+    pub(crate) fn new(context: Context) -> Self {
+        let (interrupt_send, interrupt_recv) = channel::bounded(1);
+
+        let handle = task::spawn(async move { Self::run(context, interrupt_recv).await });
+        Self {
+            handle,
+            interrupt_send,
+        }
+    }
+
+    async fn run(context: Context, interrupt: Receiver<RecentlySeenInterrupt>) {
+        type MyHeapElem = (Reverse<i64>, ContactId);
+
+        // Priority contains all recently seen sorted by the timestamp
+        // when they become not recently seen.
+        //
+        // Initialize with contacts which are currently seen, but will
+        // become unseen in the future.
+        let mut unseen_queue: BinaryHeap<MyHeapElem> = context
+            .sql
+            .query_map(
+                "SELECT id, last_seen FROM contacts
+                 WHERE last_seen > ?",
+                paramsv![time() - SEEN_RECENTLY_SECONDS],
+                |row| {
+                    let contact_id: ContactId = row.get("id")?;
+                    let last_seen: i64 = row.get("last_seen")?;
+                    Ok((Reverse(last_seen + SEEN_RECENTLY_SECONDS), contact_id))
+                },
+                |rows| {
+                    rows.collect::<std::result::Result<BinaryHeap<MyHeapElem>, _>>()
+                        .map_err(Into::into)
+                },
+            )
+            .await
+            .unwrap_or_default();
+
+        loop {
+            let now = SystemTime::now();
+
+            let (until, contact_id) =
+                if let Some((Reverse(timestamp), contact_id)) = unseen_queue.peek() {
+                    (
+                        UNIX_EPOCH
+                            + Duration::from_secs((*timestamp).try_into().unwrap_or(u64::MAX))
+                            + Duration::from_secs(1),
+                        Some(contact_id),
+                    )
+                } else {
+                    // Sleep for 24 hours.
+                    (now + Duration::from_secs(86400), None)
+                };
+
+            if let Ok(duration) = until.duration_since(now) {
+                info!(
+                    context,
+                    "Recently seen loop waiting for {} or interrupt",
+                    duration_to_str(duration)
+                );
+
+                match timeout(duration, interrupt.recv()).await {
+                    Err(_) => {
+                        // Timeout, notify about contact.
+                        if let Some(contact_id) = contact_id {
+                            context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
+                            unseen_queue.pop();
+                        }
+                    }
+                    Ok(Err(err)) => {
+                        warn!(
+                            context,
+                            "Error receiving an interruption in recently seen loop: {}", err
+                        );
+                    }
+                    Ok(Ok(RecentlySeenInterrupt {
+                        contact_id,
+                        timestamp,
+                    })) => {
+                        // Received an interrupt.
+                        unseen_queue.push((Reverse(timestamp + SEEN_RECENTLY_SECONDS), contact_id));
+                    }
+                }
+            } else {
+                info!(
+                    context,
+                    "Recently seen loop is not waiting, event is already due."
+                );
+
+                // Event is already in the past.
+                if let Some(contact_id) = contact_id {
+                    context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
+                }
+                unseen_queue.pop();
+            }
+        }
+    }
+
+    pub(crate) fn interrupt(&self, contact_id: ContactId, timestamp: i64) {
+        self.interrupt_send
+            .try_send(RecentlySeenInterrupt {
+                contact_id,
+                timestamp,
+            })
+            .ok();
+    }
+
+    pub(crate) fn abort(self) {
+        self.handle.abort();
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1602,7 +1731,7 @@ mod tests {
         );
         assert_eq!(Contact::add_address_book(&t, book).await.unwrap(), 4);
 
-        // check first added contact, this modifies authname beacuse it is empty
+        // check first added contact, this modifies authname because it is empty
         let (contact_id, sth_modified) =
             Contact::add_or_lookup(&t, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
                 .await
@@ -1810,21 +1939,70 @@ mod tests {
         // Create Bob contact
         let (contact_id, _) =
             Contact::add_or_lookup(&alice, "Bob", "bob@example.net", Origin::ManuallyCreated)
-                .await
-                .unwrap();
-
+                .await?;
         let chat = alice
             .create_chat_with_contact("Bob", "bob@example.net")
             .await;
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            1
+        );
 
-        // Can't delete a contact with ongoing chats.
-        assert!(Contact::delete(&alice, contact_id).await.is_err());
+        // If a contact has ongoing chats, contact is only hidden on deletion
+        Contact::delete(&alice, contact_id).await?;
+        let contact = Contact::load_from_db(&alice, contact_id).await?;
+        assert_eq!(contact.origin, Origin::Hidden);
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            0
+        );
 
         // Delete chat.
         chat.get_id().delete(&alice).await?;
 
-        // Can delete contact now.
+        // Can delete contact physically now
         Contact::delete(&alice, contact_id).await?;
+        assert!(Contact::load_from_db(&alice, contact_id).await.is_err());
+        assert_eq!(
+            Contact::get_all(&alice, 0, Some("bob@example.net"))
+                .await?
+                .len(),
+            0
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_delete_and_recreate_contact() -> Result<()> {
+        let t = TestContext::new_alice().await;
+
+        // test recreation after physical deletion
+        let contact_id1 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
+        Contact::delete(&t, contact_id1).await?;
+        assert!(Contact::load_from_db(&t, contact_id1).await.is_err());
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
+        let contact_id2 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        assert_ne!(contact_id2, contact_id1);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
+
+        // test recreation after hiding
+        t.create_chat_with_contact("Foo", "foo@bar.de").await;
+        Contact::delete(&t, contact_id2).await?;
+        let contact = Contact::load_from_db(&t, contact_id2).await?;
+        assert_eq!(contact.origin, Origin::Hidden);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
+
+        let contact_id3 = Contact::create(&t, "Foo", "foo@bar.de").await?;
+        let contact = Contact::load_from_db(&t, contact_id3).await?;
+        assert_eq!(contact.origin, Origin::ManuallyCreated);
+        assert_eq!(contact_id3, contact_id2);
+        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
 
         Ok(())
     }

src/context.rs

@@ -26,6 +26,156 @@ use crate::sql::Sql;
 use crate::stock_str::StockStrings;
 use crate::tools::{duration_to_str, time};
 
+/// Builder for the [`Context`].
+///
+/// Many arguments to the [`Context`] are kind of optional and only needed to handle
+/// multiple contexts, for which the [account manager](crate::accounts::Accounts) should be
+/// used.  This builder makes creating a new context simpler, especially for the
+/// standalone-context case.
+///
+/// # Examples
+///
+/// Creating a new unecrypted database:
+///
+/// ```
+/// # let rt = tokio::runtime::Runtime::new().unwrap();
+/// # rt.block_on(async move {
+/// use deltachat::context::ContextBuilder;
+///
+/// let dir = tempfile::tempdir().unwrap();
+/// let context = ContextBuilder::new(dir.path().join("db"))
+///      .open()
+///      .await
+///      .unwrap();
+/// drop(context);
+/// # });
+/// ```
+///
+/// To use an encrypted database provide a password.  If the database does not yet exist it
+/// will be created:
+///
+/// ```
+/// # let rt = tokio::runtime::Runtime::new().unwrap();
+/// # rt.block_on(async move {
+/// use deltachat::context::ContextBuilder;
+///
+/// let dir = tempfile::tempdir().unwrap();
+/// let context = ContextBuilder::new(dir.path().join("db"))
+///      .with_password("secret".into())
+///      .open()
+///      .await
+///      .unwrap();
+/// drop(context);
+/// # });
+/// ```
+#[derive(Clone, Debug)]
+pub struct ContextBuilder {
+    dbfile: PathBuf,
+    id: u32,
+    events: Events,
+    stock_strings: StockStrings,
+    password: Option<String>,
+}
+
+impl ContextBuilder {
+    /// Create the builder using the given database file.
+    ///
+    /// The *dbfile* should be in a dedicated directory and this directory must exist.  The
+    /// [`Context`] will create other files and folders in the same directory as the
+    /// database file used.
+    pub fn new(dbfile: PathBuf) -> Self {
+        ContextBuilder {
+            dbfile,
+            id: rand::random(),
+            events: Events::new(),
+            stock_strings: StockStrings::new(),
+            password: None,
+        }
+    }
+
+    /// Sets the context ID.
+    ///
+    /// This identifier is used e.g. in [`Event`]s to identify which [`Context`] an event
+    /// belongs to.  The only real limit on it is that it should not conflict with any other
+    /// [`Context`]s you currently have open.  So if you handle multiple [`Context`]s you
+    /// may want to use this.
+    ///
+    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
+    /// common case for using multiple [`Context`] instances.
+    pub fn with_id(mut self, id: u32) -> Self {
+        self.id = id;
+        self
+    }
+
+    /// Sets the event channel for this [`Context`].
+    ///
+    /// Mostly useful when using multiple [`Context`]s, this allows creating one [`Events`]
+    /// channel and passing it to all [`Context`]s so all events are recieved on the same
+    /// channel.
+    ///
+    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
+    /// common case for using multiple [`Context`] instances.
+    pub fn with_events(mut self, events: Events) -> Self {
+        self.events = events;
+        self
+    }
+
+    /// Sets the [`StockStrings`] map to use for this [`Context`].
+    ///
+    /// This is useful in order to share the same translation strings in all [`Context`]s.
+    /// The mapping may be empty when set, it will be populated by
+    /// [`Context::set_stock-translation`] or [`Accounts::set_stock_translation`] calls.
+    ///
+    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
+    /// common case for using multiple [`Context`] instances.
+    ///
+    /// [`Accounts::set_stock_translation`]: crate::accounts::Accounts::set_stock_translation
+    pub fn with_stock_strings(mut self, stock_strings: StockStrings) -> Self {
+        self.stock_strings = stock_strings;
+        self
+    }
+
+    /// Sets the password to unlock the database.
+    ///
+    /// If an encrypted database is used it must be opened with a password.  Setting a
+    /// password on a new database will enable encryption.
+    pub fn with_password(mut self, password: String) -> Self {
+        self.password = Some(password);
+        self
+    }
+
+    /// Opens the [`Context`].
+    pub async fn open(self) -> Result<Context, ContextError> {
+        let context =
+            Context::new_closed(&self.dbfile, self.id, self.events, self.stock_strings).await?;
+        let password = self.password.unwrap_or_default();
+        match context.open(password).await? {
+            true => Ok(context),
+            false => Err(ContextError::DatabaseEncrypted),
+        }
+    }
+}
+
+#[non_exhaustive]
+#[derive(Debug, thiserror::Error)]
+pub enum ContextError {
+    #[error("database could not be decrypted, incorrect or missing password")]
+    DatabaseEncrypted,
+    #[error("failed to open context")]
+    Other(#[from] anyhow::Error),
+}
+
+/// The context for a single DeltaChat account.
+///
+/// This contains all the state for a single DeltaChat account, including background tasks
+/// running in Tokio to operate the account.  The [`Context`] can be cheaply cloned.
+///
+/// Each context, and thus each account, must be associated with an directory where all the
+/// state is kept.  This state is also preserved between restarts.
+///
+/// To use multiple accounts it is best to look at the [accounts
+/// manager][crate::accounts::Accounts] which handles storing multiple accounts in a single
+/// directory structure and handles loading them all concurrently.
 #[derive(Clone, Debug)]
 pub struct Context {
     pub(crate) inner: Arc<InnerContext>,
@@ -420,6 +570,10 @@ impl Context {
             .await?
             .unwrap_or_default();
 
+        let configured_inbox_folder = self
+            .get_config(Config::ConfiguredInboxFolder)
+            .await?
+            .unwrap_or_else(|| "<unset>".to_string());
         let configured_sentbox_folder = self
             .get_config(Config::ConfiguredSentboxFolder)
             .await?
@@ -491,6 +645,7 @@ impl Context {
         res.insert("mvbox_move", mvbox_move.to_string());
         res.insert("only_fetch_mvbox", only_fetch_mvbox.to_string());
         res.insert("folders_configured", folders_configured.to_string());
+        res.insert("configured_inbox_folder", configured_inbox_folder);
         res.insert("configured_sentbox_folder", configured_sentbox_folder);
         res.insert("configured_mvbox_folder", configured_mvbox_folder);
         res.insert("mdns_enabled", mdns_enabled.to_string());
@@ -544,6 +699,12 @@ impl Context {
                 .await?
                 .to_string(),
         );
+        res.insert(
+            "authserv_id_candidates",
+            self.get_config(Config::AuthservIdCandidates)
+                .await?
+                .unwrap_or_default(),
+        );
 
         let elapsed = self.creation_time.elapsed();
         res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));
@@ -650,7 +811,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 +864,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 +1201,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;

src/decrypt.rs

@@ -4,12 +4,13 @@ use std::collections::HashSet;
 
 use anyhow::{Context as _, Result};
 use mailparse::ParsedMail;
+use mailparse::SingleInfo;
 
 use crate::aheader::Aheader;
+use crate::authres;
+use crate::authres::handle_authres;
 use crate::contact::addr_cmp;
 use crate::context::Context;
-use crate::headerdef::HeaderDef;
-use crate::headerdef::HeaderDefMap;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
 use crate::log::LogExt;
@@ -55,35 +56,44 @@ pub async fn try_decrypt(
     .await
 }
 
-pub async fn create_decryption_info(
+pub async fn prepare_decryption(
     context: &Context,
     mail: &ParsedMail<'_>,
+    from: &[SingleInfo],
     message_time: i64,
 ) -> Result<DecryptionInfo> {
-    let from = mail
-        .headers
-        .get_header(HeaderDef::From_)
-        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
-        .and_then(|from| from.extract_single_info())
-        .map(|from| from.addr)
-        .unwrap_or_default();
+    let from = if let Some(f) = from.first() {
+        &f.addr
+    } else {
+        return Ok(DecryptionInfo::default());
+    };
 
-    let autocrypt_header = Aheader::from_headers(&from, &mail.headers)
+    let autocrypt_header = Aheader::from_headers(from, &mail.headers)
         .ok_or_log_msg(context, "Failed to parse Autocrypt header")
         .flatten();
 
-    let peerstate =
-        get_autocrypt_peerstate(context, &from, autocrypt_header.as_ref(), message_time).await?;
+    let dkim_results = handle_authres(context, mail, from, message_time).await?;
+
+    let peerstate = get_autocrypt_peerstate(
+        context,
+        from,
+        autocrypt_header.as_ref(),
+        message_time,
+        // Disallowing keychanges is disabled for now:
+        true, // dkim_results.allow_keychange,
+    )
+    .await?;
 
     Ok(DecryptionInfo {
-        from,
+        from: from.to_string(),
         autocrypt_header,
         peerstate,
         message_time,
+        dkim_results,
     })
 }
 
-#[derive(Debug)]
+#[derive(Default, Debug)]
 pub struct DecryptionInfo {
     /// The From address. This is the address from the unnencrypted, outer
     /// From header.
@@ -96,6 +106,7 @@ pub struct DecryptionInfo {
     /// means out-of-order message arrival, We don't modify the
     /// peerstate in this case.
     pub message_time: i64,
+    pub(crate) dkim_results: authres::DkimResults,
 }
 
 /// Returns a reference to the encrypted payload of a ["Mixed
@@ -263,12 +274,16 @@ fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublic
 /// If we already know this fingerprint from another contact's peerstate, return that
 /// peerstate in order to make AEAP work, but don't save it into the db yet.
 ///
+/// The param `allow_change` is used to prevent the autocrypt key from being changed
+/// if we suspect that the message may be forged and have a spoofed sender identity.
+///
 /// Returns updated peerstate.
 pub(crate) async fn get_autocrypt_peerstate(
     context: &Context,
     from: &str,
     autocrypt_header: Option<&Aheader>,
     message_time: i64,
+    allow_change: bool,
 ) -> Result<Option<Peerstate>> {
     let mut peerstate;
 
@@ -289,8 +304,15 @@ pub(crate) async fn get_autocrypt_peerstate(
 
         if let Some(ref mut peerstate) = peerstate {
             if addr_cmp(&peerstate.addr, from) {
-                peerstate.apply_header(header, message_time);
-                peerstate.save_to_db(&context.sql, false).await?;
+                if allow_change {
+                    peerstate.apply_header(header, message_time);
+                    peerstate.save_to_db(&context.sql, false).await?;
+                } else {
+                    info!(
+                        context,
+                        "Refusing to update existing peerstate of {}", &peerstate.addr
+                    );
+                }
             }
             // If `peerstate.addr` and `from` differ, this means that
             // someone is using the same key but a different addr, probably

src/download.rs

@@ -11,7 +11,7 @@ use crate::imap::{Imap, ImapActionResult};
 use crate::job::{self, Action, Job, Status};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, Part};
-use crate::param::{Param, Params};
+use crate::param::Params;
 use crate::tools::time;
 use crate::{job_try, stock_str, EventType};
 use std::cmp::max;
@@ -69,42 +69,6 @@ impl Context {
             Ok(Some(max(MIN_DOWNLOAD_LIMIT, download_limit as u32)))
         }
     }
-
-    // Merges the two messages to `placeholder_msg_id`;
-    // `full_msg_id` is no longer used afterwards.
-    pub(crate) async fn merge_messages(
-        &self,
-        full_msg_id: MsgId,
-        placeholder_msg_id: MsgId,
-    ) -> Result<()> {
-        let placeholder = Message::load_from_db(self, placeholder_msg_id).await?;
-        self.sql
-            .transaction(move |transaction| {
-                transaction
-                    .execute("DELETE FROM msgs WHERE id=?;", paramsv![placeholder_msg_id])?;
-                transaction.execute(
-                    "UPDATE msgs SET id=? WHERE id=?",
-                    paramsv![placeholder_msg_id, full_msg_id],
-                )?;
-                Ok(())
-            })
-            .await?;
-        let mut full = Message::load_from_db(self, placeholder_msg_id).await?;
-
-        for key in [
-            Param::WebxdcSummary,
-            Param::WebxdcSummaryTimestamp,
-            Param::WebxdcDocument,
-            Param::WebxdcDocumentTimestamp,
-        ] {
-            if let Some(value) = placeholder.param.get(key) {
-                full.param.set(key, value);
-            }
-        }
-        full.update_param(self).await?;
-
-        Ok(())
-    }
 }
 
 impl MsgId {
@@ -464,14 +428,14 @@ mod tests {
             .await?;
         alice.flush_status_updates().await?;
         let sent2 = alice.pop_sent_msg().await;
-        let sent2_rfc742_mid = Message::load_from_db(&alice, sent2.sender_msg_id)
+        let sent2_rfc724_mid = Message::load_from_db(&alice, sent2.sender_msg_id)
             .await?
             .rfc724_mid;
 
         // not downloading the status update results in an placeholder
         receive_imf_inner(
             &bob,
-            &sent2_rfc742_mid,
+            &sent2_rfc724_mid,
             sent2.payload().as_bytes(),
             false,
             Some(sent2.payload().len() as u32),
@@ -487,7 +451,7 @@ mod tests {
         // (usually status updates are too small for not being downloaded directly)
         receive_imf_inner(
             &bob,
-            &sent2_rfc742_mid,
+            &sent2_rfc724_mid,
             sent2.payload().as_bytes(),
             false,
             None,

src/events.rs

@@ -189,6 +189,10 @@ pub enum EventType {
         msg_id: MsgId,
     },
 
+    IncomingMsgBunch {
+        msg_ids: Vec<MsgId>,
+    },
+
     /// Messages were seen or noticed.
     /// chat id is always set.
     MsgsNoticed(ChatId),

src/headerdef.rs

@@ -63,6 +63,11 @@ pub enum HeaderDef {
     Sender,
     EphemeralTimer,
     Received,
+
+    /// A header that includes the results of the DKIM, SPF and DMARC checks.
+    /// See <https://datatracker.ietf.org/doc/html/rfc8601>
+    AuthenticationResults,
+
     _TestHeader,
 }
 

src/html.rs

@@ -94,7 +94,7 @@ impl HtmlMsgParser {
 
         let parsedmail = mailparse::parse_mail(rawmime)?;
 
-        parser.collect_texts_recursive(context, &parsedmail).await?;
+        parser.collect_texts_recursive(&parsedmail).await?;
 
         if parser.html.is_empty() {
             if let Some(plain) = &parser.plain {
@@ -117,7 +117,6 @@ impl HtmlMsgParser {
     /// therefore we use the first one.
     fn collect_texts_recursive<'a>(
         &'a mut self,
-        context: &'a Context,
         mail: &'a mailparse::ParsedMail<'a>,
     ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a + Send>> {
         // Boxed future to deal with recursion
@@ -125,7 +124,7 @@ impl HtmlMsgParser {
             match get_mime_multipart_type(&mail.ctype) {
                 MimeMultipartType::Multiple => {
                     for cur_data in mail.subparts.iter() {
-                        self.collect_texts_recursive(context, cur_data).await?
+                        self.collect_texts_recursive(cur_data).await?
                     }
                     Ok(())
                 }
@@ -135,7 +134,7 @@ impl HtmlMsgParser {
                         return Ok(());
                     }
                     let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?;
-                    self.collect_texts_recursive(context, &mail).await
+                    self.collect_texts_recursive(&mail).await
                 }
                 MimeMultipartType::Single => {
                     let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
@@ -207,7 +206,7 @@ impl HtmlMsgParser {
                                         Ok(re) => {
                                             self.html = re
                                                 .replace_all(
-                                                    &*self.html,
+                                                    &self.html,
                                                     format!("${{1}}{}${{3}}", replacement).as_str(),
                                                 )
                                                 .as_ref()

src/imap.rs

@@ -494,6 +494,8 @@ impl Imap {
     }
 
     async fn disconnect(&mut self, context: &Context) {
+        info!(context, "disconnecting");
+
         // Close folder if messages should be expunged
         if let Err(err) = self.close_folder(context).await {
             warn!(context, "failed to close folder: {:?}", err);
@@ -902,6 +904,12 @@ impl Imap {
 
         info!(context, "{} mails read from \"{}\".", read_cnt, folder);
 
+        let msg_ids = received_msgs
+            .iter()
+            .flat_map(|m| m.msg_ids.clone())
+            .collect();
+        context.emit_event(EventType::IncomingMsgBunch { msg_ids });
+
         chat::mark_old_messages_as_noticed(context, received_msgs).await?;
 
         Ok(read_cnt > 0)
@@ -1941,15 +1949,20 @@ fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning {
 
 fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
     for attr in folder_name.attributes() {
-        if let NameAttribute::Extension(ref label) = attr {
-            match label.as_ref() {
-                "\\Trash" => return FolderMeaning::Other,
-                "\\Sent" => return FolderMeaning::Sent,
-                "\\Spam" | "\\Junk" => return FolderMeaning::Spam,
-                "\\Drafts" => return FolderMeaning::Drafts,
-                "\\All" | "\\Important" | "\\Flagged" => return FolderMeaning::Virtual,
-                _ => {}
-            };
+        match attr {
+            NameAttribute::Trash => return FolderMeaning::Other,
+            NameAttribute::Sent => return FolderMeaning::Sent,
+            NameAttribute::Junk => return FolderMeaning::Spam,
+            NameAttribute::Drafts => return FolderMeaning::Drafts,
+            NameAttribute::All | NameAttribute::Flagged => return FolderMeaning::Virtual,
+            NameAttribute::Extension(ref label) => {
+                match label.as_ref() {
+                    "\\Spam" => return FolderMeaning::Spam,
+                    "\\Important" => return FolderMeaning::Virtual,
+                    _ => {}
+                };
+            }
+            _ => {}
         }
     }
     FolderMeaning::Unknown

src/imap/idle.rs

@@ -54,10 +54,10 @@ impl Imap {
                 Interrupt(InterruptInfo),
             }
 
+            let folder_name = watch_folder.as_deref().unwrap_or("None");
             info!(
                 context,
-                "{}: Idle entering wait-on-remote state",
-                watch_folder.as_deref().unwrap_or("None")
+                "{}: Idle entering wait-on-remote state", folder_name
             );
             let fut = idle_wait.map(|ev| ev.map(Event::IdleResponse)).race(async {
                 let info = self.idle_interrupt.recv().await;
@@ -70,26 +70,36 @@ impl Imap {
 
             match fut.await {
                 Ok(Event::IdleResponse(IdleResponse::NewData(x))) => {
-                    info!(context, "Idle has NewData {:?}", x);
+                    info!(context, "{}: Idle has NewData {:?}", folder_name, x);
                 }
                 Ok(Event::IdleResponse(IdleResponse::Timeout)) => {
-                    info!(context, "Idle-wait timeout or interruption");
+                    info!(
+                        context,
+                        "{}: Idle-wait timeout or interruption", folder_name
+                    );
                 }
                 Ok(Event::IdleResponse(IdleResponse::ManualInterrupt)) => {
-                    info!(context, "Idle wait was interrupted");
+                    info!(
+                        context,
+                        "{}: Idle wait was interrupted manually", folder_name
+                    );
                 }
                 Ok(Event::Interrupt(i)) => {
+                    info!(
+                        context,
+                        "{}: Idle wait was interrupted: {:?}", folder_name, &i
+                    );
                     info = i;
-                    info!(context, "Idle wait was interrupted");
                 }
                 Err(err) => {
-                    warn!(context, "Idle wait errored: {:?}", err);
+                    warn!(context, "{}: Idle wait errored: {:?}", folder_name, err);
                 }
             }
 
             let session = tokio::time::timeout(Duration::from_secs(15), handle.done())
-                .await?
-                .context("IMAP IDLE protocol timed out")?;
+                .await
+                .with_context(|| format!("{}: IMAP IDLE protocol timed out", folder_name))?
+                .with_context(|| format!("{}: IMAP IDLE failed", folder_name))?;
             self.session = Some(Session { inner: session });
         } else {
             warn!(context, "Attempted to idle without a session");
@@ -173,6 +183,7 @@ impl Imap {
                 }
                 Event::Interrupt(info) => {
                     // Interrupt
+                    info!(context, "Fake IDLE interrupted");
                     break info;
                 }
             }

src/imap/select_folder.rs

@@ -19,35 +19,31 @@ pub enum Error {
     #[error("Got a NO response when trying to select {0}, usually this means that it doesn't exist: {1}")]
     NoFolder(String, String),
 
-    #[error("IMAP close/expunge failed")]
-    CloseExpungeFailed(#[from] async_imap::error::Error),
-
     #[error("IMAP other error: {0}")]
     Other(String),
 }
 
+impl From<anyhow::Error> for Error {
+    fn from(err: anyhow::Error) -> Error {
+        Error::Other(format!("{:#}", err))
+    }
+}
+
 impl Imap {
     /// Issues a CLOSE command to expunge selected folder.
     ///
     /// CLOSE is considerably faster than an EXPUNGE, see
     /// <https://tools.ietf.org/html/rfc3501#section-6.4.2>
-    pub(super) async fn close_folder(&mut self, context: &Context) -> Result<()> {
+    pub(super) async fn close_folder(&mut self, context: &Context) -> anyhow::Result<()> {
         if let Some(ref folder) = self.config.selected_folder {
             info!(context, "Expunge messages in \"{}\".", folder);
 
-            if let Some(ref mut session) = self.session {
-                match session.close().await {
-                    Ok(_) => {
-                        info!(context, "close/expunge succeeded");
-                    }
-                    Err(err) => {
-                        self.trigger_reconnect(context).await;
-                        return Err(Error::CloseExpungeFailed(err));
-                    }
-                }
-            } else {
-                return Err(Error::NoSession);
+            let session = self.session.as_mut().context("no session")?;
+            if let Err(err) = session.close().await.context("IMAP close/expunge failed") {
+                self.trigger_reconnect(context).await;
+                return Err(err);
             }
+            info!(context, "close/expunge succeeded");
         }
         self.config.selected_folder = None;
         self.config.selected_folder_needs_expunge = false;
@@ -56,7 +52,7 @@ impl Imap {
     }
 
     /// Issues a CLOSE command if selected folder needs expunge.
-    pub(crate) async fn maybe_close_folder(&mut self, context: &Context) -> Result<()> {
+    pub(crate) async fn maybe_close_folder(&mut self, context: &Context) -> anyhow::Result<()> {
         if self.config.selected_folder_needs_expunge {
             self.close_folder(context).await?;
         }

src/imex.rs

@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 
 use ::pgp::types::KeyTrait;
 use anyhow::{bail, ensure, format_err, Context as _, Result};
-use futures::{StreamExt, TryStreamExt};
+use futures::StreamExt;
 use futures_lite::FutureExt;
 use rand::{thread_rng, Rng};
 use tokio::fs::{self, File};
@@ -17,7 +17,6 @@ use crate::chat::{self, delete_and_reset_all_device_msgs, ChatId};
 use crate::config::Config;
 use crate::contact::ContactId;
 use crate::context::Context;
-use crate::e2ee;
 use crate::events::EventType;
 use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
 use crate::log::LogExt;
@@ -31,6 +30,7 @@ use crate::tools::{
     create_folder, delete_file, get_filesuffix_lc, open_file_std, read_file, time, write_file,
     EmailAddress,
 };
+use crate::{e2ee, tools};
 
 // Name of the database file in the backup.
 const DBFILE_BACKUP_NAME: &str = "dc_database_backup.sqlite";
@@ -576,10 +576,7 @@ async fn export_backup_inner(
         .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
         .await?;
 
-    let read_dir: Vec<_> =
-        tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(context.get_blobdir()).await?)
-            .try_collect()
-            .await?;
+    let read_dir = tools::read_dir(context.get_blobdir()).await?;
     let count = read_dir.len();
     let mut written_files = 0;
 

src/lib.rs

@@ -18,7 +18,11 @@
     clippy::mixed_read_write_in_expression,
     clippy::bool_assert_comparison,
     clippy::manual_split_once,
-    clippy::format_push_string
+    clippy::format_push_string,
+    clippy::bool_to_int_with_if,
+    // This lint can be re-enabled once we don't target
+    // Rust 1.56 anymore:
+    clippy::collapsible_str_replace
 )]
 
 #[macro_use]
@@ -93,6 +97,7 @@ mod update_helper;
 pub mod webxdc;
 #[macro_use]
 mod dehtml;
+mod authres;
 mod color;
 pub mod html;
 pub mod plaintext;

src/message.rs

@@ -726,7 +726,7 @@ impl Message {
         self.text = text;
     }
 
-    pub fn set_file(&mut self, file: impl AsRef<str>, filemime: Option<&str>) {
+    pub fn set_file(&mut self, file: impl ToString, filemime: Option<&str>) {
         self.param.set(Param::File, file);
         if let Some(filemime) = filemime {
             self.param.set(Param::MimeType, filemime);
@@ -752,6 +752,11 @@ impl Message {
         self.param.set_int(Param::Duration, duration);
     }
 
+    /// Marks the message as reaction.
+    pub(crate) fn set_reaction(&mut self) {
+        self.param.set_int(Param::Reaction, 1);
+    }
+
     pub async fn latefiling_mediasize(
         &mut self,
         context: &Context,
@@ -1117,6 +1122,28 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String> {
     }
     if !msg.rfc724_mid.is_empty() {
         ret += &format!("\nMessage-ID: {}", msg.rfc724_mid);
+
+        let server_uids = context
+            .sql
+            .query_map(
+                "SELECT folder, uid FROM imap WHERE rfc724_mid=?",
+                paramsv![msg.rfc724_mid],
+                |row| {
+                    let folder: String = row.get("folder")?;
+                    let uid: u32 = row.get("uid")?;
+                    Ok((folder, uid))
+                },
+                |rows| {
+                    rows.collect::<std::result::Result<Vec<_>, _>>()
+                        .map_err(Into::into)
+                },
+            )
+            .await?;
+
+        for (folder, uid) in server_uids {
+            // Format as RFC 5092 relative IMAP URL.
+            ret += &format!("\n</{}/;UID={}>", folder, uid);
+        }
     }
     let hop_info: Option<String> = context
         .sql
@@ -1768,9 +1795,6 @@ pub enum Viewtype {
     /// The text of the message is set using dc_msg_set_text() and retrieved with dc_msg_get_text().
     Text = 10,
 
-    /// RFC 9078 reaction.
-    Reaction = 11,
-
     /// Image message.
     /// If the image is an animated GIF, the type DC_MSG_GIF should be used.
     /// File, width and height are set via dc_msg_set_file(), dc_msg_set_dimension
@@ -1830,7 +1854,6 @@ impl Viewtype {
         match self {
             Viewtype::Unknown => false,
             Viewtype::Text => false,
-            Viewtype::Reaction => false,
             Viewtype::Image => true,
             Viewtype::Gif => true,
             Viewtype::Sticker => true,

src/mimefactory.rs

@@ -183,7 +183,10 @@ impl<'a> MimeFactory<'a> {
                 )
                 .await?;
 
-            if !msg.is_system_message() && context.get_config_bool(Config::MdnsEnabled).await? {
+            if !msg.is_system_message()
+                && msg.param.get_int(Param::Reaction).unwrap_or_default() == 0
+                && context.get_config_bool(Config::MdnsEnabled).await?
+            {
                 req_mdn = true;
             }
         }
@@ -1123,7 +1126,7 @@ impl<'a> MimeFactory<'a> {
             ))
             .body(message_text);
 
-        if self.msg.viewtype == Viewtype::Reaction {
+        if self.msg.param.get_int(Param::Reaction).unwrap_or_default() != 0 {
             main_part = main_part.header(("Content-Disposition", "reaction"));
         }
 
@@ -1308,7 +1311,7 @@ impl<'a> MimeFactory<'a> {
 /// This line length limit is an
 /// [RFC5322 requirement](https://tools.ietf.org/html/rfc5322#section-2.1.1).
 fn wrapped_base64_encode(buf: &[u8]) -> String {
-    let base64 = base64::encode(&buf);
+    let base64 = base64::encode(buf);
     let mut chars = base64.chars();
     std::iter::repeat_with(|| chars.by_ref().take(78).collect::<String>())
         .take_while(|s| !s.is_empty())

src/mimeparser.rs

@@ -15,7 +15,7 @@ use crate::blob::BlobObject;
 use crate::constants::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
 use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
-use crate::decrypt::{create_decryption_info, try_decrypt};
+use crate::decrypt::{prepare_decryption, try_decrypt};
 use crate::dehtml::dehtml;
 use crate::events::EventType;
 use crate::format_flowed::unformat_flowed;
@@ -178,7 +178,7 @@ impl MimeMessage {
             .get_header_value(HeaderDef::Date)
             .and_then(|v| mailparse::dateparse(&v).ok())
             .unwrap_or_default();
-        let hop_info = parse_receive_headers(&mail.get_headers());
+        let mut hop_info = parse_receive_headers(&mail.get_headers());
 
         let mut headers = Default::default();
         let mut recipients = Default::default();
@@ -220,7 +220,9 @@ impl MimeMessage {
         let mut mail_raw = Vec::new();
         let mut gossiped_addr = Default::default();
         let mut from_is_signed = false;
-        let mut decryption_info = create_decryption_info(context, &mail, message_time).await?;
+        let mut decryption_info = prepare_decryption(context, &mail, &from, message_time).await?;
+        hop_info += "\n\n";
+        hop_info += &decryption_info.dkim_results.to_string();
 
         // `signatures` is non-empty exactly if the message was encrypted and correctly signed.
         let (mail, signatures, warn_empty_signature) =
@@ -296,6 +298,8 @@ impl MimeMessage {
                     if let Some(peerstate) = &mut decryption_info.peerstate {
                         if message_time > peerstate.last_seen_autocrypt
                             && mail.ctype.mimetype != "multipart/report"
+                        // Disallowing keychanges is disabled for now:
+                        // && decryption_info.dkim_results.allow_keychange
                         {
                             peerstate.degrade_encryption(message_time);
                             peerstate.save_to_db(&context.sql, false).await?;
@@ -369,6 +373,12 @@ impl MimeMessage {
         parser.heuristically_parse_ndn(context).await;
         parser.parse_headers(context).await?;
 
+        // Disallowing keychanges is disabled for now
+        // if !decryption_info.dkim_results.allow_keychange {
+        //     for part in parser.parts.iter_mut() {
+        //         part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string());
+        //     }
+        // }
         if warn_empty_signature && parser.signatures.is_empty() {
             for part in parser.parts.iter_mut() {
                 part.error = Some("No valid signature".to_string());
@@ -465,10 +475,7 @@ impl MimeMessage {
                     | Viewtype::Video
                     | Viewtype::File
                     | Viewtype::Webxdc => true,
-                    Viewtype::Unknown
-                    | Viewtype::Text
-                    | Viewtype::Reaction
-                    | Viewtype::VideochatInvitation => false,
+                    Viewtype::Unknown | Viewtype::Text | Viewtype::VideochatInvitation => false,
                 };
 
             if need_drop {
@@ -557,7 +564,7 @@ impl MimeMessage {
                 let part_with_text = self
                     .parts
                     .iter_mut()
-                    .find(|part| !part.msg.is_empty() && part.typ != Viewtype::Reaction);
+                    .find(|part| !part.msg.is_empty() && !part.is_reaction);
                 if let Some(mut part) = part_with_text {
                     part.msg = format!("{} – {}", subject, part.msg);
                 }
@@ -953,7 +960,10 @@ impl MimeMessage {
                         warn!(context, "Missing attachment");
                         return Ok(false);
                     }
-                    mime::TEXT if msg_type == Viewtype::Reaction => {
+                    mime::TEXT
+                        if mail.get_content_disposition().disposition
+                            == DispositionType::Extension("reaction".to_string()) =>
+                    {
                         // Reaction.
                         let decoded_data = match mail.get_body() {
                             Ok(decoded_data) => decoded_data,
@@ -965,9 +975,10 @@ impl MimeMessage {
                         };
 
                         let part = Part {
-                            typ: Viewtype::Reaction,
+                            typ: Viewtype::Text,
                             mimetype: Some(mime_type),
                             msg: decoded_data,
+                            is_reaction: true,
                             ..Default::default()
                         };
                         self.do_add_single_part(part);
@@ -1671,6 +1682,9 @@ pub struct Part {
     /// note that multipart/related may contain further multipart nestings
     /// and all of them needs to be marked with `is_related`.
     pub(crate) is_related: bool,
+
+    /// Part is an RFC 9078 reaction.
+    pub(crate) is_reaction: bool,
 }
 
 /// return mimetype and viewtype for a parsed mail
@@ -1679,11 +1693,7 @@ fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> {
 
     let viewtype = match mimetype.type_() {
         mime::TEXT => {
-            if mail.get_content_disposition().disposition
-                == DispositionType::Extension("reaction".to_string())
-            {
-                Viewtype::Reaction
-            } else if !is_attachment_disposition(mail) {
+            if !is_attachment_disposition(mail) {
                 match mimetype.subtype() {
                     mime::PLAIN | mime::HTML => Viewtype::Text,
                     _ => Viewtype::File,
@@ -3384,7 +3394,7 @@ Content-Disposition: reaction\n\
         .await?;
 
         assert_eq!(mime_message.parts.len(), 1);
-        assert_eq!(mime_message.parts[0].typ, Viewtype::Reaction);
+        assert_eq!(mime_message.parts[0].is_reaction, true);
         assert_eq!(
             mime_message
                 .get_header(HeaderDef::InReplyTo)

src/param.rs

@@ -59,6 +59,9 @@ pub enum Param {
     /// For Messages
     WantsMdn = b'r',
 
+    /// For Messages: the message is a reaction.
+    Reaction = b'x',
+
     /// For Messages: a message with Auto-Submitted header ("bot").
     Bot = b'b',
 
@@ -263,8 +266,8 @@ impl Params {
     }
 
     /// Set the given key to the passed in value.
-    pub fn set(&mut self, key: Param, value: impl AsRef<str>) -> &mut Self {
-        self.inner.insert(key, value.as_ref().to_string());
+    pub fn set(&mut self, key: Param, value: impl ToString) -> &mut Self {
+        self.inner.insert(key, value.to_string());
         self
     }
 

src/peerstate.rs

@@ -196,35 +196,36 @@ impl Peerstate {
                 //   gossip_key_fingerprint, verified_key, verified_key_fingerprint
 
                 let res = Peerstate {
-                    addr: row.get(0)?,
-                    last_seen: row.get(1)?,
-                    last_seen_autocrypt: row.get(2)?,
-                    prefer_encrypt: EncryptPreference::from_i32(row.get(3)?).unwrap_or_default(),
+                    addr: row.get("addr")?,
+                    last_seen: row.get("last_seen")?,
+                    last_seen_autocrypt: row.get("last_seen_autocrypt")?,
+                    prefer_encrypt: EncryptPreference::from_i32(row.get("prefer_encrypted")?)
+                        .unwrap_or_default(),
                     public_key: row
-                        .get(4)
+                        .get("public_key")
                         .ok()
                         .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                     public_key_fingerprint: row
-                        .get::<_, Option<String>>(7)?
+                        .get::<_, Option<String>>("public_key_fingerprint")?
                         .map(|s| s.parse::<Fingerprint>())
                         .transpose()
                         .unwrap_or_default(),
                     gossip_key: row
-                        .get(6)
+                        .get("gossip_key")
                         .ok()
                         .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                     gossip_key_fingerprint: row
-                        .get::<_, Option<String>>(8)?
+                        .get::<_, Option<String>>("gossip_key_fingerprint")?
                         .map(|s| s.parse::<Fingerprint>())
                         .transpose()
                         .unwrap_or_default(),
-                    gossip_timestamp: row.get(5)?,
+                    gossip_timestamp: row.get("gossip_timestamp")?,
                     verified_key: row
-                        .get(9)
+                        .get("verified_key")
                         .ok()
                         .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                     verified_key_fingerprint: row
-                        .get::<_, Option<String>>(10)?
+                        .get::<_, Option<String>>("verified_key_fingerprint")?
                         .map(|s| s.parse::<Fingerprint>())
                         .transpose()
                         .unwrap_or_default(),

src/plaintext.rs

@@ -44,12 +44,12 @@ impl PlainText {
             let line = line.to_string().replace('\r', "");
 
             let mut line = LINKIFY_MAIL_RE
-                .replace_all(&*line, "\rLTa href=\rQUOTmailto:$1\rQUOT\rGT$1\rLT/a\rGT")
+                .replace_all(&line, "\rLTa href=\rQUOTmailto:$1\rQUOT\rGT$1\rLT/a\rGT")
                 .as_ref()
                 .to_string();
 
             line = LINKIFY_URL_RE
-                .replace_all(&*line, "\rLTa href=\rQUOT$1\rQUOT\rGT$1\rLT/a\rGT")
+                .replace_all(&line, "\rLTa href=\rQUOT$1\rQUOT\rGT$1\rLT/a\rGT")
                 .as_ref()
                 .to_string();
 

src/qr.rs

@@ -230,7 +230,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
                 .await
                 .with_context(|| format!("can't check if address {:?} is our address", addr))?
             {
-                if token::exists(context, token::Namespace::InviteNumber, &*invitenumber).await {
+                if token::exists(context, token::Namespace::InviteNumber, &invitenumber).await {
                     Ok(Qr::WithdrawVerifyGroup {
                         grpname,
                         grpid,
@@ -260,7 +260,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
                 })
             }
         } else if context.is_self_addr(addr).await? {
-            if token::exists(context, token::Namespace::InviteNumber, &*invitenumber).await {
+            if token::exists(context, token::Namespace::InviteNumber, &invitenumber).await {
                 Ok(Qr::WithdrawVerifyContact {
                     contact_id,
                     fingerprint,

src/reaction.rs

@@ -45,7 +45,7 @@ impl From<&str> for Reaction {
     /// the end of string is acceptable.
     ///
     /// Any short enough string is accepted as a reaction to avoid the
-    /// complexity of validating emoji sequences ase required by RFC
+    /// complexity of validating emoji sequences as required by RFC
     /// 9078. On the sender side UI is responsible to provide only
     /// valid emoji sequences via reaction picker. On the receiver
     /// side, abuse of the possibility to use arbitrary strings as
@@ -57,7 +57,7 @@ impl From<&str> for Reaction {
             .split_ascii_whitespace()
             .filter(|&emoji| emoji.len() < 30)
             .collect();
-        emojis.sort();
+        emojis.sort_unstable();
         emojis.dedup();
         let reaction = emojis.join(" ");
         Self { reaction }
@@ -75,7 +75,7 @@ impl Reaction {
         self.reaction.split(' ').collect()
     }
 
-    /// Returns space-separated string of emojis.
+    /// Returns space-separated string of emojis
     pub fn as_str(&self) -> &str {
         &self.reaction
     }
@@ -84,7 +84,7 @@ impl Reaction {
     pub fn add(&self, other: Self) -> Self {
         let mut emojis: Vec<&str> = self.emojis();
         emojis.append(&mut other.emojis());
-        emojis.sort();
+        emojis.sort_unstable();
         emojis.dedup();
         let reaction = emojis.join(" ");
         Self { reaction }
@@ -133,8 +133,8 @@ impl fmt::Display for Reactions {
         for (emoji, frequency) in emoji_frequencies {
             if !first {
                 write!(f, " ")?;
-                first = true;
             }
+            first = false;
             write!(f, "{}{}", emoji, frequency)?;
         }
         Ok(())
@@ -189,18 +189,25 @@ pub async fn send_reaction(context: &Context, msg_id: MsgId, reaction: &str) ->
     let chat_id = msg.chat_id;
 
     let reaction: Reaction = reaction.into();
-    let mut reaction_msg = Message::new(Viewtype::Reaction);
+    let mut reaction_msg = Message::new(Viewtype::Text);
     reaction_msg.text = Some(reaction.as_str().to_string());
+    reaction_msg.set_reaction();
+    reaction_msg.in_reply_to = Some(msg.rfc724_mid);
+    reaction_msg.hidden = true;
 
+    // Send messsage first.
+    let reaction_msg_id = send_msg(context, chat_id, &mut reaction_msg).await?;
+
+    // Only set reaction if we successfully sent the message.
     set_msg_id_reaction(context, msg_id, msg.chat_id, ContactId::SELF, reaction).await?;
-    send_msg(context, chat_id, &mut reaction_msg).await
+    Ok(reaction_msg_id)
 }
 
 /// Adds given reaction to message `msg_id` and sends an update.
 ///
 /// This can be used to implement advanced clients that allow reacting
 /// with multiple emojis. For a simple messenger UI, you probably want
-/// to use [`send_reaction()`] instead so reacing with a new emoji
+/// to use [`send_reaction()`] instead so reacting with a new emoji
 /// removes previous emoji at the same time.
 pub async fn add_reaction(context: &Context, msg_id: MsgId, reaction: &str) -> Result<MsgId> {
     let self_reaction = get_self_reaction(context, msg_id).await?;
@@ -284,8 +291,9 @@ mod tests {
     use crate::config::Config;
     use crate::constants::DC_CHAT_ID_TRASH;
     use crate::contact::{Contact, Origin};
+    use crate::download::DownloadState;
     use crate::message::MessageState;
-    use crate::receive_imf::receive_imf;
+    use crate::receive_imf::{receive_imf, receive_imf_inner};
     use crate::test_utils::TestContext;
 
     #[test]
@@ -434,16 +442,21 @@ Content-Disposition: reaction\n\
         assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 1);
         assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 1);
 
+        let alice_msg2 = alice.send_text(chat_alice.id, "Hi again!").await;
+        bob.recv_msg(&alice_msg2).await;
+        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 2);
+        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 2);
+
         bob_msg.chat_id.accept(&bob).await?;
 
         send_reaction(&bob, bob_msg.id, "👍").await.unwrap();
         expect_reactions_changed_event(&bob, bob_msg.chat_id, bob_msg.id, ContactId::SELF).await?;
-        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 1);
+        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 2);
 
         let bob_reaction_msg = bob.pop_sent_msg().await;
         let alice_reaction_msg = alice.recv_msg_opt(&bob_reaction_msg).await.unwrap();
         assert_eq!(alice_reaction_msg.chat_id, DC_CHAT_ID_TRASH);
-        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 1);
+        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 2);
 
         let reactions = get_msg_reactions(&alice, alice_msg.sender_msg_id).await?;
         assert_eq!(reactions.to_string(), "👍1");
@@ -457,6 +470,82 @@ Content-Disposition: reaction\n\
         expect_reactions_changed_event(&alice, chat_alice.id, alice_msg.sender_msg_id, *bob_id)
             .await?;
 
+        // Alice reacts to own message.
+        send_reaction(&alice, alice_msg.sender_msg_id, "👍 😀")
+            .await
+            .unwrap();
+        let reactions = get_msg_reactions(&alice, alice_msg.sender_msg_id).await?;
+        assert_eq!(reactions.to_string(), "👍2 😀1");
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_partial_download_and_reaction() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+        let bob = TestContext::new_bob().await;
+
+        alice
+            .create_chat_with_contact("Bob", "bob@example.net")
+            .await;
+
+        let msg_header = "From: Bob <bob@example.net>\n\
+                    To: Alice <alice@example.org>\n\
+                    Chat-Version: 1.0\n\
+                    Subject: subject\n\
+                    Message-ID: <first@example.org>\n\
+                    Date: Sun, 14 Nov 2021 00:10:00 +0000\
+                    Content-Type: text/plain";
+        let msg_full = format!("{}\n\n100k text...", msg_header);
+
+        // Alice downloads message from Bob partially.
+        let alice_received_message = receive_imf_inner(
+            &alice,
+            "first@example.org",
+            msg_header.as_bytes(),
+            false,
+            Some(100000),
+            false,
+        )
+        .await?
+        .unwrap();
+        let alice_msg_id = *alice_received_message.msg_ids.get(0).unwrap();
+
+        // Bob downloads own message on the other device.
+        let bob_received_message = receive_imf(&bob, msg_full.as_bytes(), false)
+            .await?
+            .unwrap();
+        let bob_msg_id = *bob_received_message.msg_ids.get(0).unwrap();
+
+        // Bob reacts to own message.
+        send_reaction(&bob, bob_msg_id, "👍").await.unwrap();
+        let bob_reaction_msg = bob.pop_sent_msg().await;
+
+        // Alice receives a reaction.
+        alice.recv_msg_opt(&bob_reaction_msg).await.unwrap();
+
+        let reactions = get_msg_reactions(&alice, alice_msg_id).await?;
+        assert_eq!(reactions.to_string(), "👍1");
+        let msg = Message::load_from_db(&alice, alice_msg_id).await?;
+        assert_eq!(msg.download_state(), DownloadState::Available);
+
+        // Alice downloads full message.
+        receive_imf_inner(
+            &alice,
+            "first@example.org",
+            msg_full.as_bytes(),
+            false,
+            None,
+            false,
+        )
+        .await?;
+
+        // Check that reaction is still on the message after full download.
+        let msg = Message::load_from_db(&alice, alice_msg_id).await?;
+        assert_eq!(msg.download_state(), DownloadState::Done);
+        let reactions = get_msg_reactions(&alice, alice_msg_id).await?;
+        assert_eq!(reactions.to_string(), "👍1");
+
         Ok(())
     }
 }

src/receive_imf.rs

@@ -173,10 +173,13 @@ pub(crate) async fn receive_imf_inner(
     .await?;
 
     let rcvd_timestamp = smeared_time(context).await;
+
+    // Sender timestamp is allowed to be a bit in the future due to
+    // unsynchronized clocks, but not too much.
     let sent_timestamp = mime_parser
         .get_header(HeaderDef::Date)
         .and_then(|value| mailparse::dateparse(value).ok())
-        .map_or(rcvd_timestamp, |value| min(value, rcvd_timestamp));
+        .map_or(rcvd_timestamp, |value| min(value, rcvd_timestamp + 60));
 
     // Add parts
     let received_msg = add_parts(
@@ -405,7 +408,7 @@ async fn add_parts(
     from_id: ContactId,
     seen: bool,
     is_partial_download: Option<u32>,
-    replace_msg_id: Option<MsgId>,
+    mut replace_msg_id: Option<MsgId>,
     fetching_existing_messages: bool,
     prevent_rename: bool,
 ) -> Result<ReceivedMsg> {
@@ -433,10 +436,7 @@ async fn add_parts(
 
     let is_location_kml = mime_parser.location_kml.is_some();
     let is_mdn = !mime_parser.mdn_reports.is_empty();
-    let is_reaction = mime_parser
-        .parts
-        .iter()
-        .any(|part| part.typ == Viewtype::Reaction);
+    let is_reaction = mime_parser.parts.iter().any(|part| part.is_reaction);
     let show_emails =
         ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?).unwrap_or_default();
 
@@ -1060,7 +1060,7 @@ async fn add_parts(
     let conn = context.sql.get_conn().await?;
 
     for part in &mime_parser.parts {
-        if part.typ == Viewtype::Reaction {
+        if part.is_reaction {
             set_msg_reaction(
                 context,
                 &mime_in_reply_to,
@@ -1071,11 +1071,30 @@ async fn add_parts(
             .await?;
         }
 
+        let mut param = part.param.clone();
+        if is_system_message != SystemMessage::Unknown {
+            param.set_int(Param::Cmd, is_system_message as i32);
+        }
+        if let Some(replace_msg_id) = replace_msg_id {
+            let placeholder = Message::load_from_db(context, replace_msg_id).await?;
+            for key in [
+                Param::WebxdcSummary,
+                Param::WebxdcSummaryTimestamp,
+                Param::WebxdcDocument,
+                Param::WebxdcDocumentTimestamp,
+            ] {
+                if let Some(value) = placeholder.param.get(key) {
+                    param.set(key, value);
+                }
+            }
+        }
+
         let mut txt_raw = "".to_string();
         let mut stmt = conn.prepare_cached(
             r#"
 INSERT INTO msgs
   (
+    id,
     rfc724_mid, chat_id,
     from_id, to_id, timestamp, timestamp_sent, 
     timestamp_rcvd, type, state, msgrmsg, 
@@ -1085,13 +1104,22 @@ INSERT INTO msgs
     ephemeral_timestamp, download_state, hop_info
   )
   VALUES (
+    ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?
-  );
+  )
+ON CONFLICT (id) DO UPDATE
+SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
+    from_id=excluded.from_id, to_id=excluded.to_id, timestamp=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
+    timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
+    txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
+    bytes=excluded.bytes, mime_headers=excluded.mime_headers, mime_in_reply_to=excluded.mime_in_reply_to,
+    mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
+    ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
 "#,
         )?;
 
@@ -1113,11 +1141,6 @@ INSERT INTO msgs
             txt_raw = format!("{}\n\n{}", subject, msg_raw);
         }
 
-        let mut param = part.param.clone();
-        if is_system_message != SystemMessage::Unknown {
-            param.set_int(Param::Cmd, is_system_message as i32);
-        }
-
         let ephemeral_timestamp = if in_fresh {
             0
         } else {
@@ -1134,6 +1157,7 @@ INSERT INTO msgs
         let trash = chat_id.is_trash() || (is_location_kml && msg.is_empty());
 
         stmt.execute(paramsv![
+            replace_msg_id,
             rfc724_mid,
             if trash { DC_CHAT_ID_TRASH } else { chat_id },
             if trash { ContactId::UNDEFINED } else { from_id },
@@ -1172,6 +1196,10 @@ INSERT INTO msgs
             },
             mime_parser.hop_info
         ])?;
+
+        // We only replace placeholder with a first part,
+        // afterwards insert additional parts.
+        replace_msg_id = None;
         let row_id = conn.last_insert_rowid();
 
         drop(stmt);
@@ -1180,14 +1208,8 @@ INSERT INTO msgs
     drop(conn);
 
     if let Some(replace_msg_id) = replace_msg_id {
-        if let Some(created_msg_id) = created_db_entries.pop() {
-            context
-                .merge_messages(created_msg_id, replace_msg_id)
-                .await?;
-            created_db_entries.push(replace_msg_id);
-        } else {
-            replace_msg_id.delete_from_db(context).await?;
-        }
+        // "Replace" placeholder with a message that has no parts.
+        replace_msg_id.delete_from_db(context).await?;
     }
 
     chat_id.unarchive_if_not_muted(context).await?;
@@ -1882,7 +1904,7 @@ async fn apply_mailinglist_changes(
             Contact::add_or_lookup(context, "", list_post, Origin::Hidden).await?;
         let mut contact = Contact::load_from_db(context, contact_id).await?;
         if contact.param.get(Param::ListId) != Some(listid) {
-            contact.param.set(Param::ListId, &listid);
+            contact.param.set(Param::ListId, listid);
             contact.update_param(context).await?;
         }
 
@@ -1890,7 +1912,7 @@ async fn apply_mailinglist_changes(
             if list_post != old_list_post {
                 // Apparently the mailing list is using a different List-Post header in each message.
                 // Make the mailing list read-only because we would't know which message the user wants to reply to.
-                chat.param.set(Param::ListPost, "");
+                chat.param.remove(Param::ListPost);
                 chat.update_param(context).await?;
             }
         } else {
@@ -2967,7 +2989,7 @@ mod tests {
         assert!(chat.can_send(&t.ctx).await?);
         assert_eq!(
             chat.get_mailinglist_addr(),
-            "reply+elernshsetushoyseshetihseusaferuhsedtisneu@reply.github.com"
+            Some("reply+elernshsetushoyseshetihseusaferuhsedtisneu@reply.github.com")
         );
         assert_eq!(chat.name, "deltachat/deltachat-core-rust");
         assert_eq!(chat::get_chat_contacts(&t.ctx, chat_id).await?.len(), 1);
@@ -2976,7 +2998,7 @@ mod tests {
 
         let chat = chat::Chat::load_from_db(&t.ctx, chat_id).await?;
         assert!(!chat.can_send(&t.ctx).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
         assert_eq!(chats.len(), 1);
@@ -3035,7 +3057,7 @@ mod tests {
         let chat = Chat::load_from_db(&t.ctx, chat_id).await.unwrap();
         assert_eq!(chat.name, "delta-dev");
         assert!(chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "delta@codespeak.net");
+        assert_eq!(chat.get_mailinglist_addr(), Some("delta@codespeak.net"));
 
         let msg = get_chat_msg(&t, chat_id, 0, 1).await;
         let contact1 = Contact::load_from_db(&t.ctx, msg.from_id).await.unwrap();
@@ -3127,6 +3149,7 @@ Hello mailinglist!\r\n"
             .unwrap();
 
         receive_imf(&t.ctx, DC_MAILINGLIST, false).await.unwrap();
+        t.evtracker.wait_next_incoming_message().await;
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let chat_id = chats.get_chat_id(0).unwrap();
@@ -3139,7 +3162,6 @@ Hello mailinglist!\r\n"
         let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 0); // Test that the message disappeared
 
-        t.evtracker.consume_events();
         receive_imf(&t.ctx, DC_MAILINGLIST2, false).await.unwrap();
 
         // Check that no notification is displayed for blocked mailing list message.
@@ -3298,7 +3320,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.name, "ola");
         assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 1);
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         // receive another message with no sender name but the same address,
         // make sure this lands in the same chat
@@ -3351,7 +3373,7 @@ Hello mailinglist!\r\n"
         );
         assert_eq!(chat.name, "Atlas Obscura");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         Ok(())
     }
@@ -3380,7 +3402,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.grpid, "1234ABCD-123LMNO.mailing.dhl.de");
         assert_eq!(chat.name, "DHL Paket");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         Ok(())
     }
@@ -3409,7 +3431,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.grpid, "dpdde.mxmail.service.dpd.de");
         assert_eq!(chat.name, "DPD");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         Ok(())
     }
@@ -3430,7 +3452,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.grpid, "96540.xt.local");
         assert_eq!(chat.name, "Microsoft Store");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         receive_imf(
             &t,
@@ -3443,7 +3465,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.grpid, "121231234.xt.local");
         assert_eq!(chat.name, "DER SPIEGEL Kundenservice");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         Ok(())
     }
@@ -3466,7 +3488,7 @@ Hello mailinglist!\r\n"
         assert_eq!(chat.grpid, "51231231231231231231231232869f58.xing.com");
         assert_eq!(chat.name, "xing.com");
         assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
+        assert_eq!(chat.get_mailinglist_addr(), None);
 
         Ok(())
     }

src/scheduler.rs

@@ -5,6 +5,7 @@ use futures_lite::FutureExt;
 use tokio::task;
 
 use crate::config::Config;
+use crate::contact::{ContactId, RecentlySeenLoop};
 use crate::context::Context;
 use crate::ephemeral::{self, delete_expired_imap_messages};
 use crate::imap::Imap;
@@ -35,6 +36,8 @@ pub(crate) struct Scheduler {
     ephemeral_interrupt_send: Sender<()>,
     location_handle: task::JoinHandle<()>,
     location_interrupt_send: Sender<()>,
+
+    recently_seen_loop: RecentlySeenLoop,
 }
 
 impl Context {
@@ -79,6 +82,12 @@ impl Context {
             scheduler.interrupt_location();
         }
     }
+
+    pub(crate) async fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
+        if let Some(scheduler) = &*self.scheduler.read().await {
+            scheduler.interrupt_recently_seen(contact_id, timestamp);
+        }
+    }
 }
 
 async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConnectionHandlers) {
@@ -157,112 +166,117 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
         .await;
 }
 
-async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> InterruptInfo {
-    match ctx.get_config(folder).await {
-        Ok(Some(watch_folder)) => {
-            // connect and fake idle if unable to connect
-            if let Err(err) = connection.prepare(ctx).await {
-                warn!(ctx, "imap connection failed: {}", err);
-                return connection.fake_idle(ctx, Some(watch_folder)).await;
-            }
-
-            if folder == Config::ConfiguredInboxFolder {
-                if let Err(err) = connection
-                    .store_seen_flags_on_imap(ctx)
-                    .await
-                    .context("store_seen_flags_on_imap failed")
-                {
-                    warn!(ctx, "{:#}", err);
-                }
-            }
-
-            // Fetch the watched folder.
-            if let Err(err) = connection
-                .fetch_move_delete(ctx, &watch_folder, false)
-                .await
-            {
-                connection.trigger_reconnect(ctx).await;
-                warn!(ctx, "{:#}", err);
-                return InterruptInfo::new(false);
-            }
-
-            // Mark expired messages for deletion. Marked messages will be deleted from the server
-            // on the next iteration of `fetch_move_delete`. `delete_expired_imap_messages` is not
-            // called right before `fetch_move_delete` because it is not well optimized and would
-            // otherwise slow down message fetching.
-            if let Err(err) = delete_expired_imap_messages(ctx)
-                .await
-                .context("delete_expired_imap_messages failed")
-            {
-                warn!(ctx, "{:#}", err);
-            }
-
-            // Scan additional folders only after finishing fetching the watched folder.
-            //
-            // On iOS the application has strictly limited time to work in background, so we may not
-            // be able to scan all folders before time is up if there are many of them.
-            if folder == Config::ConfiguredInboxFolder {
-                // Only scan on the Inbox thread in order to prevent parallel scans, which might lead to duplicate messages
-                match connection.scan_folders(ctx).await {
-                    Err(err) => {
-                        // Don't reconnect, if there is a problem with the connection we will realize this when IDLEing
-                        // but maybe just one folder can't be selected or something
-                        warn!(ctx, "{}", err);
-                    }
-                    Ok(true) => {
-                        // Fetch the watched folder again in case scanning other folder moved messages
-                        // there.
-                        //
-                        // In most cases this will select the watched folder and return because there are
-                        // no new messages. We want to select the watched folder anyway before going IDLE
-                        // there, so this does not take additional protocol round-trip.
-                        if let Err(err) = connection
-                            .fetch_move_delete(ctx, &watch_folder, false)
-                            .await
-                        {
-                            connection.trigger_reconnect(ctx).await;
-                            warn!(ctx, "{:#}", err);
-                            return InterruptInfo::new(false);
-                        }
-                    }
-                    Ok(false) => {}
-                }
-            }
-
-            // Synchronize Seen flags.
-            connection
-                .sync_seen_flags(ctx, &watch_folder)
-                .await
-                .context("sync_seen_flags")
-                .ok_or_log(ctx);
-
-            connection.connectivity.set_connected(ctx).await;
-
-            // idle
-            if connection.can_idle() {
-                match connection.idle(ctx, Some(watch_folder)).await {
-                    Ok(v) => v,
-                    Err(err) => {
-                        connection.trigger_reconnect(ctx).await;
-                        warn!(ctx, "{}", err);
-                        InterruptInfo::new(false)
-                    }
-                }
-            } else {
-                connection.fake_idle(ctx, Some(watch_folder)).await
-            }
-        }
-        Ok(None) => {
-            connection.connectivity.set_not_configured(ctx).await;
-            info!(ctx, "Can not watch {} folder, not set", folder);
-            connection.fake_idle(ctx, None).await
-        }
+async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config) -> InterruptInfo {
+    let folder = match ctx.get_config(folder_config).await {
+        Ok(folder) => folder,
         Err(err) => {
             warn!(
                 ctx,
-                "Can not watch {} folder, failed to retrieve config: {:?}", folder, err
+                "Can not watch {} folder, failed to retrieve config: {:#}", folder_config, err
             );
-            connection.fake_idle(ctx, None).await
+            return connection.fake_idle(ctx, None).await;
+        }
+    };
+
+    let watch_folder = if let Some(watch_folder) = folder {
+        watch_folder
+    } else {
+        connection.connectivity.set_not_configured(ctx).await;
+        info!(ctx, "Can not watch {} folder, not set", folder_config);
+        return connection.fake_idle(ctx, None).await;
+    };
+
+    // connect and fake idle if unable to connect
+    if let Err(err) = connection.prepare(ctx).await {
+        warn!(ctx, "imap connection failed: {}", err);
+        return connection.fake_idle(ctx, Some(watch_folder)).await;
+    }
+
+    if folder_config == Config::ConfiguredInboxFolder {
+        if let Err(err) = connection
+            .store_seen_flags_on_imap(ctx)
+            .await
+            .context("store_seen_flags_on_imap failed")
+        {
+            warn!(ctx, "{:#}", err);
+        }
+    }
+
+    // Fetch the watched folder.
+    if let Err(err) = connection
+        .fetch_move_delete(ctx, &watch_folder, false)
+        .await
+        .context("fetch_move_delete")
+    {
+        connection.trigger_reconnect(ctx).await;
+        warn!(ctx, "{:#}", err);
+        return InterruptInfo::new(false);
+    }
+
+    // Mark expired messages for deletion. Marked messages will be deleted from the server
+    // on the next iteration of `fetch_move_delete`. `delete_expired_imap_messages` is not
+    // called right before `fetch_move_delete` because it is not well optimized and would
+    // otherwise slow down message fetching.
+    if let Err(err) = delete_expired_imap_messages(ctx)
+        .await
+        .context("delete_expired_imap_messages")
+    {
+        warn!(ctx, "{:#}", err);
+    }
+
+    // Scan additional folders only after finishing fetching the watched folder.
+    //
+    // On iOS the application has strictly limited time to work in background, so we may not
+    // be able to scan all folders before time is up if there are many of them.
+    if folder_config == Config::ConfiguredInboxFolder {
+        // Only scan on the Inbox thread in order to prevent parallel scans, which might lead to duplicate messages
+        match connection.scan_folders(ctx).await.context("scan_folders") {
+            Err(err) => {
+                // Don't reconnect, if there is a problem with the connection we will realize this when IDLEing
+                // but maybe just one folder can't be selected or something
+                warn!(ctx, "{:#}", err);
+            }
+            Ok(true) => {
+                // Fetch the watched folder again in case scanning other folder moved messages
+                // there.
+                //
+                // In most cases this will select the watched folder and return because there are
+                // no new messages. We want to select the watched folder anyway before going IDLE
+                // there, so this does not take additional protocol round-trip.
+                if let Err(err) = connection
+                    .fetch_move_delete(ctx, &watch_folder, false)
+                    .await
+                    .context("fetch_move_delete after scan_folders")
+                {
+                    connection.trigger_reconnect(ctx).await;
+                    warn!(ctx, "{:#}", err);
+                    return InterruptInfo::new(false);
+                }
+            }
+            Ok(false) => {}
+        }
+    }
+
+    // Synchronize Seen flags.
+    connection
+        .sync_seen_flags(ctx, &watch_folder)
+        .await
+        .context("sync_seen_flags")
+        .ok_or_log(ctx);
+
+    connection.connectivity.set_connected(ctx).await;
+
+    // idle
+    if !connection.can_idle() {
+        return connection.fake_idle(ctx, Some(watch_folder)).await;
+    }
+
+    match connection.idle(ctx, Some(watch_folder)).await {
+        Ok(v) => v,
+        Err(err) => {
+            connection.trigger_reconnect(ctx).await;
+            warn!(ctx, "{:#}", err);
+            InterruptInfo::new(false)
         }
     }
 }
@@ -271,11 +285,11 @@ async fn simple_imap_loop(
     ctx: Context,
     started: Sender<()>,
     inbox_handlers: ImapConnectionHandlers,
-    folder: Config,
+    folder_config: Config,
 ) {
     use futures::future::FutureExt;
 
-    info!(ctx, "starting simple loop for {}", folder.as_ref());
+    info!(ctx, "starting simple loop for {}", folder_config);
     let ImapConnectionHandlers {
         mut connection,
         stop_receiver,
@@ -291,7 +305,7 @@ async fn simple_imap_loop(
         }
 
         loop {
-            fetch_idle(&ctx, &mut connection, folder).await;
+            fetch_idle(&ctx, &mut connection, folder_config).await;
         }
     };
 
@@ -472,6 +486,8 @@ impl Scheduler {
             })
         };
 
+        let recently_seen_loop = RecentlySeenLoop::new(ctx.clone());
+
         let res = Self {
             inbox,
             mvbox,
@@ -485,6 +501,7 @@ impl Scheduler {
             ephemeral_interrupt_send,
             location_handle,
             location_interrupt_send,
+            recently_seen_loop,
         };
 
         // wait for all loops to be started
@@ -539,6 +556,10 @@ impl Scheduler {
         self.location_interrupt_send.try_send(()).ok();
     }
 
+    fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
+        self.recently_seen_loop.interrupt(contact_id, timestamp);
+    }
+
     /// Halt the scheduler.
     ///
     /// It consumes the scheduler and never fails to stop it. In the worst case, long-running tasks
@@ -574,6 +595,7 @@ impl Scheduler {
             .ok_or_log(context);
         self.ephemeral_handle.abort();
         self.location_handle.abort();
+        self.recently_seen_loop.abort();
     }
 }
 

src/scheduler/connectivity.rs

@@ -405,7 +405,7 @@ impl Context {
                     ret += " <b>";
                     ret += &*escaper::encode_minimal(&foldername);
                     ret += ":</b> ";
-                    ret += &*escaper::encode_minimal(&*detailed.to_string_imap(self).await);
+                    ret += &*escaper::encode_minimal(&detailed.to_string_imap(self).await);
                     ret += "</li>";
 
                     folder_added = true;

src/sql.rs

@@ -396,7 +396,7 @@ impl Sql {
     }
 
     /// Used for executing `SELECT COUNT` statements only. Returns the resulting count.
-    pub async fn count(&self, query: &str, params: impl rusqlite::Params) -> anyhow::Result<usize> {
+    pub async fn count(&self, query: &str, params: impl rusqlite::Params) -> Result<usize> {
         let count: isize = self.query_row(query, params, |row| row.get(0)).await?;
         Ok(usize::try_from(count)?)
     }
@@ -429,10 +429,10 @@ impl Sql {
     ///
     /// If the function returns an error, the transaction will be rolled back. If it does not return an
     /// error, the transaction will be committed.
-    pub async fn transaction<G, H>(&self, callback: G) -> anyhow::Result<H>
+    pub async fn transaction<G, H>(&self, callback: G) -> Result<H>
     where
         H: Send + 'static,
-        G: Send + 'static + FnOnce(&mut rusqlite::Transaction<'_>) -> anyhow::Result<H>,
+        G: Send + 'static + FnOnce(&mut rusqlite::Transaction<'_>) -> Result<H>,
     {
         let mut conn = self.get_conn().await?;
         tokio::task::block_in_place(move || {
@@ -453,7 +453,7 @@ impl Sql {
     }
 
     /// Query the database if the requested table already exists.
-    pub async fn table_exists(&self, name: &str) -> anyhow::Result<bool> {
+    pub async fn table_exists(&self, name: &str) -> Result<bool> {
         let conn = self.get_conn().await?;
         tokio::task::block_in_place(move || {
             let mut exists = false;
@@ -468,7 +468,7 @@ impl Sql {
     }
 
     /// Check if a column exists in a given table.
-    pub async fn col_exists(&self, table_name: &str, col_name: &str) -> anyhow::Result<bool> {
+    pub async fn col_exists(&self, table_name: &str, col_name: &str) -> Result<bool> {
         let conn = self.get_conn().await?;
         tokio::task::block_in_place(move || {
             let mut exists = false;
@@ -492,7 +492,7 @@ impl Sql {
         sql: &str,
         params: impl rusqlite::Params,
         f: F,
-    ) -> anyhow::Result<Option<T>>
+    ) -> Result<Option<T>>
     where
         F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
     {
@@ -516,7 +516,7 @@ impl Sql {
         &self,
         query: &str,
         params: impl rusqlite::Params,
-    ) -> anyhow::Result<Option<T>>
+    ) -> Result<Option<T>>
     where
         T: rusqlite::types::FromSql,
     {

src/sql/migrations.rs

@@ -609,6 +609,13 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
             92
         ).await?;
     }
+    if dbversion < 93 {
+        sql.execute_migration(
+            "CREATE TABLE sending_domains(domain TEXT PRIMARY KEY, dkim_works INTEGER DEFAULT 0);",
+            93,
+        )
+        .await?;
+    }
 
     let new_version = sql
         .get_raw_config_int(VERSION_CFG)

src/summary.rs

@@ -144,7 +144,7 @@ impl Message {
                     .map(|info| info.name)
                     .unwrap_or_else(|_| "ErrWebxdcName".to_string())
             }
-            Viewtype::Text | Viewtype::Reaction | Viewtype::Unknown => {
+            Viewtype::Text | Viewtype::Unknown => {
                 if self.param.get_cmd() != SystemMessage::LocationOnly {
                     "".to_string()
                 } else {

src/test_utils.rs

@@ -74,6 +74,14 @@ impl TestContextManager {
             .await
     }
 
+    /// Creates a new unconfigured test account.
+    pub async fn unconfigured(&mut self) -> TestContext {
+        TestContext::builder()
+            .with_log_sink(self.log_tx.clone())
+            .build()
+            .await
+    }
+
     /// Writes info events to the log that mark a section, e.g.:
     ///
     /// ========== `msg` goes here ==========
@@ -89,19 +97,23 @@ impl TestContextManager {
     /// - Let the other TestContext receive it and accept the chat
     /// - Assert that the message arrived
     pub async fn send_recv_accept(&self, from: &TestContext, to: &TestContext, msg: &str) {
+        let received_msg = self.try_send_recv(from, to, msg).await;
+        assert_eq!(received_msg.text.as_ref().unwrap(), msg);
+        received_msg.chat_id.accept(to).await.unwrap();
+    }
+
+    /// - Let one TestContext send a message
+    /// - Let the other TestContext receive it
+    pub async fn try_send_recv(&self, from: &TestContext, to: &TestContext, msg: &str) -> Message {
         self.section(&format!(
             "{} sends a message '{}' to {}",
             from.name(),
             msg,
             to.name()
         ));
-
         let chat = from.create_chat(to).await;
         let sent = from.send_text(chat.id, msg).await;
-
-        let received_msg = to.recv_msg(&sent).await;
-        received_msg.chat_id.accept(to).await.unwrap();
-        assert_eq!(received_msg.text.unwrap(), msg);
+        to.recv_msg(&sent).await
     }
 
     pub async fn change_addr(&self, test_context: &TestContext, new_addr: &str) {
@@ -369,6 +381,12 @@ impl TestContext {
     ///
     /// Panics if there is no message or on any error.
     pub async fn pop_sent_msg(&self) -> SentMessage {
+        self.pop_sent_msg_opt(Duration::from_secs(3))
+            .await
+            .expect("no sent message found in jobs table")
+    }
+
+    pub async fn pop_sent_msg_opt(&self, timeout: Duration) -> Option<SentMessage> {
         let start = Instant::now();
         let (rowid, msg_id, payload, recipients) = loop {
             let row = self
@@ -393,25 +411,25 @@ impl TestContext {
             if let Some(row) = row {
                 break row;
             }
-            if start.elapsed() < Duration::from_secs(3) {
+            if start.elapsed() < timeout {
                 tokio::time::sleep(Duration::from_millis(100)).await;
             } else {
-                panic!("no sent message found in jobs table");
+                return None;
             }
         };
         self.ctx
             .sql
-            .execute("DELETE FROM jobs WHERE id=?;", paramsv![rowid])
+            .execute("DELETE FROM smtp WHERE id=?;", paramsv![rowid])
             .await
             .expect("failed to remove job");
         update_msg_state(&self.ctx, msg_id, MessageState::OutDelivered)
             .await
             .expect("failed to update message state");
-        SentMessage {
+        Some(SentMessage {
             payload,
             sender_msg_id: msg_id,
             recipients,
-        }
+        })
     }
 
     /// Parses a message.
@@ -725,7 +743,7 @@ impl Drop for LogSink {
 /// passed through a SMTP-IMAP pipeline.
 #[derive(Debug, Clone)]
 pub struct SentMessage {
-    payload: String,
+    pub payload: String,
     recipients: String,
     pub sender_msg_id: MsgId,
 }
@@ -858,9 +876,10 @@ impl EventTracker {
         .await
     }
 
-    /// Consumes all pending events.
-    pub fn consume_events(&self) {
-        while self.try_recv().is_ok() {}
+    /// Wait for the next IncomingMsg event.
+    pub async fn wait_next_incoming_message(&self) {
+        self.get_matching(|evt| matches!(evt, EventType::IncomingMsg { .. }))
+            .await;
     }
 }
 

src/tools.rs

@@ -12,7 +12,7 @@ use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, Error, Result};
 use chrono::{Local, TimeZone};
-use futures::StreamExt;
+use futures::{StreamExt, TryStreamExt};
 use mailparse::dateparse;
 use mailparse::headers::Headers;
 use mailparse::MailHeaderMap;
@@ -272,7 +272,7 @@ pub(crate) fn create_id() -> String {
     rng.fill(&mut arr[..]);
 
     // Take 11 base64 characters containing 66 random bits.
-    base64::encode_config(&arr, base64::URL_SAFE)
+    base64::encode_config(arr, base64::URL_SAFE)
         .chars()
         .take(11)
         .collect()
@@ -495,6 +495,13 @@ pub fn open_file_std<P: AsRef<std::path::Path>>(
     }
 }
 
+pub async fn read_dir(path: &Path) -> Result<Vec<fs::DirEntry>> {
+    let res = tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(path).await?)
+        .try_collect()
+        .await?;
+    Ok(res)
+}
+
 pub(crate) fn time() -> i64 {
     SystemTime::now()
         .duration_since(SystemTime::UNIX_EPOCH)
@@ -715,7 +722,9 @@ hi
 Message-ID: 2dfdbde7@example.org
 
 Hop: From: localhost; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:22 +0000
-Hop: From: hq5.merlinux.eu; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:25 +0000";
+Hop: From: hq5.merlinux.eu; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:25 +0000
+
+DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
         check_parse_receive_headers_integration(raw, expected).await;
 
         let raw = include_bytes!("../test-data/message/encrypted_with_received_headers.eml");
@@ -732,7 +741,9 @@ Message-ID: Mr.adQpEwndXLH.LPDdlFVJ7wG@example.net
 
 Hop: From: [127.0.0.1]; By: mail.example.org; Date: Mon, 27 Dec 2021 11:21:21 +0000
 Hop: From: mout.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000
-Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000";
+Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000
+
+DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
         check_parse_receive_headers_integration(raw, expected).await;
     }
 

src/webxdc.rs

@@ -496,7 +496,7 @@ impl Context {
         for update_item in updates.updates {
             self.create_status_update_record(
                 &mut instance,
-                &*serde_json::to_string(&update_item)?,
+                &serde_json::to_string(&update_item)?,
                 timestamp,
                 can_info_msg,
                 from_id,
@@ -545,7 +545,7 @@ impl Context {
                         let (update_item_str, serial) = row;
                         let update_item = StatusUpdateItemAndSerial
                         {
-                            item: serde_json::from_str(&*update_item_str)?,
+                            item: serde_json::from_str(&update_item_str)?,
                             serial,
                             max_serial,
                         };
@@ -553,7 +553,7 @@ impl Context {
                         if !json.is_empty() {
                             json.push_str(",\n");
                         }
-                        json.push_str(&*serde_json::to_string(&update_item)?);
+                        json.push_str(&serde_json::to_string(&update_item)?);
                     }
                     Ok(json)
                 },
@@ -1825,7 +1825,7 @@ sth_for_the = "future""#
 
         let instance = t.get_last_msg().await;
         let html = instance.get_webxdc_blob(&t, "index.html").await?;
-        assert!(String::from_utf8_lossy(&*html).contains("requires a newer Delta Chat version"));
+        assert!(String::from_utf8_lossy(&html).contains("requires a newer Delta Chat version"));
 
         Ok(())
     }

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@buzon.uy

@@ -0,0 +1,6 @@
+Authentication-Results: atlas106.aol.mail.ne1.yahoo.com;
+ dkim=pass header.i=@buzon.uy header.s=2019;
+ spf=pass smtp.mailfrom=buzon.uy;
+ dmarc=pass(p=REJECT) header.from=buzon.uy;
+From: <alice@buzon.uy>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@delta.blinzeln.de

@@ -0,0 +1,6 @@
+Authentication-Results: atlas206.aol.mail.ne1.yahoo.com;
+ dkim=unknown;
+ spf=none smtp.mailfrom=delta.blinzeln.de;
+ dmarc=unknown header.from=delta.blinzeln.de;
+From: <alice@delta.blinzeln.de>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@disroot.org

@@ -0,0 +1,6 @@
+Authentication-Results: atlas210.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@disroot.org header.s=mail;
+ spf=pass smtp.mailfrom=disroot.org;
+ dmarc=pass(p=QUARANTINE) header.from=disroot.org;
+From: <alice@disroot.org>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@fastmail.com

@@ -0,0 +1,7 @@
+Authentication-Results: atlas105.aol.mail.ne1.yahoo.com;
+ dkim=pass header.i=@fastmail.com header.s=fm2;
+ dkim=pass header.i=@messagingengine.com header.s=fm2;
+ spf=pass smtp.mailfrom=fastmail.com;
+ dmarc=pass(p=NONE,sp=NONE) header.from=fastmail.com;
+From: <alice@fastmail.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@gmail.com

@@ -0,0 +1,6 @@
+Authentication-Results: atlas-baseline-production.v2-mail-prod1-gq1.omega.yahoo.com;
+ dkim=pass header.i=@gmail.com header.s=20210112;
+ spf=pass smtp.mailfrom=gmail.com;
+ dmarc=pass(p=NONE,sp=QUARANTINE) header.from=gmail.com;
+From: <alice@gmail.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@hotmail.com

@@ -0,0 +1,8 @@
+Authentication-Results: atlas112.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@hotmail.com header.s=selector1;
+ spf=pass smtp.mailfrom=hotmail.com;
+ dmarc=pass(p=NONE) header.from=hotmail.com;
+ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
+ dkim=none; arc=none
+From: <alice@hotmail.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@icloud.com

@@ -0,0 +1,6 @@
+Authentication-Results: atlas101.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@icloud.com header.s=1a1hai;
+ spf=pass smtp.mailfrom=icloud.com;
+ dmarc=pass(p=QUARANTINE,sp=QUARANTINE) header.from=icloud.com;
+From: <alice@icloud.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@ik.me

@@ -0,0 +1,6 @@
+Authentication-Results: atlas-production.v2-mail-prod1-gq1.omega.yahoo.com;
+ dkim=pass header.i=@ik.me header.s=20200325;
+ spf=pass smtp.mailfrom=ik.me;
+ dmarc=pass(p=REJECT) header.from=ik.me;
+From: <alice@ik.me>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@mail.ru

@@ -0,0 +1,6 @@
+Authentication-Results: atlas104.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@mail.ru header.s=mail4;
+ spf=pass smtp.mailfrom=mail.ru;
+ dmarc=pass(p=REJECT) header.from=mail.ru;
+From: <alice@mail.ru>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@mailo.com

@@ -0,0 +1,6 @@
+Authentication-Results: atlas211.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@mailo.com header.s=mailo;
+ spf=pass smtp.mailfrom=mailo.com;
+ dmarc=pass(p=NONE) header.from=mailo.com;
+From: <alice@mailo.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@outlook.com

@@ -0,0 +1,8 @@
+Authentication-Results: atlas-production.v2-mail-prod1-gq1.omega.yahoo.com;
+ dkim=pass header.i=@outlook.com header.s=selector1;
+ spf=pass smtp.mailfrom=outlook.com;
+ dmarc=pass(p=NONE,sp=QUARANTINE) header.from=outlook.com;
+ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
+ dkim=none; arc=none
+From: <alice@outlook.com>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@posteo.de

@@ -0,0 +1,6 @@
+Authentication-Results: atlas-production.v2-mail-prod1-gq1.omega.yahoo.com;
+ dkim=pass header.i=@posteo.de header.s=2017;
+ spf=pass smtp.mailfrom=posteo.de;
+ dmarc=pass(p=NONE) header.from=posteo.de;
+From: <alice@posteo.de>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@yandex.ru

@@ -0,0 +1,6 @@
+Authentication-Results: atlas114.aol.mail.bf1.yahoo.com;
+ dkim=pass header.i=@yandex.ru header.s=mail;
+ spf=pass smtp.mailfrom=yandex.ru;
+ dmarc=pass(p=NONE) header.from=yandex.ru;
+From: <alice@yandex.ru>
+To: <alice@aol.com>

test-data/message/dkimchecks-2022-09-28/alice@aol.com/forged-authres-added@example.com

@@ -0,0 +1,6 @@
+Authentication-Results: atlas206.aol.mail.ne1.yahoo.com;
+ dkim=unknown;
+ spf=none smtp.mailfrom=delta.blinzeln.de;
+ dmarc=unknown header.from=delta.blinzeln.de;
+From: forged-authres-added@example.com
+Authentication-Results: aaa.com; dkim=pass header.i=@example.com

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@aol.com

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=aol.com header.i=@aol.com header.b="sjmqxpKe";
+	dkim-atps=neutral
+From: <alice@aol.com>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@delta.blinzeln.de

@@ -0,0 +1,3 @@
+From: <alice@delta.blinzeln.de>
+To: <alice@buzon.uy>
+Authentication-Results: secure-mailgate.com; auth=pass smtp.auth=91.203.111.88@webbox222.server-home.org

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@disroot.org

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.b="L9SmOHOj";
+	dkim-atps=neutral
+From: <alice@disroot.org>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@fastmail.com

@@ -0,0 +1,6 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=fastmail.com header.i=@fastmail.com header.b="kLB05is1";
+	dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="B8mfR89g";
+	dkim-atps=neutral
+From: <alice@fastmail.com>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@gmail.com

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ngf1X5eN";
+	dkim-atps=neutral
+From: <alice@gmail.com>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@hotmail.com

@@ -0,0 +1,7 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=hotmail.com header.i=@hotmail.com header.b="dEHn9Szj";
+	dkim-atps=neutral
+ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
+ dkim=none; arc=none
+From: <alice@hotmail.com>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@icloud.com

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=icloud.com header.i=@icloud.com header.b="rAXD4xVN";
+	dkim-atps=neutral
+From: <alice@icloud.com>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@ik.me

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (1024-bit key; secure) header.d=ik.me header.i=@ik.me header.b="EWWQpVZX";
+	dkim-atps=neutral
+From: <alice@ik.me>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@mail.de

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; secure) header.d=mail.de header.i=@mail.de header.b="18cRkjHf";
+	dkim-atps=neutral
+From: <alice@mail.de>
+To: <alice@buzon.uy>

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@mail.ru

@@ -0,0 +1,6 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (2048-bit key; unprotected) header.d=mail.ru header.i=@mail.ru header.b="uXBGAnnn";
+	dkim-atps=neutral
+From: <alice@mail.ru>
+To: <alice@buzon.uy>
+Authentication-Results: smtpng1.m.smailru.net; auth=pass smtp.auth=alice@mail.ru smtp.mailfrom=alice@mail.ru

test-data/message/dkimchecks-2022-09-28/alice@buzon.uy/alice@mailo.com

@@ -0,0 +1,5 @@
+Authentication-Results: mail.buzon.uy;
+	dkim=pass (1024-bit key; unprotected) header.d=mailo.com header.i=@mailo.com header.b="awx9eOw9";
+	dkim-atps=neutral
+From: <alice@mailo.com>
+To: <alice@buzon.uy>