method to get busy webxdcs

.github/workflows/jsonrpc-client-npm-package.yml

@@ -1,83 +0,0 @@
-name: 'jsonrpc js client build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  pack-module:
-    name: 'Package @deltachat/jsonrpc-client and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          npm --version
-          node --version
-          echo $DELTACHAT_JSONRPC_TAR_GZ
-      - name: install dependencies without running scripts
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install --ignore-scripts
-      - name: package
-        shell: bash
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build:tsc
-          npm pack .
-          ls -lah
-          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-jsonrpc-client.tgz
-          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

CHANGELOG.md

@@ -2,38 +2,6 @@
 
 ## Unreleased
 
-### API-Changes
-
-### Changes
-
-### Fixes
-
-## 1.96.0
-
-### Changes
-- jsonrpc js client:
-  - Change package name from `deltachat-jsonrpc-client` to `@deltachat/jsonrpc-client`
-  - remove relative file dependency to it from `deltachat-node` (because it did not work anyway and broke the nix build of desktop)
-  - ci: add github ci action to upload it to our download server automaticaly on realease
-
-## 1.95.0
-
-### API-Changes
-- jsonrpc: add `mailingListAddress` property to `FullChat` #3607
-- jsonrpc: add `MessageNotificationInfo` & `messageGetNotificationInfo()` #3614
-- jsonrpc: add `chat_get_neighboring_media` function #3610
-
-### Changes
-- added `dclogin:` scheme to allow configuration from a qr code
-  (data inside qrcode, contrary to `dcaccount:` which points to an API to create an account) #3541
-- truncate incoming messages by lines instead of just length #3480
-- emit separate `DC_EVENT_MSGS_CHANGED` for each expired message,
-  and `DC_EVENT_WEBXDC_INSTANCE_DELETED` when a message contains a webxdc #3605
-- enable `bcc_self` by default #3612
-
-
-## 1.94.0
-
 ### API-Changes
 - breaking change: replace `dc_accounts_event_emitter_t` with `dc_event_emitter_t` #3422
 
@@ -43,8 +11,7 @@
   and `dc_event_emitter_unref()` should be used instead of
   `dc_accounts_event_emitter_unref`.
 - add `dc_contact_was_seen_recently()` #3560
-- Fix `get_connectivity_html` and `get_encrinfo` futures not being Send. See rust-lang/rust#101650 for more information
-- jsonrpc: add functions: #3586, #3587, #3590
+- jsonrpc: add functions: #3586, #3587
   - `deleteChat()`
   - `getChatEncryptionInfo()`
   - `getChatSecurejoinQrCodeSvg()`
@@ -53,37 +20,17 @@
   - `addContactToChat()`
   - `deleteMessages()`
   - `getMessageInfo()`
-  - `getBasicChatInfo()`
-  - `marknoticedChat()`
-  - `getFirstUnreadMessageOfChat()`
-  - `markseenMsgs()`
-  - `forwardMessages()`
-  - `removeDraft()`
-  - `getDraft()`
-  - `miscSendMsg()`
-  - `miscSetDraft()`
-  - `maybeNetwork()`
-  - `getConnectivity()`
-  - `getContactEncryptionInfo()`
-  - `getConnectivityHtml()`
 - jsonrpc: add `is_broadcast` property to `ChatListItemFetchResult` #3584
 - jsonrpc: add `was_seen_recently` property to `ChatListItemFetchResult`, `FullChat` and `Contact` #3584
 - jsonrpc: add `webxdc_info` property to `Message` #3588
-- python: move `get_dc_event_name()` from `deltachat` to `deltachat.events` #3564
-- jsonrpc: add `webxdc_info`, `parent_id` and `download_state` property to `Message` #3588, #3590
-- jsonrpc: add `BasicChat` object as a leaner alternative to `FullChat` #3590
-- jsonrpc: add `last_seen` property to `Contact` #3590
-- breaking! jsonrpc: replace `Message.quoted_text` and `Message.quoted_message_id` with `Message.quote` #3590
-- add separate stock strings for actions done by contacts to make them easier to translate #3518
-- `dc_initiate_key_transfer()` is non-blocking now. #3553
-  UIs don't need to display a button to cancel sending Autocrypt Setup Message with
-  `dc_stop_ongoing_process()` anymore.
 
 ### Changes
 - order contact lists by "last seen";
   this affects `dc_get_chat_contacts()`, `dc_get_contacts()` and `dc_get_blocked_contacts()` #3562
 - add `internet_access` flag to `dc_msg_get_webxdc_info()` #3516
-- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3592
+- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3105
+- `DC_EVENT_WEBXDC_BUSY_UPDATING` is emitted when a new update has to be sent by an webxdc #3320
+- `DC_EVENT_WEBXDC_UP_TO_DATE` is emitted when a webxdc has sent all updates #3320
 
 ### Fixes
 - do not emit notifications for blocked chats #3557

Cargo.lock

@@ -893,7 +893,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.96.0"
+version = "1.93.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -965,7 +965,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.96.0"
+version = "1.93.0"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -993,7 +993,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.96.0"
+version = "1.93.0"
 dependencies = [
  "anyhow",
  "deltachat",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.96.0"
+version = "1.93.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.96.0"
+version = "1.93.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"

deltachat-ffi/deltachat.h

@@ -468,10 +468,10 @@ int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_i
 /**
  * Set configuration values from a QR code.
  * Before this function is called, dc_check_qr() should confirm the type of the
- * QR code is DC_QR_ACCOUNT, DC_QR_LOGIN or DC_QR_WEBRTC_INSTANCE.
+ * QR code is DC_QR_ACCOUNT or DC_QR_WEBRTC_INSTANCE.
  *
  * Internally, the function will call dc_set_config() with the appropriate keys,
- * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT and DC_QR_LOGIN
+ * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT
  * or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
  *
  * @memberof dc_context_t
@@ -2174,10 +2174,11 @@ char*           dc_imex_has_backup           (dc_context_t* context, const char*
  * ~~~
  *
  * After that, this function should be called to send the Autocrypt Setup Message.
- * The function creates the setup message and adds it to outgoing message queue.
- * The message is sent asynchronously.
+ * The function creates the setup message and waits until it is really sent.
+ * As this may take a while, it is recommended to start the function in a separate thread;
+ * to interrupt it, you can use dc_stop_ongoing_process().
  *
- * The required setup code is returned in the following format:
+ * After everything succeeded, the required setup code is returned in the following format:
  *
  * ~~~
  * 1234-1234-1234-1234-1234-1234-1234-1234-1234
@@ -2243,8 +2244,8 @@ int             dc_continue_key_transfer     (dc_context_t* context, uint32_t ms
  * The ongoing process will return ASAP then, however, it may
  * still take a moment.
  *
- * Typical ongoing processes are started by dc_configure()
- * or dc_imex(). As there is always at most only
+ * Typical ongoing processes are started by dc_configure(),
+ * dc_initiate_key_transfer() or dc_imex(). As there is always at most only
  * one onging process at the same time, there is no need to define _which_ process to exit.
  *
  * @memberof dc_context_t
@@ -2270,7 +2271,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_WITHDRAW_VERIFYGROUP   502 // text1=groupname
 #define         DC_QR_REVIVE_VERIFYCONTACT   510
 #define         DC_QR_REVIVE_VERIFYGROUP     512 // text1=groupname
-#define         DC_QR_LOGIN                  520 // text1=email_address
 
 /**
  * Check a scanned QR code.
@@ -2343,10 +2343,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to revive the withdrawn group-invite code;
  *   if so, call dc_set_config_from_qr().
  *
- * - DC_QR_LOGIN with dc_lot_t::text1=email_address:
- *   ask the user if they want to login with the email_address,
- *   if so, call dc_set_config_from_qr() and then dc_configure().
- *
  * @memberof dc_context_t
  * @param context The context object.
  * @param qr The text of the scanned QR code.
@@ -5735,10 +5731,24 @@ void dc_event_unref(dc_event_t* event);
  *
  * @param data1 (int) msg_id
  */
-
 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121
 
 
+/**
+ * Webxdc has some updates that need to be sent
+ *
+ * @param data1 (int) msg_id
+ */
+#define DC_EVENT_WEBXDC_BUSY_UPDATING             2122
+
+
+/**
+ * Webxdc has finished sending updates
+ *
+ * @param data1 (int) msg_id
+ */
+#define DC_EVENT_WEBXDC_UP_TO_DATE                2123
+
 /**
  * @}
  */
@@ -5970,38 +5980,28 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages for group name changes.
 /// - %1$s will be replaced by the old group name
 /// - %2$s will be replaced by the new group name
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPNAME                 15
 
 /// "Group image changed."
 ///
 /// Used in status messages for group images changes.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPIMGCHANGED           16
 
 /// "Member %1$s added."
 ///
 /// Used in status messages for added members.
 /// - %1$s will be replaced by the name of the added member
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGADDMEMBER               17
 
 /// "Member %1$s removed."
 ///
 /// Used in status messages for removed members.
 /// - %1$s will be replaced by the name of the removed member
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGDELMEMBER               18
 
 /// "Group left."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGROUPLEFT               19
 
 /// "GIF"
@@ -6048,7 +6048,9 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by the subject of the displayed message
 #define DC_STR_READRCPT_MAILBODY          32
 
-/// @deprecated Deprecated, this string is no longer needed.
+/// "Group image deleted."
+///
+/// Used in status messages for deleted group images.
 #define DC_STR_MSGGRPIMGDELETED           33
 
 /// "End-to-end encryption preferred."
@@ -6101,8 +6103,6 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
 /// - %2$s will be replaced by the name of the user taking that action
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYUSER            62
 
 /// "%1$s by me"
@@ -6110,8 +6110,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used to concretize actions.
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYME              63
 
 /// "Location streaming enabled."
@@ -6175,8 +6173,6 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is disabled."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DISABLED         75
 
 /// "Message deletion timer is set to %1$s s."
@@ -6184,36 +6180,26 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages when the other constants
 /// (#DC_STR_EPHEMERAL_MINUTE, #DC_STR_EPHEMERAL_HOUR and so on) do not match the timer.
 /// - %1$s will be replaced by the number of seconds the timer is set to
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_SECONDS          76
 
 /// "Message deletion timer is set to 1 minute."
 ///
 /// Used in status messages.
-///
-/// @deperecated 2022-09-10
 #define DC_STR_EPHEMERAL_MINUTE           77
 
 /// "Message deletion timer is set to 1 hour."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_HOUR             78
 
 /// "Message deletion timer is set to 1 day."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DAY              79
 
 /// "Message deletion timer is set to 1 week."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_WEEK             80
 
 /// @deprecated Deprecated 2021-01-30, DC_STR_EPHEMERAL_WEEKS is used instead.
@@ -6254,11 +6240,12 @@ void dc_event_unref(dc_event_t* event);
 
 /// "Chat protection enabled."
 ///
-
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_ENABLED_PROTECTION and DC_STR_MSG_PROTECTION_ENABLED_BY.
+/// Used in status messages.
 #define DC_STR_PROTECTION_ENABLED         88
 
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_DISABLED_PROTECTION and DC_STR_MSG_PROTECTION_DISABLED_BY.
+/// "Chat protection disabled."
+///
+/// Used in status messages.
 #define DC_STR_PROTECTION_DISABLED        89
 
 /// "Reply"
@@ -6280,37 +6267,29 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is set to %1$s minutes."
 ///
 /// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_MINUTES and DC_STR_MSG_EPHEMERAL_TIMER_MINUTES_BY.
+//
+/// `%1$s` will be replaced by the number of minutes (alwasy >1) the timer is set to.
 #define DC_STR_EPHEMERAL_MINUTES          93
 
 /// "Message deletion timer is set to %1$s hours."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_HOURS and DC_STR_MSG_EPHEMERAL_TIMER_HOURS_BY.
 #define DC_STR_EPHEMERAL_HOURS            94
 
 /// "Message deletion timer is set to %1$s days."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_DAYS and DC_STR_MSG_EPHEMERAL_TIMER_DAYS_BY.
 #define DC_STR_EPHEMERAL_DAYS             95
 
 /// "Message deletion timer is set to %1$s weeks."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_WEEKS and DC_STR_MSG_EPHEMERAL_TIMER_WEEKS_BY.
 #define DC_STR_EPHEMERAL_WEEKS            96
 
 /// "Forwarded"
@@ -6467,7 +6446,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used as status in the connectivity view.
 #define DC_STR_NOT_CONNECTED              121
 
-/// "%1$s changed their address from %2$s to %3$s"
+/// %1$s changed their address from %2$s to %3$s"
 ///
 /// Used as an info message to chats with contacts that changed their address.
 #define DC_STR_AEAP_ADDR_CHANGED          122
@@ -6485,246 +6464,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used in a device message that explains AEAP.
 #define DC_STR_AEAP_EXPLANATION_AND_LINK  123
 
-/// "You changed group name from \"%1$s\" to \"%2$s\"."
-///
-/// `%1$s` will be replaced by the old group name.
-/// `%2$s` will be replaced by the new group name.
-#define DC_STR_GROUP_NAME_CHANGED_BY_YOU 124
-
-/// "Group name changed from \"%1$s\" to \"%2$s\" by %3$s."
-///
-/// `%1$s` will be replaced by the old group name.
-/// `%2$s` will be replaced by the new group name.
-/// `%3$s` will be replaced by name and address of the contact who did the action.
-#define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125
-
-/// "You changed the group image."
-#define DC_STR_GROUP_IMAGE_CHANGED_BY_YOU 126
-
-/// "Group image changed by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact who did the action.
-#define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127
-
-/// "You added member %1$s."
-///
-/// Used in status messages.
-#define DC_STR_ADD_MEMBER_BY_YOU 128
-
-/// "Member %1$s added by %2$s."
-///
-/// `%1$s` will be replaced by name and address of the contact added to the group.
-/// `%2$s` will be replaced by name and address of the contact who did the action.
-///
-/// Used in status messages.
-#define DC_STR_ADD_MEMBER_BY_OTHER 129
-
-/// "You removed member %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact removed from the group.
-///
-/// Used in status messages.
-#define DC_STR_REMOVE_MEMBER_BY_YOU 130
-
-/// "Member %1$s removed by %2$s."
-///
-/// `%1$s` will be replaced by name and address of the contact removed from the group.
-/// `%2$s` will be replaced by name and address of the contact who did the action.
-///
-/// Used in status messages.
-#define DC_STR_REMOVE_MEMBER_BY_OTHER 131
-
-/// "You left the group."
-///
-/// Used in status messages.
-#define DC_STR_GROUP_LEFT_BY_YOU 132
-
-/// "Group left by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_GROUP_LEFT_BY_OTHER 133
-
-/// "You deleted the group image."
-///
-/// Used in status messages.
-#define DC_STR_GROUP_IMAGE_DELETED_BY_YOU 134
-
-/// "Group image deleted by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
-
-/// "You enabled location streaming."
-///
-/// Used in status messages.
-#define DC_STR_LOCATION_ENABLED_BY_YOU 136
-
-/// "Location streaming enabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_LOCATION_ENABLED_BY_OTHER 137
-
-/// "You disabled message deletion timer."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU 138
-
-/// "Message deletion timer is disabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
-
-/// "You set message deletion timer to %1$s s."
-///
-/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU 140
-
-/// "Message deletion timer is set to %1$s s by %2$s."
-///
-/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141
-
-/// "You set message deletion timer to 1 minute."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU 142
-
-/// "Message deletion timer is set to 1 minute by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143
-
-/// "You set message deletion timer to 1 hour."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU 144
-
-/// "Message deletion timer is set to 1 hour by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
-
-/// "You set message deletion timer to 1 day."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU 146
-
-/// "Message deletion timer is set to 1 day by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
-
-/// "You set message deletion timer to 1 week."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU 148
-
-/// "Message deletion timer is set to 1 week by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
-
-/// "You set message deletion timer to %1$s minutes."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU 150
-
-/// "Message deletion timer is set to %1$s minutes by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151
-
-/// "You set message deletion timer to %1$s hours."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU 152
-
-/// "Message deletion timer is set to %1$s hours by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153
-
-/// "You set message deletion timer to %1$s days."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU 154
-
-/// "Message deletion timer is set to %1$s days by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155
-
-/// "You set message deletion timer to %1$s weeks."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU 156
-
-/// "Message deletion timer is set to %1$s weeks by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
-
-/// "You enabled chat protection."
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_YOU 158
-
-/// "Chat protection enabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_OTHER 159
-
-/// "You disabled chat protection."
-#define DC_STR_PROTECTION_DISABLED_BY_YOU 160
-
-/// "Chat protection disabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-#define DC_STR_PROTECTION_DISABLED_BY_OTHER 161
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -169,7 +169,7 @@ pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
         eprintln!("ignoring careless call to dc_context_unref()");
         return;
     }
-    drop(Box::from_raw(context));
+    Box::from_raw(context);
 }
 
 #[no_mangle]
@@ -463,7 +463,7 @@ pub unsafe extern "C" fn dc_event_unref(a: *mut dc_event_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -505,6 +505,8 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::SelfavatarChanged => 2110,
         EventType::WebxdcStatusUpdate { .. } => 2120,
         EventType::WebxdcInstanceDeleted { .. } => 2121,
+        EventType::WebxdcBusyUpdating { .. } => 2022,
+        EventType::WebxdcUpToDate { .. } => 2023,
     }
 }
 
@@ -552,6 +554,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         }
         EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
         EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcBusyUpdating { msg_id } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcUpToDate { msg_id } => msg_id.to_u32() as libc::c_int,
     }
 }
 
@@ -584,6 +588,8 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
         | EventType::WebxdcInstanceDeleted { .. }
+        | EventType::WebxdcBusyUpdating { .. }
+        | EventType::WebxdcUpToDate { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
@@ -641,6 +647,8 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::SelfavatarChanged
         | EventType::WebxdcStatusUpdate { .. }
         | EventType::WebxdcInstanceDeleted { .. }
+        | EventType::WebxdcBusyUpdating { .. }
+        | EventType::WebxdcUpToDate { .. }
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -687,7 +695,7 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
         return;
     }
 
-    drop(Box::from_raw(emitter));
+    Box::from_raw(emitter);
 }
 
 #[no_mangle]
@@ -2426,7 +2434,7 @@ pub unsafe extern "C" fn dc_array_unref(a: *mut dc_array::dc_array_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -2607,7 +2615,7 @@ pub unsafe extern "C" fn dc_chatlist_unref(chatlist: *mut dc_chatlist_t) {
         eprintln!("ignoring careless call to dc_chatlist_unref()");
         return;
     }
-    drop(Box::from_raw(chatlist));
+    Box::from_raw(chatlist);
 }
 
 #[no_mangle]
@@ -2752,7 +2760,7 @@ pub unsafe extern "C" fn dc_chat_unref(chat: *mut dc_chat_t) {
         return;
     }
 
-    drop(Box::from_raw(chat));
+    Box::from_raw(chat);
 }
 
 #[no_mangle]
@@ -3022,7 +3030,7 @@ pub unsafe extern "C" fn dc_msg_unref(msg: *mut dc_msg_t) {
         return;
     }
 
-    drop(Box::from_raw(msg));
+    Box::from_raw(msg);
 }
 
 #[no_mangle]
@@ -3744,7 +3752,7 @@ pub unsafe extern "C" fn dc_contact_unref(contact: *mut dc_contact_t) {
         eprintln!("ignoring careless call to dc_contact_unref()");
         return;
     }
-    drop(Box::from_raw(contact));
+    Box::from_raw(contact);
 }
 
 #[no_mangle]
@@ -3908,7 +3916,7 @@ pub unsafe extern "C" fn dc_lot_unref(lot: *mut dc_lot_t) {
         return;
     }
 
-    drop(Box::from_raw(lot));
+    Box::from_raw(lot);
 }
 
 #[no_mangle]
@@ -4200,8 +4208,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_account(id)
+    block_on(async move { accounts.read().await.get_account(id).await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4216,8 +4223,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_selected_account()
+    block_on(async move { accounts.read().await.get_selected_account().await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4362,7 +4368,7 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *m
     }
 
     let accounts = &*accounts;
-    let list = block_on(accounts.read()).get_all();
+    let list = block_on(async move { accounts.read().await.get_all().await });
     let array: dc_array_t = list.into();
 
     Box::into_raw(Box::new(array))
@@ -4432,7 +4438,7 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     }
 
     let accounts = &*accounts;
-    let emitter = block_on(accounts.read()).get_event_emitter();
+    let emitter = block_on(async move { accounts.read().await.get_event_emitter().await });
 
     Box::into_raw(Box::new(emitter))
 }

deltachat-ffi/src/lot.rs

@@ -58,7 +58,6 @@ impl Lot {
                 Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
                 Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::Login { address, .. } => Some(address),
             },
             Self::Error(err) => Some(err),
         }
@@ -109,7 +108,6 @@ impl Lot {
                 Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
                 Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                 Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-                Qr::Login { .. } => LotState::QrLogin,
             },
             Self::Error(_err) => LotState::QrError,
         }
@@ -133,7 +131,6 @@ impl Lot {
                 Qr::WithdrawVerifyGroup { .. } => Default::default(),
                 Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
                 Qr::ReviveVerifyGroup { .. } => Default::default(),
-                Qr::Login { .. } => Default::default(),
             },
             Self::Error(_) => Default::default(),
         }
@@ -198,9 +195,6 @@ pub enum LotState {
     /// text1=groupname
     QrReviveVerifyGroup = 512,
 
-    /// text1=email_address
-    QrLogin = 520,
-
     // Message States
     MsgInFresh = 10,
     MsgInNoticed = 13,

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.96.0"
+version = "1.93.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"

deltachat-jsonrpc/src/api/events.rs

@@ -61,6 +61,8 @@ pub fn event_to_json_rpc_notification(event: Event) -> Value {
             status_update_serial,
         } => (json!(msg_id), json!(status_update_serial)),
         EventType::WebxdcInstanceDeleted { msg_id } => (json!(msg_id), Value::Null),
+        EventType::WebxdcBusyUpdating { msg_id } => (json!(msg_id), Value::Null),
+        EventType::WebxdcUpToDate { msg_id } => (json!(msg_id), Value::Null),
     };
 
     let id: EventTypeName = event.typ.into();
@@ -103,7 +105,9 @@ pub enum EventTypeName {
     ConnectivityChanged,
     SelfavatarChanged,
     WebxdcStatusUpdate,
-    WebXdInstanceDeleted,
+    WebxdcInstanceDeleted,
+    WebxdcBusyUpdating,
+    WebxdcUpToDate,
 }
 
 impl From<EventType> for EventTypeName {
@@ -139,7 +143,9 @@ impl From<EventType> for EventTypeName {
             EventType::ConnectivityChanged => ConnectivityChanged,
             EventType::SelfavatarChanged => SelfavatarChanged,
             EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
-            EventType::WebxdcInstanceDeleted { .. } => WebXdInstanceDeleted,
+            EventType::WebxdcInstanceDeleted { .. } => WebxdcInstanceDeleted,
+            EventType::WebxdcBusyUpdating { .. } => WebxdcBusyUpdating,
+            EventType::WebxdcUpToDate { .. } => WebxdcUpToDate,
         }
     }
 }

deltachat-jsonrpc/src/api/mod.rs

@@ -1,14 +1,11 @@
 use anyhow::{anyhow, bail, Context, Result};
 use deltachat::{
-    chat::{
-        self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
-        remove_contact_from_chat, Chat, ChatId, ChatItem,
-    },
+    chat::{add_contact_to_chat, get_chat_media, get_chat_msgs, remove_contact_from_chat, ChatId},
     chatlist::Chatlist,
     config::Config,
     contact::{may_be_valid_addr, Contact, ContactId},
     context::get_info,
-    message::{delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype},
+    message::{delete_msgs, get_msg_info, Message, MsgId, Viewtype},
     provider::get_provider_info,
     qr,
     qr_code_generator::get_securejoin_qr_svg,
@@ -37,10 +34,7 @@ use types::message::MessageObject;
 use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;
 
-use self::types::{
-    chat::{BasicChat, MuteDuration},
-    message::{MessageNotificationInfo, MessageViewtype},
-};
+use self::types::message::MessageViewtype;
 
 #[derive(Clone, Debug)]
 pub struct CommandApi {
@@ -65,6 +59,7 @@ impl CommandApi {
             .read()
             .await
             .get_account(id)
+            .await
             .ok_or_else(|| anyhow!("account with id {} not found", id))?;
         Ok(sc)
     }
@@ -99,7 +94,7 @@ impl CommandApi {
     }
 
     async fn get_all_account_ids(&self) -> Vec<u32> {
-        self.accounts.read().await.get_all()
+        self.accounts.read().await.get_all().await
     }
 
     /// Select account id for internally selected state.
@@ -111,14 +106,14 @@ impl CommandApi {
     /// Get the selected account id of the internal state..
     /// TODO: Likely this is deprecated as all methods take an account id now.
     async fn get_selected_account_id(&self) -> Option<u32> {
-        self.accounts.read().await.get_selected_account_id()
+        self.accounts.read().await.get_selected_account_id().await
     }
 
     /// Get a list of all configured accounts.
     async fn get_all_accounts(&self) -> Result<Vec<Account>> {
         let mut accounts = Vec::new();
-        for id in self.accounts.read().await.get_all() {
-            let context_option = self.accounts.read().await.get_account(id);
+        for id in self.accounts.read().await.get_all().await {
+            let context_option = self.accounts.read().await.get_account(id).await;
             if let Some(ctx) = context_option {
                 accounts.push(Account::from_context(&ctx, id).await?)
             } else {
@@ -134,7 +129,7 @@ impl CommandApi {
 
     /// Get top-level info for an account.
     async fn get_account_info(&self, account_id: u32) -> Result<Account> {
-        let context_option = self.accounts.read().await.get_account(account_id);
+        let context_option = self.accounts.read().await.get_account(account_id).await;
         if let Some(ctx) = context_option {
             Ok(Account::from_context(&ctx, account_id).await?)
         } else {
@@ -373,13 +368,6 @@ impl CommandApi {
         FullChat::try_from_dc_chat_id(&ctx, chat_id).await
     }
 
-    /// get basic info about a chat,
-    /// use chatlist_get_full_chat_by_id() instead if you need more information
-    async fn get_basic_chat_info(&self, account_id: u32, chat_id: u32) -> Result<BasicChat> {
-        let ctx = self.get_context(account_id).await?;
-        BasicChat::try_from_dc_chat_id(&ctx, chat_id).await
-    }
-
     async fn accept_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         ChatId::new(chat_id).accept(&ctx).await
@@ -439,8 +427,6 @@ impl CommandApi {
     ///     If not set, the Setup-Contact protocol is offered in the QR code.
     ///     See https://countermitm.readthedocs.io/en/latest/new.html
     ///     for details about both protocols.
-    ///
-    /// return format: `[code, svg]`
     // TODO fix doc comment after adding dc_join_securejoin
     async fn get_chat_securejoin_qr_code_svg(
         &self,
@@ -509,101 +495,10 @@ impl CommandApi {
         Ok(message_id.to_u32())
     }
 
-    ///  Mark all messages in a chat as _noticed_.
-    ///  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
-    ///  but are still waiting for being marked as "seen" using markseen_msgs()
-    ///  (IMAP/MDNs is not done for noticed messages).
-    ///
-    ///  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
-    ///  See also markseen_msgs().
-    async fn marknoticed_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        marknoticed_chat(&ctx, ChatId::new(chat_id)).await
-    }
-
-    async fn get_first_unread_message_of_chat(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-    ) -> Result<Option<u32>> {
-        let ctx = self.get_context(account_id).await?;
-
-        // TODO: implement this in core with an SQL query, that will be way faster
-        let messages = get_chat_msgs(&ctx, ChatId::new(chat_id), 0).await?;
-        let mut first_unread_message_id = None;
-        for item in messages.into_iter().rev() {
-            if let ChatItem::Message { msg_id } = item {
-                match msg_id.get_state(&ctx).await? {
-                    MessageState::InSeen => break,
-                    MessageState::InFresh | MessageState::InNoticed => {
-                        first_unread_message_id = Some(msg_id)
-                    }
-                    _ => continue,
-                }
-            }
-        }
-        Ok(first_unread_message_id.map(|id| id.to_u32()))
-    }
-
-    /// Set mute duration of a chat.
-    ///
-    /// The UI can then call is_chat_muted() when receiving a new message
-    /// to decide whether it should trigger an notification.
-    ///
-    /// Muted chats should not sound or vibrate
-    /// and should not show a visual notification in the system area.
-    /// Moreover, muted chats should be excluded from global badge counter
-    /// (get_fresh_msgs() skips muted chats therefore)
-    /// and the in-app, per-chat badge counter should use a less obtrusive color.
-    ///
-    /// Sends out #DC_EVENT_CHAT_MODIFIED.
-    async fn set_chat_mute_duration(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        duration: MuteDuration,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        chat::set_muted(&ctx, ChatId::new(chat_id), duration.try_into_core_type()?).await
-    }
-
-    /// Check whether the chat is currently muted (can be changed by set_chat_mute_duration()).
-    ///
-    /// This is available as a standalone function outside of fullchat, because it might be only needed for notification
-    async fn is_chat_muted(&self, account_id: u32, chat_id: u32) -> Result<bool> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(Chat::load_from_db(&ctx, ChatId::new(chat_id))
-            .await?
-            .is_muted())
-    }
-
     // ---------------------------------------------
     // message list
     // ---------------------------------------------
 
-    /// Mark messages as presented to the user.
-    /// Typically, UIs call this function on scrolling through the message list,
-    /// when the messages are presented at least for a little moment.
-    /// The concrete action depends on the type of the chat and on the users settings
-    /// (dc_msgs_presented() may be a better name therefore, but well. :)
-    ///
-    /// - For normal chats, the IMAP state is updated, MDN is sent
-    ///   (if set_config()-options `mdns_enabled` is set)
-    ///   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
-    ///
-    /// - For contact requests, no IMAP or MDNs is done
-    ///   and the internal state is not changed therefore.
-    ///   See also marknoticed_chat().
-    ///
-    /// Moreover, timer is started for incoming ephemeral messages.
-    /// This also happens for contact requests chats.
-    ///
-    /// One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
-    async fn markseen_msgs(&self, account_id: u32, msg_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        markseen_msgs(&ctx, msg_ids.into_iter().map(MsgId::new).collect()).await
-    }
-
     async fn message_list_get_message_ids(
         &self,
         account_id: u32,
@@ -642,16 +537,6 @@ impl CommandApi {
         Ok(messages)
     }
 
-    /// Fetch info desktop needs for creating a notification for a message
-    async fn message_get_notification_info(
-        &self,
-        account_id: u32,
-        message_id: u32,
-    ) -> Result<MessageNotificationInfo> {
-        let ctx = self.get_context(account_id).await?;
-        MessageNotificationInfo::from_msg_id(&ctx, MsgId::new(message_id)).await
-    }
-
     /// Delete messages. The messages are deleted on the current device and
     /// on the IMAP server.
     async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
@@ -802,19 +687,6 @@ impl CommandApi {
         }
         Ok(contacts)
     }
-
-    /// Get encryption info for a contact.
-    /// Get a multi-line encryption info, containing your fingerprint and the
-    /// fingerprint of the contact, used e.g. to compare the fingerprints for a simple out-of-band verification.
-    async fn get_contact_encryption_info(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        Contact::get_encrinfo(&ctx, ContactId::new(contact_id)).await
-    }
-
     // ---------------------------------------------
     //                   chat
     // ---------------------------------------------
@@ -850,95 +722,6 @@ impl CommandApi {
         Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
     }
 
-    /// Search next/previous message based on a given message and a list of types.
-    /// Typically used to implement the "next" and "previous" buttons
-    /// in a gallery or in a media player.
-    ///
-    /// 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(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        message_type: MessageViewtype,
-        or_message_type2: Option<MessageViewtype>,
-        or_message_type3: Option<MessageViewtype>,
-    ) -> Result<(Option<u32>, Option<u32>)> {
-        let ctx = self.get_context(account_id).await?;
-
-        let msg_type: Viewtype = message_type.into();
-        let msg_type2: Viewtype = or_message_type2.map(|v| v.into()).unwrap_or_default();
-        let msg_type3: Viewtype = or_message_type3.map(|v| v.into()).unwrap_or_default();
-
-        let prev = chat::get_next_media(
-            &ctx,
-            MsgId::new(msg_id),
-            chat::Direction::Backward,
-            msg_type,
-            msg_type2,
-            msg_type3,
-        )
-        .await?
-        .map(|id| id.to_u32());
-
-        let next = chat::get_next_media(
-            &ctx,
-            MsgId::new(msg_id),
-            chat::Direction::Forward,
-            msg_type,
-            msg_type2,
-            msg_type3,
-        )
-        .await?
-        .map(|id| id.to_u32());
-
-        Ok((prev, next))
-    }
-
-    // ---------------------------------------------
-    //                connectivity
-    // ---------------------------------------------
-
-    /// Indicate that the network likely has come back.
-    /// or just that the network conditions might have changed
-    async fn maybe_network(&self) -> Result<()> {
-        self.accounts.read().await.maybe_network().await;
-        Ok(())
-    }
-
-    /// Get the current connectivity, i.e. whether the device is connected to the IMAP server.
-    /// One of:
-    /// - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
-    /// - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
-    /// - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
-    /// - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
-    ///
-    /// We don't use exact values but ranges here so that we can split up
-    /// states into multiple states in the future.
-    ///
-    /// Meant as a rough overview that can be shown
-    /// e.g. in the title of the main screen.
-    ///
-    /// If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-    async fn get_connectivity(&self, account_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx.get_connectivity().await as u32)
-    }
-
-    /// Get an overview of the current connectivity, and possibly more statistics.
-    /// Meant to give the user more insight about the current status than
-    /// the basic connectivity info returned by get_connectivity(); show this
-    /// e.g., if the user taps on said basic connectivity info.
-    ///
-    /// If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-    ///
-    /// This comes as an HTML from the core so that we can easily improve it
-    /// and the improvement instantly reaches all UIs.
-    async fn get_connectivity_html(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.get_connectivity_html().await
-    }
-
     // ---------------------------------------------
     //                   webxdc
     // ---------------------------------------------
@@ -979,45 +762,6 @@ impl CommandApi {
         WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
     }
 
-    /// Forward messages to another chat.
-    ///
-    /// All types of messages can be forwarded,
-    /// however, they will be flagged as such (dc_msg_is_forwarded() is set).
-    ///
-    /// Original sender, info-state and webxdc updates are not forwarded on purpose.
-    async fn forward_messages(
-        &self,
-        account_id: u32,
-        message_ids: Vec<u32>,
-        chat_id: u32,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let message_ids: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
-    }
-
-    // ---------------------------------------------
-    //           functions for the composer
-    //    the composer is the message input field
-    // ---------------------------------------------
-
-    async fn remove_draft(&self, account_id: u32, chat_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id).set_draft(&ctx, None).await
-    }
-
-    ///  Get draft for a chat, if any.
-    async fn get_draft(&self, account_id: u32, chat_id: u32) -> Result<Option<MessageObject>> {
-        let ctx = self.get_context(account_id).await?;
-        if let Some(draft) = ChatId::new(chat_id).get_draft(&ctx).await? {
-            Ok(Some(
-                MessageObject::from_msg_id(&ctx, draft.get_id()).await?,
-            ))
-        } else {
-            Ok(None)
-        }
-    }
-
     // ---------------------------------------------
     //           misc prototyping functions
     //       that might get removed later again
@@ -1038,91 +782,6 @@ impl CommandApi {
         let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
         Ok(message_id.to_u32())
     }
-
-    // mimics the old desktop call, will get replaced with something better in the composer rewrite,
-    // the better version will just be sending the current draft, though there will be probably something similar with more options to this for the corner cases like setting a marker on the map
-    async fn misc_send_msg(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        text: Option<String>,
-        file: Option<String>,
-        location: Option<(f64, f64)>,
-        quoted_message_id: Option<u32>,
-    ) -> Result<(u32, MessageObject)> {
-        let ctx = self.get_context(account_id).await?;
-        let mut message = Message::new(if file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        if text.is_some() {
-            message.set_text(text);
-        }
-        if let Some(file) = file {
-            message.set_file(file, None);
-        }
-        if let Some((latitude, longitude)) = location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = quoted_message_id {
-            message
-                .set_quote(
-                    &ctx,
-                    Some(
-                        &Message::load_from_db(&ctx, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-        let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await?
-            .to_u32();
-        let message = MessageObject::from_message_id(&ctx, msg_id).await?;
-        Ok((msg_id, message))
-    }
-
-    // mimics the old desktop call, will get replaced with something better in the composer rewrite,
-    // the better version should support:
-    // - changing viewtype to enable/disable compression
-    // - keeping same message id as long as attachment does not change for webxdc messages
-    async fn misc_set_draft(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        text: Option<String>,
-        file: Option<String>,
-        quoted_message_id: Option<u32>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let mut draft = Message::new(if file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        if text.is_some() {
-            draft.set_text(text);
-        }
-        if let Some(file) = file {
-            draft.set_file(file, None);
-        }
-        if let Some(id) = quoted_message_id {
-            draft
-                .set_quote(
-                    &ctx,
-                    Some(
-                        &Message::load_from_db(&ctx, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-
-        ChatId::new(chat_id).set_draft(&ctx, Some(&mut draft)).await
-    }
 }
 
 // Helper functions (to prevent code duplication)

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

@@ -1,13 +1,11 @@
-use std::time::{Duration, SystemTime};
-
-use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts};
+use anyhow::{anyhow, Result};
+use deltachat::chat::get_chat_contacts;
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::context::Context;
 use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
@@ -37,7 +35,6 @@ 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,
 }
 
 impl FullChat {
@@ -81,14 +78,12 @@ impl FullChat {
             false
         };
 
-        let mailing_list_address = chat.get_mailinglist_addr().to_string();
-
         Ok(FullChat {
             id: chat_id,
             name: chat.name.clone(),
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
-            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
+            archived: chat.get_visibility() == deltachat::chat::ChatVisibility::Archived,
             chat_type: chat
                 .get_type()
                 .to_u32()
@@ -106,90 +101,6 @@ impl FullChat {
             ephemeral_timer,
             can_send,
             was_seen_recently,
-            mailing_list_address,
         })
     }
 }
-
-/// cheaper version of fullchat, omits:
-/// - contacts
-/// - contact_ids
-/// - fresh_message_counter
-/// - ephemeral_timer
-/// - self_in_group
-/// - was_seen_recently
-/// - can_send
-///
-/// used when you only need the basic metadata of a chat like type, name, profile picture
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct BasicChat {
-    id: u32,
-    name: String,
-    is_protected: bool,
-    profile_image: Option<String>, //BLOBS ?
-    archived: bool,
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    color: String,
-    is_contact_request: bool,
-    is_device_chat: bool,
-    is_muted: bool,
-}
-
-impl BasicChat {
-    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
-        let rust_chat_id = ChatId::new(chat_id);
-        let chat = Chat::load_from_db(context, rust_chat_id).await?;
-
-        let profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-        let color = color_int_to_hex_string(chat.get_color(context).await?);
-
-        Ok(BasicChat {
-            id: chat_id,
-            name: chat.name.clone(),
-            is_protected: chat.is_protected(),
-            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            chat_type: chat
-                .get_type()
-                .to_u32()
-                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
-            is_unpromoted: chat.is_unpromoted(),
-            is_self_talk: chat.is_self_talk(),
-            color,
-            is_contact_request: chat.is_contact_request(),
-            is_device_chat: chat.is_device_talk(),
-            is_muted: chat.is_muted(),
-        })
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-pub enum MuteDuration {
-    NotMuted,
-    Forever,
-    Until(i64),
-}
-
-impl MuteDuration {
-    pub fn try_into_core_type(self) -> Result<chat::MuteDuration> {
-        match self {
-            MuteDuration::NotMuted => Ok(chat::MuteDuration::NotMuted),
-            MuteDuration::Forever => Ok(chat::MuteDuration::Forever),
-            MuteDuration::Until(n) => {
-                if n <= 0 {
-                    bail!("failed to read mute duration")
-                }
-
-                Ok(SystemTime::now()
-                    .checked_add(Duration::from_secs(n as u64))
-                    .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
-            }
-        }
-    }
-}

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

@@ -20,8 +20,6 @@ pub struct ContactObject {
     name_and_addr: String,
     is_blocked: bool,
     is_verified: bool,
-    /// the contact's last seen timestamp
-    last_seen: i64,
     was_seen_recently: bool,
 }
 
@@ -48,7 +46,6 @@ impl ContactObject {
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
             is_verified,
-            last_seen: contact.last_seen(),
             was_seen_recently: contact.was_seen_recently(),
         })
     }

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

@@ -1,8 +1,6 @@
 use anyhow::{anyhow, Result};
-use deltachat::chat::Chat;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::download;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
 use deltachat::message::Viewtype;
@@ -11,7 +9,6 @@ use serde::Deserialize;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::webxdc::WebxdcMessageInfo;
 
@@ -21,9 +18,8 @@ pub struct MessageObject {
     id: u32,
     chat_id: u32,
     from_id: u32,
-    quote: Option<MessageQuote>,
-    parent_id: Option<u32>,
-
+    quoted_text: Option<String>,
+    quoted_message_id: Option<u32>,
     text: Option<String>,
     has_location: bool,
     has_html: bool,
@@ -60,37 +56,18 @@ pub struct MessageObject {
     file_name: Option<String>,
 
     webxdc_info: Option<WebxdcMessageInfo>,
-
-    download_state: DownloadState,
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "kind")]
-enum MessageQuote {
-    JustText {
-        text: String,
-    },
-    #[serde(rename_all = "camelCase")]
-    WithMessage {
-        text: String,
-        message_id: u32,
-        author_display_name: String,
-        author_display_color: String,
-        override_sender_name: Option<String>,
-        image: Option<String>,
-        is_forwarded: bool,
-    },
 }
 
 impl MessageObject {
     pub async fn from_message_id(context: &Context, message_id: u32) -> Result<Self> {
         let msg_id = MsgId::new(message_id);
-        Self::from_msg_id(context, msg_id).await
-    }
-
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
         let message = Message::load_from_db(context, msg_id).await?;
 
+        let quoted_message_id = message
+            .quoted_message(context)
+            .await?
+            .map(|m| m.get_id().to_u32());
+
         let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
         let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
         let file_bytes = message.get_filebytes(context).await;
@@ -102,45 +79,12 @@ impl MessageObject {
             None
         };
 
-        let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
-
-        let download_state = message.download_state().into();
-
-        let quote = if let Some(quoted_text) = message.quoted_text() {
-            match message.quoted_message(context).await? {
-                Some(quote) => {
-                    let quote_author = Contact::load_from_db(context, quote.get_from_id()).await?;
-                    Some(MessageQuote::WithMessage {
-                        text: quoted_text,
-                        message_id: quote.get_id().to_u32(),
-                        author_display_name: quote_author.get_display_name().to_owned(),
-                        author_display_color: color_int_to_hex_string(quote_author.get_color()),
-                        override_sender_name: quote.get_override_sender_name(),
-                        image: if quote.get_viewtype() == Viewtype::Image
-                            || quote.get_viewtype() == Viewtype::Gif
-                        {
-                            match quote.get_file(context) {
-                                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                                None => None,
-                            }
-                        } else {
-                            None
-                        },
-                        is_forwarded: quote.is_forwarded(),
-                    })
-                }
-                None => Some(MessageQuote::JustText { text: quoted_text }),
-            }
-        } else {
-            None
-        };
-
         Ok(MessageObject {
-            id: msg_id.to_u32(),
+            id: message_id,
             chat_id: message.get_chat_id().to_u32(),
             from_id: message.get_from_id().to_u32(),
-            quote,
-            parent_id,
+            quoted_text: message.quoted_text(),
+            quoted_message_id,
             text: message.get_text(),
             has_location: message.has_location(),
             has_html: message.has_html(),
@@ -187,8 +131,6 @@ impl MessageObject {
             file_bytes,
             file_name: message.get_filename(),
             webxdc_info,
-
-            download_state,
         })
     }
 }
@@ -268,80 +210,3 @@ impl From<MessageViewtype> for Viewtype {
         }
     }
 }
-
-#[derive(Serialize, TypeDef)]
-pub enum DownloadState {
-    Done,
-    Available,
-    Failure,
-    InProgress,
-}
-
-impl From<download::DownloadState> for DownloadState {
-    fn from(state: download::DownloadState) -> Self {
-        match state {
-            download::DownloadState::Done => DownloadState::Done,
-            download::DownloadState::Available => DownloadState::Available,
-            download::DownloadState::Failure => DownloadState::Failure,
-            download::DownloadState::InProgress => DownloadState::InProgress,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    id: u32,
-    chat_id: u32,
-    account_id: u32,
-
-    image: Option<String>,
-    image_mime_type: Option<String>,
-
-    chat_name: String,
-    chat_profile_image: Option<String>,
-
-    /// also known as summary_text1
-    summary_prefix: Option<String>,
-    /// also known as summary_text2
-    summary_text: String,
-}
-
-impl MessageNotificationInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-
-        let image = if matches!(
-            message.get_viewtype(),
-            Viewtype::Image | Viewtype::Gif | Viewtype::Sticker
-        ) {
-            message
-                .get_file(context)
-                .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        let chat_profile_image = chat
-            .get_profile_image(context)
-            .await?
-            .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-            .unwrap_or_default();
-
-        let summary = message.get_summary(context, Some(&chat)).await?;
-
-        Ok(MessageNotificationInfo {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            account_id: context.get_id(),
-            image,
-            image_mime_type: message.get_filemime(),
-            chat_name: chat.name,
-            chat_profile_image,
-            summary_prefix: summary.prefix.map(|s| s.to_string()),
-            summary_text: summary.text,
-        })
-    }
-}

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

@@ -94,9 +94,6 @@ pub enum QrObject {
         invitenumber: String,
         authcode: String,
     },
-    Login {
-        address: String,
-    },
 }
 
 impl From<Qr> for QrObject {
@@ -227,7 +224,6 @@ impl From<Qr> for QrObject {
                     authcode,
                 }
             }
-            Qr::Login { address, .. } => QrObject::Login { address },
         }
     }
 }

deltachat-jsonrpc/src/webserver.rs

@@ -44,7 +44,7 @@ async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) ->
     let (client, out_receiver) = RpcClient::new();
     let session = RpcSession::new(client.clone(), api.clone());
     tokio::spawn(async move {
-        let events = api.accounts.read().await.get_event_emitter();
+        let events = api.accounts.read().await.get_event_emitter().await;
         while let Some(event) = events.recv().await {
             let event = event_to_json_rpc_notification(event);
             client.send_notification("event", Some(event)).await.ok();

deltachat-jsonrpc/typescript/generated/client.ts

@@ -204,14 +204,6 @@ export class RawClient {
     return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
   }
 
-  /**
-   * get basic info about a chat,
-   * use chatlist_get_full_chat_by_id() instead if you need more information
-   */
-  public getBasicChatInfo(accountId: T.U32, chatId: T.U32): Promise<T.BasicChat> {
-    return (this._transport.request('get_basic_chat_info', [accountId, chatId] as RPC.Params)) as Promise<T.BasicChat>;
-  }
-
 
   public acceptChat(accountId: T.U32, chatId: T.U32): Promise<null> {
     return (this._transport.request('accept_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -273,8 +265,6 @@ export class RawClient {
    *     If not set, the Setup-Contact protocol is offered in the QR code.
    *     See https://countermitm.readthedocs.io/en/latest/new.html
    *     for details about both protocols.
-   *
-   * return format: `[code, svg]`
    */
   public getChatSecurejoinQrCodeSvg(accountId: T.U32, chatId: (T.U32|null)): Promise<[string,string]> {
     return (this._transport.request('get_chat_securejoin_qr_code_svg', [accountId, chatId] as RPC.Params)) as Promise<[string,string]>;
@@ -316,75 +306,6 @@ export class RawClient {
     return (this._transport.request('add_device_message', [accountId, label, text] as RPC.Params)) as Promise<T.U32>;
   }
 
-  /**
-   *  Mark all messages in a chat as _noticed_.
-   *  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
-   *  but are still waiting for being marked as "seen" using markseen_msgs()
-   *  (IMAP/MDNs is not done for noticed messages).
-   *
-   *  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
-   *  See also markseen_msgs().
-   */
-  public marknoticedChat(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('marknoticed_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getFirstUnreadMessageOfChat(accountId: T.U32, chatId: T.U32): Promise<(T.U32|null)> {
-    return (this._transport.request('get_first_unread_message_of_chat', [accountId, chatId] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
-  /**
-   * Set mute duration of a chat.
-   *
-   * The UI can then call is_chat_muted() when receiving a new message
-   * to decide whether it should trigger an notification.
-   *
-   * Muted chats should not sound or vibrate
-   * and should not show a visual notification in the system area.
-   * Moreover, muted chats should be excluded from global badge counter
-   * (get_fresh_msgs() skips muted chats therefore)
-   * and the in-app, per-chat badge counter should use a less obtrusive color.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED.
-   */
-  public setChatMuteDuration(accountId: T.U32, chatId: T.U32, duration: T.MuteDuration): Promise<null> {
-    return (this._transport.request('set_chat_mute_duration', [accountId, chatId, duration] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Check whether the chat is currently muted (can be changed by set_chat_mute_duration()).
-   *
-   * This is available as a standalone function outside of fullchat, because it might be only needed for notification
-   */
-  public isChatMuted(accountId: T.U32, chatId: T.U32): Promise<boolean> {
-    return (this._transport.request('is_chat_muted', [accountId, chatId] as RPC.Params)) as Promise<boolean>;
-  }
-
-  /**
-   * Mark messages as presented to the user.
-   * Typically, UIs call this function on scrolling through the message list,
-   * when the messages are presented at least for a little moment.
-   * The concrete action depends on the type of the chat and on the users settings
-   * (dc_msgs_presented() may be a better name therefore, but well. :)
-   *
-   * - For normal chats, the IMAP state is updated, MDN is sent
-   *   (if set_config()-options `mdns_enabled` is set)
-   *   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
-   *
-   * - For contact requests, no IMAP or MDNs is done
-   *   and the internal state is not changed therefore.
-   *   See also marknoticed_chat().
-   *
-   * Moreover, timer is started for incoming ephemeral messages.
-   * This also happens for contact requests chats.
-   *
-   * One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
-   */
-  public markseenMsgs(accountId: T.U32, msgIds: (T.U32)[]): Promise<null> {
-    return (this._transport.request('markseen_msgs', [accountId, msgIds] as RPC.Params)) as Promise<null>;
-  }
-
 
   public messageListGetMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
     return (this._transport.request('message_list_get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
@@ -400,13 +321,6 @@ export class RawClient {
     return (this._transport.request('message_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>;
-  }
-
   /**
    * Delete messages. The messages are deleted on the current device and
    * on the IMAP server.
@@ -482,15 +396,6 @@ export class RawClient {
     return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
   }
 
-  /**
-   * Get encryption info for a contact.
-   * Get a multi-line encryption info, containing your fingerprint and the
-   * fingerprint of the contact, used e.g. to compare the fingerprints for a simple out-of-band verification.
-   */
-  public getContactEncryptionInfo(accountId: T.U32, contactId: T.U32): Promise<string> {
-    return (this._transport.request('get_contact_encryption_info', [accountId, contactId] as RPC.Params)) as Promise<string>;
-  }
-
   /**
    * Returns all message IDs of the given types in a chat.
    * Typically used to show a gallery.
@@ -506,61 +411,6 @@ export class RawClient {
     return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
   }
 
-  /**
-   * Search next/previous message based on a given message and a list of types.
-   * Typically used to implement the "next" and "previous" buttons
-   * in a gallery or in a media player.
-   *
-   * 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)]>;
-  }
-
-  /**
-   * Indicate that the network likely has come back.
-   * or just that the network conditions might have changed
-   */
-  public maybeNetwork(): Promise<null> {
-    return (this._transport.request('maybe_network', [] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
-   * One of:
-   * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
-   * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
-   * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
-   * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
-   *
-   * We don't use exact values but ranges here so that we can split up
-   * states into multiple states in the future.
-   *
-   * Meant as a rough overview that can be shown
-   * e.g. in the title of the main screen.
-   *
-   * If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   */
-  public getConnectivity(accountId: T.U32): Promise<T.U32> {
-    return (this._transport.request('get_connectivity', [accountId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Get an overview of the current connectivity, and possibly more statistics.
-   * Meant to give the user more insight about the current status than
-   * the basic connectivity info returned by get_connectivity(); show this
-   * e.g., if the user taps on said basic connectivity info.
-   *
-   * If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   *
-   * This comes as an HTML from the core so that we can easily improve it
-   * and the improvement instantly reaches all UIs.
-   */
-  public getConnectivityHtml(accountId: T.U32): Promise<string> {
-    return (this._transport.request('get_connectivity_html', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
 
   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>;
@@ -578,30 +428,6 @@ export class RawClient {
     return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
   }
 
-  /**
-   * Forward messages to another chat.
-   *
-   * All types of messages can be forwarded,
-   * however, they will be flagged as such (dc_msg_is_forwarded() is set).
-   *
-   * Original sender, info-state and webxdc updates are not forwarded on purpose.
-   */
-  public forwardMessages(accountId: T.U32, messageIds: (T.U32)[], chatId: T.U32): Promise<null> {
-    return (this._transport.request('forward_messages', [accountId, messageIds, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
-    return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   *  Get draft for a chat, if any.
-   */
-  public getDraft(accountId: T.U32, chatId: T.U32): Promise<(T.Message|null)> {
-    return (this._transport.request('get_draft', [accountId, chatId] as RPC.Params)) as Promise<(T.Message|null)>;
-  }
-
   /**
    * Returns the messageid of the sent message
    */
@@ -610,14 +436,4 @@ export class RawClient {
   }
 
 
-  public miscSendMsg(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), location: ([T.F64,T.F64]|null), quotedMessageId: (T.U32|null)): Promise<[T.U32,T.Message]> {
-    return (this._transport.request('misc_send_msg', [accountId, chatId, text, file, location, quotedMessageId] as RPC.Params)) as Promise<[T.U32,T.Message]>;
-  }
-
-
-  public miscSetDraft(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), quotedMessageId: (T.U32|null)): Promise<null> {
-    return (this._transport.request('misc_set_draft', [accountId, chatId, text, file, quotedMessageId] as RPC.Params)) as Promise<null>;
-  }
-
-
 }

deltachat-jsonrpc/typescript/generated/types.ts

@@ -3,7 +3,7 @@
 export type U32=number;
 export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
 export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
-export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"login";}&{"address":string;}));
+export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;}));
 export type Usize=number;
 export type ChatListEntry=[U32,U32];
 export type I64=number;
@@ -16,41 +16,8 @@ export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":
  * contact id if this is a dm chat (for view profile entry in context menu)
  */
 "dmChatContact":(U32|null);"wasSeenRecently":boolean;})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
-export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;
-/**
- * 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;};
-
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-export type BasicChat=
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-{"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
-export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
-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;}));
+export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;"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;};
 export type Viewtype=("Unknown"|
 /**
  * Text message.
@@ -135,16 +102,5 @@ export type WebxdcMessageInfo={
  * True if full internet access should be granted to the app.
  */
 "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;};
-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
- */
-"summaryPrefix":(string|null);
-/**
- * also known as summary_text2
- */
-"summaryText":string;};
-export type F64=number;
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,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)>,U32,null,U32,null,U32,(U32)[],U32,U32,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,U32,null,U32,U32,U32,null,U32,U32,U32,null,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,Message,U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,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,string,U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],null,U32,U32,U32,string,U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,null,U32,U32,(Message|null),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 Message={"id":U32;"chatId":U32;"fromId":U32;"quotedText":(string|null);"quotedMessageId":(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);};
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,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)>,U32,null,U32,null,U32,(U32)[],U32,U32,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,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,string,string,U32,U32,U32,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,U32,(U32)[],null,U32,U32,string,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|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,string,U32,U32];

deltachat-jsonrpc/typescript/package.json

@@ -26,7 +26,7 @@
   },
   "license": "MPL-2.0",
   "main": "dist/deltachat.js",
-  "name": "@deltachat/jsonrpc-client",
+  "name": "deltachat-jsonrpc-client",
   "scripts": {
     "build": "run-s generate-bindings build:tsc build:bundle",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
@@ -47,5 +47,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.96.0"
+  "version": "1.93.0"
 }

node/constants.js

@@ -56,7 +56,6 @@ module.exports = {
   DC_EVENT_SMTP_CONNECTED: 101,
   DC_EVENT_SMTP_MESSAGE_SENT: 103,
   DC_EVENT_WARNING: 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
   DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
   DC_GCL_ADD_ALLDONE_HINT: 4,
   DC_GCL_ADD_SELF: 2,
@@ -103,7 +102,6 @@ module.exports = {
   DC_QR_FPR_MISMATCH: 220,
   DC_QR_FPR_OK: 210,
   DC_QR_FPR_WITHOUT_ADDR: 230,
-  DC_QR_LOGIN: 520,
   DC_QR_REVIVE_VERIFYCONTACT: 510,
   DC_QR_REVIVE_VERIFYGROUP: 512,
   DC_QR_TEXT: 330,
@@ -130,10 +128,6 @@ module.exports = {
   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,
@@ -164,26 +158,6 @@ module.exports = {
   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,
@@ -193,20 +167,10 @@ module.exports = {
   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,
@@ -226,16 +190,10 @@ module.exports = {
   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,

node/events.js

@@ -30,6 +30,5 @@ module.exports = {
   2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
 }

node/lib/constants.ts

@@ -56,7 +56,6 @@ export enum C {
   DC_EVENT_SMTP_CONNECTED = 101,
   DC_EVENT_SMTP_MESSAGE_SENT = 103,
   DC_EVENT_WARNING = 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
   DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
   DC_GCL_ADD_ALLDONE_HINT = 4,
   DC_GCL_ADD_SELF = 2,
@@ -103,7 +102,6 @@ export enum C {
   DC_QR_FPR_MISMATCH = 220,
   DC_QR_FPR_OK = 210,
   DC_QR_FPR_WITHOUT_ADDR = 230,
-  DC_QR_LOGIN = 520,
   DC_QR_REVIVE_VERIFYCONTACT = 510,
   DC_QR_REVIVE_VERIFYGROUP = 512,
   DC_QR_TEXT = 330,
@@ -130,10 +128,6 @@ export enum C {
   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,
@@ -164,26 +158,6 @@ export enum C {
   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,
@@ -193,20 +167,10 @@ export enum C {
   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,
@@ -226,16 +190,10 @@ export enum C {
   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,
@@ -299,5 +257,4 @@ export const EventId2EventName: { [key: number]: string } = {
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
 }

node/scripts/postLinksToDetails.js

@@ -12,12 +12,11 @@ const GITHUB_API_URL =
 
 const file_url = process.env['URL']
 const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
-const context = process.env['MSG_CONTEXT']
 
 const STATUS_DATA = {
   state: 'success',
   description: '⏩ Click on "Details" to download →',
-  context: context || 'Download the node-bindings.tar.gz',
+  context: 'Download the node-bindings.tar.gz',
   target_url: base_url + file_url,
 }
 

package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@deltachat/jsonrpc-client": "file:deltachat-jsonrpc/typescript",
     "debug": "^4.1.1",
     "napi-macros": "^2.0.0",
     "node-gyp-build": "^4.1.0"
@@ -60,5 +61,5 @@
     "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.96.0"
+  "version": "1.93.0"
 }

python/src/deltachat/__init__.py

@@ -2,7 +2,7 @@ import sys
 
 from pkg_resources import DistributionNotFound, get_distribution
 
-from . import capi, events, hookspec  # noqa
+from . import capi, const, events, hookspec  # noqa
 from .account import Account, get_core_info  # noqa
 from .capi import ffi  # noqa
 from .chat import Chat  # noqa
@@ -17,6 +17,14 @@ except DistributionNotFound:
     __version__ = "0.0.0.dev0-unknown"
 
 
+def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
+    if not _DC_EVENTNAME_MAP:
+        for name in dir(const):
+            if name.startswith("DC_EVENT_"):
+                _DC_EVENTNAME_MAP[getattr(const, name)] = name
+    return _DC_EVENTNAME_MAP[integer]
+
+
 def register_global_plugin(plugin):
     """Register a global plugin which implements one or more
     of the :class:`deltachat.hookspec.Global` hooks.

python/src/deltachat/events.py

@@ -8,21 +8,14 @@ import traceback
 from contextlib import contextmanager
 from queue import Empty, Queue
 
-from . import const
+import deltachat
+
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
 from .message import map_system_message
 
 
-def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
-    if not _DC_EVENTNAME_MAP:
-        for name in dir(const):
-            if name.startswith("DC_EVENT_"):
-                _DC_EVENTNAME_MAP[getattr(const, name)] = name
-    return _DC_EVENTNAME_MAP[integer]
-
-
 class FFIEvent:
     def __init__(self, name: str, data1, data2):
         self.name = name
@@ -246,7 +239,7 @@ class EventThread(threading.Thread):
             data1 = lib.dc_event_get_data1_int(event)
             # the following code relates to the deltachat/_build.py's helper
             # function which provides us signature info of an event call
-            evt_name = get_dc_event_name(evt)
+            evt_name = deltachat.get_dc_event_name(evt)
             if lib.dc_event_has_string_data(evt):
                 data2 = from_optional_dc_charpointer(lib.dc_event_get_data2_str(event))
             else:

python/src/deltachat/message.py

@@ -507,8 +507,6 @@ def parse_system_add_remove(text):
 
     returns a (action, affected, actor) triple"""
 
-    # You removed member a@b.
-    # You added member a@b.
     # Member Me (x@y) removed by a@b.
     # Member x@y added by a@b
     # Member With space (tmp1@x.org) removed by tmp2@x.org.
@@ -520,10 +518,6 @@ def parse_system_add_remove(text):
     if m:
         affected, action, actor = m.groups()
         return action, extract_addr(affected), extract_addr(actor)
-    m = re.match(r"you (removed|added) member (.+)", text)
-    if m:
-        action, affected = m.groups()
-        return action, extract_addr(affected), "me"
     if text.startswith("group left by "):
         addr = extract_addr(text[13:])
         if addr:

python/tests/test_3_offline.py

@@ -80,7 +80,7 @@ class TestOfflineAccountBasic:
         d = ac1.get_info()
         assert d["arch"]
         assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "1"
+        assert d["bcc_self"] == "0"
 
     def test_is_not_configured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -118,7 +118,7 @@ class TestOfflineAccountBasic:
     def test_has_bccself(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "1"
+        assert ac1.get_config("bcc_self") == "0"
 
     def test_selfcontact_if_unconfigured(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
@@ -301,7 +301,7 @@ class TestOfflineChat:
         assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
 
     def test_group_chat_creation_with_translation(self, ac1):
-        ac1.set_stock_translation(const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
+        ac1.set_stock_translation(const.DC_STR_MSGGRPNAME, "abc %1$s xyz %2$s")
         ac1._evtracker.consume_events()
         with pytest.raises(ValueError):
             ac1.set_stock_translation(const.DC_STR_FILE, "xyz %1$s")
@@ -317,7 +317,7 @@ class TestOfflineChat:
         chat.send_text("Now we have a group for homework")
         assert chat.is_promoted()
         chat.set_name("Homework")
-        assert chat.get_messages()[-1].text == "abc homework xyz Homework"
+        assert chat.get_messages()[-1].text == "abc homework xyz Homework by me."
 
     @pytest.mark.parametrize("verified", [True, False])
     def test_group_chat_qr(self, acfactory, ac1, verified):

src/accounts.rs

@@ -69,19 +69,19 @@ impl Accounts {
     }
 
     /// Get an account by its `id`:
-    pub fn get_account(&self, id: u32) -> Option<Context> {
+    pub async fn get_account(&self, id: u32) -> Option<Context> {
         self.accounts.get(&id).cloned()
     }
 
     /// Get the currently selected account.
-    pub fn get_selected_account(&self) -> Option<Context> {
-        let id = self.config.get_selected_account();
+    pub async fn get_selected_account(&self) -> Option<Context> {
+        let id = self.config.get_selected_account().await;
         self.accounts.get(&id).cloned()
     }
 
     /// Returns the currently selected account's id or None if no account is selected.
-    pub fn get_selected_account_id(&self) -> Option<u32> {
-        match self.config.get_selected_account() {
+    pub async fn get_selected_account_id(&self) -> Option<u32> {
+        match self.config.get_selected_account().await {
             0 => None,
             id => Some(id),
         }
@@ -135,7 +135,7 @@ impl Accounts {
         ctx.stop_io().await;
         drop(ctx);
 
-        if let Some(cfg) = self.config.get_account(id) {
+        if let Some(cfg) = self.config.get_account(id).await {
             // Spend up to 1 minute trying to remove the files.
             // Files may remain locked up to 30 seconds due to r2d2 bug:
             // https://github.com/sfackler/r2d2/issues/99
@@ -171,7 +171,7 @@ impl Accounts {
         ensure!(dbfile.exists(), "no database found: {}", dbfile.display());
         ensure!(blobdir.exists(), "no blobdir found: {}", blobdir.display());
 
-        let old_id = self.config.get_selected_account();
+        let old_id = self.config.get_selected_account().await;
 
         // create new account
         let account_config = self
@@ -225,7 +225,7 @@ impl Accounts {
     }
 
     /// Get a list of all account ids.
-    pub fn get_all(&self) -> Vec<u32> {
+    pub async fn get_all(&self) -> Vec<u32> {
         self.accounts.keys().copied().collect()
     }
 
@@ -281,7 +281,7 @@ impl Accounts {
     }
 
     /// Returns event emitter.
-    pub fn get_event_emitter(&self) -> EventEmitter {
+    pub async fn get_event_emitter(&self) -> EventEmitter {
         self.events.get_emitter()
     }
 }
@@ -380,6 +380,7 @@ impl Config {
             .context("failed to select just added account")?;
         let cfg = self
             .get_account(id)
+            .await
             .context("failed to get just added account")?;
         Ok(cfg)
     }
@@ -401,11 +402,11 @@ impl Config {
         self.sync().await
     }
 
-    fn get_account(&self, id: u32) -> Option<AccountConfig> {
+    async fn get_account(&self, id: u32) -> Option<AccountConfig> {
         self.inner.accounts.iter().find(|e| e.id == id).cloned()
     }
 
-    pub fn get_selected_account(&self) -> u32 {
+    pub async fn get_selected_account(&self) -> u32 {
         self.inner.selected_account
     }
 
@@ -457,7 +458,7 @@ mod tests {
         let accounts2 = Accounts::open(p).await.unwrap();
 
         assert_eq!(accounts1.accounts.len(), 1);
-        assert_eq!(accounts1.config.get_selected_account(), 1);
+        assert_eq!(accounts1.config.get_selected_account().await, 1);
 
         assert_eq!(accounts1.dir, accounts2.dir);
         assert_eq!(accounts1.config, accounts2.config,);
@@ -471,23 +472,23 @@ mod tests {
 
         let mut accounts = Accounts::new(p.clone()).await.unwrap();
         assert_eq!(accounts.accounts.len(), 0);
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert_eq!(accounts.config.get_selected_account().await, 0);
 
         let id = accounts.add_account().await.unwrap();
         assert_eq!(id, 1);
         assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);
 
         let id = accounts.add_account().await.unwrap();
         assert_eq!(id, 2);
-        assert_eq!(accounts.config.get_selected_account(), id);
+        assert_eq!(accounts.config.get_selected_account().await, id);
         assert_eq!(accounts.accounts.len(), 2);
 
         accounts.select_account(1).await.unwrap();
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);
 
         accounts.remove_account(1).await.unwrap();
-        assert_eq!(accounts.config.get_selected_account(), 2);
+        assert_eq!(accounts.config.get_selected_account().await, 2);
         assert_eq!(accounts.accounts.len(), 1);
     }
 
@@ -497,17 +498,17 @@ mod tests {
         let p: PathBuf = dir.path().join("accounts");
 
         let mut accounts = Accounts::new(p.clone()).await?;
-        assert!(accounts.get_selected_account().is_none());
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert!(accounts.get_selected_account().await.is_none());
+        assert_eq!(accounts.config.get_selected_account().await, 0);
 
         let id = accounts.add_account().await?;
-        assert!(accounts.get_selected_account().is_some());
+        assert!(accounts.get_selected_account().await.is_some());
         assert_eq!(id, 1);
         assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), id);
+        assert_eq!(accounts.config.get_selected_account().await, id);
 
         accounts.remove_account(id).await?;
-        assert!(accounts.get_selected_account().is_none());
+        assert!(accounts.get_selected_account().await.is_none());
 
         Ok(())
     }
@@ -519,7 +520,7 @@ mod tests {
 
         let mut accounts = Accounts::new(p.clone()).await.unwrap();
         assert_eq!(accounts.accounts.len(), 0);
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert_eq!(accounts.config.get_selected_account().await, 0);
 
         let extern_dbfile: PathBuf = dir.path().join("other");
         let ctx = Context::new(&extern_dbfile, 0, Events::new())
@@ -536,9 +537,9 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);
 
-        let ctx = accounts.get_selected_account().unwrap();
+        let ctx = accounts.get_selected_account().await.unwrap();
         assert_eq!(
             "me@mail.com",
             ctx.get_config(crate::config::Config::Addr)
@@ -561,7 +562,7 @@ mod tests {
             assert_eq!(id, expected_id);
         }
 
-        let ids = accounts.get_all();
+        let ids = accounts.get_all().await;
         for (i, expected_id) in (1..10).enumerate() {
             assert_eq!(ids.get(i), Some(&expected_id));
         }
@@ -576,16 +577,16 @@ mod tests {
         let (id0, id1, id2) = {
             let mut accounts = Accounts::new(p.clone()).await?;
             accounts.add_account().await?;
-            let ids = accounts.get_all();
+            let ids = accounts.get_all().await;
             assert_eq!(ids.len(), 1);
 
             let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).unwrap();
+            let ctx = accounts.get_account(id0).await.unwrap();
             ctx.set_config(crate::config::Config::Addr, Some("one@example.org"))
                 .await?;
 
             let id1 = accounts.add_account().await?;
-            let ctx = accounts.get_account(id1).unwrap();
+            let ctx = accounts.get_account(id1).await.unwrap();
             ctx.set_config(crate::config::Config::Addr, Some("two@example.org"))
                 .await?;
 
@@ -596,7 +597,7 @@ mod tests {
             }
 
             let id2 = accounts.add_account().await?;
-            let ctx = accounts.get_account(id2).unwrap();
+            let ctx = accounts.get_account(id2).await.unwrap();
             ctx.set_config(crate::config::Config::Addr, Some("three@example.org"))
                 .await?;
 
@@ -610,31 +611,31 @@ mod tests {
 
         let (id0_reopened, id1_reopened, id2_reopened) = {
             let accounts = Accounts::new(p.clone()).await?;
-            let ctx = accounts.get_selected_account().unwrap();
+            let ctx = accounts.get_selected_account().await.unwrap();
             assert_eq!(
                 ctx.get_config(crate::config::Config::Addr).await?,
                 Some("two@example.org".to_string())
             );
 
-            let ids = accounts.get_all();
+            let ids = accounts.get_all().await;
             assert_eq!(ids.len(), 3);
 
             let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).unwrap();
+            let ctx = accounts.get_account(id0).await.unwrap();
             assert_eq!(
                 ctx.get_config(crate::config::Config::Addr).await?,
                 Some("one@example.org".to_string())
             );
 
             let id1 = *ids.get(1).unwrap();
-            let t = accounts.get_account(id1).unwrap();
+            let t = accounts.get_account(id1).await.unwrap();
             assert_eq!(
                 t.get_config(crate::config::Config::Addr).await?,
                 Some("two@example.org".to_string())
             );
 
             let id2 = *ids.get(2).unwrap();
-            let ctx = accounts.get_account(id2).unwrap();
+            let ctx = accounts.get_account(id2).await.unwrap();
             assert_eq!(
                 ctx.get_config(crate::config::Config::Addr).await?,
                 Some("three@example.org".to_string())
@@ -660,7 +661,7 @@ mod tests {
         assert_eq!(accounts.accounts.len(), 0);
 
         // Create event emitter.
-        let event_emitter = accounts.get_event_emitter();
+        let event_emitter = accounts.get_event_emitter().await;
 
         // Test that event emitter does not return `None` immediately.
         let duration = std::time::Duration::from_millis(1);
@@ -691,6 +692,7 @@ mod tests {
             .context("failed to add closed account")?;
         let account = accounts
             .get_selected_account()
+            .await
             .context("failed to get account")?;
         assert_eq!(account.id, account_id);
         let passphrase_set_success = account
@@ -705,6 +707,7 @@ mod tests {
             .context("failed to create second accounts manager")?;
         let account = accounts
             .get_selected_account()
+            .await
             .context("failed to get account")?;
         assert_eq!(account.is_open().await, false);
 

src/blob.rs

@@ -326,7 +326,10 @@ impl<'a> BlobObject<'a> {
 
         // max_bytes is 20_000 bytes: Outlook servers don't allow headers larger than 32k.
         // 32 / 4 * 3 = 24k if you account for base64 encoding. To be safe, we reduced this to 20k.
-        if let Some(new_name) = self.recode_to_size(context, blob_abs, img_wh, Some(20_000))? {
+        if let Some(new_name) = self
+            .recode_to_size(context, blob_abs, img_wh, Some(20_000))
+            .await?
+        {
             self.name = new_name;
         }
         Ok(())
@@ -349,7 +352,8 @@ impl<'a> BlobObject<'a> {
             };
 
         if self
-            .recode_to_size(context, blob_abs, img_wh, None)?
+            .recode_to_size(context, blob_abs, img_wh, None)
+            .await?
             .is_some()
         {
             return Err(format_err!(
@@ -359,7 +363,7 @@ impl<'a> BlobObject<'a> {
         Ok(())
     }
 
-    fn recode_to_size(
+    async fn recode_to_size(
         &self,
         context: &Context,
         mut blob_abs: PathBuf,
@@ -742,6 +746,7 @@ mod tests {
         let blob = BlobObject::new_from_path(&t, &avatar_blob).await.unwrap();
 
         blob.recode_to_size(&t, blob.to_abs_path(), 1000, Some(3000))
+            .await
             .unwrap();
         assert!(file_size(&avatar_blob).await <= 3000);
         assert!(file_size(&avatar_blob).await > 2000);

src/chat.rs

@@ -4554,24 +4554,26 @@ mod tests {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_set_protection() -> Result<()> {
+    async fn test_set_protection() {
         let t = TestContext::new_alice().await;
-        t.set_config_bool(Config::BccSelf, false).await?;
-        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo")
+            .await
+            .unwrap();
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
         assert!(!chat.is_protected());
         assert!(chat.is_unpromoted());
 
         // enable protection on unpromoted chat, the info-message is added via add_info_msg()
         chat_id
             .set_protection(&t, ProtectionStatus::Protected)
-            .await?;
+            .await
+            .unwrap();
 
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
         assert!(chat.is_protected());
         assert!(chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 1);
 
         let msg = t.get_last_msg_in(chat_id).await;
@@ -4582,9 +4584,10 @@ mod tests {
         // disable protection again, still unpromoted
         chat_id
             .set_protection(&t, ProtectionStatus::Unprotected)
-            .await?;
+            .await
+            .unwrap();
 
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
         assert!(!chat.is_protected());
         assert!(chat.is_unpromoted());
 
@@ -4594,20 +4597,21 @@ mod tests {
         assert_eq!(msg.get_state(), MessageState::InNoticed);
 
         // send a message, this switches to promoted state
-        send_text_msg(&t, chat_id, "hi!".to_string()).await?;
+        send_text_msg(&t, chat_id, "hi!".to_string()).await.unwrap();
 
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
         assert!(!chat.is_protected());
         assert!(!chat.is_unpromoted());
 
-        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
         assert_eq!(msgs.len(), 3);
 
         // enable protection on promoted chat, the info-message is sent via send_msg() this time
         chat_id
             .set_protection(&t, ProtectionStatus::Protected)
-            .await?;
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+            .await
+            .unwrap();
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
         assert!(chat.is_protected());
         assert!(!chat.is_unpromoted());
 
@@ -4615,8 +4619,6 @@ mod tests {
         assert!(msg.is_info());
         assert_eq!(msg.get_info_type(), SystemMessage::ChatProtectionEnabled);
         assert_eq!(msg.get_state(), MessageState::OutDelivered); // as bcc-self is disabled and there is nobody else in the chat
-
-        Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/config.rs

@@ -55,7 +55,7 @@ pub enum Config {
     Selfstatus,
     Selfavatar,
 
-    #[strum(props(default = "1"))]
+    #[strum(props(default = "0"))]
     BccSelf,
 
     #[strum(props(default = "1"))]
@@ -198,7 +198,7 @@ impl Context {
                 let rel_path = self.sql.get_raw_config(key).await?;
                 rel_path.map(|p| get_abs_path(self, &p).to_string_lossy().into_owned())
             }
-            Config::SysVersion => Some((*DC_VERSION_STR).clone()),
+            Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{}", RECOMMENDED_FILE_SIZE)),
             Config::SysConfigKeys => Some(get_config_keys_string()),
             _ => self.sql.get_raw_config(key).await?,

src/configure.rs

@@ -579,7 +579,8 @@ async fn try_imap_one_param(
 
     let (_s, r) = async_channel::bounded(1);
 
-    let mut imap = match Imap::new(param, socks5_config.clone(), addr, provider_strict_tls, r) {
+    let mut imap = match Imap::new(param, socks5_config.clone(), addr, provider_strict_tls, r).await
+    {
         Err(err) => {
             info!(context, "failure: {}", err);
             return Err(ConfigurationError {

src/constants.rs

@@ -167,11 +167,6 @@ pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;
 
 /// String that indicates that something is left out or truncated.
 pub const DC_ELLIPSIS: &str = "[...]";
-// how many lines desktop can display when fullscreen (fullscreen at zoomlevel 1x)
-// (taken from "subjective" testing what looks ok)
-pub const DC_DESIRED_TEXT_LINES: usize = 38;
-// how many chars desktop can display per line (from "subjective" testing)
-pub const DC_DESIRED_TEXT_LINE_LEN: usize = 100;
 
 /// Message length limit.
 ///
@@ -181,7 +176,7 @@ pub const DC_DESIRED_TEXT_LINE_LEN: usize = 100;
 ///
 /// Note that for simplicity maximum length is defined as the number of Unicode Scalar Values (Rust
 /// `char`s), not Unicode Grapheme Clusters.
-pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEXT_LINES;
+pub const DC_DESIRED_TEXT_LEN: usize = 5000;
 
 // Flags for empty server job
 

src/contact.rs

@@ -896,8 +896,11 @@ impl Contact {
                     EncryptPreference::Reset => stock_str::encr_none(context).await,
                 };
 
-                let finger_prints = stock_str::finger_prints(context).await;
-                ret += &format!("{}.\n{}:", stock_message, finger_prints);
+                ret += &format!(
+                    "{}.\n{}:",
+                    stock_message,
+                    stock_str::finger_prints(context).await
+                );
 
                 let fingerprint_self = SignedPublicKey::load_self(context)
                     .await?
@@ -2278,7 +2281,7 @@ Hi."#;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_was_seen_recently() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 

src/context.rs

@@ -138,7 +138,7 @@ impl Context {
         if !blobdir.exists() {
             tokio::fs::create_dir_all(&blobdir).await?;
         }
-        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events)?;
+        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events).await?;
         Ok(context)
     }
 
@@ -169,7 +169,7 @@ impl Context {
         self.sql.check_passphrase(passphrase).await
     }
 
-    pub(crate) fn with_blobdir(
+    pub(crate) async fn with_blobdir(
         dbfile: PathBuf,
         blobdir: PathBuf,
         id: u32,
@@ -346,7 +346,6 @@ impl Context {
         }
     }
 
-    #[allow(unused)]
     pub(crate) async fn shall_stop_ongoing(&self) -> bool {
         match &*self.running_state.read().await {
             RunningState::Running { .. } => false,
@@ -883,7 +882,7 @@ mod tests {
         let tmp = tempfile::tempdir().unwrap();
         let dbfile = tmp.path().join("db.sqlite");
         let blobdir = PathBuf::new();
-        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
         assert!(res.is_err());
     }
 
@@ -892,7 +891,7 @@ mod tests {
         let tmp = tempfile::tempdir().unwrap();
         let dbfile = tmp.path().join("db.sqlite");
         let blobdir = tmp.path().join("blobs");
-        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
         assert!(res.is_err());
     }
 

src/ephemeral.rs

@@ -36,21 +36,15 @@
 //!
 //! ## How messages are deleted
 //!
-//! When Delta Chat deletes the message locally, it moves the message
-//! to the trash chat and removes actual message contents. Messages in
-//! the trash chat are called "tombstones" and track the Message-ID to
-//! prevent accidental redownloading of the message from the server,
-//! e.g. in case of UID validity change.
-//!
-//! Vice versa, when Delta Chat deletes the message from the server,
-//! it removes IMAP folder and UID row from the `imap` table, but
-//! keeps the message in the `msgs` table.
-//!
-//! Delta Chat eventually removes tombstones from the `msgs` table,
-//! leaving no trace of the message, when it thinks there are no more
-//! copies of the message stored on the server, i.e. when there is no
-//! corresponding `imap` table entry. This is done in the
-//! `prune_tombstones()` procedure during housekeeping.
+//! When the message is deleted locally, its contents is removed and
+//! it is moved to the trash chat. This database entry is then used to
+//! track the Message-ID and corresponding IMAP folder and UID until
+//! the message is deleted from the server. Vice versa, when device
+//! deletes the message from the server, it removes IMAP folder and
+//! UID information, but keeps the message contents. When database
+//! entry is both moved to trash chat and does not contain UID
+//! information, it is deleted from the database, leaving no trace of
+//! the message.
 //!
 //! ## When messages are deleted
 //!
@@ -332,35 +326,35 @@ pub(crate) async fn start_ephemeral_timers_msgids(
     Ok(())
 }
 
-/// Selects messages which are expired according to
+/// Deletes messages which are expired according to
 /// `delete_device_after` setting or `ephemeral_timestamp` column.
 ///
-/// For each message a row ID, chat id and viewtype is returned.
-async fn select_expired_messages(
-    context: &Context,
-    now: i64,
-) -> Result<Vec<(MsgId, ChatId, Viewtype)>> {
-    let mut rows = context
+/// Returns true if any message is deleted, so caller can emit
+/// MsgsChanged event. If nothing has been deleted, returns
+/// false. This function does not emit the MsgsChanged event itself,
+/// because it is also called when chatlist is reloaded, and emitting
+/// MsgsChanged there will cause infinite reload loop.
+pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Result<()> {
+    let mut updated = context
         .sql
-        .query_map(
+        .execute(
+            // If you change which information is removed here, also change MsgId::trash() and
+            // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
             r#"
-SELECT id, chat_id, type
-FROM msgs
+UPDATE msgs
+SET 
+  chat_id=?, txt='', subject='', txt_raw='', 
+  mime_headers='', from_id=0, to_id=0, param=''
 WHERE
   ephemeral_timestamp != 0
   AND ephemeral_timestamp <= ?
   AND chat_id != ?
 "#,
-            paramsv![now, DC_CHAT_ID_TRASH],
-            |row| {
-                let id: MsgId = row.get("id")?;
-                let chat_id: ChatId = row.get("chat_id")?;
-                let viewtype: Viewtype = row.get("type")?;
-                Ok((id, chat_id, viewtype))
-            },
-            |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
+            paramsv![DC_CHAT_ID_TRASH, now, DC_CHAT_ID_TRASH],
         )
-        .await?;
+        .await
+        .context("update failed")?
+        > 0;
 
     if let Some(delete_device_after) = context.get_config_delete_device_after().await? {
         let self_chat_id = ChatId::lookup_by_contact(context, ContactId::SELF)
@@ -372,81 +366,36 @@ WHERE
 
         let threshold_timestamp = now.saturating_sub(delete_device_after);
 
-        let rows_expired = context
+        // Delete expired messages
+        //
+        // Only update the rows that have to be updated, to avoid emitting
+        // unnecessary "chat modified" events.
+        let rows_modified = context
             .sql
-            .query_map(
-                r#"
-SELECT id, chat_id, type
-FROM msgs
-WHERE
-  timestamp < ?
-  AND chat_id > ?
-  AND chat_id != ?
-  AND chat_id != ?
-"#,
+            .execute(
+                "UPDATE msgs \
+             SET chat_id = ?, txt = '', subject='', txt_raw='', \
+                 mime_headers='', from_id=0, to_id=0, param='' \
+             WHERE timestamp < ? \
+             AND chat_id > ? \
+             AND chat_id != ? \
+             AND chat_id != ?",
                 paramsv![
+                    DC_CHAT_ID_TRASH,
                     threshold_timestamp,
                     DC_CHAT_ID_LAST_SPECIAL,
                     self_chat_id,
                     device_chat_id
                 ],
-                |row| {
-                    let id: MsgId = row.get("id")?;
-                    let chat_id: ChatId = row.get("chat_id")?;
-                    let viewtype: Viewtype = row.get("type")?;
-                    Ok((id, chat_id, viewtype))
-                },
-                |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
-            )
-            .await?;
-
-        rows.extend(rows_expired);
-    }
-
-    Ok(rows)
-}
-
-/// Deletes messages which are expired according to
-/// `delete_device_after` setting or `ephemeral_timestamp` column.
-///
-/// Emits relevant `MsgsChanged` and `WebxdcInstanceDeleted` events
-/// if messages are deleted.
-pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Result<()> {
-    let rows = select_expired_messages(context, now).await?;
-
-    if !rows.is_empty() {
-        context
-            .sql
-            .execute(
-                // If you change which information is removed here, also change MsgId::trash() and
-                // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                &format!(
-                    r#"
-UPDATE msgs
-SET
-  chat_id=?, txt='', subject='', txt_raw='',
-  mime_headers='', from_id=0, to_id=0, param=''
-WHERE id IN ({})
-"#,
-                    sql::repeat_vars(rows.len())
-                ),
-                rusqlite::params_from_iter(
-                    std::iter::once(&DC_CHAT_ID_TRASH as &dyn crate::ToSql).chain(
-                        rows.iter()
-                            .map(|(msg_id, _chat_id, _viewtype)| msg_id as &dyn crate::ToSql),
-                    ),
-                ),
             )
             .await
-            .context("update failed")?;
+            .context("deleted update failed")?;
 
-        for (msg_id, chat_id, viewtype) in rows {
-            context.emit_msgs_changed(chat_id, msg_id);
+        updated |= rows_modified > 0;
+    }
 
-            if viewtype == Viewtype::Webxdc {
-                context.emit_event(EventType::WebxdcInstanceDeleted { msg_id });
-            }
-        }
+    if updated {
+        context.emit_msgs_changed_without_ids();
     }
 
     Ok(())
@@ -638,7 +587,7 @@ mod tests {
 
         assert_eq!(
             stock_ephemeral_timer_changed(&context, Timer::Disabled, ContactId::SELF).await,
-            "You disabled message deletion timer."
+            "Message deletion timer is disabled by me."
         );
 
         assert_eq!(
@@ -648,7 +597,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1 s."
+            "Message deletion timer is set to 1 s by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -657,7 +606,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 30 s."
+            "Message deletion timer is set to 30 s by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -666,7 +615,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1 minute."
+            "Message deletion timer is set to 1 minute by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -675,7 +624,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1.5 minutes."
+            "Message deletion timer is set to 1.5 minutes by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -684,7 +633,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 30 minutes."
+            "Message deletion timer is set to 30 minutes by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -693,7 +642,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1 hour."
+            "Message deletion timer is set to 1 hour by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -702,7 +651,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1.5 hours."
+            "Message deletion timer is set to 1.5 hours by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -713,7 +662,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 2 hours."
+            "Message deletion timer is set to 2 hours by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -724,7 +673,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1 day."
+            "Message deletion timer is set to 1 day by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -735,7 +684,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 2 days."
+            "Message deletion timer is set to 2 days by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -746,7 +695,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 1 week."
+            "Message deletion timer is set to 1 week by me."
         );
         assert_eq!(
             stock_ephemeral_timer_changed(
@@ -757,7 +706,7 @@ mod tests {
                 ContactId::SELF
             )
             .await,
-            "You set message deletion timer to 4 weeks."
+            "Message deletion timer is set to 4 weeks by me."
         );
     }
 
@@ -1001,19 +950,6 @@ mod tests {
 
         assert!(next_expiration < deleted_at);
         delete_expired_messages(t, deleted_at).await?;
-        t.evtracker
-            .get_matching(|evt| {
-                if let EventType::MsgsChanged {
-                    msg_id: event_msg_id,
-                    ..
-                } = evt
-                {
-                    *event_msg_id == msg_id
-                } else {
-                    false
-                }
-            })
-            .await;
 
         let loaded = Message::load_from_db(t, msg_id).await?;
         assert_eq!(loaded.text.unwrap(), "");

src/events.rs

@@ -307,4 +307,12 @@ pub enum EventType {
     WebxdcInstanceDeleted {
         msg_id: MsgId,
     },
+
+    WebxdcBusyUpdating {
+        msg_id: MsgId,
+    },
+
+    WebxdcUpToDate {
+        msg_id: MsgId,
+    },
 }

src/html.rs

@@ -98,7 +98,7 @@ impl HtmlMsgParser {
 
         if parser.html.is_empty() {
             if let Some(plain) = &parser.plain {
-                parser.html = plain.to_html();
+                parser.html = plain.to_html().await;
             }
         } else {
             parser.cid_to_data_recursive(context, &parsedmail).await?;

src/imap.rs

@@ -237,7 +237,7 @@ impl Imap {
     /// Creates new disconnected IMAP client using the specific login parameters.
     ///
     /// `addr` is used to renew token if OAuth2 authentication is used.
-    pub fn new(
+    pub async fn new(
         lp: &ServerLoginParam,
         socks5_config: Option<Socks5Config>,
         addr: &str,
@@ -303,7 +303,8 @@ impl Imap {
                     provider.strict_tls
                 }),
             idle_interrupt,
-        )?;
+        )
+        .await?;
         Ok(imap)
     }
 

src/imex.rs

@@ -134,9 +134,19 @@ pub async fn has_backup(_context: &Context, dir_name: &Path) -> Result<String> {
 }
 
 /// Initiates key transfer via Autocrypt Setup Message.
-///
-/// Returns setup code.
 pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
+    use futures::future::FutureExt;
+
+    let cancel = context.alloc_ongoing().await?;
+    let res = do_initiate_key_transfer(context)
+        .race(cancel.recv().map(|_| Err(format_err!("canceled"))))
+        .await;
+
+    context.free_ongoing().await;
+    res
+}
+
+async fn do_initiate_key_transfer(context: &Context) -> Result<String> {
     let setup_code = create_setup_code(context);
     /* this may require a keypair to be created. this may take a second ... */
     let setup_file_content = render_setup_file(context, &setup_code).await?;
@@ -161,7 +171,17 @@ pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
     msg.force_plaintext();
     msg.param.set_int(Param::SkipAutocrypt, 1);
 
-    chat::send_msg(context, chat_id, &mut msg).await?;
+    let msg_id = chat::send_msg(context, chat_id, &mut msg).await?;
+    info!(context, "Wait for setup message being sent ...",);
+    while !context.shall_stop_ongoing().await {
+        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        if let Ok(msg) = Message::load_from_db(context, msg_id).await {
+            if msg.is_sent() {
+                info!(context, "... setup message sent.",);
+                break;
+            }
+        }
+    }
     // no maybe_add_bcc_self_device_msg() here.
     // the ui shows the dialog with the setup code on this device,
     // it would be too much noise to have two things popping up at the same time.
@@ -960,10 +980,16 @@ mod tests {
     async fn test_key_transfer() -> Result<()> {
         let alice = TestContext::new_alice().await;
 
-        let setup_code = initiate_key_transfer(&alice).await?;
+        let alice_clone = alice.clone();
+        let key_transfer_task = tokio::task::spawn(async move {
+            let ctx = alice_clone;
+            initiate_key_transfer(&ctx).await
+        });
 
-        // Get Autocrypt Setup Message.
+        // Wait for the message to be added to the queue.
+        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
         let sent = alice.pop_sent_msg().await;
+        let setup_code = key_transfer_task.await??;
 
         // Alice sets up a second device.
         let alice2 = TestContext::new().await;

src/login_param.rs

@@ -15,7 +15,7 @@ use crate::constants::{DC_LP_AUTH_FLAGS, DC_LP_AUTH_NORMAL, DC_LP_AUTH_OAUTH2};
 use crate::provider::{get_provider_by_id, Provider};
 use crate::{context::Context, provider::Socket};
 
-#[derive(Copy, Clone, Debug, Display, FromPrimitive, ToPrimitive, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Display, FromPrimitive, PartialEq, Eq)]
 #[repr(u32)]
 #[strum(serialize_all = "snake_case")]
 pub enum CertificateChecks {

src/mimefactory.rs

@@ -1177,17 +1177,17 @@ impl<'a> MimeFactory<'a> {
         if command == SystemMessage::MultiDeviceSync && self.is_e2ee_guaranteed() {
             let json = self.msg.param.get(Param::Arg).unwrap_or_default();
             let ids = self.msg.param.get(Param::Arg2).unwrap_or_default();
-            parts.push(context.build_sync_part(json.to_string()));
+            parts.push(context.build_sync_part(json.to_string()).await);
             self.sync_ids_to_delete = Some(ids.to_string());
         } else if command == SystemMessage::WebxdcStatusUpdate {
             let json = self.msg.param.get(Param::Arg).unwrap_or_default();
-            parts.push(context.build_status_update_part(json));
+            parts.push(context.build_status_update_part(json).await);
         } else if self.msg.viewtype == Viewtype::Webxdc {
             if let Some(json) = context
                 .render_webxdc_status_update_object(self.msg.id, None)
                 .await?
             {
-                parts.push(context.build_status_update_part(&json));
+                parts.push(context.build_status_update_part(&json).await);
             }
         }
 

src/mimeparser.rs

@@ -12,7 +12,7 @@ use once_cell::sync::Lazy;
 
 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
-use crate::constants::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
+use crate::constants::{DC_DESIRED_TEXT_LEN, DC_ELLIPSIS};
 use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
 use crate::decrypt::{create_decryption_info, try_decrypt};
@@ -28,7 +28,7 @@ use crate::peerstate::Peerstate;
 use crate::simplify::{simplify, SimplifiedText};
 use crate::stock_str;
 use crate::sync::SyncItems;
-use crate::tools::{get_filemeta, parse_receive_headers, truncate_by_lines};
+use crate::tools::{get_filemeta, parse_receive_headers, truncate};
 
 /// A parsed MIME message.
 ///
@@ -392,10 +392,15 @@ impl MimeMessage {
     /// Parses system messages.
     fn parse_system_message_headers(&mut self, context: &Context) {
         if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() {
-            self.parts.retain(|part| {
-                part.mimetype.is_none()
-                    || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
-            });
+            self.parts = self
+                .parts
+                .iter()
+                .filter(|part| {
+                    part.mimetype.is_none()
+                        || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
+                })
+                .cloned()
+                .collect();
 
             if self.parts.len() == 1 {
                 self.is_system_message = SystemMessage::AutocryptSetupMessage;
@@ -1007,15 +1012,14 @@ impl MimeMessage {
                             (simplified_txt, top_quote)
                         };
 
-                        // Truncate text if it has too many lines
-                        let (simplified_txt, was_truncated) = truncate_by_lines(
-                            simplified_txt,
-                            DC_DESIRED_TEXT_LINES,
-                            DC_DESIRED_TEXT_LINE_LEN,
-                        );
-                        if was_truncated {
-                            self.is_mime_modified = was_truncated;
-                        }
+                        let simplified_txt = if simplified_txt.chars().count()
+                            > DC_DESIRED_TEXT_LEN + DC_ELLIPSIS.len()
+                        {
+                            self.is_mime_modified = true;
+                            truncate(&*simplified_txt, DC_DESIRED_TEXT_LEN).to_string()
+                        } else {
+                            simplified_txt
+                        };
 
                         if !simplified_txt.is_empty() || simplified_quote.is_some() {
                             let mut part = Part {
@@ -1813,7 +1817,7 @@ mod tests {
     use crate::{
         chatlist::Chatlist,
         config::Config,
-        constants::{Blocked, DC_DESIRED_TEXT_LEN, DC_ELLIPSIS},
+        constants::Blocked,
         message::{Message, MessageState, MessengerMessage},
         receive_imf::receive_imf,
         test_utils::TestContext,

src/plaintext.rs

@@ -21,7 +21,7 @@ pub struct PlainText {
 impl PlainText {
     /// Convert plain text to HTML.
     /// The function handles quotes, links, fixed and floating text paragraphs.
-    pub fn to_html(&self) -> String {
+    pub async fn to_html(&self) -> String {
         static LINKIFY_MAIL_RE: Lazy<regex::Regex> =
             Lazy::new(|| regex::Regex::new(r#"\b([\w.\-+]+@[\w.\-]+)\b"#).unwrap());
 
@@ -111,7 +111,8 @@ http://link-at-start-of-line.org
             flowed: false,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r##"<!DOCTYPE html>
@@ -133,7 +134,8 @@ line with <a href="https://link-mid-of-line.org">https://link-mid-of-line.org</a
             flowed: false,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>
@@ -151,7 +153,8 @@ line with &lt;<a href="http://encapsulated.link/?foo=_bar">http://encapsulated.l
             flowed: false,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>
@@ -169,7 +172,8 @@ line with nohttp://no.link here<br/>
             flowed: false,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>
@@ -187,7 +191,8 @@ just an address: <a href="mailto:foo@bar.org">foo@bar.org</a> <a href="mailto:an
             flowed: true,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>
@@ -208,7 +213,8 @@ line still line<br/>
             flowed: true,
             delsp: true,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>
@@ -229,7 +235,8 @@ linestill line<br/>
             flowed: false,
             delsp: false,
         }
-        .to_html();
+        .to_html()
+        .await;
         assert_eq!(
             html,
             r#"<!DOCTYPE html>

src/qr.rs

@@ -1,8 +1,5 @@
 //! # QR code module.
 
-mod dclogin_scheme;
-pub use dclogin_scheme::LoginOptions;
-
 use anyhow::{anyhow, bail, ensure, Context as _, Error, Result};
 use once_cell::sync::Lazy;
 use percent_encoding::percent_decode_str;
@@ -20,11 +17,8 @@ use crate::peerstate::Peerstate;
 use crate::tools::time;
 use crate::{token, EventType};
 
-use self::dclogin_scheme::configure_from_login_qr;
-
 const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
 const DCACCOUNT_SCHEME: &str = "DCACCOUNT:";
-pub(super) const DCLOGIN_SCHEME: &str = "DCLOGIN:";
 const DCWEBRTC_SCHEME: &str = "DCWEBRTC:";
 const MAILTO_SCHEME: &str = "mailto:";
 const MATMSG_SCHEME: &str = "MATMSG:";
@@ -103,10 +97,6 @@ pub enum Qr {
         invitenumber: String,
         authcode: String,
     },
-    Login {
-        address: String,
-        options: LoginOptions,
-    },
 }
 
 fn starts_with_ignore_case(string: &str, pattern: &str) -> bool {
@@ -125,8 +115,6 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
             .context("failed to decode OPENPGP4FPR QR code")?
     } else if starts_with_ignore_case(qr, DCACCOUNT_SCHEME) {
         decode_account(qr)?
-    } else if starts_with_ignore_case(qr, DCLOGIN_SCHEME) {
-        dclogin_scheme::decode_login(qr)?
     } else if starts_with_ignore_case(qr, DCWEBRTC_SCHEME) {
         decode_webrtc_instance(context, qr)?
     } else if qr.starts_with(MAILTO_SCHEME) {
@@ -474,9 +462,6 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             context.sync_qr_code_tokens(chat_id).await?;
             context.send_sync_msg().await?;
         }
-        Qr::Login { address, options } => {
-            configure_from_login_qr(context, &address, options).await?
-        }
         _ => bail!("qr code {:?} does not contain config", qr),
     }
 
@@ -1039,103 +1024,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_and_apply_dclogin() -> Result<()> {
-        let ctx = TestContext::new().await;
-
-        let result = check_qr(&ctx.ctx, "dclogin:usename+extension@host?p=1234&v=1").await?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "usename+extension@host".to_owned());
-
-            if let LoginOptions::V1 { mail_pw, .. } = options {
-                assert_eq!(mail_pw, "1234".to_owned());
-            } else {
-                bail!("wrong type")
-            }
-        } else {
-            bail!("wrong type")
-        }
-
-        assert!(ctx.ctx.get_config(Config::Addr).await?.is_none());
-        assert!(ctx.ctx.get_config(Config::MailPw).await?.is_none());
-
-        set_config_from_qr(&ctx.ctx, "dclogin:username+extension@host?p=1234&v=1").await?;
-        assert_eq!(
-            ctx.ctx.get_config(Config::Addr).await?,
-            Some("username+extension@host".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPw).await?,
-            Some("1234".to_owned())
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_and_apply_dclogin_advanced_options() -> Result<()> {
-        let ctx = TestContext::new().await;
-        set_config_from_qr(&ctx.ctx, "dclogin:username+extension@host?p=1234&spw=4321&sh=send.host&sp=7273&su=SendUser&ih=host.tld&ip=4343&iu=user&ipw=password&is=ssl&ic=1&sc=3&ss=plain&v=1").await?;
-        assert_eq!(
-            ctx.ctx.get_config(Config::Addr).await?,
-            Some("username+extension@host".to_owned())
-        );
-
-        // `p=1234` is ignored, because `ipw=password` is set
-
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailServer).await?,
-            Some("host.tld".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPort).await?,
-            Some("4343".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailUser).await?,
-            Some("user".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPw).await?,
-            Some("password".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailSecurity).await?,
-            Some("1".to_owned()) // ssl
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::ImapCertificateChecks).await?,
-            Some("1".to_owned())
-        );
-
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendPw).await?,
-            Some("4321".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendServer).await?,
-            Some("send.host".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendPort).await?,
-            Some("7273".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendUser).await?,
-            Some("SendUser".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SmtpCertificateChecks).await?,
-            Some("3".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendSecurity).await?,
-            Some("3".to_owned()) // plain
-        );
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_decode_account() -> Result<()> {
         let ctx = TestContext::new().await;

src/qr/dclogin_scheme.rs

@@ -1,388 +0,0 @@
-use std::collections::HashMap;
-
-use crate::config::Config;
-use crate::context::Context;
-use crate::provider::Socket;
-use crate::{contact, login_param::CertificateChecks};
-use anyhow::{bail, Context as _, Result};
-use num_traits::cast::ToPrimitive;
-
-use super::{Qr, DCLOGIN_SCHEME};
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum LoginOptions {
-    UnsuportedVersion(u32),
-    V1 {
-        mail_pw: String,
-        imap_host: Option<String>,
-        imap_port: Option<u16>,
-        imap_username: Option<String>,
-        imap_password: Option<String>,
-        imap_security: Option<Socket>,
-        imap_certificate_checks: Option<CertificateChecks>,
-        smtp_host: Option<String>,
-        smtp_port: Option<u16>,
-        smtp_username: Option<String>,
-        smtp_password: Option<String>,
-        smtp_security: Option<Socket>,
-        smtp_certificate_checks: Option<CertificateChecks>,
-    },
-}
-
-/// scheme: `dclogin://user@host/?p=password&v=1[&options]`
-/// read more about the scheme at <https://github.com/deltachat/interface/blob/master/uri-schemes.md#DCLOGIN>
-pub(super) fn decode_login(qr: &str) -> Result<Qr> {
-    let url = url::Url::parse(qr).with_context(|| format!("Malformed url: {:?}", qr))?;
-
-    let url_without_scheme = qr
-        .get(DCLOGIN_SCHEME.len()..)
-        .context("invalid DCLOGIN payload E1")?;
-    let payload = url_without_scheme
-        .strip_prefix("//")
-        .unwrap_or(url_without_scheme);
-
-    let addr = payload
-        .split(|c| c == '?' || c == '/')
-        .next()
-        .context("invalid DCLOGIN payload E3")?;
-
-    if url.scheme().eq_ignore_ascii_case("dclogin") {
-        let options = url.query_pairs();
-        if options.count() == 0 {
-            bail!("invalid DCLOGIN payload E4")
-        }
-        // load options into hashmap
-        let parameter_map: HashMap<String, String> = options
-            .map(|(key, value)| (key.into_owned(), value.into_owned()))
-            .collect();
-
-        // check if username is there
-        if !contact::may_be_valid_addr(addr) {
-            bail!("invalid DCLOGIN payload: invalid username E5");
-        }
-
-        // apply to result struct
-        let options: LoginOptions = match parameter_map.get("v").map(|i| i.parse::<u32>()) {
-            Some(Ok(1)) => LoginOptions::V1 {
-                mail_pw: parameter_map
-                    .get("p")
-                    .map(|s| s.to_owned())
-                    .context("password missing")?,
-                imap_host: parameter_map.get("ih").map(|s| s.to_owned()),
-                imap_port: parse_port(parameter_map.get("ip"))
-                    .context("could not parse imap port")?,
-                imap_username: parameter_map.get("iu").map(|s| s.to_owned()),
-                imap_password: parameter_map.get("ipw").map(|s| s.to_owned()),
-                imap_security: parse_socket_security(parameter_map.get("is"))?,
-                imap_certificate_checks: parse_certificate_checks(parameter_map.get("ic"))?,
-                smtp_host: parameter_map.get("sh").map(|s| s.to_owned()),
-                smtp_port: parse_port(parameter_map.get("sp"))
-                    .context("could not parse smtp port")?,
-                smtp_username: parameter_map.get("su").map(|s| s.to_owned()),
-                smtp_password: parameter_map.get("spw").map(|s| s.to_owned()),
-                smtp_security: parse_socket_security(parameter_map.get("ss"))?,
-                smtp_certificate_checks: parse_certificate_checks(parameter_map.get("sc"))?,
-            },
-            Some(Ok(v)) => LoginOptions::UnsuportedVersion(v),
-            Some(Err(_)) => bail!("version could not be parsed as number E6"),
-            None => bail!("invalid DCLOGIN payload: version missing E7"),
-        };
-
-        Ok(Qr::Login {
-            address: addr.to_owned(),
-            options,
-        })
-    } else {
-        bail!("Bad scheme for account URL: {:?}.", payload);
-    }
-}
-
-fn parse_port(port: Option<&String>) -> core::result::Result<Option<u16>, std::num::ParseIntError> {
-    match port {
-        Some(p) => Ok(Some(p.parse::<u16>()?)),
-        None => Ok(None),
-    }
-}
-
-fn parse_socket_security(security: Option<&String>) -> Result<Option<Socket>> {
-    Ok(match security.map(|s| s.as_str()) {
-        Some("ssl") => Some(Socket::Ssl),
-        Some("starttls") => Some(Socket::Starttls),
-        Some("default") => Some(Socket::Automatic),
-        Some("plain") => Some(Socket::Plain),
-        Some(other) => bail!("Unknown security level: {}", other),
-        None => None,
-    })
-}
-
-fn parse_certificate_checks(
-    certificate_checks: Option<&String>,
-) -> Result<Option<CertificateChecks>> {
-    Ok(match certificate_checks.map(|s| s.as_str()) {
-        Some("0") => Some(CertificateChecks::Automatic),
-        Some("1") => Some(CertificateChecks::Strict),
-        Some("3") => Some(CertificateChecks::AcceptInvalidCertificates),
-        Some(other) => bail!("Unknown certificatecheck level: {}", other),
-        None => None,
-    })
-}
-
-pub(crate) async fn configure_from_login_qr(
-    context: &Context,
-    address: &str,
-    options: LoginOptions,
-) -> Result<()> {
-    context.set_config(Config::Addr, Some(address)).await?;
-
-    match options {
-        LoginOptions::V1 {
-            mail_pw,
-            imap_host,
-            imap_port,
-            imap_username,
-            imap_password,
-            imap_security,
-            imap_certificate_checks,
-            smtp_host,
-            smtp_port,
-            smtp_username,
-            smtp_password,
-            smtp_security,
-            smtp_certificate_checks,
-        } => {
-            context.set_config(Config::MailPw, Some(&mail_pw)).await?;
-            if let Some(value) = imap_host {
-                context.set_config(Config::MailServer, Some(&value)).await?;
-            }
-            if let Some(value) = imap_port {
-                context
-                    .set_config(Config::MailPort, Some(&value.to_string()))
-                    .await?;
-            }
-            if let Some(value) = imap_username {
-                context.set_config(Config::MailUser, Some(&value)).await?;
-            }
-            if let Some(value) = imap_password {
-                context.set_config(Config::MailPw, Some(&value)).await?;
-            }
-            if let Some(value) = imap_security {
-                let code = value
-                    .to_u8()
-                    .context("could not convert imap security value to number")?;
-                context
-                    .set_config(Config::MailSecurity, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = imap_certificate_checks {
-                let code = value
-                    .to_u32()
-                    .context("could not convert imap certificate checks value to number")?;
-                context
-                    .set_config(Config::ImapCertificateChecks, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_host {
-                context.set_config(Config::SendServer, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_port {
-                context
-                    .set_config(Config::SendPort, Some(&value.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_username {
-                context.set_config(Config::SendUser, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_password {
-                context.set_config(Config::SendPw, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_security {
-                let code = value
-                    .to_u8()
-                    .context("could not convert smtp security value to number")?;
-                context
-                    .set_config(Config::SendSecurity, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_certificate_checks {
-                let code = value
-                    .to_u32()
-                    .context("could not convert smtp certificate checks value to number")?;
-                context
-                    .set_config(Config::SmtpCertificateChecks, Some(&code.to_string()))
-                    .await?;
-            }
-            Ok(())
-        }
-        _ => bail!(
-            "DeltaChat does not understand this QR Code yet, please update the app and try again."
-        ),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::{decode_login, LoginOptions};
-    use crate::{login_param::CertificateChecks, provider::Socket, qr::Qr};
-    use anyhow::{self, bail};
-
-    macro_rules! login_options_just_pw {
-        ($pw: expr) => {
-            LoginOptions::V1 {
-                mail_pw: $pw,
-                imap_host: None,
-                imap_port: None,
-                imap_username: None,
-                imap_password: None,
-                imap_security: None,
-                imap_certificate_checks: None,
-                smtp_host: None,
-                smtp_port: None,
-                smtp_username: None,
-                smtp_password: None,
-                smtp_security: None,
-                smtp_certificate_checks: None,
-            }
-        };
-    }
-
-    #[test]
-    fn minimal_no_options() -> anyhow::Result<()> {
-        let result = decode_login("dclogin://email@host.tld?p=123&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin://email@host.tld/?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin://email@host.tld/ignored/path?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-    #[test]
-    fn minimal_no_options_no_double_slash() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:email@host.tld?p=123&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin:email@host.tld/ignored/path?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn no_version_set() {
-        assert!(decode_login("dclogin:email@host.tld?p=123").is_err());
-    }
-
-    #[test]
-    fn invalid_version_set() {
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=%40").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=-20").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=hi").is_err());
-    }
-
-    #[test]
-    fn version_too_new() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=2")?;
-        if let Qr::Login { options, .. } = result {
-            assert_eq!(options, LoginOptions::UnsuportedVersion(2));
-        } else {
-            bail!("wrong type");
-        }
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=5")?;
-        if let Qr::Login { options, .. } = result {
-            assert_eq!(options, LoginOptions::UnsuportedVersion(5));
-        } else {
-            bail!("wrong type");
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn all_advanced_options() -> anyhow::Result<()> {
-        let result = decode_login(
-            "dclogin:email@host.tld?p=secret&v=1&ih=imap.host.tld&ip=4000&iu=max&ipw=87654&is=ssl&ic=1&sh=mail.host.tld&sp=3000&su=max@host.tld&spw=3242HS&ss=plain&sc=3",
-        )?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(
-                options,
-                LoginOptions::V1 {
-                    mail_pw: "secret".to_owned(),
-                    imap_host: Some("imap.host.tld".to_owned()),
-                    imap_port: Some(4000),
-                    imap_username: Some("max".to_owned()),
-                    imap_password: Some("87654".to_owned()),
-                    imap_security: Some(Socket::Ssl),
-                    imap_certificate_checks: Some(CertificateChecks::Strict),
-                    smtp_host: Some("mail.host.tld".to_owned()),
-                    smtp_port: Some(3000),
-                    smtp_username: Some("max@host.tld".to_owned()),
-                    smtp_password: Some("3242HS".to_owned()),
-                    smtp_security: Some(Socket::Plain),
-                    smtp_certificate_checks: Some(CertificateChecks::AcceptInvalidCertificates),
-                }
-            );
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn uri_encoded_password() -> anyhow::Result<()> {
-        let result = decode_login(
-            "dclogin:email@host.tld?p=%7BDaehFl%3B%22as%40%21fhdodn5%24234%22%7B%7Dfg&v=1",
-        )?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(
-                options,
-                login_options_just_pw!("{DaehFl;\"as@!fhdodn5$234\"{}fg".to_owned())
-            );
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn email_with_plus_extension() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:usename+extension@host?p=1234&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "usename+extension@host".to_owned());
-            assert_eq!(options, login_options_just_pw!("1234".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-}

src/receive_imf.rs

@@ -3121,7 +3121,7 @@ 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();
+        t.evtracker.consume_events().await;
         receive_imf(&t.ctx, DC_MAILINGLIST2, false).await.unwrap();
 
         // Check that no notification is displayed for blocked mailing list message.
@@ -4949,7 +4949,7 @@ Reply from different address
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_long_filenames() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 
@@ -5001,7 +5001,7 @@ Reply from different address
     /// Tests that contact request is accepted automatically on outgoing message.
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_accept_outgoing() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice1 = tcm.alice().await;
         let alice2 = tcm.alice().await;
         let bob1 = tcm.bob().await;
@@ -5046,7 +5046,7 @@ Reply from different address
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_outgoing_private_reply_multidevice() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice1 = tcm.alice().await;
         let alice2 = tcm.alice().await;
         let bob = tcm.bob().await;
@@ -5134,7 +5134,7 @@ Reply from different address
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_no_private_reply_to_blocked_account() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 

src/scheduler.rs

@@ -1,6 +1,6 @@
 use anyhow::{bail, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
-use futures::try_join;
+use futures::{join, try_join};
 use futures_lite::FutureExt;
 use tokio::task;
 
@@ -42,7 +42,7 @@ impl Context {
     pub async fn maybe_network(&self) {
         let lock = self.scheduler.read().await;
         if let Some(scheduler) = &*lock {
-            scheduler.maybe_network();
+            scheduler.maybe_network().await;
         }
         connectivity::idle_interrupted(lock).await;
     }
@@ -51,32 +51,32 @@ impl Context {
     pub async fn maybe_network_lost(&self) {
         let lock = self.scheduler.read().await;
         if let Some(scheduler) = &*lock {
-            scheduler.maybe_network_lost();
+            scheduler.maybe_network_lost().await;
         }
         connectivity::maybe_network_lost(self, lock).await;
     }
 
     pub(crate) async fn interrupt_inbox(&self, info: InterruptInfo) {
         if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_inbox(info);
+            scheduler.interrupt_inbox(info).await;
         }
     }
 
     pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
         if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_smtp(info);
+            scheduler.interrupt_smtp(info).await;
         }
     }
 
     pub(crate) async fn interrupt_ephemeral_task(&self) {
         if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_ephemeral_task();
+            scheduler.interrupt_ephemeral_task().await;
         }
     }
 
     pub(crate) async fn interrupt_location(&self) {
         if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_location();
+            scheduler.interrupt_location().await;
         }
     }
 }
@@ -332,7 +332,7 @@ async fn smtp_loop(ctx: Context, started: Sender<()>, smtp_handlers: SmtpConnect
                 if !duration_until_can_send.is_zero() {
                     info!(
                         ctx,
-                        "smtp got rate limited, waiting for {} until can send again",
+                        "smtp got rate limited, delaying next try by {}",
                         duration_to_str(duration_until_can_send)
                     );
                     tokio::time::timeout(duration_until_can_send, async {
@@ -501,41 +501,45 @@ impl Scheduler {
         Ok(res)
     }
 
-    fn maybe_network(&self) {
-        self.interrupt_inbox(InterruptInfo::new(true));
-        self.interrupt_mvbox(InterruptInfo::new(true));
-        self.interrupt_sentbox(InterruptInfo::new(true));
-        self.interrupt_smtp(InterruptInfo::new(true));
+    async fn maybe_network(&self) {
+        join!(
+            self.interrupt_inbox(InterruptInfo::new(true)),
+            self.interrupt_mvbox(InterruptInfo::new(true)),
+            self.interrupt_sentbox(InterruptInfo::new(true)),
+            self.interrupt_smtp(InterruptInfo::new(true))
+        );
     }
 
-    fn maybe_network_lost(&self) {
-        self.interrupt_inbox(InterruptInfo::new(false));
-        self.interrupt_mvbox(InterruptInfo::new(false));
-        self.interrupt_sentbox(InterruptInfo::new(false));
-        self.interrupt_smtp(InterruptInfo::new(false));
+    async fn maybe_network_lost(&self) {
+        join!(
+            self.interrupt_inbox(InterruptInfo::new(false)),
+            self.interrupt_mvbox(InterruptInfo::new(false)),
+            self.interrupt_sentbox(InterruptInfo::new(false)),
+            self.interrupt_smtp(InterruptInfo::new(false))
+        );
     }
 
-    fn interrupt_inbox(&self, info: InterruptInfo) {
-        self.inbox.interrupt(info);
+    async fn interrupt_inbox(&self, info: InterruptInfo) {
+        self.inbox.interrupt(info).await;
     }
 
-    fn interrupt_mvbox(&self, info: InterruptInfo) {
-        self.mvbox.interrupt(info);
+    async fn interrupt_mvbox(&self, info: InterruptInfo) {
+        self.mvbox.interrupt(info).await;
     }
 
-    fn interrupt_sentbox(&self, info: InterruptInfo) {
-        self.sentbox.interrupt(info);
+    async fn interrupt_sentbox(&self, info: InterruptInfo) {
+        self.sentbox.interrupt(info).await;
     }
 
-    fn interrupt_smtp(&self, info: InterruptInfo) {
-        self.smtp.interrupt(info);
+    async fn interrupt_smtp(&self, info: InterruptInfo) {
+        self.smtp.interrupt(info).await;
     }
 
-    fn interrupt_ephemeral_task(&self) {
+    async fn interrupt_ephemeral_task(&self) {
         self.ephemeral_interrupt_send.try_send(()).ok();
     }
 
-    fn interrupt_location(&self) {
+    async fn interrupt_location(&self) {
         self.location_interrupt_send.try_send(()).ok();
     }
 
@@ -599,7 +603,7 @@ impl ConnectionState {
         Ok(())
     }
 
-    fn interrupt(&self, info: InterruptInfo) {
+    async fn interrupt(&self, info: InterruptInfo) {
         // Use try_send to avoid blocking on interrupts.
         self.idle_interrupt_sender.try_send(info).ok();
     }
@@ -633,8 +637,8 @@ impl SmtpConnectionState {
     }
 
     /// Interrupt any form of idle.
-    fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info);
+    async fn interrupt(&self, info: InterruptInfo) {
+        self.state.interrupt(info).await;
     }
 
     /// Shutdown this connection completely.
@@ -678,8 +682,8 @@ impl ImapConnectionState {
     }
 
     /// Interrupt any form of idle.
-    fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info);
+    async fn interrupt(&self, info: InterruptInfo) {
+        self.state.interrupt(info).await;
     }
 
     /// Shutdown this connection completely.

src/scheduler/connectivity.rs

@@ -390,8 +390,7 @@ impl Context {
         // =============================================================================================
 
         let watched_folders = get_watched_folder_configs(self).await?;
-        let incoming_messages = stock_str::incoming_messages(self).await;
-        ret += &format!("<h3>{}</h3><ul>", incoming_messages);
+        ret += &format!("<h3>{}</h3><ul>", stock_str::incoming_messages(self).await);
         for (folder, state) in &folders_states {
             let mut folder_added = false;
 
@@ -433,8 +432,10 @@ impl Context {
         //                                Your last message was sent successfully
         // =============================================================================================
 
-        let outgoing_messages = stock_str::outgoing_messages(self).await;
-        ret += &format!("<h3>{}</h3><ul><li>", outgoing_messages);
+        ret += &format!(
+            "<h3>{}</h3><ul><li>",
+            stock_str::outgoing_messages(self).await
+        );
         let detailed = smtp.get_detailed().await;
         ret += &*detailed.to_icon();
         ret += " ";
@@ -449,8 +450,10 @@ impl Context {
         // =============================================================================================
 
         let domain = tools::EmailAddress::new(&self.get_primary_self_addr().await?)?.domain;
-        let storage_on_domain = stock_str::storage_on_domain(self, domain).await;
-        ret += &format!("<h3>{}</h3><ul>", storage_on_domain);
+        ret += &format!(
+            "<h3>{}</h3><ul>",
+            stock_str::storage_on_domain(self, domain).await
+        );
         let quota = self.quota.read().await;
         if let Some(quota) = &*quota {
             match &quota.recent {
@@ -470,23 +473,30 @@ impl Context {
                                 info!(self, "connectivity: root name hidden: \"{}\"", root_name);
                             }
 
-                            let messages = stock_str::messages(self).await;
-                            let part_of_total_used = stock_str::part_of_total_used(
-                                self,
-                                resource.usage.to_string(),
-                                resource.limit.to_string(),
-                            )
-                            .await;
                             ret += &match &resource.name {
                                 Atom(resource_name) => {
                                     format!(
                                         "<b>{}:</b> {}",
                                         &*escaper::encode_minimal(resource_name),
-                                        part_of_total_used
+                                        stock_str::part_of_total_used(
+                                            self,
+                                            resource.usage.to_string(),
+                                            resource.limit.to_string()
+                                        )
+                                        .await,
                                     )
                                 }
                                 Message => {
-                                    format!("<b>{}:</b> {}", part_of_total_used, messages)
+                                    format!(
+                                        "<b>{}:</b> {}",
+                                        stock_str::messages(self).await,
+                                        stock_str::part_of_total_used(
+                                            self,
+                                            resource.usage.to_string(),
+                                            resource.limit.to_string()
+                                        )
+                                        .await,
+                                    )
                                 }
                                 Storage => {
                                     // do not use a special title needed for "Storage":
@@ -528,8 +538,7 @@ impl Context {
                 self.schedule_quota_update().await?;
             }
         } else {
-            let not_connected = stock_str::not_connected(self).await;
-            ret += &format!("<li>{}</li>", not_connected);
+            ret += &format!("<li>{}</li>", stock_str::not_connected(self).await);
             self.schedule_quota_update().await?;
         }
         ret += "</ul>";

src/securejoin.rs

@@ -696,7 +696,7 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_setup_contact() {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
         assert_eq!(
@@ -910,7 +910,7 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_setup_contact_bob_knows_alice() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 
@@ -1035,7 +1035,7 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_setup_contact_concurrent_calls() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 
@@ -1066,7 +1066,7 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_secure_join() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 

src/smtp.rs

@@ -22,6 +22,7 @@ use crate::mimefactory::MimeFactory;
 use crate::oauth2::get_oauth2_access_token;
 use crate::provider::Socket;
 use crate::sql;
+use crate::webxdc::get_busy_webxdc_instances;
 use crate::{context::Context, scheduler::connectivity::ConnectivityStore};
 
 /// SMTP write and read timeout in seconds.
@@ -64,7 +65,7 @@ impl Smtp {
 
     /// Return true if smtp was connected but is not known to
     /// have been successfully used the last 60 seconds
-    pub fn has_maybe_stale_connection(&self) -> bool {
+    pub async fn has_maybe_stale_connection(&self) -> bool {
         if let Some(last_success) = self.last_success {
             SystemTime::now()
                 .duration_since(last_success)
@@ -77,7 +78,7 @@ impl Smtp {
     }
 
     /// Check whether we are connected.
-    pub fn is_connected(&self) -> bool {
+    pub async fn is_connected(&self) -> bool {
         self.transport
             .as_ref()
             .map(|t| t.is_connected())
@@ -86,12 +87,12 @@ impl Smtp {
 
     /// Connect using configured parameters.
     pub async fn connect_configured(&mut self, context: &Context) -> Result<()> {
-        if self.has_maybe_stale_connection() {
+        if self.has_maybe_stale_connection().await {
             info!(context, "Closing stale connection");
             self.disconnect().await;
         }
 
-        if self.is_connected() {
+        if self.is_connected().await {
             return Ok(());
         }
 
@@ -117,7 +118,7 @@ impl Smtp {
         addr: &str,
         provider_strict_tls: bool,
     ) -> Result<()> {
-        if self.is_connected() {
+        if self.is_connected().await {
             warn!(context, "SMTP already connected.");
             return Ok(());
         }
@@ -499,7 +500,15 @@ async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
 pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<()> {
     let ratelimited = if context.ratelimit.read().await.can_send() {
         // add status updates and sync messages to end of sending queue
+
+        let update_needed = get_busy_webxdc_instances(&context.sql).await?;
         context.flush_status_updates().await?;
+        let update_needed_after_sending = get_busy_webxdc_instances(&context.sql).await?;
+
+        for msg_id in update_needed.difference(&update_needed_after_sending) {
+            context.emit_event(EventType::WebxdcUpToDate { msg_id: *msg_id })
+        }
+
         context.send_sync_msg().await?;
         false
     } else {

src/sql.rs

@@ -7,6 +7,7 @@ use std::path::PathBuf;
 use std::time::Duration;
 
 use anyhow::{bail, Context as _, Result};
+use rusqlite::types::FromSql;
 use rusqlite::{config::DbConfig, Connection, OpenFlags};
 use tokio::sync::RwLock;
 
@@ -363,6 +364,25 @@ impl Sql {
         })
     }
 
+    /// Returns unique values of a `column` in `table`
+    pub async fn distinct<T: FromSql + Default>(
+        &self,
+        table: &str,
+        column: &str,
+    ) -> Result<Vec<T>> {
+        let conn = self.get_conn().await?;
+        let rows: Result<Vec<T>> = tokio::task::block_in_place(move || {
+            let mut stmt = conn.prepare(&format!("SELECT DISTINCT {column} FROM {table}"))?;
+            let rows = stmt
+                .query([])?
+                .mapped(|r| r.get(0))
+                .map(|a| a.unwrap_or_default())
+                .collect();
+            Ok(rows)
+        });
+        rows
+    }
+
     /// Prepares and executes the statement and maps a function over the resulting rows.
     /// Then executes the second function over the returned iterator and returns the
     /// result of that function.

src/stock_str.rs

@@ -1,5 +1,8 @@
 //! Module to work with translatable stock strings.
 
+use std::future::Future;
+use std::pin::Pin;
+
 use anyhow::{bail, Error};
 use strum::EnumProperty as EnumPropertyTrait;
 use strum_macros::EnumProperty;
@@ -49,6 +52,21 @@ pub enum StockMessage {
     #[strum(props(fallback = "File"))]
     File = 12,
 
+    #[strum(props(fallback = "Group name changed from \"%1$s\" to \"%2$s\"."))]
+    MsgGrpName = 15,
+
+    #[strum(props(fallback = "Group image changed."))]
+    MsgGrpImgChanged = 16,
+
+    #[strum(props(fallback = "Member %1$s added."))]
+    MsgAddMember = 17,
+
+    #[strum(props(fallback = "Member %1$s removed."))]
+    MsgDelMember = 18,
+
+    #[strum(props(fallback = "Group left."))]
+    MsgGroupLeft = 19,
+
     #[strum(props(fallback = "GIF"))]
     Gif = 23,
 
@@ -73,6 +91,9 @@ pub enum StockMessage {
     #[strum(props(fallback = "This is a return receipt for the message \"%1$s\"."))]
     ReadRcptMailBody = 32,
 
+    #[strum(props(fallback = "Group image deleted."))]
+    MsgGrpImgDeleted = 33,
+
     #[strum(props(fallback = "End-to-end encryption preferred"))]
     E2ePreferred = 34,
 
@@ -101,6 +122,12 @@ pub enum StockMessage {
     ))]
     CannotLogin = 60,
 
+    #[strum(props(fallback = "%1$s by %2$s."))]
+    MsgActionByUser = 62,
+
+    #[strum(props(fallback = "%1$s by me."))]
+    MsgActionByMe = 63,
+
     #[strum(props(fallback = "Location streaming enabled."))]
     MsgLocationEnabled = 64,
 
@@ -145,6 +172,26 @@ pub enum StockMessage {
     #[strum(props(fallback = "Failed to send message to %1$s."))]
     FailedSendingTo = 74,
 
+    #[strum(props(fallback = "Message deletion timer is disabled."))]
+    MsgEphemeralTimerDisabled = 75,
+
+    // A fallback message for unknown timer values.
+    // "s" stands for "second" SI unit here.
+    #[strum(props(fallback = "Message deletion timer is set to %1$s s."))]
+    MsgEphemeralTimerEnabled = 76,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 minute."))]
+    MsgEphemeralTimerMinute = 77,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 hour."))]
+    MsgEphemeralTimerHour = 78,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 day."))]
+    MsgEphemeralTimerDay = 79,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 week."))]
+    MsgEphemeralTimerWeek = 80,
+
     #[strum(props(fallback = "Video chat invitation"))]
     VideochatInvitation = 82,
 
@@ -171,6 +218,12 @@ pub enum StockMessage {
     ))]
     ErrorNoNetwork = 87,
 
+    #[strum(props(fallback = "Chat protection enabled."))]
+    ProtectionEnabled = 88,
+
+    #[strum(props(fallback = "Chat protection disabled."))]
+    ProtectionDisabled = 89,
+
     // used in summaries, a noun, not a verb (not: "to reply")
     #[strum(props(fallback = "Reply"))]
     ReplyNoun = 90,
@@ -186,6 +239,18 @@ pub enum StockMessage {
     ))]
     DeleteServerTurnedOff = 92,
 
+    #[strum(props(fallback = "Message deletion timer is set to %1$s minutes."))]
+    MsgEphemeralTimerMinutes = 93,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s hours."))]
+    MsgEphemeralTimerHours = 94,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s days."))]
+    MsgEphemeralTimerDays = 95,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s weeks."))]
+    MsgEphemeralTimerWeeks = 96,
+
     #[strum(props(fallback = "Forwarded"))]
     Forwarded = 97,
 
@@ -275,122 +340,6 @@ pub enum StockMessage {
         fallback = "You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt's highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet."
     ))]
     AeapExplanationAndLink = 123,
-
-    #[strum(props(fallback = "You changed group name from \"%1$s\" to \"%2$s\"."))]
-    MsgYouChangedGrpName = 124,
-
-    #[strum(props(fallback = "Group name changed from \"%1$s\" to \"%2$s\" by %3$s."))]
-    MsgGrpNameChangedBy = 125,
-
-    #[strum(props(fallback = "You changed the group image."))]
-    MsgYouChangedGrpImg = 126,
-
-    #[strum(props(fallback = "Group image changed by %1$s."))]
-    MsgGrpImgChangedBy = 127,
-
-    #[strum(props(fallback = "You added member %1$s."))]
-    MsgYouAddMember = 128,
-
-    #[strum(props(fallback = "Member %1$s added by %2$s."))]
-    MsgAddMemberBy = 129,
-
-    #[strum(props(fallback = "You removed member %1$s."))]
-    MsgYouDelMember = 130,
-
-    #[strum(props(fallback = "Member %1$s removed by %2$s."))]
-    MsgDelMemberBy = 131,
-
-    #[strum(props(fallback = "You left the group."))]
-    MsgYouLeftGroup = 132,
-
-    #[strum(props(fallback = "Group left by %1$s."))]
-    MsgGroupLeftBy = 133,
-
-    #[strum(props(fallback = "You deleted the group image."))]
-    MsgYouDeletedGrpImg = 134,
-
-    #[strum(props(fallback = "Group image deleted by %1$s."))]
-    MsgGrpImgDeletedBy = 135,
-
-    #[strum(props(fallback = "You enabled location streaming."))]
-    MsgYouEnabledLocation = 136,
-
-    #[strum(props(fallback = "Location streaming enabled by %1$s."))]
-    MsgLocationEnabledBy = 137,
-
-    #[strum(props(fallback = "You disabled message deletion timer."))]
-    MsgYouDisabledEphemeralTimer = 138,
-
-    #[strum(props(fallback = "Message deletion timer is disabled by %1$s."))]
-    MsgEphemeralTimerDisabledBy = 139,
-
-    // A fallback message for unknown timer values.
-    // "s" stands for "second" SI unit here.
-    #[strum(props(fallback = "You set message deletion timer to %1$s s."))]
-    MsgYouEnabledEphemeralTimer = 140,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s s by %2$s."))]
-    MsgEphemeralTimerEnabledBy = 141,
-
-    #[strum(props(fallback = "You set message deletion timer to 1 minute."))]
-    MsgYouEphemeralTimerMinute = 142,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 minute by %1$s."))]
-    MsgEphemeralTimerMinuteBy = 143,
-
-    #[strum(props(fallback = "You set message deletion timer to 1 hour."))]
-    MsgYouEphemeralTimerHour = 144,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 hour by %1$s."))]
-    MsgEphemeralTimerHourBy = 145,
-
-    #[strum(props(fallback = "You set message deletion timer to 1 day."))]
-    MsgYouEphemeralTimerDay = 146,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 day by %1$s."))]
-    MsgEphemeralTimerDayBy = 147,
-
-    #[strum(props(fallback = "You set message deletion timer to 1 week."))]
-    MsgYouEphemeralTimerWeek = 148,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 week by %1$s."))]
-    MsgEphemeralTimerWeekBy = 149,
-
-    #[strum(props(fallback = "You set message deletion timer to %1$s minutes."))]
-    MsgYouEphemeralTimerMinutes = 150,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s minutes by %2$s."))]
-    MsgEphemeralTimerMinutesBy = 151,
-
-    #[strum(props(fallback = "You set message deletion timer to %1$s hours."))]
-    MsgYouEphemeralTimerHours = 152,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s hours by %2$s."))]
-    MsgEphemeralTimerHoursBy = 153,
-
-    #[strum(props(fallback = "You set message deletion timer to %1$s days."))]
-    MsgYouEphemeralTimerDays = 154,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s days by %2$s."))]
-    MsgEphemeralTimerDaysBy = 155,
-
-    #[strum(props(fallback = "You set message deletion timer to %1$s weeks."))]
-    MsgYouEphemeralTimerWeeks = 156,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s weeks by %2$s."))]
-    MsgEphemeralTimerWeeksBy = 157,
-
-    #[strum(props(fallback = "You enabled chat protection."))]
-    YouEnabledProtection = 158,
-
-    #[strum(props(fallback = "Chat protection enabled by %1$s."))]
-    ProtectionEnabledBy = 159,
-
-    #[strum(props(fallback = "You disabled chat protection."))]
-    YouDisabledProtection = 160,
-
-    #[strum(props(fallback = "Chat protection disabled by %1$s."))]
-    ProtectionDisabledBy = 161,
 }
 
 impl StockMessage {
@@ -444,15 +393,38 @@ trait StockStringMods: AsRef<str> + Sized {
             .replacen("%3$d", replacement.as_ref(), 1)
             .replacen("%3$@", replacement.as_ref(), 1)
     }
-}
 
-impl ContactId {
-    /// Get contact name for stock string.
-    async fn get_stock_name(self, context: &Context) -> String {
-        Contact::get_by_id(context, self)
-            .await
-            .map(|contact| contact.get_name_n_addr())
-            .unwrap_or_else(|_| self.to_string())
+    /// Augments the message by saying it was performed by a user.
+    ///
+    /// This looks up the display name of `contact` and uses the [`msg_action_by_me`] and
+    /// [`msg_action_by_user`] stock strings to turn the stock string in one that says the
+    /// action was performed by this user.
+    ///
+    /// E.g. this turns `Group image changed.` into `Group image changed by me.` or `Group
+    /// image changed by Alice.`.
+    ///
+    /// Note that the original message should end in a `.`.
+    fn action_by_contact<'a>(
+        self,
+        context: &'a Context,
+        contact_id: ContactId,
+    ) -> Pin<Box<dyn Future<Output = String> + Send + 'a>>
+    where
+        Self: Send + 'a,
+    {
+        Box::pin(async move {
+            let message = self.as_ref().trim_end_matches('.');
+            match contact_id {
+                ContactId::SELF => msg_action_by_me(context, message).await,
+                _ => {
+                    let displayname = Contact::get_by_id(context, contact_id)
+                        .await
+                        .map(|contact| contact.get_name_n_addr())
+                        .unwrap_or_else(|_| contact_id.to_string());
+                    msg_action_by_user(context, message, displayname).await
+                }
+            }
+        })
     }
 }
 
@@ -505,28 +477,20 @@ pub(crate) async fn msg_grp_name(
     to_group: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouChangedGrpName)
-            .await
-            .replace1(from_group)
-            .replace2(to_group)
-    } else {
-        translated(context, StockMessage::MsgGrpNameChangedBy)
-            .await
-            .replace1(from_group)
-            .replace2(to_group)
-            .replace3(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgGrpName)
+        .await
+        .replace1(from_group)
+        .replace2(to_group)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
+/// Stock string: `Group image changed.`.
 pub(crate) async fn msg_grp_img_changed(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouChangedGrpImg).await
-    } else {
-        translated(context, StockMessage::MsgGrpImgChangedBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgGrpImgChanged)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Member %1$s added.`.
@@ -546,16 +510,11 @@ pub(crate) async fn msg_add_member(
             .unwrap_or_else(|_| addr.to_string()),
         _ => addr.to_string(),
     };
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouAddMember)
-            .await
-            .replace1(who)
-    } else {
-        translated(context, StockMessage::MsgAddMemberBy)
-            .await
-            .replace1(who)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgAddMember)
+        .await
+        .replace1(who)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Member %1$s removed.`.
@@ -575,27 +534,19 @@ pub(crate) async fn msg_del_member(
             .unwrap_or_else(|_| addr.to_string()),
         _ => addr.to_string(),
     };
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouDelMember)
-            .await
-            .replace1(who)
-    } else {
-        translated(context, StockMessage::MsgDelMemberBy)
-            .await
-            .replace1(who)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgDelMember)
+        .await
+        .replace1(who)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Group left.`.
 pub(crate) async fn msg_group_left(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouLeftGroup).await
-    } else {
-        translated(context, StockMessage::MsgGroupLeftBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgGroupLeft)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `GIF`.
@@ -642,13 +593,10 @@ pub(crate) async fn read_rcpt_mail_body(context: &Context, message: impl AsRef<s
 
 /// Stock string: `Group image deleted.`.
 pub(crate) async fn msg_grp_img_deleted(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouDeletedGrpImg).await
-    } else {
-        translated(context, StockMessage::MsgGrpImgDeletedBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgGrpImgDeleted)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `End-to-end encryption preferred.`.
@@ -766,6 +714,25 @@ pub(crate) async fn cannot_login(context: &Context, user: impl AsRef<str>) -> St
         .replace1(user)
 }
 
+/// Stock string: `%1$s by %2$s.`.
+pub(crate) async fn msg_action_by_user(
+    context: &Context,
+    action: impl AsRef<str>,
+    user: impl AsRef<str>,
+) -> String {
+    translated(context, StockMessage::MsgActionByUser)
+        .await
+        .replace1(action)
+        .replace2(user)
+}
+
+/// Stock string: `%1$s by me.`.
+pub(crate) async fn msg_action_by_me(context: &Context, action: impl AsRef<str>) -> String {
+    translated(context, StockMessage::MsgActionByMe)
+        .await
+        .replace1(action)
+}
+
 /// Stock string: `Location streaming enabled.`.
 pub(crate) async fn msg_location_enabled(context: &Context) -> String {
     translated(context, StockMessage::MsgLocationEnabled).await
@@ -773,13 +740,10 @@ pub(crate) async fn msg_location_enabled(context: &Context) -> String {
 
 /// Stock string: `Location streaming enabled by ...`.
 pub(crate) async fn msg_location_enabled_by(context: &Context, contact: ContactId) -> String {
-    if contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEnabledLocation).await
-    } else {
-        translated(context, StockMessage::MsgLocationEnabledBy)
-            .await
-            .replace1(contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgLocationEnabled)
+        .await
+        .action_by_contact(context, contact)
+        .await
 }
 
 /// Stock string: `Location streaming disabled.`.
@@ -845,13 +809,10 @@ pub(crate) async fn msg_ephemeral_timer_disabled(
     context: &Context,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouDisabledEphemeralTimer).await
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerDisabledBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerDisabled)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to %1$s s.`.
@@ -860,60 +821,43 @@ pub(crate) async fn msg_ephemeral_timer_enabled(
     timer: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEnabledEphemeralTimer)
-            .await
-            .replace1(timer)
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerEnabledBy)
-            .await
-            .replace1(timer)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerEnabled)
+        .await
+        .replace1(timer)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to 1 minute.`.
 pub(crate) async fn msg_ephemeral_timer_minute(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerMinute).await
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerMinuteBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerMinute)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to 1 hour.`.
 pub(crate) async fn msg_ephemeral_timer_hour(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerHour).await
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerHourBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerHour)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to 1 day.`.
 pub(crate) async fn msg_ephemeral_timer_day(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerDay).await
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerDayBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerDay)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to 1 week.`.
 pub(crate) async fn msg_ephemeral_timer_week(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerWeek).await
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerWeekBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerWeek)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Video chat invitation`.
@@ -955,24 +899,18 @@ pub(crate) async fn error_no_network(context: &Context) -> String {
 
 /// Stock string: `Chat protection enabled.`.
 pub(crate) async fn protection_enabled(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::YouEnabledProtection).await
-    } else {
-        translated(context, StockMessage::ProtectionEnabledBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::ProtectionEnabled)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Chat protection disabled.`.
 pub(crate) async fn protection_disabled(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::YouDisabledProtection).await
-    } else {
-        translated(context, StockMessage::ProtectionDisabledBy)
-            .await
-            .replace1(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::ProtectionDisabled)
+        .await
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Reply`.
@@ -996,16 +934,11 @@ pub(crate) async fn msg_ephemeral_timer_minutes(
     minutes: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerMinutes)
-            .await
-            .replace1(minutes)
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerMinutesBy)
-            .await
-            .replace1(minutes)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerMinutes)
+        .await
+        .replace1(minutes)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to %1$s hours.`.
@@ -1014,16 +947,11 @@ pub(crate) async fn msg_ephemeral_timer_hours(
     hours: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerHours)
-            .await
-            .replace1(hours)
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerHoursBy)
-            .await
-            .replace1(hours)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerHours)
+        .await
+        .replace1(hours)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to %1$s days.`.
@@ -1032,16 +960,11 @@ pub(crate) async fn msg_ephemeral_timer_days(
     days: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerDays)
-            .await
-            .replace1(days)
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerDaysBy)
-            .await
-            .replace1(days)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerDays)
+        .await
+        .replace1(days)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Message deletion timer is set to %1$s weeks.`.
@@ -1050,16 +973,11 @@ pub(crate) async fn msg_ephemeral_timer_weeks(
     weeks: impl AsRef<str>,
     by_contact: ContactId,
 ) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::MsgYouEphemeralTimerWeeks)
-            .await
-            .replace1(weeks)
-    } else {
-        translated(context, StockMessage::MsgEphemeralTimerWeeksBy)
-            .await
-            .replace1(weeks)
-            .replace2(by_contact.get_stock_name(context).await)
-    }
+    translated(context, StockMessage::MsgEphemeralTimerWeeks)
+        .await
+        .replace1(weeks)
+        .action_by_contact(context, by_contact)
+        .await
 }
 
 /// Stock string: `Forwarded`.
@@ -1338,6 +1256,12 @@ mod tests {
         // We have no string using %1$d to test...
     }
 
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_stock_string_repl_str2() {
+        let t = TestContext::new().await;
+        assert_eq!(msg_action_by_user(&t, "foo", "bar").await, "foo by bar.");
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_stock_system_msg_simple() {
         let t = TestContext::new().await;
@@ -1352,7 +1276,7 @@ mod tests {
         let t = TestContext::new().await;
         assert_eq!(
             msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
-            "You added member alice@example.org."
+            "Member alice@example.org added by me."
         )
     }
 
@@ -1364,7 +1288,7 @@ mod tests {
             .expect("failed to create contact");
         assert_eq!(
             msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
-            "You added member Alice (alice@example.org)."
+            "Member Alice (alice@example.org) added by me."
         );
     }
 

src/sync.rs

@@ -185,7 +185,7 @@ impl Context {
         }
     }
 
-    pub(crate) fn build_sync_part(&self, json: String) -> PartBuilder {
+    pub(crate) async fn build_sync_part(&self, json: String) -> PartBuilder {
         PartBuilder::new()
             .content_type(&"application/json".parse::<mime::Mime>().unwrap())
             .header((

src/test_utils.rs

@@ -44,7 +44,7 @@ pub struct TestContextManager {
 }
 
 impl TestContextManager {
-    pub fn new() -> Self {
+    pub async fn new() -> Self {
         let (log_tx, _log_sink) = LogSink::create();
         Self { log_tx, _log_sink }
     }
@@ -858,7 +858,7 @@ impl EventTracker {
     }
 
     /// Consumes all pending events.
-    pub fn consume_events(&self) {
+    pub async fn consume_events(&self) {
         while self.try_recv().is_ok() {}
     }
 }
@@ -1039,7 +1039,7 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_with_both() {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 

src/tests/aeap.rs

@@ -18,7 +18,7 @@ use crate::test_utils::TestContextManager;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_change_primary_self_addr() -> Result<()> {
-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
@@ -130,7 +130,7 @@ async fn check_aeap_transition(
     // the case where Bob already had contact with Alice's new address
     const ALICE_NEW_ADDR: &str = "fiona@example.net";
 
-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
@@ -362,7 +362,7 @@ async fn get_last_info_msg(t: &TestContext, chat_id: ChatId) -> Option<Message>
 /// to make Bob think that there was a transition to Fiona's address.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_aeap_replay_attack() -> Result<()> {
-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 

src/tools.rs

@@ -49,65 +49,6 @@ pub(crate) fn truncate(buf: &str, approx_chars: usize) -> Cow<str> {
     }
 }
 
-/// Shortens a string to a specified line count and adds "[...]" to the
-/// end of the shortened string.
-///
-/// returns tuple with the String and a boolean whether is was truncated
-pub(crate) fn truncate_by_lines(
-    buf: String,
-    max_lines: usize,
-    max_line_len: usize,
-) -> (String, bool) {
-    let mut lines = 0;
-    let mut line_chars = 0;
-    let mut break_point: Option<usize> = None;
-
-    for (index, char) in buf.char_indices() {
-        if char == '\n' {
-            line_chars = 0;
-            lines += 1;
-        } else {
-            line_chars += 1;
-            if line_chars > max_line_len {
-                line_chars = 1;
-                lines += 1;
-            }
-        }
-        if lines == max_lines {
-            break_point = Some(index);
-            break;
-        }
-    }
-
-    if let Some(end_pos) = break_point {
-        // Text has too many lines and needs to be truncated.
-        let text = {
-            if let Some(buffer) = buf.get(..end_pos) {
-                if let Some(index) = buffer.rfind(|c| c == ' ' || c == '\n') {
-                    buf.get(..=index)
-                } else {
-                    buf.get(..end_pos)
-                }
-            } else {
-                None
-            }
-        };
-
-        if let Some(truncated_text) = text {
-            (format!("{}{}", truncated_text, DC_ELLIPSIS), true)
-        } else {
-            // In case of indexing/slicing error, we return an error
-            // message as a preview and add HTML version. This should
-            // never happen.
-            let error_text = "[Truncation of the message failed, this is a bug in the Delta Chat core. Please report it.\nYou can still open the full text to view the original message.]";
-            (error_text.to_string(), true)
-        }
-    } else {
-        // text is unchanged
-        (buf, false)
-    }
-}
-
 /* ******************************************************************************
  * date/time tools
  ******************************************************************************/
@@ -803,79 +744,6 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
         );
     }
 
-    mod truncate_by_lines {
-        use super::*;
-
-        #[test]
-        fn test_just_text() {
-            let s = "this is a little test string".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 6),
-                ("this is a little test [...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn test_with_linebreaks() {
-            let s = "this\n is\n a little test string".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 6),
-                ("this\n is\n a little [...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn test_only_linebreaks() {
-            let s = "\n\n\n\n\n\n\n".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 5),
-                ("\n\n\n[...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn limit_hits_end() {
-            let s = "hello\n world !".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 2, 8),
-                ("hello\n world !".to_string(), false)
-            );
-        }
-
-        #[test]
-        fn test_edge() {
-            assert_eq!(
-                truncate_by_lines("".to_string(), 2, 4),
-                ("".to_string(), false)
-            );
-
-            assert_eq!(
-                truncate_by_lines("\n  hello \n world".to_string(), 2, 4),
-                ("\n  [...]".to_string(), true)
-            );
-            assert_eq!(
-                truncate_by_lines("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ".to_string(), 1, 2),
-                ("𐠈0[...]".to_string(), true)
-            );
-            assert_eq!(
-                truncate_by_lines("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ".to_string(), 1, 0),
-                ("[...]".to_string(), true)
-            );
-
-            // 9 characters, so no truncation
-            assert_eq!(
-                truncate_by_lines("𑒀ὐ￠🜀\u{1e01b}A a🟠".to_string(), 1, 12),
-                ("𑒀ὐ￠🜀\u{1e01b}A a🟠".to_string(), false),
-            );
-
-            // 12 characters, truncation
-            assert_eq!(
-                truncate_by_lines("𑒀ὐ￠🜀\u{1e01b}A a🟠bcd".to_string(), 1, 7),
-                ("𑒀ὐ￠🜀\u{1e01b}A [...]".to_string(), true),
-            );
-        }
-    }
-
     #[test]
     fn test_create_id() {
         let buf = create_id();

src/webxdc.rs

@@ -1,5 +1,6 @@
 //! # Handle webxdc messages.
 
+use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::path::Path;
 
@@ -20,6 +21,7 @@ use crate::mimeparser::SystemMessage;
 use crate::param::Param;
 use crate::param::Params;
 use crate::scheduler::InterruptInfo;
+use crate::sql::Sql;
 use crate::tools::{create_smeared_timestamp, get_abs_path};
 use crate::{chat, EventType};
 
@@ -377,6 +379,10 @@ impl Context {
             )
             .await?;
 
+        self.emit_event(EventType::WebxdcBusyUpdating {
+            msg_id: instance.id,
+        });
+
         if send_now {
             self.sql.insert(
                 "INSERT INTO smtp_status_updates (msg_id, first_serial, last_serial, descr) VALUES(?, ?, ?, ?)
@@ -390,7 +396,6 @@ impl Context {
     }
 
     /// Pops one record of queued webxdc status updates.
-    /// This function exists to make the sqlite statement testable.
     async fn pop_smtp_status_update(
         &self,
     ) -> Result<Option<(MsgId, StatusUpdateSerial, StatusUpdateSerial, String)>> {
@@ -414,12 +419,15 @@ impl Context {
     }
 
     /// Attempts to send queued webxdc status updates.
-    pub(crate) async fn flush_status_updates(&self) -> Result<()> {
+    ///
+    /// Returns true if there are more status updates to send, but rate limiter does not
+    /// allow to send them. Returns false if there are no more status updates to send.
+    pub(crate) async fn flush_status_updates(&self) -> Result<bool> {
         loop {
             let (instance_id, first_serial, last_serial, descr) =
                 match self.pop_smtp_status_update().await? {
                     Some(res) => res,
-                    None => return Ok(()),
+                    None => return Ok(false),
                 };
 
             if let Some(json) = self
@@ -445,7 +453,7 @@ impl Context {
         }
     }
 
-    pub(crate) fn build_status_update_part(&self, json: &str) -> PartBuilder {
+    pub(crate) async fn build_status_update_part(&self, json: &str) -> PartBuilder {
         PartBuilder::new()
             .content_type(&"application/json".parse::<mime::Mime>().unwrap())
             .header((
@@ -741,6 +749,15 @@ impl Message {
     }
 }
 
+/// Returns a hashset of all webxdc instaces which still have updates to send
+pub(crate) async fn get_busy_webxdc_instances(sql: &Sql) -> Result<HashSet<MsgId>> {
+    Ok(sql
+        .distinct("smtp_status_updates", "msg_id")
+        .await?
+        .into_iter()
+        .collect())
+}
+
 #[cfg(test)]
 mod tests {
     use crate::chat::{
@@ -948,7 +965,6 @@ mod tests {
     async fn test_resend_webxdc_instance_and_info() -> Result<()> {
         // Alice uses webxdc in a group
         let alice = TestContext::new_alice().await;
-        alice.set_config_bool(Config::BccSelf, false).await?;
         let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
         let alice_instance = send_webxdc_instance(&alice, alice_grp).await?;
         assert_eq!(alice_grp.get_msg_cnt(&alice).await?, 1);