Merge branch 'webxdc_delete_event' into webxdc_update_notifications

.cargo/config.toml

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

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -26,12 +26,15 @@ jobs:
       - run: rustup component add rustfmt
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v1
-      - run: cargo fmt --all -- --check
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
 
   run_clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: stable
@@ -51,7 +54,7 @@ jobs:
       RUSTDOCFLAGS: -Dwarnings
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Install rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -62,7 +65,10 @@ jobs:
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v1
       - name: Rustdoc
-        run: cargo doc --document-private-items --no-deps
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --document-private-items --no-deps
 
   build_and_test:
     name: Build and test
@@ -71,19 +77,19 @@ jobs:
         include:
           # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.65.0
+            rust: 1.61.0
             python: 3.9
           - os: windows-latest
-            rust: 1.65.0
+            rust: 1.61.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.61.0
+          # Minimum Supported Rust Version = 1.56.1
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.61.0
+            rust: 1.56.1
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
@@ -99,13 +105,21 @@ jobs:
       uses: swatinem/rust-cache@v1
 
     - name: check
-      run: cargo check --all --bins --examples --tests --features repl --benches
+      uses: actions-rs/cargo@v1
+      with:
+        command: check
+        args: --all --bins --examples --tests --features repl --benches
 
     - name: tests
-      run: cargo test --all
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
 
     - name: test cargo vendor
-      run: cargo vendor
+      uses: actions-rs/cargo@v1
+      with:
+        command: vendor
 
     - name: install python
       if: ${{ matrix.python }}
@@ -119,7 +133,10 @@ jobs:
 
     - name: build C library
       if: ${{ matrix.python }}
-      run: cargo build -p deltachat_ffi --features jsonrpc
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: -p deltachat_ffi --features jsonrpc
 
     - name: run python tests
       if: ${{ matrix.python }}
@@ -130,21 +147,6 @@ jobs:
       working-directory: python
       run: tox -e lint,mypy,doc,py3
 
-    - name: build deltachat-rpc-server
-      if: ${{ matrix.python }}
-      run: cargo build -p deltachat-rpc-server
-
-    - name: add deltachat-rpc-server to path
-      if: ${{ matrix.python }}
-      run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
-
-    - name: run deltachat-rpc-client tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      working-directory: deltachat-rpc-client
-      run: tox -e py3
-
     - name: install pypy
       if: ${{ matrix.python }}
       uses: actions/setup-python@v4

.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@v3
-      - uses: actions/setup-node@v3
-        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
-          npm pack .
-          ls -lah
-          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
-        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/"

.github/workflows/jsonrpc.yml

@@ -8,15 +8,14 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_MIN_STACK: "8388608"
 
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
           node-version: 16.x
       - uses: actions-rs/toolchain@v1

.github/workflows/node-delete-preview.yml

@@ -15,7 +15,7 @@ jobs:
       id: getid
       run: |
         export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-        echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
+        echo ::set-output name=prid::$PULLREQUEST_ID
     - name: Renaming
       run: |
         # create empty file to copy it over the outdated deliverable on download.delta.chat

.github/workflows/node-docs.yml

@@ -9,10 +9,10 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1
 
     - name: Use Node.js 16.x
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
       with:
         node-version: 16.x
 

.github/workflows/node-package.yml

@@ -16,8 +16,8 @@ jobs:
         os: [ubuntu-18.04, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ${{ env.APPDATA }}/npm-cache
@@ -37,7 +37,7 @@ jobs:
           key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry/
@@ -58,7 +58,7 @@ jobs:
           tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
 
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.os }}
           path: node/${{ matrix.os }}.tar.gz
@@ -71,7 +71,7 @@ jobs:
       - name: install tree
         run: sudo apt install tree
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
@@ -134,7 +134,7 @@ jobs:
           ls -lah
           mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v1
         with:
           name: deltachat-node.tgz
           path: ${{ env.DELTACHAT_NODE_TAR_GZ }}

.github/workflows/node-tests.yml

@@ -16,8 +16,8 @@ jobs:
         os: [ubuntu-18.04, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ${{ env.APPDATA }}/npm-cache
@@ -37,7 +37,7 @@ jobs:
           key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry/
@@ -52,7 +52,6 @@ jobs:
           npm install --verbose
 
       - name: Test
-        timeout-minutes: 10
         if: runner.os != 'Windows'
         run: |
           cd node
@@ -60,7 +59,6 @@ jobs:
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
       - name: Run tests on Windows, except lint
-        timeout-minutes: 10
         if: runner.os == 'Windows'
         run: |
           cd node

.github/workflows/repl.yml

@@ -11,7 +11,7 @@ jobs:
     name: Build REPL example
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@master
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
@@ -20,10 +20,13 @@ jobs:
         override: true
 
     - name: build
-      run: cargo build --example repl --features repl,vendored
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: --example repl --features repl,vendored
 
     - name: Upload binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: repl.exe
         path: 'target/debug/examples/repl.exe'

.github/workflows/upload-docs.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1
     - uses: actions-rs/toolchain@v1
     - name: Build the documentation with cargo
       run: |

.github/workflows/upload-ffi-docs.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1
     - uses: actions-rs/toolchain@v1
     - name: Build the documentation with cargo
       run: |

.gitignore

@@ -12,8 +12,8 @@ include
 *.db
 *.db-blobs
 
-.tox
 python/.eggs
+python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so

CHANGELOG.md

@@ -2,233 +2,6 @@
 
 ## Unreleased
 
-### Changes
-
-### API-Changes
-
-### Fixes
-
-
-## 1.103.0
-
-### Changes
-- Disable Autocrypt & Authres-checking for mailing lists,
-  because they don't work well with mailing lists #3765
-- Refactor: Remove the remaining AsRef<str> #3669
-- Add more logging to `fetch_many_msgs` and refactor it #3811
-- Small speedup #3780
-- Log the reason when the message cannot be sent to the chat #3810
-- Add IMAP server ID line to the context info only when it is known #3814
-- Remove autogenerated typescript files #3815
-- Move functions that require an IMAP session from `Imap` to `Session`
-  to reduce the number of code paths where IMAP session may not exist.
-  Drop connection on error instead of trying to disconnect,
-  potentially preventing IMAP task from getting stuck. #3812
-
-### API-Changes
-- Add Python API to send reactions #3762
-- jsonrpc: add message errors to MessageObject #3788
-- jsonrpc: Add async Python client #3734
-
-### Fixes
-- Make sure malformed messsages will never block receiving further messages anymore #3771
-- strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
-- Assume all Thunderbird users prefer encryption #3774
-- refactor peerstate handling to ensure no duplicate peerstates #3776
-- Fetch messages in order of their INTERNALDATE (fixes reactions for Gmail f.e.) #3789
-- python: do not pass NULL to ffi.gc if the context can't be created #3818
-- Add read/write timeouts to IMAP sockets #3820
-- Add connection timeout to IMAP sockets #3828
-- Disable read timeout during IMAP IDLE #3826
-- Bots automatically accept mailing lists #3831
-
-
-## 1.102.0
-
-### Changes
-
-- If an email has multiple From addresses, handle this as if there was
-  no From address, to prevent from forgery attacks. Also, improve
-  handling of emails with invalid From addresses in general #3667
-
-### API-Changes
-
-### Fixes
-- fix detection of "All mail", "Trash", "Junk" etc folders. #3760
-- fetch messages sequentially to fix reactions on partially downloaded messages #3688
-- Fix a bug where one malformed message blocked receiving any further messages #3769
-
-
-## 1.101.0
-
-### Changes
-- add `configured_inbox_folder` to account info #3748
-- `dc_delete_contact()` hides contacts if referenced #3751
-- add IMAP UIDs to message info #3755
-
-### Fixes
-- improve IMAP logging, in particular fix incorrect "IMAP IDLE protocol
-  timed out" message on network error during IDLE #3749
-- pop Recently Seen Loop event out of the queue when it is in the past
-  to avoid busy looping #3753
-- fix build failures by going back to standard `async_zip` #3747
-
-
-## 1.100.0
-
-### API-Changes
-- jsonrpc: add `miscSaveSticker` method
-
-### Changes
-- add JSON-RPC stdio server `deltachat-rpc-server` and use it for JSON-RPC tests #3695
-- update rPGP from 0.8 to 0.9 #3737
-- jsonrpc: typescript client: use npm released deltachat fork of the tiny emitter package #3741
-- jsonrpc: show sticker image in quote #3744
-
-
-
-## 1.99.0
-
-### API-Changes
-- breaking jsonrpc: changed function naming
-  - `autocryptInitiateKeyTransfer` -> `initiateAutocryptKeyTransfer`
-  - `autocryptContinueKeyTransfer` -> `continueAutocryptKeyTransfer`
-  - `chatlistGetFullChatById` -> `getFullChatById`
-  - `messageGetMessage` -> `getMessage`
-  - `messageGetMessages` -> `getMessages`
-  - `messageGetNotificationInfo` -> `getMessageNotificationInfo`
-  - `contactsGetContact` -> `getContact`
-  - `contactsCreateContact` -> `createContact`
-  - `contactsCreateChatByContactId` -> `createChatByContactId`
-  - `contactsBlock` -> `blockContact`
-  - `contactsUnblock` -> `unblockContact`
-  - `contactsGetBlocked` -> `getBlockedContacts`
-  - `contactsGetContactIds` -> `getContactIds`
-  - `contactsGetContacts` -> `getContacts`
-  - `contactsGetContactsByIds` -> `getContactsByIds`
-  - `chatGetMedia` -> `getChatMedia`
-  - `chatGetNeighboringMedia` -> `getNeighboringChatMedia`
-  - `webxdcSendStatusUpdate` -> `sendWebxdcStatusUpdate`
-  - `webxdcGetStatusUpdates` -> `getWebxdcStatusUpdates`
-  - `messageGetWebxdcInfo` -> `getWebxdcInfo`
-- jsonrpc: changed method signature
-  - `miscSendTextMessage(accountId, text, chatId)` -> `miscSendTextMessage(accountId, chatId, text)`
-- jsonrpc: add `SystemMessageType` to `Message`
-- cffi: add missing `DC_INFO_` constants
-- Add DC_EVENT_INCOMING_MSG_BUNCH event #3643
-- Python bindings: Make get_matching() only match the
-  whole event name, e.g. events.get_matching("DC_EVENT_INCOMING_MSG")
-  won't match DC_EVENT_INCOMING_MSG_BUNCH anymore #3643
-
-
-- Rust: Introduce a ContextBuilder #3698
-
-### Changes
-- allow sender timestamp to be in the future, but not too much
-- Disable the new "Authentication-Results/DKIM checking" security feature
-  until we have tested it a bit #3728
-- refactorings #3706
-
-### Fixes
-- `dc_search_msgs()` returns unaccepted requests #3694
-- emit "contacts changed" event when the contact is no longer "seen recently" #3703
-- do not allow peerstate reset if DKIM check failed #3731
-
-
-## 1.98.0
-
-### API-Changes
-- jsonrpc: typescript client: export constants under `C` enum, similar to how its exported from `deltachat-node` #3681
-- added reactions support #3644
-- jsonrpc: reactions: added reactions to `Message` type and the `sendReaction()` method #3686
-
-### Changes
-- simplify `UPSERT` queries #3676
-
-### Fixes
-
-
-## 1.97.0
-
-### API-Changes
-- jsonrpc: add function: #3641, #3645, #3653
-  - `getChatContacts()`
-  - `createGroupChat()`
-  - `createBroadcastList()`
-  - `setChatName()`
-  - `setChatProfileImage()`
-  - `downloadFullMessage()`
-  - `lookupContactIdByAddr()`
-  - `sendVideochatInvitation()`
-  - `searchMessages()`
-  - `messageIdsToSearchResults()`
-  - `setChatVisibility()`
-  - `getChatEphemeralTimer()`
-  - `setChatEphemeralTimer()`
-  - `getLocations()`
-  - `getAccountFileSize()`
-  - `estimateAutoDeletionCount()`
-  - `setStockStrings()`
-  - `exportSelfKeys()`
-  - `importSelfKeys()`
-  - `sendSticker()`
-  - `changeContactName()`
-  - `deleteContact()`
-  - `joinSecurejoin()`
-  - `stopIoForAllAccounts()`
-  - `startIoForAllAccounts()`
-  - `startIo()`
-  - `stopIo()`
-  - `exportBackup()`
-  - `importBackup()`
-  - `getMessageHtml()` #3671
-  - `miscGetStickerFolder` and `miscGetStickers` #3672
-- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now prefered way of using the message list.
-- jsonrpc: add type: #3641, #3645
-  - `MessageSearchResult`
-  - `Location`
-- jsonrpc: add `viewType` to quoted message(`MessageQuote` type) in `Message` object type #3651
-
-
-### Changes
-- Look at Authentication-Results. Don't accept Autocrypt key changes
-  if they come with negative authentiation results while this contact
-  sent emails with positive authentication results in the past. #3583
-- jsonrpc in cffi also sends events now #3662
-- jsonrpc: new format for events and better typescript autocompletion
-- Join all "[migration] vXX" log messages into one
-
-### Fixes
-- share stock string translations across accounts created by the same account manager #3640
-- suppress welcome device messages after account import #3642
-- fix unix timestamp used for daymarker #3660
-
-## 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
 
@@ -238,7 +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
+- 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
   - `deleteChat()`
   - `getChatEncryptionInfo()`
@@ -270,15 +43,14 @@
 - 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.toml

@@ -1,19 +1,16 @@
 [package]
 name = "deltachat"
-version = "1.103.0"
+version = "1.93.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.61"
+rust-version = "1.56"
 
 [profile.dev]
 debug = 0
 panic = 'abort'
 opt-level = 1
 
-[profile.test]
-opt-level = 0
-
 [profile.release]
 lto = true
 panic = 'abort'
@@ -26,7 +23,7 @@ anyhow = "1"
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.22"
+trust-dns-resolver = "0.21"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 backtrace = "0.3"
@@ -39,25 +36,25 @@ encoded-words = { git = "https://github.com/async-email/encoded-words", branch =
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
 log = {version = "0.4.16", optional = true }
 mailparse = "0.13"
 native-tls = "0.2"
-num_cpus = "1.14"
+num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.16.0"
-percent-encoding = "2.2"
-pgp = { version = "0.9", default-features = false }
+once_cell = "1.13.1"
+percent-encoding = "2.0"
+pgp = { version = "0.8", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
 quick-xml = "0.23"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
 rand = "0.8"
-regex = "1.7"
+regex = "1.6"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustyline = { version = "10", optional = true }
@@ -74,20 +71,19 @@ toml = "0.5"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 fast-socks5 = "0.8"
-humansize = "2"
+humansize = "1"
 qrcodegen = "1.7.0"
-tagger = "4.3.4"
-textwrap = "0.16.0"
-async-channel = "1.8.0"
+tagger = "4.3.3"
+textwrap = "0.15.0"
+async-channel = "1.6.1"
 futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.11", features = ["fs"] }
-tokio-io-timeout = "1.2.0"
-reqwest = { version = "0.11.13", features = ["json"] }
-async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
+tokio-stream = { version = "0.1.9", features = ["fs"] }
+reqwest = { version = "0.11.11", features = ["json"] }
+async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.4.0", features = ["async_tokio"] }
+criterion = { version = "0.3.6", features = ["async_tokio"] }
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
@@ -99,8 +95,7 @@ tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc",
-  "deltachat-rpc-server"
+  "deltachat-jsonrpc"
 ]
 
 [[example]]

README.md

@@ -120,26 +120,15 @@ $ cargo test -- --ignored
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
 - `nightly`: Enable nightly only performance and security related features.
 
-## Update Provider Data
-
-To add the updates from the
-[provider-db](https://github.com/deltachat/provider-db) to the core, run:
-
-```
-./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
-```
-
 ## Language bindings and frontend projects
 
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** 
-  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
-  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
+- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 
 The following "frontend" projects make use of the Rust-library
@@ -151,5 +140,3 @@ or its language bindings:
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**
-
-[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

benches/contacts.rs

@@ -1,7 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 use tempfile::tempdir;
 
@@ -9,9 +8,7 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
 
     let book = (0..n)
         .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))

benches/get_chat_msgs.rs

@@ -5,14 +5,11 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 
 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let id = 100;
-    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile, id, Events::new()).await.unwrap();
 
     for c in chats.iter().take(10) {
         black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
@@ -26,7 +23,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         let rt = tokio::runtime::Runtime::new().unwrap();
 
         let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+            let context = Context::new(Path::new(&path), 100, Events::new())
                 .await
                 .unwrap();
             let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();

benches/get_chatlist.rs

@@ -4,7 +4,6 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 
 async fn get_chat_list_benchmark(context: &Context) {
@@ -17,7 +16,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
         let rt = tokio::runtime::Runtime::new().unwrap();
         let context = rt.block_on(async {
-            Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+            Context::new(Path::new(&path), 100, Events::new())
                 .await
                 .unwrap()
         });

benches/receive_emails.rs

@@ -6,7 +6,6 @@ use deltachat::{
     context::Context,
     imex::{imex, ImexMode},
     receive_imf::receive_imf,
-    stock_str::StockStrings,
     Events,
 };
 use tempfile::tempdir;
@@ -38,66 +37,11 @@ Hello {i}",
     context
 }
 
-/// Receive 100 emails that remove charlie@example.com and add
-/// him back
-async fn recv_groupmembership_emails(context: Context) -> Context {
-    for i in 0..50 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-    }
-    context
-}
-
 async fn create_context() -> Context {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(dbfile.as_path(), id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
 
     let backup: PathBuf = std::env::current_dir()
         .unwrap()
@@ -105,7 +49,7 @@ async fn create_context() -> Context {
 
     if backup.exists() {
         println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, backup.as_path(), None)
+        imex(&context, ImexMode::ImportBackup, &backup, None)
             .await
             .unwrap();
     }
@@ -136,20 +80,6 @@ fn criterion_benchmark(c: &mut Criterion) {
             }
         });
     });
-    group.bench_function(
-        "Receive 100 Chat-Group-Member-{Added|Removed} messages",
-        |b| {
-            let rt = tokio::runtime::Runtime::new().unwrap();
-            let context = rt.block_on(create_context());
-
-            b.to_async(&rt).iter(|| {
-                let ctx = context.clone();
-                async move {
-                    recv_groupmembership_emails(black_box(ctx)).await;
-                }
-            });
-        },
-    );
     group.finish();
 }
 

benches/search_msgs.rs

@@ -1,12 +1,11 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 use std::path::Path;
 
 async fn search_benchmark(dbfile: impl AsRef<Path>) {
     let id = 100;
-    let context = Context::new(dbfile.as_ref(), id, Events::new(), StockStrings::new())
+    let context = Context::new(dbfile.as_ref(), id, Events::new())
         .await
         .unwrap();
 

deltachat-ffi/Cargo.toml

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

deltachat-ffi/deltachat.h

@@ -11,17 +11,16 @@ extern "C" {
 #endif
 
 
-typedef struct _dc_context   dc_context_t;
-typedef struct _dc_accounts  dc_accounts_t;
-typedef struct _dc_array     dc_array_t;
-typedef struct _dc_chatlist  dc_chatlist_t;
-typedef struct _dc_chat      dc_chat_t;
-typedef struct _dc_msg       dc_msg_t;
-typedef struct _dc_reactions dc_reactions_t;
-typedef struct _dc_contact   dc_contact_t;
-typedef struct _dc_lot       dc_lot_t;
-typedef struct _dc_provider  dc_provider_t;
-typedef struct _dc_event     dc_event_t;
+typedef struct _dc_context  dc_context_t;
+typedef struct _dc_accounts dc_accounts_t;
+typedef struct _dc_array    dc_array_t;
+typedef struct _dc_chatlist dc_chatlist_t;
+typedef struct _dc_chat     dc_chat_t;
+typedef struct _dc_msg      dc_msg_t;
+typedef struct _dc_contact  dc_contact_t;
+typedef struct _dc_lot      dc_lot_t;
+typedef struct _dc_provider dc_provider_t;
+typedef struct _dc_event    dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
 
@@ -469,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
@@ -992,34 +991,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);
 
 
-/**
- * Send a reaction to message.
- *
- * Reaction is a string of emojis separated by spaces. Reaction to a
- * single message can be sent multiple times. The last reaction
- * received overrides all previously received reactions. It is
- * possible to remove all reactions by sending an empty string.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id ID of the message you react to.
- * @param reaction A string consisting of emojis separated by spaces.
- * @return The ID of the message sent out or 0 for errors.
- */
-uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reaction);
-
-
-/**
- * Get a structure with reactions to the message.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id The message ID to get reactions for.
- * @return A structure with all reactions to the message.
- */
-dc_reactions_t* dc_get_msg_reactions (dc_context_t *context, int msg_id);
-
-
 /**
  * A webxdc instance sends a status update to its other members.
  *
@@ -2056,9 +2027,8 @@ char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t co
 
 
 /**
- * Delete a contact so that it disappears from the corresponding lists.
- * Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
- * The contact is deleted from the local device.
+ * Delete a contact. The contact is deleted from the local device. It may happen that this is not
+ * possible as the contact is in use. In this case, the contact can be blocked.
  *
  * May result in a #DC_EVENT_CONTACTS_CHANGED event.
  *
@@ -2204,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
@@ -2273,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
@@ -2300,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.
@@ -2373,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.
@@ -4098,19 +4064,9 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 
 
 // DC_INFO* uses the same values as SystemMessage in rust-land
-#define         DC_INFO_UNKNOWN                    0
-#define         DC_INFO_GROUP_NAME_CHANGED         2
-#define         DC_INFO_GROUP_IMAGE_CHANGED        3
-#define         DC_INFO_MEMBER_ADDED_TO_GROUP      4
-#define         DC_INFO_MEMBER_REMOVED_FROM_GROUP  5
-#define         DC_INFO_AUTOCRYPT_SETUP_MESSAGE    6
-#define         DC_INFO_SECURE_JOIN_MESSAGE        7
-#define         DC_INFO_LOCATIONSTREAMING_ENABLED  8
-#define         DC_INFO_LOCATION_ONLY              9
-#define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
-#define         DC_INFO_PROTECTION_ENABLED        11
-#define         DC_INFO_PROTECTION_DISABLED       12
-#define         DC_INFO_WEBXDC_INFO_MESSAGE       32
+#define         DC_INFO_PROTECTION_ENABLED     11
+#define         DC_INFO_PROTECTION_DISABLED    12
+
 
 /**
  * Check if a message is still in creation. A message is in creation between
@@ -4922,49 +4878,7 @@ uint32_t        dc_lot_get_id            (const dc_lot_t* lot);
  * @param lot The lot object.
  * @return The timestamp as defined by the creator of the object. 0 if there is not timestamp or on errors.
  */
-int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
-
-
-/**
- * @class dc_reactions_t
- *
- * An object representing all reactions for a single message.
- */
-
-/**
- * Returns array of contacts which reacted to the given message.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
- *         dc_array_get_id() to get the IDs. Should be freed using `dc_array_unref()` after usage.
- */
-dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
-
-
-/**
- * Returns a string containing space-separated reactions of a single contact.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @param contact_id ID of the contact.
- * @return Space-separated list of emoji sequences, which could be empty.
- *         Returned string should not be modified and should be freed
- *         with dc_str_unref() after usage.
- */
-char*           dc_reactions_get_by_contact_id(dc_reactions_t* reactions, uint32_t contact_id);
-
-
-/**
- * Frees an object containing message reactions.
- *
- * Reactions objects are created by dc_get_msg_reactions().
- *
- * @memberof dc_reactions_t
- * @param reactions The object to free.
- *     If NULL is given, nothing is done.
- */
-void            dc_reactions_unref       (dc_reactions_t* reactions);
+int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 
 /**
@@ -5615,15 +5529,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_MSGS_CHANGED             2000
 
 
-/**
- * Message reactions changed.
- *
- * @param data1 (int) chat_id ID of the chat affected by the changes.
- * @param data2 (int) msg_id ID of the message for which reactions were changed.
- */
-#define DC_EVENT_REACTIONS_CHANGED        2001
-
-
 /**
  * There is a fresh message. Typically, the user will show an notification
  * when receiving this message.
@@ -5635,17 +5540,6 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_INCOMING_MSG             2005
 
-/**
- * Downloading a bunch of messages just finished. This is an experimental
- * event to allow the UI to only show one notification per message bunch,
- * instead of cluttering the user with many notifications.
- * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
- * 
- * @param data1 0
- * @param data2 (char*) msg_ids, a json object with the message ids.
- */
-#define DC_EVENT_INCOMING_MSG_BUNCH       2006
-
 
 /**
  * Messages were marked noticed or seen.
@@ -5837,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
+
 /**
  * @}
  */

deltachat-ffi/src/dc_array.rs

@@ -1,6 +1,5 @@
 use crate::chat::ChatItem;
 use crate::constants::DC_MSG_ID_DAYMARKER;
-use crate::contact::ContactId;
 use crate::location::Location;
 use crate::message::MsgId;
 
@@ -8,7 +7,6 @@ use crate::message::MsgId;
 #[derive(Debug, Clone)]
 pub enum dc_array_t {
     MsgIds(Vec<MsgId>),
-    ContactIds(Vec<ContactId>),
     Chat(Vec<ChatItem>),
     Locations(Vec<Location>),
     Uint(Vec<u32>),
@@ -18,7 +16,6 @@ impl dc_array_t {
     pub(crate) fn get_id(&self, index: usize) -> u32 {
         match self {
             Self::MsgIds(array) => array[index].to_u32(),
-            Self::ContactIds(array) => array[index].to_u32(),
             Self::Chat(array) => match array[index] {
                 ChatItem::Message { msg_id } => msg_id.to_u32(),
                 ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
@@ -31,7 +28,6 @@ impl dc_array_t {
     pub(crate) fn get_timestamp(&self, index: usize) -> Option<i64> {
         match self {
             Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
             Self::Chat(array) => array.get(index).and_then(|item| match item {
                 ChatItem::Message { .. } => None,
                 ChatItem::DayMarker { timestamp } => Some(*timestamp),
@@ -44,7 +40,6 @@ impl dc_array_t {
     pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
         match self {
             Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
             Self::Chat(_) => None,
             Self::Locations(array) => array
                 .get(index)
@@ -65,7 +60,6 @@ impl dc_array_t {
     pub(crate) fn len(&self) -> usize {
         match self {
             Self::MsgIds(array) => array.len(),
-            Self::ContactIds(array) => array.len(),
             Self::Chat(array) => array.len(),
             Self::Locations(array) => array.len(),
             Self::Uint(array) => array.len(),
@@ -89,12 +83,6 @@ impl From<Vec<MsgId>> for dc_array_t {
     }
 }
 
-impl From<Vec<ContactId>> for dc_array_t {
-    fn from(array: Vec<ContactId>) -> Self {
-        dc_array_t::ContactIds(array)
-    }
-}
-
 impl From<Vec<ChatItem>> for dc_array_t {
     fn from(array: Vec<ChatItem>) -> Self {
         dc_array_t::Chat(array)

deltachat-ffi/src/lib.rs

@@ -37,9 +37,7 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
-use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
@@ -67,8 +65,6 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
-pub type dc_reactions_t = Reactions;
-
 static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));
 
 fn block_on<T>(fut: T) -> T::Output
@@ -102,12 +98,7 @@ pub unsafe extern "C" fn dc_context_new(
     let ctx = if blobdir.is_null() || *blobdir == 0 {
         // generate random ID as this functionality is not yet available on the C-api.
         let id = rand::thread_rng().gen();
-        block_on(Context::new(
-            as_path(dbfile),
-            id,
-            Events::new(),
-            StockStrings::new(),
-        ))
+        block_on(Context::new(as_path(dbfile), id, Events::new()))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
         return ptr::null_mut();
@@ -131,12 +122,7 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
     }
 
     let id = rand::thread_rng().gen();
-    match block_on(Context::new_closed(
-        as_path(dbfile),
-        id,
-        Events::new(),
-        StockStrings::new(),
-    )) {
+    match block_on(Context::new_closed(as_path(dbfile), id, Events::new())) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
             eprintln!("failed to create context: {:#}", err);
@@ -183,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]
@@ -477,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]
@@ -501,9 +487,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::Error(_) => 400,
         EventType::ErrorSelfNotInGroup(_) => 410,
         EventType::MsgsChanged { .. } => 2000,
-        EventType::ReactionsChanged { .. } => 2001,
         EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch { .. } => 2006,
         EventType::MsgsNoticed { .. } => 2008,
         EventType::MsgDelivered { .. } => 2010,
         EventType::MsgFailed { .. } => 2012,
@@ -521,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,
     }
 }
 
@@ -545,10 +531,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::Error(_)
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
-        | EventType::IncomingMsgBunch { .. }
         | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
-        | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
         | EventType::MsgsNoticed(chat_id)
         | EventType::MsgDelivered { chat_id, .. }
@@ -570,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,
     }
 }
 
@@ -602,11 +588,11 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
         | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::IncomingMsgBunch { .. }
+        | EventType::WebxdcBusyUpdating { .. }
+        | EventType::WebxdcUpToDate { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
-        | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
         | EventType::MsgFailed { msg_id, .. }
@@ -646,7 +632,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             data2.into_raw()
         }
         EventType::MsgsChanged { .. }
-        | EventType::ReactionsChanged { .. }
         | EventType::IncomingMsg { .. }
         | EventType::MsgsNoticed(_)
         | EventType::MsgDelivered { .. }
@@ -662,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 {
@@ -674,11 +661,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = file.to_c_string().unwrap_or_default();
             data2.into_raw()
         }
-        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
-            .unwrap_or_default()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
     }
 }
 
@@ -713,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]
@@ -963,48 +945,6 @@ pub unsafe extern "C" fn dc_send_videochat_invitation(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_send_reaction(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    reaction: *const libc::c_char,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_reaction()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        send_reaction(ctx, MsgId::new(msg_id), &to_string_lossy(reaction))
-            .await
-            .map(|msg_id| msg_id.to_u32())
-            .unwrap_or_log_default(ctx, "Failed to send reaction")
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_msg_reactions(
-    context: *mut dc_context_t,
-    msg_id: u32,
-) -> *mut dc_reactions_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_msg_reactions()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
-        .log_err(ctx, "failed dc_get_msg_reactions() call")
-    {
-        reactions
-    } else {
-        return ptr::null_mut();
-    };
-
-    Box::into_raw(Box::new(reactions))
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_webxdc_status_update(
     context: *mut dc_context_t,
@@ -1659,7 +1599,7 @@ pub unsafe extern "C" fn dc_set_chat_profile_image(
     let ctx = &*context;
 
     block_on(async move {
-        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), &to_string_lossy(image))
+        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), to_string_lossy(image))
             .await
             .map(|_| 1)
             .unwrap_or_log_default(ctx, "Failed to set profile image")
@@ -2144,10 +2084,7 @@ pub unsafe extern "C" fn dc_delete_contact(
     block_on(async move {
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
-            Err(err) => {
-                error!(ctx, "cannot delete contact: {}", err);
-                0
-            }
+            Err(_) => 0,
         }
     })
 }
@@ -2497,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]
@@ -2678,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]
@@ -2823,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]
@@ -2863,11 +2800,7 @@ pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *
         return "".strdup();
     }
     let ffi_chat = &*chat;
-    ffi_chat
-        .chat
-        .get_mailinglist_addr()
-        .unwrap_or_default()
-        .strdup()
+    ffi_chat.chat.get_mailinglist_addr().strdup()
 }
 
 #[no_mangle]
@@ -3097,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]
@@ -3819,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]
@@ -3983,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]
@@ -4052,45 +3985,6 @@ pub unsafe extern "C" fn dc_lot_get_timestamp(lot: *mut dc_lot_t) -> i64 {
     lot.get_timestamp()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_contacts(
-    reactions: *mut dc_reactions_t,
-) -> *mut dc_array::dc_array_t {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_contacts()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    let array: dc_array_t = reactions.contacts().into();
-
-    Box::into_raw(Box::new(array))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_by_contact_id(
-    reactions: *mut dc_reactions_t,
-    contact_id: u32,
-) -> *mut libc::c_char {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_by_contact_id()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    reactions.get(ContactId::new(contact_id)).as_str().strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_unref(reactions: *mut dc_reactions_t) {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_unref()");
-        return;
-    }
-
-    drop(Box::from_raw(reactions));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_str_unref(s: *mut libc::c_char) {
     libc::free(s as *mut _)
@@ -4314,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)
 }
@@ -4330,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)
 }
@@ -4476,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))
@@ -4546,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))
 }
@@ -4555,13 +4447,11 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
 mod jsonrpc {
     use super::*;
     use deltachat_jsonrpc::api::CommandApi;
-    use deltachat_jsonrpc::events::event_to_json_rpc_notification;
     use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
 
     pub struct dc_jsonrpc_instance_t {
         receiver: OutReceiver,
         handle: RpcSession<CommandApi>,
-        event_thread: JoinHandle<Result<(), anyhow::Error>>,
     }
 
     #[no_mangle]
@@ -4577,36 +4467,9 @@ mod jsonrpc {
             deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());
 
         let (request_handle, receiver) = RpcClient::new();
-        let request_handle2 = request_handle.clone();
         let handle = RpcSession::new(request_handle, cmd_api);
 
-        let events = block_on({
-            async {
-                let am = (*account_manager).inner.clone();
-                let ev = am.read().await.get_event_emitter();
-                drop(am);
-                ev
-            }
-        });
-
-        let event_thread = spawn({
-            async move {
-                while let Some(event) = events.recv().await {
-                    let event = event_to_json_rpc_notification(event);
-                    request_handle2
-                        .send_notification("event", Some(event))
-                        .await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        let instance = dc_jsonrpc_instance_t {
-            receiver,
-            handle,
-            event_thread,
-        };
+        let instance = dc_jsonrpc_instance_t { receiver, handle };
 
         Box::into_raw(Box::new(instance))
     }
@@ -4617,8 +4480,8 @@ mod jsonrpc {
             eprintln!("ignoring careless call to dc_jsonrpc_unref()");
             return;
         }
-        (*jsonrpc_instance).event_thread.abort();
-        drop(Box::from_raw(jsonrpc_instance));
+
+        Box::from_raw(jsonrpc_instance);
     }
 
     #[no_mangle]

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.103.0"
+version = "1.93.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
@@ -19,21 +19,19 @@ num-traits = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.3.0"
 log = "0.4"
-async-channel = { version = "1.8.0" }
-futures = { version = "0.3.25" }
-serde_json = "1.0.89"
+async-channel = { version = "1.6.1" }
+futures = { version = "0.3.24" }
+serde_json = "1.0.85"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.22.0" }
-sanitize-filename = "0.4"
-walkdir = "2.3.2"
+typescript-type-def = { version = "0.5.3", features = ["json_value"] }
+tokio = { version = "1.19.2" }
 
 # optional dependencies
-axum = { version = "0.6.1", optional = true, features = ["ws"] }
-env_logger = { version = "0.10.0", optional = true }
+axum = { version = "0.5.9", optional = true, features = ["ws"] }
+env_logger = { version = "0.9.0", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.22.0", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.19.2", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api/events.rs

@@ -4,383 +4,148 @@ use serde_json::{json, Value};
 use typescript_type_def::TypeDef;
 
 pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    let id: JSONRPCEventType = event.typ.into();
+    let (field1, field2): (Value, Value) = match &event.typ {
+        // events with a single string in field1
+        EventType::Info(txt)
+        | EventType::SmtpConnected(txt)
+        | EventType::ImapConnected(txt)
+        | EventType::SmtpMessageSent(txt)
+        | EventType::ImapMessageDeleted(txt)
+        | EventType::ImapMessageMoved(txt)
+        | EventType::NewBlobFile(txt)
+        | EventType::DeletedBlobFile(txt)
+        | EventType::Warning(txt)
+        | EventType::Error(txt)
+        | EventType::ErrorSelfNotInGroup(txt) => (json!(txt), Value::Null),
+        EventType::ImexFileWritten(path) => (json!(path.to_str()), Value::Null),
+        // single number
+        EventType::MsgsNoticed(chat_id) | EventType::ChatModified(chat_id) => {
+            (json!(chat_id), Value::Null)
+        }
+        EventType::ImexProgress(progress) => (json!(progress), Value::Null),
+        // both fields contain numbers
+        EventType::MsgsChanged { chat_id, msg_id }
+        | EventType::IncomingMsg { chat_id, msg_id }
+        | EventType::MsgDelivered { chat_id, msg_id }
+        | EventType::MsgFailed { chat_id, msg_id }
+        | EventType::MsgRead { chat_id, msg_id } => (json!(chat_id), json!(msg_id)),
+        EventType::ChatEphemeralTimerModified { chat_id, timer } => (json!(chat_id), json!(timer)),
+        EventType::SecurejoinInviterProgress {
+            contact_id,
+            progress,
+        }
+        | EventType::SecurejoinJoinerProgress {
+            contact_id,
+            progress,
+        } => (json!(contact_id), json!(progress)),
+        // field 1 number or null
+        EventType::ContactsChanged(maybe_number) | EventType::LocationChanged(maybe_number) => (
+            match maybe_number {
+                Some(number) => json!(number),
+                None => Value::Null,
+            },
+            Value::Null,
+        ),
+        // number and maybe string
+        EventType::ConfigureProgress { progress, comment } => (
+            json!(progress),
+            match comment {
+                Some(content) => json!(content),
+                None => Value::Null,
+            },
+        ),
+        EventType::ConnectivityChanged => (Value::Null, Value::Null),
+        EventType::SelfavatarChanged => (Value::Null, Value::Null),
+        EventType::WebxdcStatusUpdate {
+            msg_id,
+            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();
     json!({
-        "event": id,
+        "id": id,
         "contextId": event.id,
+        "field1": field1,
+        "field2": field2
     })
 }
 
 #[derive(Serialize, TypeDef)]
-#[serde(tag = "type", rename = "Event")]
-pub enum JSONRPCEventType {
-    /// The library-user may write an informational string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Info {
-        msg: String,
-    },
-
-    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected {
-        msg: String,
-    },
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected {
-        msg: String,
-    },
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved {
-        msg: String,
-    },
-
-    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile {
-        file: String,
-    },
-
-    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile {
-        file: String,
-    },
-
-    /// The library-user should write a warning string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Warning {
-        msg: String,
-    },
-
-    /// The library-user should report an error to the end-user.
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a messasge box then.
-    Error {
-        msg: String,
-    },
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// setChatName(), setChatProfileImage(),
-    /// addContactToChat(), removeContactFromChat(),
-    /// and messages sending functions.
-    ErrorSelfNotInGroup {
-        msg: String,
-    },
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    ///
-    /// `chatId` is set if only a single chat is affected by the changes, otherwise 0.
-    /// `msgId` is set if only a single message is affected by the changes, otherwise 0.
-    #[serde(rename_all = "camelCase")]
-    MsgsChanged {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Reactions for the message changed.
-    #[serde(rename_all = "camelCase")]
-    ReactionsChanged {
-        chat_id: u32,
-        msg_id: u32,
-        contact_id: u32,
-    },
-
-    /// There is a fresh message. Typically, the user will show an notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsg {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Downloading a bunch of messages just finished. This is an experimental
-    /// event to allow the UI to only show one notification per message bunch,
-    /// instead of cluttering the user with many notifications.
-    ///
-    /// msg_ids contains the message ids.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch {
-        msg_ids: Vec<u32>,
-    },
-
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[serde(rename_all = "camelCase")]
-    MsgsNoticed {
-        chat_id: u32,
-    },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgDelivered {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgFailed {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgRead {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See setChatName(), setChatProfileImage(), addContactToChat()
-    /// and removeContactFromChat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
-    #[serde(rename_all = "camelCase")]
-    ChatModified {
-        chat_id: u32,
-    },
-
-    /// Chat ephemeral timer changed.
-    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        chat_id: u32,
-        timer: u32,
-    },
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    ///
-    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
-    #[serde(rename_all = "camelCase")]
-    ContactsChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Location of one or more contact has changed.
-    ///
-    /// @param data1 (u32) contact_id of the contact for which the location has changed.
-    ///     If the locations of several contacts have been changed,
-    ///     this parameter is set to `None`.
-    #[serde(rename_all = "camelCase")]
-    LocationChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Inform about the configuration progress started by configure().
-    ConfigureProgress {
-        /// Progress.
-        ///
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-
-        /// Progress comment or error, something to display to the user.
-        comment: Option<String>,
-    },
-
-    /// Inform about the import/export progress started by imex().
-    ///
-    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexProgress {
-        progress: usize,
-    },
-
-    /// A file has been exported. A file has been written by imex().
-    /// This event may be sent multiple times by a single call to imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexFileWritten {
-        path: String,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by getChatSecurejoinQrCodeSvg().
-    ///
-    /// @param data1 (int) ID of the contact that wants to join.
-    /// @param data2 (int) Progress as:
-    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
-    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
-    ///     1000=Protocol finished for this contact.
-    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while secureJoin(), which
-    /// may take some time, is executed.
-    /// @param data1 (int) ID of the inviting contact.
-    /// @param data2 (int) Progress as:
-    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-    ///     (Bob has verified alice and waits until Alice does the same for him)
-    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// The connectivity to the server changed.
-    /// This means that you should refresh the connectivity view
-    /// and possibly the connectivtiy HTML; see getConnectivity() and
-    /// getConnectivityHtml() for details.
+pub enum EventTypeName {
+    Info,
+    SmtpConnected,
+    ImapConnected,
+    SmtpMessageSent,
+    ImapMessageDeleted,
+    ImapMessageMoved,
+    NewBlobFile,
+    DeletedBlobFile,
+    Warning,
+    Error,
+    ErrorSelfNotInGroup,
+    MsgsChanged,
+    IncomingMsg,
+    MsgsNoticed,
+    MsgDelivered,
+    MsgFailed,
+    MsgRead,
+    ChatModified,
+    ChatEphemeralTimerModified,
+    ContactsChanged,
+    LocationChanged,
+    ConfigureProgress,
+    ImexProgress,
+    ImexFileWritten,
+    SecurejoinInviterProgress,
+    SecurejoinJoinerProgress,
     ConnectivityChanged,
-
     SelfavatarChanged,
-
-    #[serde(rename_all = "camelCase")]
-    WebxdcStatusUpdate {
-        msg_id: u32,
-        status_update_serial: u32,
-    },
-
-    /// Inform that a message containing a webxdc instance has been deleted
-    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted {
-        msg_id: u32,
-    },
+    WebxdcStatusUpdate,
+    WebxdcInstanceDeleted,
+    WebxdcBusyUpdating,
+    WebxdcUpToDate,
 }
 
-impl From<EventType> for JSONRPCEventType {
+impl From<EventType> for EventTypeName {
     fn from(event: EventType) -> Self {
-        use JSONRPCEventType::*;
+        use EventTypeName::*;
         match event {
-            EventType::Info(msg) => Info { msg },
-            EventType::SmtpConnected(msg) => SmtpConnected { msg },
-            EventType::ImapConnected(msg) => ImapConnected { msg },
-            EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
-            EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
-            EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            EventType::NewBlobFile(file) => NewBlobFile { file },
-            EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
-            EventType::Warning(msg) => Warning { msg },
-            EventType::Error(msg) => Error { msg },
-            EventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
-            EventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => ReactionsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-            },
-            EventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::IncomingMsgBunch { msg_ids } => IncomingMsgBunch {
-                msg_ids: msg_ids.into_iter().map(|id| id.to_u32()).collect(),
-            },
-            EventType::MsgsNoticed(chat_id) => MsgsNoticed {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgFailed { chat_id, msg_id } => MsgFailed {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgRead { chat_id, msg_id } => MsgRead {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ChatModified(chat_id) => ChatModified {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::ChatEphemeralTimerModified { chat_id, timer } => {
-                ChatEphemeralTimerModified {
-                    chat_id: chat_id.to_u32(),
-                    timer: timer.to_u32(),
-                }
-            }
-            EventType::ContactsChanged(contact) => ContactsChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::LocationChanged(contact) => LocationChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::ConfigureProgress { progress, comment } => {
-                ConfigureProgress { progress, comment }
-            }
-            EventType::ImexProgress(progress) => ImexProgress { progress },
-            EventType::ImexFileWritten(path) => ImexFileWritten {
-                path: path.to_str().unwrap_or_default().to_owned(),
-            },
-            EventType::SecurejoinInviterProgress {
-                contact_id,
-                progress,
-            } => SecurejoinInviterProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            EventType::SecurejoinJoinerProgress {
-                contact_id,
-                progress,
-            } => SecurejoinJoinerProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
+            EventType::Info(_) => Info,
+            EventType::SmtpConnected(_) => SmtpConnected,
+            EventType::ImapConnected(_) => ImapConnected,
+            EventType::SmtpMessageSent(_) => SmtpMessageSent,
+            EventType::ImapMessageDeleted(_) => ImapMessageDeleted,
+            EventType::ImapMessageMoved(_) => ImapMessageMoved,
+            EventType::NewBlobFile(_) => NewBlobFile,
+            EventType::DeletedBlobFile(_) => DeletedBlobFile,
+            EventType::Warning(_) => Warning,
+            EventType::Error(_) => Error,
+            EventType::ErrorSelfNotInGroup(_) => ErrorSelfNotInGroup,
+            EventType::MsgsChanged { .. } => MsgsChanged,
+            EventType::IncomingMsg { .. } => IncomingMsg,
+            EventType::MsgsNoticed(_) => MsgsNoticed,
+            EventType::MsgDelivered { .. } => MsgDelivered,
+            EventType::MsgFailed { .. } => MsgFailed,
+            EventType::MsgRead { .. } => MsgRead,
+            EventType::ChatModified(_) => ChatModified,
+            EventType::ChatEphemeralTimerModified { .. } => ChatEphemeralTimerModified,
+            EventType::ContactsChanged(_) => ContactsChanged,
+            EventType::LocationChanged(_) => LocationChanged,
+            EventType::ConfigureProgress { .. } => ConfigureProgress,
+            EventType::ImexProgress(_) => ImexProgress,
+            EventType::ImexFileWritten(_) => ImexFileWritten,
+            EventType::SecurejoinInviterProgress { .. } => SecurejoinInviterProgress,
+            EventType::SecurejoinJoinerProgress { .. } => SecurejoinJoinerProgress,
             EventType::ConnectivityChanged => ConnectivityChanged,
             EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate {
-                msg_id,
-                status_update_serial,
-            } => WebxdcStatusUpdate {
-                msg_id: msg_id.to_u32(),
-                status_update_serial: status_update_serial.to_u32(),
-            },
-            EventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
-                msg_id: msg_id.to_u32(),
-            },
+            EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
+            EventType::WebxdcInstanceDeleted { .. } => WebxdcInstanceDeleted,
+            EventType::WebxdcBusyUpdating { .. } => WebxdcBusyUpdating,
+            EventType::WebxdcUpToDate { .. } => WebxdcUpToDate,
         }
     }
 }
@@ -394,8 +159,7 @@ fn generate_events_ts_types_definition() {
             root_namespace: None,
             ..typescript_type_def::DefinitionFileOptions::default()
         };
-        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&mut buf, options)
-            .unwrap();
+        typescript_type_def::write_definition_file::<_, EventTypeName>(&mut buf, options).unwrap();
         String::from_utf8(buf).unwrap()
     };
     std::fs::write("typescript/generated/events.ts", events).unwrap();

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

@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};
 
 use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
+use deltachat::chat::{self, get_chat_contacts};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
@@ -37,7 +37,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: Option<String>,
 }
 
 impl FullChat {
@@ -81,8 +80,6 @@ impl FullChat {
             false
         };
 
-        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
-
         Ok(FullChat {
             id: chat_id,
             name: chat.name.clone(),
@@ -106,7 +103,6 @@ impl FullChat {
             ephemeral_timer,
             can_send,
             was_seen_recently,
-            mailing_list_address,
         })
     }
 }
@@ -193,21 +189,3 @@ impl MuteDuration {
         }
     }
 }
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-#[serde(rename = "ChatVisibility")]
-pub enum JSONRPCChatVisibility {
-    Normal,
-    Archived,
-    Pinned,
-}
-
-impl JSONRPCChatVisibility {
-    pub fn into_core_type(self) -> ChatVisibility {
-        match self {
-            JSONRPCChatVisibility::Normal => ChatVisibility::Normal,
-            JSONRPCChatVisibility::Archived => ChatVisibility::Archived,
-            JSONRPCChatVisibility::Pinned => ChatVisibility::Pinned,
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-use deltachat::location::Location;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Location", rename_all = "camelCase")]
-pub struct JsonrpcLocation {
-    pub location_id: u32,
-    pub is_independent: bool,
-    pub latitude: f64,
-    pub longitude: f64,
-    pub accuracy: f64,
-    pub timestamp: i64,
-    pub contact_id: u32,
-    pub msg_id: u32,
-    pub chat_id: u32,
-    pub marker: Option<String>,
-}
-
-impl From<Location> for JsonrpcLocation {
-    fn from(location: Location) -> Self {
-        let Location {
-            location_id,
-            independent,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id,
-            msg_id,
-            chat_id,
-            marker,
-        } = location;
-        Self {
-            location_id,
-            is_independent: independent != 0,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id: contact_id.to_u32(),
-            msg_id,
-            chat_id: chat_id.to_u32(),
-            marker,
-        }
-    }
-}

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

@@ -1,14 +1,10 @@
 use anyhow::{anyhow, Result};
-use deltachat::chat::Chat;
-use deltachat::chat::ChatItem;
-use deltachat::constants::Chattype;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::download;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
 use deltachat::message::Viewtype;
-use deltachat::reaction::get_msg_reactions;
 use num_traits::cast::ToPrimitive;
 use serde::Deserialize;
 use serde::Serialize;
@@ -16,7 +12,6 @@ use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
-use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;
 
 #[derive(Serialize, TypeDef)]
@@ -34,9 +29,6 @@ pub struct MessageObject {
     view_type: MessageViewtype,
     state: u32,
 
-    /// An error text, if there is one.
-    error: Option<String>,
-
     timestamp: i64,
     sort_timestamp: i64,
     received_timestamp: i64,
@@ -48,8 +40,6 @@ pub struct MessageObject {
     is_setupmessage: bool,
     is_info: bool,
     is_forwarded: bool,
-    /// when is_info is true this describes what type of system message it is
-    system_message_type: SystemMessageType,
 
     duration: i32,
     dimensions_height: i32,
@@ -71,8 +61,6 @@ pub struct MessageObject {
     webxdc_info: Option<WebxdcMessageInfo>,
 
     download_state: DownloadState,
-
-    reactions: Option<JSONRPCReactions>,
 }
 
 #[derive(Serialize, TypeDef)]
@@ -90,7 +78,6 @@ enum MessageQuote {
         override_sender_name: Option<String>,
         image: Option<String>,
         is_forwarded: bool,
-        view_type: MessageViewtype,
     },
 }
 
@@ -130,7 +117,6 @@ impl MessageObject {
                         override_sender_name: quote.get_override_sender_name(),
                         image: if quote.get_viewtype() == Viewtype::Image
                             || quote.get_viewtype() == Viewtype::Gif
-                            || quote.get_viewtype() == Viewtype::Sticker
                         {
                             match quote.get_file(context) {
                                 Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
@@ -140,7 +126,6 @@ impl MessageObject {
                             None
                         },
                         is_forwarded: quote.is_forwarded(),
-                        view_type: quote.get_viewtype().into(),
                     })
                 }
                 None => Some(MessageQuote::JustText { text: quoted_text }),
@@ -149,13 +134,6 @@ impl MessageObject {
             None
         };
 
-        let reactions = get_msg_reactions(context, msg_id).await?;
-        let reactions = if reactions.is_empty() {
-            None
-        } else {
-            Some(reactions.into())
-        };
-
         Ok(MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
@@ -170,7 +148,6 @@ impl MessageObject {
                 .get_state()
                 .to_u32()
                 .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-            error: message.error(),
 
             timestamp: message.get_timestamp(),
             sort_timestamp: message.get_sort_timestamp(),
@@ -182,7 +159,6 @@ impl MessageObject {
             is_setupmessage: message.is_setupmessage(),
             is_info: message.is_info(),
             is_forwarded: message.is_forwarded(),
-            system_message_type: message.get_info_type().into(),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -212,8 +188,6 @@ impl MessageObject {
             webxdc_info,
 
             download_state,
-
-            reactions,
         })
     }
 }
@@ -312,181 +286,3 @@ impl From<download::DownloadState> for DownloadState {
         }
     }
 }
-
-#[derive(Serialize, TypeDef)]
-pub enum SystemMessageType {
-    Unknown,
-    GroupNameChanged,
-    GroupImageChanged,
-    MemberAddedToGroup,
-    MemberRemovedFromGroup,
-    AutocryptSetupMessage,
-    SecurejoinMessage,
-    LocationStreamingEnabled,
-    LocationOnly,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged,
-
-    // Chat protection state changed
-    ChatProtectionEnabled,
-    ChatProtectionDisabled,
-
-    /// Self-sent-message that contains only json used for multi-device-sync;
-    /// if possible, we attach that to other messages as for locations.
-    MultiDeviceSync,
-
-    // Sync message that contains a json payload
-    // sent to the other webxdc instances
-    // These messages are not shown in the chat.
-    WebxdcStatusUpdate,
-
-    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
-    WebxdcInfoMessage,
-}
-
-impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
-    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
-        use deltachat::mimeparser::SystemMessage;
-        match system_message_type {
-            SystemMessage::Unknown => SystemMessageType::Unknown,
-            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
-            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
-            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
-            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
-            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
-            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
-            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
-            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
-            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
-            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
-            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
-            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
-            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    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,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageSearchResult {
-    id: u32,
-    author_profile_image: Option<String>,
-    author_name: String,
-    author_color: String,
-    chat_name: Option<String>,
-    message: String,
-    timestamp: i64,
-}
-
-impl MessageSearchResult {
-    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 sender = Contact::load_from_db(context, message.get_from_id()).await?;
-
-        let profile_image = match sender.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        Ok(Self {
-            id: msg_id.to_u32(),
-            author_profile_image: profile_image,
-            author_name: sender.get_display_name().to_owned(),
-            author_color: color_int_to_hex_string(sender.get_color()),
-            chat_name: if chat.get_type() == Chattype::Single {
-                Some(chat.get_name().to_owned())
-            } else {
-                None
-            },
-            message: message.get_text().unwrap_or_default(),
-            timestamp: message.get_timestamp(),
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
-pub enum JSONRPCMessageListItem {
-    Message {
-        msg_id: u32,
-    },
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers, in unix milliseconds
-        timestamp: i64,
-    },
-}
-
-impl From<ChatItem> for JSONRPCMessageListItem {
-    fn from(item: ChatItem) -> Self {
-        match item {
-            ChatItem::Message { msg_id } => JSONRPCMessageListItem::Message {
-                msg_id: msg_id.to_u32(),
-            },
-            ChatItem::DayMarker { timestamp } => JSONRPCMessageListItem::DayMarker { timestamp },
-        }
-    }
-}

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

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

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

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

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

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

deltachat-jsonrpc/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/.gitignore

@@ -6,4 +6,3 @@ yarn.lock
 package-lock.json
 docs
 accounts
-generated

deltachat-jsonrpc/typescript/example/example.ts

@@ -1,4 +1,4 @@
-import { DcEvent, DeltaChat } from "../deltachat.js";
+import { DeltaChat, DeltaChatEvent } from "../deltachat.js";
 
 var SELECTED_ACCOUNT = 0;
 
@@ -7,7 +7,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     SELECTED_ACCOUNT = Number(id);
     window.dispatchEvent(new Event("account-changed"));
   };
-  console.log("launch run script...");
+  console.log('launch run script...')
   run().catch((err) => console.error("run failed", err));
 });
 
@@ -16,13 +16,13 @@ async function run() {
   const $side = document.getElementById("side")!;
   const $head = document.getElementById("header")!;
 
-  const client = new DeltaChat("ws://localhost:20808/ws");
+  const client = new DeltaChat('ws://localhost:20808/ws')
 
-  (window as any).client = client.rpc;
+  ;(window as any).client = client.rpc;
 
-  client.on("ALL", (accountId, event) => {
-    onIncomingEvent(accountId, event);
-  });
+  client.on("ALL", event => {
+    onIncomingEvent(event)
+  })
 
   window.addEventListener("account-changed", async (_event: Event) => {
     listChatsForSelectedAccount();
@@ -31,9 +31,9 @@ async function run() {
   await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
 
   async function loadAccountsInHeader() {
-    console.log("load accounts");
+    console.log('load accounts')
     const accounts = await client.rpc.getAllAccounts();
-    console.log("accounts loaded", accounts);
+    console.log('accounts loaded', accounts)
     for (const account of accounts) {
       if (account.type === "Configured") {
         write(
@@ -48,14 +48,14 @@ async function run() {
           `<a href="#">
           ${account.id}: (unconfigured)
           </a>&nbsp;`
-        );
+        )
       }
     }
   }
 
   async function listChatsForSelectedAccount() {
     clear($main);
-    const selectedAccount = SELECTED_ACCOUNT;
+    const selectedAccount = SELECTED_ACCOUNT
     const info = await client.rpc.getAccountInfo(selectedAccount);
     if (info.type !== "Configured") {
       return write($main, "Account is not configured");
@@ -68,17 +68,17 @@ async function run() {
       null
     );
     for (const [chatId, _messageId] of chats) {
-      const chat = await client.rpc.getFullChatById(
+      const chat = await client.rpc.chatlistGetFullChatById(
         selectedAccount,
         chatId
       );
       write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.getMessageIds(
+      const messageIds = await client.rpc.messageListGetMessageIds(
         selectedAccount,
         chatId,
         0
       );
-      const messages = await client.rpc.getMessages(
+      const messages = await client.rpc.messageGetMessages(
         selectedAccount,
         messageIds
       );
@@ -88,15 +88,14 @@ async function run() {
     }
   }
 
-  function onIncomingEvent(accountId: number, event: DcEvent) {
+  function onIncomingEvent(event: DeltaChatEvent) {
     write(
       $side,
       `
         <p class="message">
-          [<strong>${event.type}</strong> on account ${accountId}]<br>
-          <em>f1:</em> ${JSON.stringify(
-            Object.assign({}, event, { type: undefined })
-          )}
+          [<strong>${event.id}</strong> on account ${event.contextId}]<br>
+          <em>f1:</em> ${JSON.stringify(event.field1)}<br>
+          <em>f2:</em> ${JSON.stringify(event.field2)}
         </p>`
     );
   }

deltachat-jsonrpc/typescript/generated/client.ts

@@ -0,0 +1,604 @@
+// AUTO-GENERATED by yerpc-derive
+
+import * as T from "./types.js"
+import * as RPC from "./jsonrpc.js"
+
+type RequestMethod = (method: string, params?: RPC.Params) => Promise<unknown>;
+type NotificationMethod = (method: string, params?: RPC.Params) => void;
+
+interface Transport {
+  request: RequestMethod,
+  notification: NotificationMethod
+}
+
+export class RawClient {
+  constructor(private _transport: Transport) {}
+
+  /**
+   * Check if an email address is valid.
+   */
+  public checkEmailValidity(email: string): Promise<boolean> {
+    return (this._transport.request('check_email_validity', [email] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Get general system info.
+   */
+  public getSystemInfo(): Promise<Record<string,string>> {
+    return (this._transport.request('get_system_info', [] as RPC.Params)) as Promise<Record<string,string>>;
+  }
+
+
+  public addAccount(): Promise<T.U32> {
+    return (this._transport.request('add_account', [] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public removeAccount(accountId: T.U32): Promise<null> {
+    return (this._transport.request('remove_account', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getAllAccountIds(): Promise<(T.U32)[]> {
+    return (this._transport.request('get_all_account_ids', [] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Select account id for internally selected state.
+   * TODO: Likely this is deprecated as all methods take an account id now.
+   */
+  public selectAccount(id: T.U32): Promise<null> {
+    return (this._transport.request('select_account', [id] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get the selected account id of the internal state..
+   * TODO: Likely this is deprecated as all methods take an account id now.
+   */
+  public getSelectedAccountId(): Promise<(T.U32|null)> {
+    return (this._transport.request('get_selected_account_id', [] as RPC.Params)) as Promise<(T.U32|null)>;
+  }
+
+  /**
+   * Get a list of all configured accounts.
+   */
+  public getAllAccounts(): Promise<(T.Account)[]> {
+    return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
+  }
+
+  /**
+   * Get top-level info for an account.
+   */
+  public getAccountInfo(accountId: T.U32): Promise<T.Account> {
+    return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
+  }
+
+  /**
+   * Returns provider for the given domain.
+   *
+   * This function looks up domain in offline database.
+   *
+   * For compatibility, email address can be passed to this function
+   * instead of the domain.
+   */
+  public getProviderInfo(accountId: T.U32, email: string): Promise<(T.ProviderInfo|null)> {
+    return (this._transport.request('get_provider_info', [accountId, email] as RPC.Params)) as Promise<(T.ProviderInfo|null)>;
+  }
+
+  /**
+   * Checks if the context is already configured.
+   */
+  public isConfigured(accountId: T.U32): Promise<boolean> {
+    return (this._transport.request('is_configured', [accountId] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Get system info for an account.
+   */
+  public getInfo(accountId: T.U32): Promise<Record<string,string>> {
+    return (this._transport.request('get_info', [accountId] as RPC.Params)) as Promise<Record<string,string>>;
+  }
+
+
+  public setConfig(accountId: T.U32, key: string, value: (string|null)): Promise<null> {
+    return (this._transport.request('set_config', [accountId, key, value] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public batchSetConfig(accountId: T.U32, config: Record<string,(string|null)>): Promise<null> {
+    return (this._transport.request('batch_set_config', [accountId, config] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
+   * Before this function is called, `checkQr()` should confirm the type of the
+   * QR code is `account` or `webrtcInstance`.
+   *
+   * Internally, the function will call dc_set_config() with the appropriate keys,
+   */
+  public setConfigFromQr(accountId: T.U32, qrContent: string): Promise<null> {
+    return (this._transport.request('set_config_from_qr', [accountId, qrContent] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public checkQr(accountId: T.U32, qrContent: string): Promise<T.Qr> {
+    return (this._transport.request('check_qr', [accountId, qrContent] as RPC.Params)) as Promise<T.Qr>;
+  }
+
+
+  public getConfig(accountId: T.U32, key: string): Promise<(string|null)> {
+    return (this._transport.request('get_config', [accountId, key] as RPC.Params)) as Promise<(string|null)>;
+  }
+
+
+  public batchGetConfig(accountId: T.U32, keys: (string)[]): Promise<Record<string,(string|null)>> {
+    return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
+  }
+
+  /**
+   * Configures this account with the currently set parameters.
+   * Setup the credential config before calling this.
+   */
+  public configure(accountId: T.U32): Promise<null> {
+    return (this._transport.request('configure', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Signal an ongoing process to stop.
+   */
+  public stopOngoingProcess(accountId: T.U32): Promise<null> {
+    return (this._transport.request('stop_ongoing_process', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Returns the message IDs of all _fresh_ messages of any chat.
+   * Typically used for implementing notification summaries
+   * or badge counters e.g. on the app icon.
+   * The list is already sorted and starts with the most recent fresh message.
+   *
+   * Messages belonging to muted chats or to the contact requests are not returned;
+   * these messages should not be notified
+   * and also badge counters should not include these messages.
+   *
+   * To get the number of fresh messages for a single chat, muted or not,
+   * use `get_fresh_msg_cnt()`.
+   */
+  public getFreshMsgs(accountId: T.U32): Promise<(T.U32)[]> {
+    return (this._transport.request('get_fresh_msgs', [accountId] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Get the number of _fresh_ messages in a chat.
+   * Typically used to implement a badge with a number in the chatlist.
+   *
+   * If the specified chat is muted,
+   * the UI should show the badge counter "less obtrusive",
+   * e.g. using "gray" instead of "red" color.
+   */
+  public getFreshMsgCnt(accountId: T.U32, chatId: T.U32): Promise<T.Usize> {
+    return (this._transport.request('get_fresh_msg_cnt', [accountId, chatId] as RPC.Params)) as Promise<T.Usize>;
+  }
+
+
+  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
+    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
+  }
+
+
+  public autocryptContinueKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
+    return (this._transport.request('autocrypt_continue_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getChatlistEntries(accountId: T.U32, listFlags: (T.U32|null), queryString: (string|null), queryContactId: (T.U32|null)): Promise<(T.ChatListEntry)[]> {
+    return (this._transport.request('get_chatlist_entries', [accountId, listFlags, queryString, queryContactId] as RPC.Params)) as Promise<(T.ChatListEntry)[]>;
+  }
+
+
+  public getChatlistItemsByEntries(accountId: T.U32, entries: (T.ChatListEntry)[]): Promise<Record<T.U32,T.ChatListItemFetchResult>> {
+    return (this._transport.request('get_chatlist_items_by_entries', [accountId, entries] as RPC.Params)) as Promise<Record<T.U32,T.ChatListItemFetchResult>>;
+  }
+
+
+  public chatlistGetFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
+    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
+  }
+
+  /**
+   * 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>;
+  }
+
+
+  public blockChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('block_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Delete a chat.
+   *
+   * Messages are deleted from the device and the chat database entry is deleted.
+   * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
+   *
+   * Things that are _not done_ implicitly:
+   *
+   * - Messages are **not deleted from the server**.
+   * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
+   *   and the user may create the chat again.
+   * - **Groups are not left** - this would
+   *   be unexpected as (1) deleting a normal chat also does not prevent new mails
+   *   from arriving, (2) leaving a group requires sending a message to
+   *   all group members - especially for groups not used for a longer time, this is
+   *   really unexpected when deletion results in contacting all members again,
+   *   (3) only leaving groups is also a valid usecase.
+   *
+   * To leave a chat explicitly, use dc_remove_contact_from_chat() with
+   * chat_id=DC_CONTACT_ID_SELF)
+   */
+  public deleteChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('delete_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get encryption info for a chat.
+   * Get a multi-line encryption info, containing encryption preferences of all members.
+   * Can be used to find out why messages sent to group are not encrypted.
+   *
+   * returns Multi-line text
+   */
+  public getChatEncryptionInfo(accountId: T.U32, chatId: T.U32): Promise<string> {
+    return (this._transport.request('get_chat_encryption_info', [accountId, chatId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
+   * The QR code is compatible to the OPENPGP4FPR format
+   * so that a basic fingerprint comparison also works e.g. with OpenKeychain.
+   *
+   * The scanning device will pass the scanned content to `checkQr()` then;
+   * if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
+   * an out-of-band-verification can be joined using dc_join_securejoin()
+   *
+   * chat_id: If set to a group-chat-id,
+   *     the Verified-Group-Invite protocol is offered in the QR code;
+   *     works for protected groups as well as for normal groups.
+   *     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]>;
+  }
+
+
+  public leaveGroup(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('leave_group', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Remove a member from a group.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   */
+  public removeContactFromChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('remove_contact_from_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Add a member to a group.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * If the group has group protection enabled, only verified contacts can be added to the group.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   */
+  public addContactToChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('add_contact_to_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public addDeviceMessage(accountId: T.U32, label: string, text: string): Promise<T.U32> {
+    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)[]>;
+  }
+
+
+  public messageGetMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
+    return (this._transport.request('message_get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
+  }
+
+
+  public messageGetMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
+    return (this._transport.request('message_get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
+  }
+
+  /**
+   * Delete messages. The messages are deleted on the current device and
+   * on the IMAP server.
+   */
+  public deleteMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<null> {
+    return (this._transport.request('delete_messages', [accountId, messageIds] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get an informational text for a single message. The text is multiline and may
+   * contain e.g. the raw text of the message.
+   *
+   * The max. text returned is typically longer (about 100000 characters) than the
+   * max. text returned by dc_msg_get_text() (about 30000 characters).
+   */
+  public getMessageInfo(accountId: T.U32, messageId: T.U32): Promise<string> {
+    return (this._transport.request('get_message_info', [accountId, messageId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Get a single contact options by ID.
+   */
+  public contactsGetContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
+    return (this._transport.request('contacts_get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
+  }
+
+  /**
+   * Add a single contact as a result of an explicit user action.
+   *
+   * Returns contact id of the created or existing contact
+   */
+  public contactsCreateContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
+    return (this._transport.request('contacts_create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Returns contact id of the created or existing DM chat with that contact
+   */
+  public contactsCreateChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
+    return (this._transport.request('contacts_create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public contactsBlock(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('contacts_block', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public contactsUnblock(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('contacts_unblock', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
+    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
+  }
+
+
+  public contactsGetContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('contacts_get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Get a list of contacts.
+   * (formerly called getContacts2 in desktop)
+   */
+  public contactsGetContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
+    return (this._transport.request('contacts_get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
+  }
+
+
+  public contactsGetContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
+    return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
+  }
+
+  /**
+   * 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.
+   *
+   * The list is already sorted and starts with the oldest message.
+   * Clients should not try to re-sort the list as this would be an expensive action
+   * and would result in inconsistencies between clients.
+   *
+   * Setting `chat_id` to `None` (`null` in typescript) means get messages with media
+   * from any chat of the currently used account.
+   */
+  public chatGetMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * 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>;
+  }
+
+
+  public webxdcGetStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
+    return (this._transport.request('webxdc_get_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Get info from a webxdc message
+   */
+  public messageGetWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
+    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
+  }
+
+  /**
+   * 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
+   */
+  public miscSendTextMessage(accountId: T.U32, text: string, chatId: T.U32): Promise<T.U32> {
+    return (this._transport.request('misc_send_text_message', [accountId, text, chatId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public 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/events.ts

@@ -0,0 +1,3 @@
+// AUTO-GENERATED by typescript-type-def
+
+export type EventTypeName=("Info"|"SmtpConnected"|"ImapConnected"|"SmtpMessageSent"|"ImapMessageDeleted"|"ImapMessageMoved"|"NewBlobFile"|"DeletedBlobFile"|"Warning"|"Error"|"ErrorSelfNotInGroup"|"MsgsChanged"|"IncomingMsg"|"MsgsNoticed"|"MsgDelivered"|"MsgFailed"|"MsgRead"|"ChatModified"|"ChatEphemeralTimerModified"|"ContactsChanged"|"LocationChanged"|"ConfigureProgress"|"ImexProgress"|"ImexFileWritten"|"SecurejoinInviterProgress"|"SecurejoinJoinerProgress"|"ConnectivityChanged"|"SelfavatarChanged"|"WebxdcStatusUpdate"|"WebXdInstanceDeleted");

deltachat-jsonrpc/typescript/generated/jsonrpc.ts

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by typescript-type-def
+
+export type JSONValue=(null|boolean|number|string|(JSONValue)[]|{[key:string]:JSONValue;});
+export type Params=((JSONValue)[]|Record<string,JSONValue>);
+export type U32=number;
+export type Request={"jsonrpc":"2.0";"method":string;"params"?:Params;"id"?:U32;};
+export type I32=number;
+export type Error={"code":I32;"message":string;"data"?:JSONValue;};
+export type Response={"jsonrpc":"2.0";"id":(U32|null);"result"?:JSONValue;"error"?:Error;};
+export type Message=(Request|Response);

deltachat-jsonrpc/typescript/generated/types.ts

@@ -0,0 +1,139 @@
+// AUTO-GENERATED by typescript-type-def
+
+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;}));
+export type Usize=number;
+export type ChatListEntry=[U32,U32];
+export type I64=number;
+export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
+/**
+ * true when chat is a broadcastlist
+ */
+"isBroadcast":boolean;
+/**
+ * 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;};
+
+/**
+ * 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 Viewtype=("Unknown"|
+/**
+ * Text message.
+ */
+"Text"|
+/**
+ * Image message.
+ * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
+ */
+"Image"|
+/**
+ * Animated GIF message.
+ */
+"Gif"|
+/**
+ * Message containing a sticker, similar to image.
+ * If possible, the ui should display the image without borders in a transparent way.
+ * A click on a sticker will offer to install the sticker set in some future.
+ */
+"Sticker"|
+/**
+ * Message containing an Audio file.
+ */
+"Audio"|
+/**
+ * A voice message that was directly recorded by the user.
+ * For all other audio messages, the type `Viewtype.Audio` should be used.
+ */
+"Voice"|
+/**
+ * Video messages.
+ */
+"Video"|
+/**
+ * Message containing any file, eg. a PDF.
+ */
+"File"|
+/**
+ * Message is an invitation to a videochat.
+ */
+"VideochatInvitation"|
+/**
+ * Message is an webxdc instance.
+ */
+"Webxdc");
+export type I32=number;
+export type U64=number;
+export type WebxdcMessageInfo={
+/**
+ * The name of the app.
+ * 
+ * Defaults to the filename if not set in the manifest.
+ */
+"name":string;
+/**
+ * App icon file name.
+ * Defaults to an standard icon if nothing is set in the manifest.
+ * 
+ * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
+ * 
+ * App icons should should be square,
+ * the implementations will add round corners etc. as needed.
+ */
+"icon":string;
+/**
+ * if the Webxdc represents a document, then this is the name of the document
+ */
+"document":(string|null);
+/**
+ * short string describing the state of the app,
+ * sth. as "2 votes", "Highscore: 123",
+ * can be changed by the apps
+ */
+"summary":(string|null);
+/**
+ * URL where the source code of the Webxdc and other information can be found;
+ * defaults to an empty string.
+ * Implementations may offer an menu or a button to open this URL.
+ */
+"sourceCodeUrl":(string|null);
+/**
+ * True if full internet access should be granted to the app.
+ */
+"internetAccess":boolean;};
+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

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

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

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

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,59 +1,40 @@
 import * as T from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { Event } from "../generated/events.js";
+import { EventTypeName } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "@deltachat/tiny-emitter";
+import { TinyEmitter } from "tiny-emitter";
 
-type DCWireEvent<T extends Event> = {
-  event: T;
+export type DeltaChatEvent = {
+  id: EventTypeName;
   contextId: number;
+  field1: any;
+  field2: any;
 };
-// export type Events = Record<
-//   Event["type"] | "ALL",
-//   (event: DeltaChatEvent<Event>) => void
-// >;
-
-type Events = { ALL: (accountId: number, event: Event) => void } & {
-  [Property in Event["type"]]: (
-    accountId: number,
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-type ContextEvents = { ALL: (event: Event) => void } & {
-  [Property in Event["type"]]: (
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-export type DcEvent = Event;
-export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>;
+export type Events = Record<
+  EventTypeName | "ALL",
+  (event: DeltaChatEvent) => void
+>;
 
 export class BaseDeltaChat<
   Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
   rpc: RawClient;
   account?: T.Account;
-  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
+  private contextEmitters: TinyEmitter<Events>[] = [];
   constructor(public transport: Transport) {
     super();
     this.rpc = new RawClient(this.transport);
     this.transport.on("request", (request: Request) => {
       const method = request.method;
       if (method === "event") {
-        const event = request.params! as DCWireEvent<Event>;
-	//@ts-ignore
-        this.emit(event.event.type, event.contextId, event.event as any);
-        this.emit("ALL", event.contextId, event.event as any);
+        const event = request.params! as DeltaChatEvent;
+        this.emit(event.id, event);
+        this.emit("ALL", event);
 
         if (this.contextEmitters[event.contextId]) {
-          this.contextEmitters[event.contextId].emit(
-            event.event.type,
-            //@ts-ignore
-            event.event as any
-          );
-          this.contextEmitters[event.contextId].emit("ALL", event.event);
+          this.contextEmitters[event.contextId].emit(event.id, event);
+          this.contextEmitters[event.contextId].emit("ALL", event);
         }
       }
     });
@@ -89,39 +70,8 @@ export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
     if (typeof opts === "string") opts = { url: opts };
     if (opts) opts = { ...DEFAULT_OPTS, ...opts };
     else opts = { ...DEFAULT_OPTS };
-    const transport = new WebsocketTransport(opts.url);
+    const transport = new WebsocketTransport(opts.url)
     super(transport);
     this.opts = opts;
   }
 }
-
-export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
-  close() {}
-  constructor(input: any, output: any) {
-    const transport = new StdioTransport(input, output);
-    super(transport);
-  }
-}
-
-export class StdioTransport extends BaseTransport {
-  constructor(public input: any, public output: any) {
-    super();
-
-    var buffer = "";
-    this.output.on("data", (data: any) => {
-      buffer += data.toString();
-      while (buffer.includes("\n")) {
-        const n = buffer.indexOf("\n");
-        const line = buffer.substring(0, n);
-        const message = JSON.parse(line);
-        this._onmessage(message);
-        buffer = buffer.substring(n + 1);
-      }
-    });
-  }
-
-  _send(message: RPC.Message): void {
-    const serialized = JSON.stringify(message);
-    this.input.write(serialized + "\n");
-  }
-}

deltachat-jsonrpc/typescript/src/lib.ts

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

deltachat-jsonrpc/typescript/test/basic.ts

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

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,8 +1,12 @@
 import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
-import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
+import { DeltaChat, DeltaChatEvent, EventTypeName } from "../deltachat.js";
+import {
+  RpcServerHandle,
+  createTempUser,
+  startServer,
+} from "./test_base.js";
 
-const EVENT_TIMEOUT = 20000;
+const EVENT_TIMEOUT = 20000
 
 describe("online tests", function () {
   let serverHandle: RpcServerHandle;
@@ -12,7 +16,7 @@ describe("online tests", function () {
   let accountId1: number, accountId2: number;
 
   before(async function () {
-    this.timeout(12000);
+    this.timeout(12000)
     if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
@@ -27,10 +31,10 @@ describe("online tests", function () {
       this.skip();
     }
     serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
+    dc = new DeltaChat(serverHandle.url)
 
-    dc.on("ALL", (contextId, { type }) => {
-      if (type !== "Info") console.log(contextId, type);
+    dc.on("ALL", ({ id, contextId }) => {
+      if (id !== "Info") console.log(contextId, id);
     });
 
     account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
@@ -70,7 +74,7 @@ describe("online tests", function () {
       addr: account2.email,
       mail_pw: account2.password,
     });
-    await dc.rpc.configure(accountId2);
+    await dc.rpc.configure(accountId2)
     accountsConfigured = true;
   });
 
@@ -80,28 +84,28 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const contactId = await dc.rpc.createContact(
+    const contactId = await dc.rpc.contactsCreateContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
 
-    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
-    const { chatId: chatIdOnAccountB } = await eventPromise;
+    await dc.rpc.miscSendTextMessage(accountId1, "Hello", chatId);
+    const { field1: chatIdOnAccountB } = await eventPromise;
     await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
+    const messageList = await dc.rpc.messageListGetMessageIds(
       accountId2,
       chatIdOnAccountB,
       0
     );
 
     expect(messageList).have.length(1);
-    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
+    const message = await dc.rpc.messageGetMessage(accountId2, messageList[0]);
     expect(message.text).equal("Hello");
   });
 
@@ -112,30 +116,30 @@ describe("online tests", function () {
     this.timeout(10000);
 
     // send message from A to B
-    const contactId = await dc.rpc.createContact(
+    const contactId = await dc.rpc.contactsCreateContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
-    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
+    dc.rpc.miscSendTextMessage(accountId1, "Hello2", chatId);
     // wait for message from A
     console.log("wait for message from A");
 
     const event = await eventPromise;
-    const { chatId: chatIdOnAccountB } = event;
+    const { field1: chatIdOnAccountB } = event;
 
     await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
+    const messageList = await dc.rpc.messageListGetMessageIds(
       accountId2,
       chatIdOnAccountB,
       0
     );
-    const message = await dc.rpc.getMessage(
+    const message = await dc.rpc.messageGetMessage(
       accountId2,
       messageList.reverse()[0]
     );
@@ -145,14 +149,14 @@ describe("online tests", function () {
       waitForEvent(dc, "MsgsChanged", accountId1),
       waitForEvent(dc, "IncomingMsg", accountId1),
     ]);
-    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
+    dc.rpc.miscSendTextMessage(accountId2, "super secret message", chatId);
     // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (
-      await dc.rpc.getMessageIds(accountId1, chatId, 0)
+      await dc.rpc.messageListGetMessageIds(accountId1, chatId, 0)
     ).reverse()[0];
-    const message2 = await dc.rpc.getMessage(accountId1, messageId);
+    const message2 = await dc.rpc.messageGetMessage(accountId1, messageId);
     expect(message2.text).equal("super secret message");
     expect(message2.showPadlock).equal(true);
   });
@@ -175,22 +179,22 @@ describe("online tests", function () {
   });
 });
 
-async function waitForEvent<T extends DcEvent["type"]>(
+async function waitForEvent(
   dc: DeltaChat,
-  eventType: T,
+  eventType: EventTypeName,
   accountId: number,
   timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { type: T }>> {
+): Promise<DeltaChatEvent> {
   return new Promise((resolve, reject) => {
     const rejectTimeout = setTimeout(
-      () => reject(new Error("Timeout reached before event came in")),
+      () => reject(new Error('Timeout reached before event came in')),
       timeout
-    );
-    const callback = (contextId: number, event: DcEvent) => {
-      if (contextId == accountId) {
+    )
+    const callback = (event: DeltaChatEvent) => {
+      if (event.contextId == accountId) {
         dc.off(eventType, callback);
-        clearTimeout(rejectTimeout);
-        resolve(event as any);
+        clearTimeout(rejectTimeout)
+        resolve(event);
       }
     };
     dc.on(eventType, callback);

deltachat-jsonrpc/typescript/test/test_base.ts

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

deltachat-rpc-client/README.md

@@ -1,41 +0,0 @@
-# Delta Chat RPC python client
-
-RPC client connects to standalone Delta Chat RPC server `deltachat-rpc-server`
-and provides asynchronous interface to it.
-
-## Getting started
-
-To use Delta Chat RPC client, first build a `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-Install it anywhere in your `PATH`.
-
-## Testing
-
-1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-2. Run `PATH="../target/debug:$PATH" tox`.
-
-Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
-
-## Using in REPL
-
-Setup a development environment:
-```
-$ tox --devenv env
-$ . env/bin/activate
-```
-
-It is recommended to use IPython, because it supports using `await` directly
-from the REPL.
-
-```
-$ pip install ipython
-$ PATH="../target/debug:$PATH" ipython
-...
-In [1]: from deltachat_rpc_client import *
-In [2]: rpc = Rpc()
-In [3]: await rpc.start()
-In [4]: dc = DeltaChat(rpc)
-In [5]: system_info = await dc.get_system_info()
-In [6]: system_info["level"]
-Out[6]: 'awesome'
-In [7]: await rpc.close()
-```

deltachat-rpc-client/examples/echobot.py

@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-import asyncio
-import logging
-import sys
-
-import deltachat_rpc_client as dc
-
-
-async def main():
-    async with dc.Rpc() as rpc:
-        deltachat = dc.DeltaChat(rpc)
-        system_info = await deltachat.get_system_info()
-        logging.info("Running deltachat core %s", system_info["deltachat_core_version"])
-
-        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else await deltachat.add_account()
-
-        await account.set_config("bot", "1")
-        if not await account.is_configured():
-            logging.info("Account is not configured, configuring")
-            await account.set_config("addr", sys.argv[1])
-            await account.set_config("mail_pw", sys.argv[2])
-            await account.configure()
-            logging.info("Configured")
-        else:
-            logging.info("Account is already configured")
-            await deltachat.start_io()
-
-        async def process_messages():
-            for message in await account.get_fresh_messages_in_arrival_order():
-                snapshot = await message.get_snapshot()
-                if not snapshot.is_info:
-                    await snapshot.chat.send_text(snapshot.text)
-                await snapshot.message.mark_seen()
-
-        # Process old messages.
-        await process_messages()
-
-        while True:
-            event = await account.wait_for_event()
-            if event["type"] == "Info":
-                logging.info("%s", event["msg"])
-            elif event["type"] == "Warning":
-                logging.warning("%s", event["msg"])
-            elif event["type"] == "Error":
-                logging.error("%s", event["msg"])
-            elif event["type"] == "IncomingMsg":
-                logging.info("Got an incoming message")
-                await process_messages()
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
-    asyncio.run(main())

deltachat-rpc-client/pyproject.toml

@@ -1,29 +0,0 @@
-[build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "deltachat-rpc-client"
-description = "Python client for Delta Chat core JSON-RPC interface"
-dependencies = [
-    "aiohttp",
-    "aiodns"
-]
-dynamic = [
-    "version"
-]
-
-[tool.setuptools]
-# We declare the package not-zip-safe so that our type hints are also available
-# when checking client code that uses our (installed) package.
-# Ref:
-# https://mypy.readthedocs.io/en/stable/installed_packages.html?highlight=zip#using-installed-packages-with-mypy-pep-561
-zip-safe = false
-
-[tool.setuptools.package-data]
-deltachat_rpc_client = [
-    "py.typed"
-]
-
-[project.entry-points.pytest11]
-"deltachat_rpc_client.pytestplugin" = "deltachat_rpc_client.pytestplugin"

deltachat-rpc-client/src/deltachat_rpc_client/__init__.py

@@ -1,5 +0,0 @@
-from .account import Account
-from .contact import Contact
-from .deltachat import DeltaChat
-from .message import Message
-from .rpc import Rpc

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -1,79 +0,0 @@
-from typing import List, Optional
-
-from .chat import Chat
-from .contact import Contact
-from .message import Message
-
-
-class Account:
-    def __init__(self, rpc, account_id) -> None:
-        self._rpc = rpc
-        self.account_id = account_id
-
-    def __repr__(self) -> str:
-        return f"<Account id={self.account_id}>"
-
-    async def wait_for_event(self) -> dict:
-        """Wait until the next event and return it."""
-        return await self._rpc.wait_for_event(self.account_id)
-
-    async def remove(self) -> None:
-        """Remove the account."""
-        await self._rpc.remove_account(self.account_id)
-
-    async def start_io(self) -> None:
-        """Start the account I/O."""
-        await self._rpc.start_io(self.account_id)
-
-    async def stop_io(self) -> None:
-        """Stop the account I/O."""
-        await self._rpc.stop_io(self.account_id)
-
-    async def get_info(self) -> dict:
-        return await self._rpc.get_info(self.account_id)
-
-    async def get_file_size(self) -> int:
-        return await self._rpc.get_account_file_size(self.account_id)
-
-    async def is_configured(self) -> bool:
-        """Return True for configured accounts."""
-        return await self._rpc.is_configured(self.account_id)
-
-    async def set_config(self, key: str, value: Optional[str] = None) -> None:
-        """Set the configuration value key pair."""
-        await self._rpc.set_config(self.account_id, key, value)
-
-    async def get_config(self, key: str) -> Optional[str]:
-        """Get the configuration value."""
-        return await self._rpc.get_config(self.account_id, key)
-
-    async def configure(self) -> None:
-        """Configure an account."""
-        await self._rpc.configure(self.account_id)
-
-    async def create_contact(self, address: str, name: Optional[str] = None) -> Contact:
-        """Create a contact with the given address and, optionally, a name."""
-        return Contact(
-            self._rpc,
-            self.account_id,
-            await self._rpc.create_contact(self.account_id, address, name),
-        )
-
-    async def secure_join(self, qrdata: str) -> Chat:
-        chat_id = await self._rpc.secure_join(self.account_id, qrdata)
-        return Chat(self._rpc, self.account_id, chat_id)
-
-    async def get_fresh_messages(self) -> List[Message]:
-        """Return the list of fresh messages, newest messages first.
-
-        This call is intended for displaying notifications.
-        If you are writing a bot, use get_fresh_messages_in_arrival_order instead,
-        to process oldest messages first.
-        """
-        fresh_msg_ids = await self._rpc.get_fresh_msgs(self.account_id)
-        return [Message(self._rpc, self.account_id, msg_id) for msg_id in fresh_msg_ids]
-
-    async def get_fresh_messages_in_arrival_order(self) -> List[Message]:
-        """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
-        fresh_msg_ids = sorted(await self._rpc.get_fresh_msgs(self.account_id))
-        return [Message(self._rpc, self.account_id, msg_id) for msg_id in fresh_msg_ids]

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -1,41 +0,0 @@
-from typing import TYPE_CHECKING
-
-from .rpc import Rpc
-
-if TYPE_CHECKING:
-    from .message import Message
-
-
-class Chat:
-    def __init__(self, rpc: Rpc, account_id: int, chat_id: int) -> None:
-        self._rpc = rpc
-        self.account_id = account_id
-        self.chat_id = chat_id
-
-    async def block(self) -> None:
-        """Block the chat."""
-        await self._rpc.block_chat(self.account_id, self.chat_id)
-
-    async def accept(self) -> None:
-        """Accept the contact request."""
-        await self._rpc.accept_chat(self.account_id, self.chat_id)
-
-    async def delete(self) -> None:
-        await self._rpc.delete_chat(self.account_id, self.chat_id)
-
-    async def get_encryption_info(self) -> str:
-        return await self._rpc.get_chat_encryption_info(self.account_id, self.chat_id)
-
-    async def send_text(self, text: str) -> "Message":
-        from .message import Message
-
-        msg_id = await self._rpc.misc_send_text_message(
-            self.account_id, self.chat_id, text
-        )
-        return Message(self._rpc, self.account_id, msg_id)
-
-    async def leave(self) -> None:
-        await self._rpc.leave_group(self.account_id, self.chat_id)
-
-    async def get_fresh_message_count(self) -> int:
-        return await self._rpc.get_fresh_msg_cnt(self.account_id, self.chat_id)

deltachat-rpc-client/src/deltachat_rpc_client/contact.py

@@ -1,52 +0,0 @@
-from typing import TYPE_CHECKING
-
-from .rpc import Rpc
-
-if TYPE_CHECKING:
-    from .chat import Chat
-
-
-class Contact:
-    """
-    Contact API.
-
-    Essentially a wrapper for RPC, account ID and a contact ID.
-    """
-
-    def __init__(self, rpc: Rpc, account_id: int, contact_id: int) -> None:
-        self._rpc = rpc
-        self.account_id = account_id
-        self.contact_id = contact_id
-
-    async def block(self) -> None:
-        """Block contact."""
-        await self._rpc.block_contact(self.account_id, self.contact_id)
-
-    async def unblock(self) -> None:
-        """Unblock contact."""
-        await self._rpc.unblock_contact(self.account_id, self.contact_id)
-
-    async def delete(self) -> None:
-        """Delete contact."""
-        await self._rpc.delete_contact(self.account_id, self.contact_id)
-
-    async def change_name(self, name: str) -> None:
-        await self._rpc.change_contact_name(self.account_id, self.contact_id, name)
-
-    async def get_encryption_info(self) -> str:
-        return await self._rpc.get_contact_encryption_info(
-            self.account_id, self.contact_id
-        )
-
-    async def get_dictionary(self) -> dict:
-        """Return a dictionary with a snapshot of all contact properties."""
-        return await self._rpc.get_contact(self.account_id, self.contact_id)
-
-    async def create_chat(self) -> "Chat":
-        from .chat import Chat
-
-        return Chat(
-            self._rpc,
-            self.account_id,
-            await self._rpc.create_chat_by_contact_id(self.account_id, self.contact_id),
-        )

deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py

@@ -1,34 +0,0 @@
-from typing import List
-
-from .account import Account
-from .rpc import Rpc
-
-
-class DeltaChat:
-    """
-    Delta Chat account manager.
-    This is the root of the object oriented API.
-    """
-
-    def __init__(self, rpc: Rpc) -> None:
-        self.rpc = rpc
-
-    async def add_account(self) -> Account:
-        account_id = await self.rpc.add_account()
-        return Account(self.rpc, account_id)
-
-    async def get_all_accounts(self) -> List[Account]:
-        account_ids = await self.rpc.get_all_account_ids()
-        return [Account(self.rpc, account_id) for account_id in account_ids]
-
-    async def start_io(self) -> None:
-        await self.rpc.start_io_for_all_accounts()
-
-    async def stop_io(self) -> None:
-        await self.rpc.stop_io_for_all_accounts()
-
-    async def maybe_network(self) -> None:
-        await self.rpc.maybe_network()
-
-    async def get_system_info(self) -> dict:
-        return await self.rpc.get_system_info()

deltachat-rpc-client/src/deltachat_rpc_client/message.py

@@ -1,42 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional
-
-from .chat import Chat
-from .contact import Contact
-from .rpc import Rpc
-
-
-class Message:
-    def __init__(self, rpc: Rpc, account_id: int, msg_id: int) -> None:
-        self._rpc = rpc
-        self.account_id = account_id
-        self.msg_id = msg_id
-
-    async def send_reaction(self, reactions: str) -> "Message":
-        msg_id = await self._rpc.send_reaction(self.account_id, self.msg_id, reactions)
-        return Message(self._rpc, self.account_id, msg_id)
-
-    async def get_snapshot(self) -> "MessageSnapshot":
-        message_object = await self._rpc.get_message(self.account_id, self.msg_id)
-        return MessageSnapshot(
-            message=self,
-            chat=Chat(self._rpc, self.account_id, message_object["chatId"]),
-            sender=Contact(self._rpc, self.account_id, message_object["fromId"]),
-            text=message_object["text"],
-            error=message_object.get("error"),
-            is_info=message_object["isInfo"],
-        )
-
-    async def mark_seen(self) -> None:
-        """Mark the message as seen."""
-        await self._rpc.markseen_msgs(self.account_id, [self.msg_id])
-
-
-@dataclass
-class MessageSnapshot:
-    message: Message
-    chat: Chat
-    sender: Contact
-    text: str
-    error: Optional[str]
-    is_info: bool

deltachat-rpc-client/src/deltachat_rpc_client/py.typed

@@ -1 +0,0 @@
-# PEP 561 marker file. See https://peps.python.org/pep-0561/

deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py

@@ -1,52 +0,0 @@
-import asyncio
-import json
-import os
-from typing import AsyncGenerator, List
-
-import aiohttp
-import pytest_asyncio
-
-from .account import Account
-from .deltachat import DeltaChat
-from .rpc import Rpc
-
-
-async def get_temp_credentials() -> dict:
-    url = os.getenv("DCC_NEW_TMP_EMAIL")
-    assert url, "Failed to get online account, DCC_NEW_TMP_EMAIL is not set"
-    async with aiohttp.ClientSession() as session:
-        async with session.post(url) as response:
-            return json.loads(await response.text())
-
-
-class ACFactory:
-    def __init__(self, deltachat: DeltaChat) -> None:
-        self.deltachat = deltachat
-
-    async def new_configured_account(self) -> Account:
-        credentials = await get_temp_credentials()
-        account = await self.deltachat.add_account()
-        assert not await account.is_configured()
-        await account.set_config("addr", credentials["email"])
-        await account.set_config("mail_pw", credentials["password"])
-        await account.configure()
-        assert await account.is_configured()
-        return account
-
-    async def get_online_accounts(self, num: int) -> List[Account]:
-        accounts = [await self.new_configured_account() for _ in range(num)]
-        await self.deltachat.start_io()
-        return accounts
-
-
-@pytest_asyncio.fixture
-async def rpc(tmp_path) -> AsyncGenerator:
-    env = {**os.environ, "DC_ACCOUNTS_PATH": str(tmp_path / "accounts")}
-    rpc_server = Rpc(env=env)
-    async with rpc_server as rpc:
-        yield rpc
-
-
-@pytest_asyncio.fixture
-async def acfactory(rpc) -> AsyncGenerator:
-    yield ACFactory(DeltaChat(rpc))

deltachat-rpc-client/src/deltachat_rpc_client/rpc.py

@@ -1,92 +0,0 @@
-import asyncio
-import json
-from typing import Any, AsyncGenerator, Dict, Optional
-
-
-class JsonRpcError(Exception):
-    pass
-
-
-class Rpc:
-    def __init__(self, *args, **kwargs):
-        """The given arguments will be passed to asyncio.create_subprocess_exec()"""
-        self._args = args
-        self._kwargs = kwargs
-
-    async def start(self) -> None:
-        self.process = await asyncio.create_subprocess_exec(
-            "deltachat-rpc-server",
-            stdin=asyncio.subprocess.PIPE,
-            stdout=asyncio.subprocess.PIPE,
-            *self._args,
-            **self._kwargs
-        )
-        self.event_queues: Dict[int, asyncio.Queue] = {}
-        self.id = 0
-        self.reader_task = asyncio.create_task(self.reader_loop())
-
-        # Map from request ID to `asyncio.Future` returning the response.
-        self.request_events: Dict[int, asyncio.Future] = {}
-
-    async def close(self) -> None:
-        """Terminate RPC server process and wait until the reader loop finishes."""
-        self.process.terminate()
-        await self.reader_task
-
-    async def __aenter__(self):
-        await self.start()
-        return self
-
-    async def __aexit__(self, exc_type, exc, tb):
-        await self.close()
-
-    async def reader_loop(self) -> None:
-        while True:
-            line = await self.process.stdout.readline()
-            if not line:  # EOF
-                break
-            response = json.loads(line)
-            if "id" in response:
-                fut = self.request_events.pop(response["id"])
-                fut.set_result(response)
-            elif response["method"] == "event":
-                # An event notification.
-                params = response["params"]
-                account_id = params["contextId"]
-                if account_id not in self.event_queues:
-                    self.event_queues[account_id] = asyncio.Queue()
-                await self.event_queues[account_id].put(params["event"])
-            else:
-                print(response)
-
-    async def wait_for_event(self, account_id: int) -> Optional[dict]:
-        """Waits for the next event from the given account and returns it."""
-        if account_id in self.event_queues:
-            return await self.event_queues[account_id].get()
-        return None
-
-    def __getattr__(self, attr: str):
-        async def method(*args, **kwargs) -> Any:
-            self.id += 1
-            request_id = self.id
-
-            assert not (args and kwargs), "Mixing positional and keyword arguments"
-
-            request = {
-                "jsonrpc": "2.0",
-                "method": attr,
-                "params": kwargs or args,
-                "id": self.id,
-            }
-            data = (json.dumps(request) + "\n").encode()
-            self.process.stdin.write(data)
-            loop = asyncio.get_running_loop()
-            fut = loop.create_future()
-            self.request_events[request_id] = fut
-            response = await fut
-            if "error" in response:
-                raise JsonRpcError(response["error"])
-            if "result" in response:
-                return response["result"]
-
-        return method

deltachat-rpc-client/tests/test_something.py

@@ -1,60 +0,0 @@
-import pytest
-
-
-@pytest.mark.asyncio
-async def test_system_info(rpc) -> None:
-    system_info = await rpc.get_system_info()
-    assert "arch" in system_info
-    assert "deltachat_core_version" in system_info
-
-
-@pytest.mark.asyncio
-async def test_email_address_validity(rpc) -> None:
-    valid_addresses = [
-        "email@example.com",
-        "36aa165ae3406424e0c61af17700f397cad3fe8ab83d682d0bddf3338a5dd52e@yggmail@yggmail",
-    ]
-    invalid_addresses = ["email@", "example.com", "emai221"]
-
-    for addr in valid_addresses:
-        assert await rpc.check_email_validity(addr)
-    for addr in invalid_addresses:
-        assert not await rpc.check_email_validity(addr)
-
-
-@pytest.mark.asyncio
-async def test_acfactory(acfactory) -> None:
-    account = await acfactory.new_configured_account()
-    while True:
-        event = await account.wait_for_event()
-        if event["type"] == "ConfigureProgress":
-            # Progress 0 indicates error.
-            assert event["progress"] != 0
-
-            if event["progress"] == 1000:
-                # Success.
-                break
-        else:
-            print(event)
-    print("Successful configuration")
-
-
-@pytest.mark.asyncio
-async def test_object_account(acfactory) -> None:
-    alice, bob = await acfactory.get_online_accounts(2)
-
-    alice_contact_bob = await alice.create_contact(await bob.get_config("addr"), "Bob")
-    alice_chat_bob = await alice_contact_bob.create_chat()
-    await alice_chat_bob.send_text("Hello!")
-
-    while True:
-        event = await bob.wait_for_event()
-        if event["type"] == "IncomingMsg":
-            chat_id = event["chatId"]
-            msg_id = event["msgId"]
-            break
-
-    rpc = acfactory.deltachat.rpc
-    message = await rpc.get_message(bob.account_id, msg_id)
-    assert message["chatId"] == chat_id
-    assert message["text"] == "Hello!"

deltachat-rpc-client/tox.ini

@@ -1,19 +0,0 @@
-[tox]
-isolated_build = true
-envlist =
-    py3
-
-[testenv]
-commands =
-    pytest {posargs}
-setenv =
-# Avoid stack overflow when Rust core is built without optimizations.
-    RUST_MIN_STACK=8388608
-passenv =
-    DCC_NEW_TMP_EMAIL
-deps =
-    pytest
-    pytest-async
-    pytest-asyncio
-    aiohttp
-    aiodns

deltachat-rpc-server/Cargo.toml

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

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

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

draft/webxdc-dev-reference.md

@@ -4,7 +4,7 @@ This document gives a quick overview about the Webxdc specification,
 It is meant for both, developing Webxdc apps
 and developing Webxdc implementations.
 
-The [Webxdc guidebook](https://docs.webxdc.org/) shows more detailed information
+The [Webxdc guidebook](https://deltachat.github.io/webxdc_docs/) shows more detailed information
 when developing Webxdc apps.
 
 

examples/repl/cmdline.rs

@@ -20,7 +20,6 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
 use deltachat::tools::*;
@@ -408,7 +407,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  resend <msg-id>\n\
                  markseen <msg-id>\n\
                  delmsg <msg-id>\n\
-                 react <msg-id> [<reaction>]\n\
                  ===========================Contact commands==\n\
                  listcontacts [<query>]\n\
                  listverified [<query>]\n\
@@ -554,11 +552,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" {
-                DC_GCL_ARCHIVED_ONLY
-            } else {
-                0
-            };
+            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
             let time_start = std::time::SystemTime::now();
             let chatlist = Chatlist::try_load(
                 &context,
@@ -1127,12 +1121,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ids[0] = MsgId::new(arg1.parse()?);
             message::delete_msgs(&context, &ids).await?;
         }
-        "react" => {
-            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id = MsgId::new(arg1.parse()?);
-            let reaction = arg2;
-            send_reaction(&context, msg_id, reaction).await?;
-        }
         "listcontacts" | "contacts" | "listverified" => {
             let contacts = Contact::get_all(
                 &context,

examples/repl/main.rs

@@ -20,7 +20,6 @@ use deltachat::context::*;
 use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
@@ -72,19 +71,6 @@ fn receive_event(event: EventType) {
                 ))
             );
         }
-        EventType::ReactionsChanged {
-            chat_id,
-            msg_id,
-            contact_id,
-        } => {
-            info!(
-                "{}",
-                yellow.paint(format!(
-                    "Received REACTIONS_CHANGED(chat_id={}, msg_id={}, contact_id={})",
-                    chat_id, msg_id, contact_id
-                ))
-            );
-        }
         EventType::ContactsChanged(_) => {
             info!("{}", yellow.paint("Received CONTACTS_CHANGED()"));
         }
@@ -221,7 +207,7 @@ const CHAT_COMMANDS: [&str; 36] = [
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 9] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -230,7 +216,6 @@ const MESSAGE_COMMANDS: [&str; 9] = [
     "markseen",
     "delmsg",
     "download",
-    "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
     "listcontacts",
@@ -313,7 +298,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
-    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new()).await?;
 
     let events = context.get_event_emitter();
     tokio::task::spawn(async move {
@@ -446,7 +431,7 @@ async fn handle_cmd(
                 }
                 println!("{}", qr);
                 let output = Command::new("qrencode")
-                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                     .output()
                     .expect("failed to execute process");
                 io::stdout().write_all(&output.stdout).unwrap();

examples/simple.rs

@@ -6,7 +6,6 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
 
 fn cb(event: EventType) {
@@ -37,7 +36,7 @@ async fn main() {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
+    let ctx = Context::new(&dbfile, 0, Events::new())
         .await
         .expect("Failed to create context");
     let info = ctx.get_info().await;

node/constants.js

@@ -42,7 +42,6 @@ module.exports = {
   DC_EVENT_IMEX_FILE_WRITTEN: 2052,
   DC_EVENT_IMEX_PROGRESS: 2051,
   DC_EVENT_INCOMING_MSG: 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
   DC_EVENT_INFO: 100,
   DC_EVENT_LOCATION_CHANGED: 2035,
   DC_EVENT_MSGS_CHANGED: 2000,
@@ -51,14 +50,12 @@ module.exports = {
   DC_EVENT_MSG_FAILED: 2012,
   DC_EVENT_MSG_READ: 2015,
   DC_EVENT_NEW_BLOB_FILE: 150,
-  DC_EVENT_REACTIONS_CHANGED: 2001,
   DC_EVENT_SECUREJOIN_INVITER_PROGRESS: 2060,
   DC_EVENT_SECUREJOIN_JOINER_PROGRESS: 2061,
   DC_EVENT_SELFAVATAR_CHANGED: 2110,
   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,
@@ -72,19 +69,8 @@ module.exports = {
   DC_IMEX_EXPORT_SELF_KEYS: 1,
   DC_IMEX_IMPORT_BACKUP: 12,
   DC_IMEX_IMPORT_SELF_KEYS: 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE: 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
-  DC_INFO_GROUP_IMAGE_CHANGED: 3,
-  DC_INFO_GROUP_NAME_CHANGED: 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
-  DC_INFO_LOCATION_ONLY: 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP: 5,
   DC_INFO_PROTECTION_DISABLED: 12,
   DC_INFO_PROTECTION_ENABLED: 11,
-  DC_INFO_SECURE_JOIN_MESSAGE: 7,
-  DC_INFO_UNKNOWN: 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE: 32,
   DC_KEY_GEN_DEFAULT: 0,
   DC_KEY_GEN_ED25519: 2,
   DC_KEY_GEN_RSA2048: 1,
@@ -116,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,

node/events.js

@@ -14,9 +14,7 @@ module.exports = {
   400: 'DC_EVENT_ERROR',
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',
@@ -32,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

@@ -42,7 +42,6 @@ export enum C {
   DC_EVENT_IMEX_FILE_WRITTEN = 2052,
   DC_EVENT_IMEX_PROGRESS = 2051,
   DC_EVENT_INCOMING_MSG = 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
   DC_EVENT_INFO = 100,
   DC_EVENT_LOCATION_CHANGED = 2035,
   DC_EVENT_MSGS_CHANGED = 2000,
@@ -51,14 +50,12 @@ export enum C {
   DC_EVENT_MSG_FAILED = 2012,
   DC_EVENT_MSG_READ = 2015,
   DC_EVENT_NEW_BLOB_FILE = 150,
-  DC_EVENT_REACTIONS_CHANGED = 2001,
   DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060,
   DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061,
   DC_EVENT_SELFAVATAR_CHANGED = 2110,
   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,
@@ -72,19 +69,8 @@ export enum C {
   DC_IMEX_EXPORT_SELF_KEYS = 1,
   DC_IMEX_IMPORT_BACKUP = 12,
   DC_IMEX_IMPORT_SELF_KEYS = 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE = 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
-  DC_INFO_GROUP_IMAGE_CHANGED = 3,
-  DC_INFO_GROUP_NAME_CHANGED = 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
-  DC_INFO_LOCATION_ONLY = 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5,
   DC_INFO_PROTECTION_DISABLED = 12,
   DC_INFO_PROTECTION_ENABLED = 11,
-  DC_INFO_SECURE_JOIN_MESSAGE = 7,
-  DC_INFO_UNKNOWN = 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE = 32,
   DC_KEY_GEN_DEFAULT = 0,
   DC_KEY_GEN_ED25519 = 2,
   DC_KEY_GEN_RSA2048 = 1,
@@ -116,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,
@@ -295,9 +280,7 @@ export const EventId2EventName: { [key: number]: string } = {
   400: 'DC_EVENT_ERROR',
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
   2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
   2010: 'DC_EVENT_MSG_DELIVERED',
   2012: 'DC_EVENT_MSG_FAILED',
@@ -314,5 +297,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,
 }
 

node/test/test.js

@@ -89,11 +89,7 @@ describe('JSON RPC', function () {
     const { dc } = DeltaChat.newTemporary()
     let promise_resolve
     const promise = new Promise((res, _rej) => {
-      promise_resolve = (response) => {
-        // ignore events
-        const answer = JSON.parse(response)
-        if (answer['method'] !== 'event') res(answer)
-      }
+      promise_resolve = res
     })
     dc.startJsonRpcHandler(promise_resolve)
     dc.jsonRpcRequest(
@@ -110,7 +106,7 @@ describe('JSON RPC', function () {
         id: 2,
         result: [1],
       },
-      await promise
+      JSON.parse(await promise)
     )
     dc.close()
   })
@@ -616,7 +612,7 @@ describe('Offline Tests with unconfigured account', function () {
     const id = context.createContact('someuser', 'someuser@site.com')
     const contact = context.getContact(id)
     strictEqual(contact.getId(), id, 'contact id matches')
-    context.deleteContact(id)
+    strictEqual(context.deleteContact(id), true, 'delete call succesful')
     strictEqual(context.getContact(id), null, 'contact is gone')
   })
 

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"
@@ -57,8 +58,8 @@
     "prebuildify": "cd node && prebuildify -t 16.13.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
     "test": "npm run test:lint && npm run test:mocha",
     "test:lint": "npm run lint",
-    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.103.0"
+  "version": "1.93.0"
 }

python/src/deltachat/_build.py

@@ -156,7 +156,6 @@ def extract_defines(flags):
                 | DC_KEY_GEN
                 | DC_IMEX
                 | DC_CONNECTIVITY
-                | DC_DOWNLOAD
             )         # End of prefix matching
             _[\w_]+   # Match the suffix, e.g. _RSA2048 in DC_KEY_GEN_RSA2048
         )             # Close the capturing group, this contains

python/src/deltachat/account.py

@@ -82,13 +82,12 @@ class Account(object):
         if hasattr(db_path, "encode"):
             db_path = db_path.encode("utf8")
 
-        ptr = lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL)
-        if ptr == ffi.NULL:
-            raise ValueError("Could not dc_context_new: {} {}".format(os_name, db_path))
         self._dc_context = ffi.gc(
-            ptr,
+            lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL),
             lib.dc_context_unref,
         )
+        if self._dc_context == ffi.NULL:
+            raise ValueError("Could not dc_context_new: {} {}".format(os_name, db_path))
 
         self._shutdown_event = Event()
         self._event_thread = EventThread(self)

python/src/deltachat/events.py

@@ -105,7 +105,7 @@ class FFIEventTracker:
             yield self.get(timeout=timeout, check_error=check_error)
 
     def get_matching(self, event_name_regex, check_error=True, timeout=None):
-        rex = re.compile("^(?:{})$".format(event_name_regex))
+        rex = re.compile("(?:{}).*".format(event_name_regex))
         for ev in self.iter_events(timeout=timeout, check_error=check_error):
             if rex.match(ev.name):
                 return ev
@@ -192,12 +192,6 @@ class FFIEventTracker:
             return self.account.get_message_by_id(ev.data2)
         return None
 
-    def wait_next_reactions_changed(self):
-        """wait for and return next reactions-changed message"""
-        ev = self.get_matching("DC_EVENT_REACTIONS_CHANGED")
-        assert ev.data1 > 0
-        return self.account.get_message_by_id(ev.data2)
-
     def wait_msg_delivered(self, msg):
         ev = self.get_matching("DC_EVENT_MSG_DELIVERED")
         assert ev.data1 == msg.chat.id
@@ -302,10 +296,6 @@ class EventThread(threading.Thread):
                         "ac_incoming_message",
                         dict(message=msg),
                     )
-        elif name == "DC_EVENT_REACTIONS_CHANGED":
-            assert ffi_event.data1 > 0
-            msg = account.get_message_by_id(ffi_event.data2)
-            yield "ac_reactions_changed", dict(message=msg)
         elif name == "DC_EVENT_MSG_DELIVERED":
             msg = account.get_message_by_id(ffi_event.data2)
             yield "ac_message_delivered", dict(message=msg)

python/src/deltachat/hookspec.py

@@ -49,10 +49,6 @@ class PerAccount:
     def ac_outgoing_message(self, message):
         """Called on each outgoing message (both system and "normal")."""
 
-    @account_hookspec
-    def ac_reactions_changed(self, message):
-        """Called when message reactions changed."""
-
     @account_hookspec
     def ac_message_delivered(self, message):
         """Called when an outgoing message has been delivered to SMTP.

python/src/deltachat/message.py

@@ -9,7 +9,6 @@ from typing import Optional, Union
 from . import const, props
 from .capi import ffi, lib
 from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer
-from .reactions import Reactions
 
 
 class Message(object):
@@ -162,17 +161,6 @@ class Message(object):
             )
         )
 
-    def send_reaction(self, reaction: str):
-        """Send a reaction to message and return the resulting Message instance."""
-        msg_id = lib.dc_send_reaction(self.account._dc_context, self.id, as_dc_charpointer(reaction))
-        if msg_id == 0:
-            raise ValueError("reaction could not be send")
-        return Message.from_db(self.account, msg_id)
-
-    def get_reactions(self) -> Reactions:
-        """Get :class:`deltachat.reactions.Reactions` to the message."""
-        return Reactions.from_msg(self)
-
     def is_system_message(self):
         """return True if this message is a system/info message."""
         return bool(lib.dc_msg_is_info(self._dc_msg))
@@ -461,17 +449,6 @@ class Message(object):
         """mark this message as seen."""
         self.account.mark_seen_messages([self.id])
 
-    #
-    # Message download state
-    #
-    @property
-    def download_state(self):
-        assert self.id > 0
-
-        # load message from db to get a fresh/current state
-        dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-        return lib.dc_msg_get_download_state(dc_msg)
-
 
 # some code for handling DC_MSG_* view types
 

python/src/deltachat/reactions.py

@@ -1,43 +0,0 @@
-""" The Reactions object. """
-
-from .capi import ffi, lib
-from .cutil import from_dc_charpointer, iter_array
-
-
-class Reactions(object):
-    """Reactions object.
-
-    You obtain instances of it through :class:`deltachat.message.Message`.
-    """
-
-    def __init__(self, account, dc_reactions):
-        assert isinstance(account._dc_context, ffi.CData)
-        assert isinstance(dc_reactions, ffi.CData)
-        assert dc_reactions != ffi.NULL
-        self.account = account
-        self._dc_reactions = dc_reactions
-
-    def __repr__(self):
-        return "<Reactions dc_reactions={}>".format(self._dc_reactions)
-
-    @classmethod
-    def from_msg(cls, msg):
-        assert msg.id > 0
-        return cls(
-            msg.account,
-            ffi.gc(lib.dc_get_msg_reactions(msg.account._dc_context, msg.id), lib.dc_reactions_unref),
-        )
-
-    def get_contacts(self) -> list:
-        """Get list of contacts reacted to the message.
-
-        :returns: list of :class:`deltachat.contact.Contact` objects for this reaction.
-        """
-        from .contact import Contact
-
-        dc_array = ffi.gc(lib.dc_reactions_get_contacts(self._dc_reactions), lib.dc_array_unref)
-        return list(iter_array(dc_array, lambda x: Contact(self.account, x)))
-
-    def get_by_contact(self, contact) -> str:
-        """Get a string containing space-separated reactions of a single :class:`deltachat.contact.Contact`."""
-        return from_dc_charpointer(lib.dc_reactions_get_by_contact_id(self._dc_reactions, contact.id))

python/tests/test_1_online.py

@@ -1,7 +1,6 @@
 import os
 import queue
 import sys
-import time
 from datetime import datetime, timezone
 
 import pytest
@@ -406,29 +405,6 @@ def test_forward_own_message(acfactory, lp):
     assert msg_in.is_forwarded()
 
 
-def test_long_group_name(acfactory, lp):
-    """See bug https://github.com/deltachat/deltachat-core-rust/issues/3650 "Space added before long
-    group names after MIME serialization/deserialization".
-
-    When the mailadm bot creates a group with botadmin, the bot creates is as
-    "pytest-supportuser-282@x.testrun.org support group" (for example). But in the botadmin's
-    account object, the group chat is called " pytest-supportuser-282@x.testrun.org support group"
-    (with an additional space character in the beginning).
-    """
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    lp.sec("ac1: creating group chat and sending a message")
-    group_name = "pytest-supportuser-282@x.testrun.org support group"
-    group = ac1.create_group_chat(group_name)
-    group.add_contact(ac2)
-    group.send_text("message")
-
-    # wait for other account to receive
-    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
-    msg_in = ac2.get_message_by_id(ev.data2)
-    assert msg_in.chat.get_name() == group_name
-
-
 def test_send_self_message(acfactory, lp):
     ac1 = acfactory.new_online_configuring_account(mvbox_move=True)
     acfactory.bring_accounts_online()
@@ -925,34 +901,6 @@ def test_dont_show_emails(acfactory, lp):
             ac1.get_config("configured_addr")
         ),
     )
-    ac1.direct_imap.append(
-        "Spam",
-        """
-        From: unknown.address@junk.org, unkwnown.add@junk.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message2@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Unknown & malformed message in Spam
-    """.format(
-            ac1.get_config("configured_addr")
-        ),
-    )
-    ac1.direct_imap.append(
-        "Spam",
-        """
-        From: alice@example.org
-        Subject: subj
-        To: {}
-        Message-ID: <spam.message3@junk.org>
-        Content-Type: text/plain; charset=utf-8
-
-        Actually interesting message in Spam
-    """.format(
-            ac1.get_config("configured_addr")
-        ),
-    )
     ac1.direct_imap.append(
         "Junk",
         """
@@ -978,9 +926,7 @@ def test_dont_show_emails(acfactory, lp):
     ac1._evtracker.wait_idle_inbox_ready()
 
     assert msg.text == "subj – message in Sent"
-    chat_msgs = msg.chat.get_messages()
-    assert len(chat_msgs) == 2
-    assert any(msg.text == "subj – Actually interesting message in Spam" for msg in chat_msgs)
+    assert len(msg.chat.get_messages()) == 1
 
     assert not any("unknown.address" in c.get_name() for c in ac1.get_chats())
     ac1.direct_imap.select_folder("Spam")
@@ -996,7 +942,7 @@ def test_dont_show_emails(acfactory, lp):
     msg2 = ac1._evtracker.wait_next_messages_changed()
 
     assert msg2.text == "subj – message in Drafts that is moved to Sent later"
-    assert len(msg.chat.get_messages()) == 3
+    assert len(msg.chat.get_messages()) == 2
 
 
 def test_no_old_msg_is_fresh(acfactory, lp):
@@ -1291,103 +1237,6 @@ def test_send_and_receive_image(acfactory, lp, data):
     assert m == msg_in
 
 
-def test_reaction_to_partially_fetched_msg(acfactory, lp, tmpdir):
-    """See https://github.com/deltachat/deltachat-core-rust/issues/3688 "Partially downloaded
-    messages are received out of order".
-
-    If the Inbox contains X small messages followed by Y large messages followed by Z small
-    messages, Delta Chat first downloaded a batch of X+Z messages, and then a batch of Y messages.
-
-    This bug was discovered by @Simon-Laux while testing reactions PR #3644 and can be reproduced
-    with online test as follows:
-    - Bob enables download limit and goes offline.
-    - Alice sends a large message to Bob and reacts to this message with a thumbs-up.
-    - Bob goes online
-    - Bob first processes a reaction message and throws it away because there is no corresponding
-      message, then processes a partially downloaded message.
-    - As a result, Bob does not see a reaction
-    """
-    download_limit = 32768
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_addr = ac1.get_config("addr")
-    chat = ac1.create_chat(ac2)
-    ac2.set_config("download_limit", str(download_limit))
-    ac2.stop_io()
-
-    reactions_queue = queue.Queue()
-
-    class InPlugin:
-        @account_hookimpl
-        def ac_reactions_changed(self, message):
-            reactions_queue.put(message)
-
-    ac2.add_account_plugin(InPlugin())
-
-    lp.sec("sending small+large messages from ac1 to ac2")
-    msgs = []
-    msgs.append(chat.send_text("hi"))
-    path = tmpdir.join("large")
-    with open(path, "wb") as fout:
-        fout.write(os.urandom(download_limit + 1))
-    msgs.append(chat.send_file(path.strpath))
-
-    lp.sec("sending a reaction to the large message from ac1 to ac2")
-    react_str = "\N{THUMBS UP SIGN}"
-    msgs.append(msgs[-1].send_reaction(react_str))
-
-    for m in msgs:
-        ac1._evtracker.wait_msg_delivered(m)
-    ac2.start_io()
-
-    lp.sec("wait for ac2 to receive a reaction")
-    msg2 = ac2._evtracker.wait_next_reactions_changed()
-    assert msg2.get_sender_contact().addr == ac1_addr
-    assert msg2.download_state == const.DC_DOWNLOAD_AVAILABLE
-    assert reactions_queue.get() == msg2
-    reactions = msg2.get_reactions()
-    contacts = reactions.get_contacts()
-    assert len(contacts) == 1
-    assert contacts[0].addr == ac1_addr
-    assert reactions.get_by_contact(contacts[0]) == react_str
-
-
-def test_reactions_for_a_reordering_move(acfactory, lp):
-    """When a batch of messages is moved from Inbox to DeltaChat folder with a single MOVE command,
-    their UIDs may be reordered (e.g. Gmail is known for that) which led to that messages were
-    processed by receive_imf in the wrong order, and, particularly, reactions were processed before
-    messages they refer to and thus dropped.
-    """
-    (ac1,) = acfactory.get_online_accounts(1)
-    ac2 = acfactory.new_online_configuring_account(mvbox_move=True)
-    acfactory.bring_accounts_online()
-    chat1 = acfactory.get_accepted_chat(ac1, ac2)
-    ac2.stop_io()
-
-    lp.sec("sending message + reaction from ac1 to ac2")
-    msg1 = chat1.send_text("hi")
-    ac1._evtracker.wait_msg_delivered(msg1)
-    # It's is sad, but messages must differ in their INTERNALDATEs to be processed in the correct
-    # order by DC, and most (if not all) mail servers provide only seconds precision.
-    time.sleep(2)
-    react_str = "\N{THUMBS UP SIGN}"
-    ac1._evtracker.wait_msg_delivered(msg1.send_reaction(react_str))
-
-    lp.sec("moving messages to ac2's DeltaChat folder in the reverse order")
-    ac2.direct_imap.connect()
-    for uid in sorted([m.uid for m in ac2.direct_imap.get_all_messages()], reverse=True):
-        ac2.direct_imap.conn.move(uid, "DeltaChat")
-
-    lp.sec("receiving messages by ac2")
-    ac2.start_io()
-    msg2 = ac2._evtracker.wait_next_reactions_changed()
-    assert msg2.text == msg1.text
-    reactions = msg2.get_reactions()
-    contacts = reactions.get_contacts()
-    assert len(contacts) == 1
-    assert contacts[0].addr == ac1.get_config("addr")
-    assert reactions.get_by_contact(contacts[0]) == react_str
-
-
 def test_import_export_online_all(acfactory, tmpdir, data, lp):
     (ac1,) = acfactory.get_online_accounts(1)
 

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

python/tox.ini

@@ -10,9 +10,6 @@ envlist =
 commands = 
     pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
     pip wheel . -w {toxworkdir}/wheelhouse --no-deps
-setenv =
-# Avoid stack overflow when Rust core is built without optimizations.
-    RUST_MIN_STACK=8388608
 passenv = 
     DCC_RS_DEV
     DCC_RS_TARGET
@@ -27,13 +24,6 @@ deps =
     pdbpp
     requests
 
-[testenv:.pkg]
-passenv =
-    DCC_RS_DEV
-    DCC_RS_TARGET
-    CARGO_TARGET_DIR
-    RUSTC_WRAPPER
-
 [testenv:auditwheels]
 skipsdist = True
 deps = auditwheel

rust-toolchain

@@ -1 +1 @@
-1.65.0
+1.61.0

scripts/coredeps/install-rust.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.65.0
+RUST_VERSION=1.61.0
 
 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

scripts/set_core_version.py

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

spec.md

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

src/accounts.rs

@@ -10,7 +10,6 @@ use uuid::Uuid;
 
 use crate::context::Context;
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::stock_str::StockStrings;
 
 /// Account manager, that can handle multiple accounts in a single place.
 #[derive(Debug)]
@@ -21,12 +20,6 @@ pub struct Accounts {
 
     /// Event channel to emit account manager errors.
     events: Events,
-
-    /// Stock string translations shared by all created contexts.
-    ///
-    /// This way changing a translation for one context automatically
-    /// changes it for all other contexts.
-    pub(crate) stockstrings: StockStrings,
 }
 
 impl Accounts {
@@ -62,9 +55,8 @@ impl Accounts {
             .await
             .context("failed to load accounts config")?;
         let events = Events::new();
-        let stockstrings = StockStrings::new();
         let accounts = config
-            .load_accounts(&events, &stockstrings)
+            .load_accounts(&events)
             .await
             .context("failed to load accounts")?;
 
@@ -73,24 +65,23 @@ impl Accounts {
             config,
             accounts,
             events,
-            stockstrings,
         })
     }
 
     /// 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),
         }
@@ -113,7 +104,6 @@ impl Accounts {
             &account_config.dbfile(),
             account_config.id,
             self.events.clone(),
-            self.stockstrings.clone(),
         )
         .await?;
         self.accounts.insert(account_config.id, ctx);
@@ -129,7 +119,6 @@ impl Accounts {
             &account_config.dbfile(),
             account_config.id,
             self.events.clone(),
-            self.stockstrings.clone(),
         )
         .await?;
         self.accounts.insert(account_config.id, ctx);
@@ -146,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
@@ -182,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
@@ -215,13 +204,7 @@ impl Accounts {
 
         match res {
             Ok(_) => {
-                let ctx = Context::new(
-                    &new_dbfile,
-                    account_config.id,
-                    self.events.clone(),
-                    self.stockstrings.clone(),
-                )
-                .await?;
+                let ctx = Context::new(&new_dbfile, account_config.id, self.events.clone()).await?;
                 self.accounts.insert(account_config.id, ctx);
                 Ok(account_config.id)
             }
@@ -242,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()
     }
 
@@ -298,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()
     }
 }
@@ -356,31 +339,17 @@ impl Config {
         Ok(Config { file, inner })
     }
 
-    /// Loads all accounts defined in the configuration file.
-    ///
-    /// Created contexts share the same event channel and stock string
-    /// translations.
-    pub async fn load_accounts(
-        &self,
-        events: &Events,
-        stockstrings: &StockStrings,
-    ) -> Result<BTreeMap<u32, Context>> {
+    pub async fn load_accounts(&self, events: &Events) -> Result<BTreeMap<u32, Context>> {
         let mut accounts = BTreeMap::new();
-
         for account_config in &self.inner.accounts {
-            let ctx = Context::new(
-                &account_config.dbfile(),
-                account_config.id,
-                events.clone(),
-                stockstrings.clone(),
-            )
-            .await
-            .with_context(|| {
-                format!(
-                    "failed to create context from file {:?}",
-                    account_config.dbfile()
-                )
-            })?;
+            let ctx = Context::new(&account_config.dbfile(), account_config.id, events.clone())
+                .await
+                .with_context(|| {
+                    format!(
+                        "failed to create context from file {:?}",
+                        account_config.dbfile()
+                    )
+                })?;
 
             accounts.insert(account_config.id, ctx);
         }
@@ -411,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)
     }
@@ -432,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
     }
 
@@ -477,8 +447,6 @@ impl AccountConfig {
 mod tests {
     use super::*;
 
-    use crate::stock_str::{self, StockMessage};
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_account_new_open() {
         let dir = tempfile::tempdir().unwrap();
@@ -490,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,);
@@ -504,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);
     }
 
@@ -530,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(())
     }
@@ -552,10 +520,10 @@ 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(), StockStrings::new())
+        let ctx = Context::new(&extern_dbfile, 0, Events::new())
             .await
             .unwrap();
         ctx.set_config(crate::config::Config::Addr, Some("me@mail.com"))
@@ -569,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)
@@ -594,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));
         }
@@ -609,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?;
 
@@ -629,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?;
 
@@ -643,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())
@@ -693,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);
@@ -724,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
@@ -738,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);
 
@@ -750,28 +720,4 @@ mod tests {
 
         Ok(())
     }
-
-    /// Tests that accounts share stock string translations.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_accounts_share_translations() -> Result<()> {
-        let dir = tempfile::tempdir().unwrap();
-        let p: PathBuf = dir.path().join("accounts");
-
-        let mut accounts = Accounts::new(p.clone()).await?;
-        accounts.add_account().await?;
-        accounts.add_account().await?;
-
-        let account1 = accounts.get_account(1).context("failed to get account 1")?;
-        let account2 = accounts.get_account(2).context("failed to get account 2")?;
-
-        assert_eq!(stock_str::no_messages(&account1).await, "No messages.");
-        assert_eq!(stock_str::no_messages(&account2).await, "No messages.");
-        account1
-            .set_stock_translation(StockMessage::NoMessages, "foobar".to_string())
-            .await?;
-        assert_eq!(stock_str::no_messages(&account1).await, "foobar");
-        assert_eq!(stock_str::no_messages(&account2).await, "foobar");
-
-        Ok(())
-    }
 }

src/authres.rs

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

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

@@ -2,7 +2,6 @@
 
 use std::collections::HashMap;
 use std::convert::{TryFrom, TryInto};
-use std::fmt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::time::{Duration, SystemTime};
@@ -82,44 +81,6 @@ impl Default for ProtectionStatus {
     }
 }
 
-/// The reason why messages cannot be sent to the chat.
-///
-/// The reason is mainly for logging and displaying in debug REPL, thus not translated.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum CantSendReason {
-    /// Special chat.
-    SpecialChat,
-
-    /// The chat is a device chat.
-    DeviceChat,
-
-    /// The chat is a contact request, it needs to be accepted before sending a message.
-    ContactRequest,
-
-    /// Mailing list without known List-Post header.
-    ReadOnlyMailingList,
-
-    /// Not a member of the chat.
-    NotAMember,
-}
-
-impl fmt::Display for CantSendReason {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::SpecialChat => write!(f, "the chat is a special chat"),
-            Self::DeviceChat => write!(f, "the chat is a device chat"),
-            Self::ContactRequest => write!(
-                f,
-                "contact request chat should be accepted before sending messages"
-            ),
-            Self::ReadOnlyMailingList => {
-                write!(f, "mailing list does not have a know post address")
-            }
-            Self::NotAMember => write!(f, "not a member of the chat"),
-        }
-    }
-}
-
 /// Chat ID, including reserved IDs.
 ///
 /// Some chat IDs are reserved to identify special chat types.  This
@@ -684,11 +645,8 @@ impl ChatId {
         }
 
         let chat = Chat::load_from_db(context, self).await?;
-        if let Some(cant_send_reason) = chat.why_cant_send(context).await? {
-            bail!(
-                "Can't set a draft because chat is not writeable: {}",
-                cant_send_reason
-            );
+        if !chat.can_send(context).await? {
+            bail!("Can't set a draft: Can't send");
         }
 
         // set back draft information to allow identifying the draft later on -
@@ -1124,33 +1082,14 @@ impl Chat {
         self.typ == Chattype::Mailinglist
     }
 
-    /// Returns None if user can send messages to this chat.
-    ///
-    /// Otherwise returns a reason useful for logging.
-    pub(crate) async fn why_cant_send(&self, context: &Context) -> Result<Option<CantSendReason>> {
-        use CantSendReason::*;
-
-        let reason = if self.id.is_special() {
-            Some(SpecialChat)
-        } else if self.is_device_talk() {
-            Some(DeviceChat)
-        } else if self.is_contact_request() {
-            Some(ContactRequest)
-        } else if self.is_mailing_list() && self.param.get(Param::ListPost).is_none_or_empty() {
-            Some(ReadOnlyMailingList)
-        } else if !self.is_self_in_chat(context).await? {
-            Some(NotAMember)
-        } else {
-            None
-        };
-        Ok(reason)
-    }
-
-    /// Returns true if can send to the chat.
-    ///
-    /// This function can be used by the UI to decide whether to display the input box.
+    /// Returns true if user can send messages to this chat.
     pub async fn can_send(&self, context: &Context) -> Result<bool> {
-        Ok(self.why_cant_send(context).await?.is_none())
+        let cannot_send = self.id.is_special()
+            || self.is_device_talk()
+            || self.is_contact_request()
+            || (self.is_mailing_list() && self.param.get(Param::ListPost).is_none_or_empty())
+            || !self.is_self_in_chat(context).await?;
+        Ok(!cannot_send)
     }
 
     /// Checks if the user is part of a chat
@@ -1191,8 +1130,8 @@ impl Chat {
     }
 
     /// Returns mailing list address where messages are sent to.
-    pub fn get_mailinglist_addr(&self) -> Option<&str> {
-        self.param.get(Param::ListPost)
+    pub fn get_mailinglist_addr(&self) -> &str {
+        self.param.get(Param::ListPost).unwrap_or_default()
     }
 
     /// Returns profile image path for the chat.
@@ -1316,13 +1255,18 @@ impl Chat {
         let mut to_id = 0;
         let mut location_id = 0;
 
-        if let Some(reason) = self.why_cant_send(context).await? {
-            if self.typ == Chattype::Group && reason == CantSendReason::NotAMember {
+        if !self.can_send(context).await? {
+            if self.typ == Chattype::Group
+                && !is_contact_in_chat(context, self.id, ContactId::SELF).await?
+            {
                 context.emit_event(EventType::ErrorSelfNotInGroup(
                     "Cannot send message; self not in group.".into(),
                 ));
+                bail!("Cannot set message; self not in group.");
+            } else {
+                error!(context, "Cannot send to chat type #{}.", self.typ,);
+                bail!("Cannot send to chat type #{}", self.typ);
             }
-            bail!("Cannot send message to {}: {}", self.id, reason);
         }
 
         let from = context.get_primary_self_addr().await?;
@@ -1937,9 +1881,7 @@ async fn prepare_msg_common(
     change_state_to: MessageState,
 ) -> Result<MsgId> {
     let mut chat = Chat::load_from_db(context, chat_id).await?;
-    if let Some(reason) = chat.why_cant_send(context).await? {
-        bail!("cannot send to {}: {}", chat_id, reason);
-    }
+    ensure!(chat.can_send(context).await?, "cannot send to {}", chat_id);
 
     // check current MessageState for drafts (to keep msg_id) ...
     let update_msg_id = if msg.state == MessageState::OutDraft {
@@ -2246,7 +2188,7 @@ pub async fn send_videochat_invitation(context: &Context, chat_id: ChatId) -> Re
     let mut msg = Message::new(Viewtype::VideochatInvitation);
     msg.param.set(Param::WebrtcRoom, &instance);
     msg.text = Some(
-        stock_str::videochat_invite_msg_body(context, &Message::parse_webrtc_instance(&instance).1)
+        stock_str::videochat_invite_msg_body(context, Message::parse_webrtc_instance(&instance).1)
             .await,
     );
     send_msg(context, chat_id, &mut msg).await
@@ -2312,7 +2254,7 @@ pub async fn get_chat_msgs(
                 let curr_day = curr_local_timestamp / 86400;
                 if curr_day != last_day {
                     ret.push(ChatItem::DayMarker {
-                        timestamp: curr_day * 86400, // Convert day back to Unix timestamp
+                        timestamp: curr_day,
                     });
                     last_day = curr_day;
                 }
@@ -2497,7 +2439,7 @@ pub async fn get_chat_media(
                 AND hidden=0
               ORDER BY timestamp, id;",
             paramsv![
-                chat_id.is_none(),
+                if chat_id.is_none() { 1i32 } else { 0i32 },
                 chat_id.unwrap_or_else(|| ChatId::new(0)),
                 msg_type,
                 if msg_type2 != Viewtype::Unknown {
@@ -2621,7 +2563,7 @@ pub async fn create_group_chat(
 
     let chat_id = ChatId::new(u32::try_from(row_id)?);
     if !is_contact_in_chat(context, chat_id, ContactId::SELF).await? {
-        add_to_chat_contacts_table(context, chat_id, &[ContactId::SELF]).await?;
+        add_to_chat_contacts_table(context, chat_id, ContactId::SELF).await?;
     }
 
     context.emit_msgs_changed_without_ids();
@@ -2682,25 +2624,19 @@ pub async fn create_broadcast_list(context: &Context) -> Result<ChatId> {
     Ok(chat_id)
 }
 
-/// Adds contacts to the `chats_contacts` table.
+/// Adds a contact to the `chats_contacts` table.
 pub(crate) async fn add_to_chat_contacts_table(
     context: &Context,
     chat_id: ChatId,
-    contact_ids: &[ContactId],
+    contact_id: ContactId,
 ) -> Result<()> {
     context
         .sql
-        .transaction(move |transaction| {
-            for contact_id in contact_ids {
-                transaction.execute(
-                    "INSERT OR IGNORE INTO chats_contacts (chat_id, contact_id) VALUES(?, ?)",
-                    paramsv![chat_id, contact_id],
-                )?;
-            }
-            Ok(())
-        })
+        .execute(
+            "INSERT INTO chats_contacts (chat_id, contact_id) VALUES(?, ?)",
+            paramsv![chat_id, contact_id],
+        )
         .await?;
-
     Ok(())
 }
 
@@ -2802,7 +2738,7 @@ pub(crate) async fn add_contact_to_chat_ex(
         if is_contact_in_chat(context, chat_id, contact_id).await? {
             return Ok(false);
         }
-        add_to_chat_contacts_table(context, chat_id, &[contact_id]).await?;
+        add_to_chat_contacts_table(context, chat_id, contact_id).await?;
     }
     if chat.typ == Chattype::Group && chat.is_promoted() {
         msg.viewtype = Viewtype::Text;
@@ -3069,7 +3005,7 @@ pub async fn set_chat_name(context: &Context, chat_id: ChatId, new_name: &str) -
 pub async fn set_chat_profile_image(
     context: &Context,
     chat_id: ChatId,
-    new_image: &str, // XXX use PathBuf
+    new_image: impl AsRef<str>, // XXX use PathBuf
 ) -> Result<()> {
     ensure!(!chat_id.is_special(), "Invalid chat ID");
     let mut chat = Chat::load_from_db(context, chat_id).await?;
@@ -3087,12 +3023,13 @@ pub async fn set_chat_profile_image(
     let mut msg = Message::new(Viewtype::Text);
     msg.param
         .set_int(Param::Cmd, SystemMessage::GroupImageChanged as i32);
-    if new_image.is_empty() {
+    if new_image.as_ref().is_empty() {
         chat.param.remove(Param::ProfileImage);
         msg.param.remove(Param::Arg);
         msg.text = Some(stock_str::msg_grp_img_deleted(context, ContactId::SELF).await);
     } else {
-        let mut image_blob = BlobObject::new_from_path(context, Path::new(new_image)).await?;
+        let mut image_blob =
+            BlobObject::new_from_path(context, Path::new(new_image.as_ref())).await?;
         image_blob.recode_to_avatar_size(context).await?;
         chat.param.set(Param::ProfileImage, image_blob.as_name());
         msg.param.set(Param::Arg, image_blob.as_name());
@@ -3117,9 +3054,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
 
     chat_id.unarchive_if_not_muted(context).await?;
     if let Ok(mut chat) = Chat::load_from_db(context, chat_id).await {
-        if let Some(reason) = chat.why_cant_send(context).await? {
-            bail!("cannot send to {}: {}", chat_id, reason);
-        }
+        ensure!(chat.can_send(context).await?, "cannot send to {}", chat_id);
         curr_timestamp = create_smeared_timestamps(context, msg_ids.len()).await;
         let ids = context
             .sql
@@ -3434,15 +3369,6 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
         .sql
         .execute("DELETE FROM devmsglabels;", paramsv![])
         .await?;
-
-    // Insert labels for welcome messages to avoid them being readded on reconfiguration.
-    context
-        .sql
-        .execute(
-            r#"INSERT INTO devmsglabels (label) VALUES ("core-welcome-image"), ("core-welcome")"#,
-            paramsv![],
-        )
-        .await?;
     context.set_config(Config::QuotaExceeding, None).await?;
     Ok(())
 }
@@ -3767,11 +3693,11 @@ mod tests {
 
         // create group and sync it to the second device
         let a1_chat_id = create_group_chat(&a1, ProtectionStatus::Unprotected, "foo").await?;
-        let sent = a1.send_text(a1_chat_id, "ho!").await;
+        a1.send_text(a1_chat_id, "ho!").await;
         let a1_msg = a1.get_last_msg().await;
         let a1_chat = Chat::load_from_db(&a1, a1_chat_id).await?;
 
-        let a2_msg = a2.recv_msg(&sent).await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
         let a2_chat_id = a2_msg.chat_id;
         let a2_chat = Chat::load_from_db(&a2, a2_chat_id).await?;
 
@@ -4093,7 +4019,6 @@ mod tests {
         assert!(chat.is_device_talk());
         assert!(!chat.is_self_talk());
         assert!(!chat.can_send(&t).await?);
-        assert!(chat.why_cant_send(&t).await? == Some(CantSendReason::DeviceChat));
 
         assert_eq!(chat.name, stock_str::device_messages(&t).await);
         assert!(chat.get_profile_image(&t).await?.is_some());
@@ -4629,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;
@@ -4657,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());
 
@@ -4669,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());
 
@@ -4690,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"))]
@@ -184,30 +184,24 @@ pub enum Config {
     /// In a future versions, this switch may be removed.
     #[strum(props(default = "0"))]
     SendSyncMsgs,
-
-    /// Space-separated list of all the authserv-ids which we believe
-    /// may be the one of our email server.
-    ///
-    /// See `crate::authres::update_authservid_candidates`.
-    AuthservIdCandidates,
 }
 
 impl Context {
     pub async fn config_exists(&self, key: Config) -> Result<bool> {
-        Ok(self.sql.get_raw_config(key.as_ref()).await?.is_some())
+        Ok(self.sql.get_raw_config(key).await?.is_some())
     }
 
     /// Get a configuration key. Returns `None` if no value is set, and no default value found.
     pub async fn get_config(&self, key: Config) -> Result<Option<String>> {
         let value = match key {
             Config::Selfavatar => {
-                let rel_path = self.sql.get_raw_config(key.as_ref()).await?;
+                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.as_ref()).await?,
+            _ => self.sql.get_raw_config(key).await?,
         };
 
         if value.is_some() {
@@ -297,30 +291,26 @@ impl Context {
                     Some(value) => {
                         let mut blob = BlobObject::new_from_path(self, value.as_ref()).await?;
                         blob.recode_to_avatar_size(self).await?;
-                        self.sql
-                            .set_raw_config(key.as_ref(), Some(blob.as_name()))
-                            .await?;
+                        self.sql.set_raw_config(key, Some(blob.as_name())).await?;
                     }
                     None => {
-                        self.sql.set_raw_config(key.as_ref(), None).await?;
+                        self.sql.set_raw_config(key, None).await?;
                     }
                 }
                 self.emit_event(EventType::SelfavatarChanged);
             }
             Config::DeleteDeviceAfter => {
-                let ret = self.sql.set_raw_config(key.as_ref(), value).await;
+                let ret = self.sql.set_raw_config(key, value).await;
                 // Interrupt ephemeral loop to delete old messages immediately.
                 self.interrupt_ephemeral_task().await;
                 ret?
             }
             Config::Displayname => {
                 let value = value.map(improve_single_line_input);
-                self.sql
-                    .set_raw_config(key.as_ref(), value.as_deref())
-                    .await?;
+                self.sql.set_raw_config(key, value.as_deref()).await?;
             }
             _ => {
-                self.sql.set_raw_config(key.as_ref(), value).await?;
+                self.sql.set_raw_config(key, value).await?;
             }
         }
         Ok(())

src/configure.rs

@@ -87,7 +87,7 @@ impl Context {
                         self,
                         // We are using Anyhow's .context() and to show the
                         // inner error, too, we need the {:#}:
-                        &format!("{:#}", err),
+                        format!("{:#}", err),
                     )
                     .await
                 )
@@ -153,7 +153,7 @@ async fn on_configure_completed(
             if !addr_cmp(&new_addr, &old_addr) {
                 let mut msg = Message::new(Viewtype::Text);
                 msg.text =
-                    Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
+                    Some(stock_str::aeap_explanation_and_link(context, old_addr, new_addr).await);
                 chat::add_device_msg(context, None, Some(&mut msg))
                     .await
                     .ok_or_log_msg(context, "Cannot add AEAP explanation");
@@ -196,7 +196,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     }
     // no oauth? - just continue it's no error
 
-    let parsed = EmailAddress::new(&param.addr).context("Bad email-address")?;
+    let parsed: EmailAddress = param.addr.parse().context("Bad email-address")?;
     let param_domain = parsed.domain;
     let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
 
@@ -442,6 +442,9 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     let create_mvbox = ctx.should_watch_mvbox().await?;
 
+    // Send client ID as soon as possible before doing anything else.
+    imap.determine_capabilities(ctx).await?;
+
     imap.configure_folders(ctx, create_mvbox).await?;
 
     imap.select_with_uidvalidity(ctx, "INBOX")
@@ -576,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

@@ -1,20 +1,14 @@
 //! Contacts module
 
-use std::cmp::Reverse;
-use std::collections::BinaryHeap;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};
 
 use anyhow::{bail, ensure, Context as _, Result};
-use async_channel::{self as channel, Receiver, Sender};
 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use tokio::task;
-use tokio::time::{timeout, Duration};
 
 use crate::aheader::EncryptPreference;
 use crate::chat::ChatId;
@@ -30,7 +24,7 @@ use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::sql::{self, params_iter};
-use crate::tools::{duration_to_str, get_abs_path, improve_single_line_input, time, EmailAddress};
+use crate::tools::{get_abs_path, improve_single_line_input, time, EmailAddress};
 use crate::{chat, stock_str};
 
 /// Time during which a contact is considered as seen recently.
@@ -40,9 +34,7 @@ const SEEN_RECENTLY_SECONDS: i64 = 600;
 ///
 /// Some contact IDs are reserved to identify special contacts.  This
 /// type can represent both the special as well as normal contacts.
-#[derive(
-    Debug, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-)]
+#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct ContactId(u32);
 
 impl ContactId {
@@ -229,7 +221,7 @@ pub enum Origin {
     /// set on Bob's side for contacts scanned and verified from a QR code. Only means the contact has once been established using the "securejoin" procedure in the past, getting the current key verification status requires calling contact_is_verified() !
     SecurejoinJoined = 0x0200_0000,
 
-    /// contact added manually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
+    /// contact added mannually by create_contact(), this should be the largest origin as otherwise the user cannot modify the names
     ManuallyCreated = 0x0400_0000,
 }
 
@@ -455,7 +447,7 @@ impl Contact {
     /// - "row_authname": name as authorized from a contact, set only through a From-header
     /// Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
     ///
-    /// Returns the contact_id and a `Modifier` value indicating if a modification occurred.
+    /// Returns the contact_id and a `Modifier` value indicating if a modification occured.
     pub(crate) async fn add_or_lookup(
         context: &Context,
         name: &str,
@@ -514,9 +506,9 @@ impl Contact {
         let mut update_addr = false;
         let mut row_id = 0;
 
-        if let Some((id, row_name, row_addr, row_origin, row_authname)) = context
+        if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context
             .sql
-            .query_row_optional(
+            .query_row(
                 "SELECT id, name, addr, origin, authname \
             FROM contacts WHERE addr=? COLLATE NOCASE;",
                 paramsv![addr.to_string()],
@@ -530,7 +522,7 @@ impl Contact {
                     Ok((row_id, row_name, row_addr, row_origin, row_authname))
                 },
             )
-            .await?
+            .await
         {
             let update_name = manual && name != row_name;
             let update_authname = !manual
@@ -944,36 +936,43 @@ impl Contact {
         Ok(ret)
     }
 
-    /// Delete a contact so that it disappears from the corresponding lists.
-    /// Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
-    /// The contact is deleted from the local device.
+    /// Delete a contact. The contact is deleted from the local device. It may happen that this is not
+    /// possible as the contact is in use. In this case, the contact can be blocked.
     ///
     /// May result in a `#DC_EVENT_CONTACTS_CHANGED` event.
     pub async fn delete(context: &Context, contact_id: ContactId) -> Result<()> {
         ensure!(!contact_id.is_special(), "Can not delete special contact");
 
-        context
+        let count_chats = context
             .sql
-            .transaction(move |transaction| {
-                // make sure, the transaction starts with a write command and becomes EXCLUSIVE by that -
-                // upgrading later may be impossible by races.
-                let deleted_contacts = transaction.execute(
-                    "DELETE FROM contacts WHERE id=?
-                     AND (SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?)=0;",
-                    paramsv![contact_id, contact_id],
-                )?;
-                if deleted_contacts == 0 {
-                    transaction.execute(
-                        "UPDATE contacts SET origin=? WHERE id=?;",
-                        paramsv![Origin::Hidden, contact_id],
-                    )?;
-                }
-                Ok(())
-            })
+            .count(
+                "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
+                paramsv![contact_id],
+            )
             .await?;
 
-        context.emit_event(EventType::ContactsChanged(None));
-        Ok(())
+        if count_chats == 0 {
+            match context
+                .sql
+                .execute("DELETE FROM contacts WHERE id=?;", paramsv![contact_id])
+                .await
+            {
+                Ok(_) => {
+                    context.emit_event(EventType::ContactsChanged(None));
+                    return Ok(());
+                }
+                Err(err) => {
+                    error!(context, "delete_contact {} failed ({})", contact_id, err);
+                    return Err(err);
+                }
+            }
+        }
+
+        info!(
+            context,
+            "could not delete contact {}, there are {} chats with it", contact_id, count_chats
+        );
+        bail!("Could not delete contact with ongoing chats");
     }
 
     /// Get a single contact object.  For a list, see eg. get_contacts().
@@ -1184,7 +1183,7 @@ impl Contact {
 
 /// Returns false if addr is an invalid address, otherwise true.
 pub fn may_be_valid_addr(addr: &str) -> bool {
-    let res = EmailAddress::new(addr);
+    let res = addr.parse::<EmailAddress>();
     res.is_ok()
 }
 
@@ -1369,17 +1368,13 @@ pub(crate) async fn update_last_seen(
         "Can not update special contact last seen timestamp"
     );
 
-    if context
+    context
         .sql
         .execute(
             "UPDATE contacts SET last_seen = ?1 WHERE last_seen < ?1 AND id = ?2",
             paramsv![timestamp, contact_id],
         )
-        .await?
-        > 0
-    {
-        context.interrupt_recently_seen(contact_id, timestamp).await;
-    }
+        .await?;
     Ok(())
 }
 
@@ -1446,138 +1441,13 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
         .collect()
 }
 
-#[derive(Debug)]
-pub(crate) struct RecentlySeenInterrupt {
-    contact_id: ContactId,
-    timestamp: i64,
-}
-
-#[derive(Debug)]
-pub(crate) struct RecentlySeenLoop {
-    /// Task running "recently seen" loop.
-    handle: task::JoinHandle<()>,
-
-    interrupt_send: Sender<RecentlySeenInterrupt>,
-}
-
-impl RecentlySeenLoop {
-    pub(crate) fn new(context: Context) -> Self {
-        let (interrupt_send, interrupt_recv) = channel::bounded(1);
-
-        let handle = task::spawn(async move { Self::run(context, interrupt_recv).await });
-        Self {
-            handle,
-            interrupt_send,
-        }
-    }
-
-    async fn run(context: Context, interrupt: Receiver<RecentlySeenInterrupt>) {
-        type MyHeapElem = (Reverse<i64>, ContactId);
-
-        // Priority contains all recently seen sorted by the timestamp
-        // when they become not recently seen.
-        //
-        // Initialize with contacts which are currently seen, but will
-        // become unseen in the future.
-        let mut unseen_queue: BinaryHeap<MyHeapElem> = context
-            .sql
-            .query_map(
-                "SELECT id, last_seen FROM contacts
-                 WHERE last_seen > ?",
-                paramsv![time() - SEEN_RECENTLY_SECONDS],
-                |row| {
-                    let contact_id: ContactId = row.get("id")?;
-                    let last_seen: i64 = row.get("last_seen")?;
-                    Ok((Reverse(last_seen + SEEN_RECENTLY_SECONDS), contact_id))
-                },
-                |rows| {
-                    rows.collect::<std::result::Result<BinaryHeap<MyHeapElem>, _>>()
-                        .map_err(Into::into)
-                },
-            )
-            .await
-            .unwrap_or_default();
-
-        loop {
-            let now = SystemTime::now();
-
-            let (until, contact_id) =
-                if let Some((Reverse(timestamp), contact_id)) = unseen_queue.peek() {
-                    (
-                        UNIX_EPOCH
-                            + Duration::from_secs((*timestamp).try_into().unwrap_or(u64::MAX))
-                            + Duration::from_secs(1),
-                        Some(contact_id),
-                    )
-                } else {
-                    // Sleep for 24 hours.
-                    (now + Duration::from_secs(86400), None)
-                };
-
-            if let Ok(duration) = until.duration_since(now) {
-                info!(
-                    context,
-                    "Recently seen loop waiting for {} or interrupt",
-                    duration_to_str(duration)
-                );
-
-                match timeout(duration, interrupt.recv()).await {
-                    Err(_) => {
-                        // Timeout, notify about contact.
-                        if let Some(contact_id) = contact_id {
-                            context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
-                            unseen_queue.pop();
-                        }
-                    }
-                    Ok(Err(err)) => {
-                        warn!(
-                            context,
-                            "Error receiving an interruption in recently seen loop: {}", err
-                        );
-                    }
-                    Ok(Ok(RecentlySeenInterrupt {
-                        contact_id,
-                        timestamp,
-                    })) => {
-                        // Received an interrupt.
-                        unseen_queue.push((Reverse(timestamp + SEEN_RECENTLY_SECONDS), contact_id));
-                    }
-                }
-            } else {
-                info!(
-                    context,
-                    "Recently seen loop is not waiting, event is already due."
-                );
-
-                // Event is already in the past.
-                if let Some(contact_id) = contact_id {
-                    context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
-                }
-                unseen_queue.pop();
-            }
-        }
-    }
-
-    pub(crate) fn interrupt(&self, contact_id: ContactId, timestamp: i64) {
-        self.interrupt_send
-            .try_send(RecentlySeenInterrupt {
-                contact_id,
-                timestamp,
-            })
-            .ok();
-    }
-
-    pub(crate) fn abort(self) {
-        self.handle.abort();
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
 
     use crate::chat::{get_chat_contacts, send_text_msg, Chat};
     use crate::chatlist::Chatlist;
+    use crate::message::Message;
     use crate::receive_imf::receive_imf;
     use crate::test_utils::{self, TestContext, TestContextManager};
 
@@ -1730,7 +1600,7 @@ mod tests {
         );
         assert_eq!(Contact::add_address_book(&t, book).await.unwrap(), 4);
 
-        // check first added contact, this modifies authname because it is empty
+        // check first added contact, this modifies authname beacuse it is empty
         let (contact_id, sth_modified) =
             Contact::add_or_lookup(&t, "bla foo", "one@eins.org", Origin::IncomingUnknownTo)
                 .await
@@ -1938,70 +1808,21 @@ mod tests {
         // Create Bob contact
         let (contact_id, _) =
             Contact::add_or_lookup(&alice, "Bob", "bob@example.net", Origin::ManuallyCreated)
-                .await?;
+                .await
+                .unwrap();
+
         let chat = alice
             .create_chat_with_contact("Bob", "bob@example.net")
             .await;
-        assert_eq!(
-            Contact::get_all(&alice, 0, Some("bob@example.net"))
-                .await?
-                .len(),
-            1
-        );
 
-        // If a contact has ongoing chats, contact is only hidden on deletion
-        Contact::delete(&alice, contact_id).await?;
-        let contact = Contact::load_from_db(&alice, contact_id).await?;
-        assert_eq!(contact.origin, Origin::Hidden);
-        assert_eq!(
-            Contact::get_all(&alice, 0, Some("bob@example.net"))
-                .await?
-                .len(),
-            0
-        );
+        // Can't delete a contact with ongoing chats.
+        assert!(Contact::delete(&alice, contact_id).await.is_err());
 
         // Delete chat.
         chat.get_id().delete(&alice).await?;
 
-        // Can delete contact physically now
+        // Can delete contact now.
         Contact::delete(&alice, contact_id).await?;
-        assert!(Contact::load_from_db(&alice, contact_id).await.is_err());
-        assert_eq!(
-            Contact::get_all(&alice, 0, Some("bob@example.net"))
-                .await?
-                .len(),
-            0
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_delete_and_recreate_contact() -> Result<()> {
-        let t = TestContext::new_alice().await;
-
-        // test recreation after physical deletion
-        let contact_id1 = Contact::create(&t, "Foo", "foo@bar.de").await?;
-        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
-        Contact::delete(&t, contact_id1).await?;
-        assert!(Contact::load_from_db(&t, contact_id1).await.is_err());
-        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
-        let contact_id2 = Contact::create(&t, "Foo", "foo@bar.de").await?;
-        assert_ne!(contact_id2, contact_id1);
-        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
-
-        // test recreation after hiding
-        t.create_chat_with_contact("Foo", "foo@bar.de").await;
-        Contact::delete(&t, contact_id2).await?;
-        let contact = Contact::load_from_db(&t, contact_id2).await?;
-        assert_eq!(contact.origin, Origin::Hidden);
-        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
-
-        let contact_id3 = Contact::create(&t, "Foo", "foo@bar.de").await?;
-        let contact = Contact::load_from_db(&t, contact_id3).await?;
-        assert_eq!(contact.origin, Origin::ManuallyCreated);
-        assert_eq!(contact_id3, contact_id2);
-        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
 
         Ok(())
     }
@@ -2327,7 +2148,7 @@ CCCB 5AA9 F6E1 141C 9431
         let sent_msg = alice1.pop_sent_msg().await;
 
         // Message is not encrypted.
-        let message = sent_msg.load_from_db().await;
+        let message = Message::load_from_db(&alice1, sent_msg.sender_msg_id).await?;
         assert!(!message.get_showpadlock());
 
         // Alice's second devices receives a copy of outgoing message.
@@ -2354,7 +2175,7 @@ CCCB 5AA9 F6E1 141C 9431
         let sent_msg = alice1.pop_sent_msg().await;
 
         // Second message is encrypted.
-        let message = sent_msg.load_from_db().await;
+        let message = Message::load_from_db(&alice1, sent_msg.sender_msg_id).await?;
         assert!(message.get_showpadlock());
 
         // Alice's second devices receives a copy of second outgoing message.
@@ -2409,7 +2230,7 @@ CCCB 5AA9 F6E1 141C 9431
         let sent_msg = alice1.pop_sent_msg().await;
 
         // The message is encrypted.
-        let message = sent_msg.load_from_db().await;
+        let message = Message::load_from_db(&alice1, sent_msg.sender_msg_id).await?;
         assert!(message.get_showpadlock());
 
         // Alice's second device receives a copy of the outgoing message.
@@ -2457,7 +2278,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

@@ -23,159 +23,8 @@ use crate::quota::QuotaInfo;
 use crate::ratelimit::Ratelimit;
 use crate::scheduler::Scheduler;
 use crate::sql::Sql;
-use crate::stock_str::StockStrings;
 use crate::tools::{duration_to_str, time};
 
-/// Builder for the [`Context`].
-///
-/// Many arguments to the [`Context`] are kind of optional and only needed to handle
-/// multiple contexts, for which the [account manager](crate::accounts::Accounts) should be
-/// used.  This builder makes creating a new context simpler, especially for the
-/// standalone-context case.
-///
-/// # Examples
-///
-/// Creating a new unecrypted database:
-///
-/// ```
-/// # let rt = tokio::runtime::Runtime::new().unwrap();
-/// # rt.block_on(async move {
-/// use deltachat::context::ContextBuilder;
-///
-/// let dir = tempfile::tempdir().unwrap();
-/// let context = ContextBuilder::new(dir.path().join("db"))
-///      .open()
-///      .await
-///      .unwrap();
-/// drop(context);
-/// # });
-/// ```
-///
-/// To use an encrypted database provide a password.  If the database does not yet exist it
-/// will be created:
-///
-/// ```
-/// # let rt = tokio::runtime::Runtime::new().unwrap();
-/// # rt.block_on(async move {
-/// use deltachat::context::ContextBuilder;
-///
-/// let dir = tempfile::tempdir().unwrap();
-/// let context = ContextBuilder::new(dir.path().join("db"))
-///      .with_password("secret".into())
-///      .open()
-///      .await
-///      .unwrap();
-/// drop(context);
-/// # });
-/// ```
-#[derive(Clone, Debug)]
-pub struct ContextBuilder {
-    dbfile: PathBuf,
-    id: u32,
-    events: Events,
-    stock_strings: StockStrings,
-    password: Option<String>,
-}
-
-impl ContextBuilder {
-    /// Create the builder using the given database file.
-    ///
-    /// The *dbfile* should be in a dedicated directory and this directory must exist.  The
-    /// [`Context`] will create other files and folders in the same directory as the
-    /// database file used.
-    pub fn new(dbfile: PathBuf) -> Self {
-        ContextBuilder {
-            dbfile,
-            id: rand::random(),
-            events: Events::new(),
-            stock_strings: StockStrings::new(),
-            password: None,
-        }
-    }
-
-    /// Sets the context ID.
-    ///
-    /// This identifier is used e.g. in [`Event`]s to identify which [`Context`] an event
-    /// belongs to.  The only real limit on it is that it should not conflict with any other
-    /// [`Context`]s you currently have open.  So if you handle multiple [`Context`]s you
-    /// may want to use this.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    pub fn with_id(mut self, id: u32) -> Self {
-        self.id = id;
-        self
-    }
-
-    /// Sets the event channel for this [`Context`].
-    ///
-    /// Mostly useful when using multiple [`Context`]s, this allows creating one [`Events`]
-    /// channel and passing it to all [`Context`]s so all events are recieved on the same
-    /// channel.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    pub fn with_events(mut self, events: Events) -> Self {
-        self.events = events;
-        self
-    }
-
-    /// Sets the [`StockStrings`] map to use for this [`Context`].
-    ///
-    /// This is useful in order to share the same translation strings in all [`Context`]s.
-    /// The mapping may be empty when set, it will be populated by
-    /// [`Context::set_stock-translation`] or [`Accounts::set_stock_translation`] calls.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    ///
-    /// [`Accounts::set_stock_translation`]: crate::accounts::Accounts::set_stock_translation
-    pub fn with_stock_strings(mut self, stock_strings: StockStrings) -> Self {
-        self.stock_strings = stock_strings;
-        self
-    }
-
-    /// Sets the password to unlock the database.
-    ///
-    /// If an encrypted database is used it must be opened with a password.  Setting a
-    /// password on a new database will enable encryption.
-    pub fn with_password(mut self, password: String) -> Self {
-        self.password = Some(password);
-        self
-    }
-
-    /// Opens the [`Context`].
-    pub async fn open(self) -> Result<Context, ContextError> {
-        let context =
-            Context::new_closed(&self.dbfile, self.id, self.events, self.stock_strings).await?;
-        let password = self.password.unwrap_or_default();
-        match context.open(password).await? {
-            true => Ok(context),
-            false => Err(ContextError::DatabaseEncrypted),
-        }
-    }
-}
-
-#[non_exhaustive]
-#[derive(Debug, thiserror::Error)]
-pub enum ContextError {
-    #[error("database could not be decrypted, incorrect or missing password")]
-    DatabaseEncrypted,
-    #[error("failed to open context")]
-    Other(#[from] anyhow::Error),
-}
-
-/// The context for a single DeltaChat account.
-///
-/// This contains all the state for a single DeltaChat account, including background tasks
-/// running in Tokio to operate the account.  The [`Context`] can be cheaply cloned.
-///
-/// Each context, and thus each account, must be associated with an directory where all the
-/// state is kept.  This state is also preserved between restarts.
-///
-/// To use multiple accounts it is best to look at the [accounts
-/// manager][crate::accounts::Accounts] which handles storing multiple accounts in a single
-/// directory structure and handles loading them all concurrently.
 #[derive(Clone, Debug)]
 pub struct Context {
     pub(crate) inner: Arc<InnerContext>,
@@ -202,7 +51,7 @@ pub struct InnerContext {
     pub(crate) oauth2_mutex: Mutex<()>,
     /// Mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messeges being sent.
     pub(crate) wrong_pw_warning_mutex: Mutex<()>,
-    pub(crate) translated_stockstrings: StockStrings,
+    pub(crate) translated_stockstrings: RwLock<HashMap<usize, String>>,
     pub(crate) events: Events,
 
     pub(crate) scheduler: RwLock<Option<Scheduler>>,
@@ -270,13 +119,8 @@ pub fn get_info() -> BTreeMap<&'static str, String> {
 
 impl Context {
     /// Creates new context and opens the database.
-    pub async fn new(
-        dbfile: &Path,
-        id: u32,
-        events: Events,
-        stock_strings: StockStrings,
-    ) -> Result<Context> {
-        let context = Self::new_closed(dbfile, id, events, stock_strings).await?;
+    pub async fn new(dbfile: &Path, id: u32, events: Events) -> Result<Context> {
+        let context = Self::new_closed(dbfile, id, events).await?;
 
         // Open the database if is not encrypted.
         if context.check_passphrase("".to_string()).await? {
@@ -286,12 +130,7 @@ impl Context {
     }
 
     /// Creates new context without opening the database.
-    pub async fn new_closed(
-        dbfile: &Path,
-        id: u32,
-        events: Events,
-        stockstrings: StockStrings,
-    ) -> Result<Context> {
+    pub async fn new_closed(dbfile: &Path, id: u32, events: Events) -> Result<Context> {
         let mut blob_fname = OsString::new();
         blob_fname.push(dbfile.file_name().unwrap_or_default());
         blob_fname.push("-blobs");
@@ -299,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, stockstrings)?;
+        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events).await?;
         Ok(context)
     }
 
@@ -330,12 +169,11 @@ 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,
         events: Events,
-        stockstrings: StockStrings,
     ) -> Result<Context> {
         ensure!(
             blobdir.is_dir(),
@@ -352,7 +190,7 @@ impl Context {
             generating_key_mutex: Mutex::new(()),
             oauth2_mutex: Mutex::new(()),
             wrong_pw_warning_mutex: Mutex::new(()),
-            translated_stockstrings: stockstrings,
+            translated_stockstrings: RwLock::new(HashMap::new()),
             events,
             scheduler: RwLock::new(None),
             ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow to send 6 messages immediately, no more than once every 10 seconds.
@@ -508,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,
@@ -570,10 +407,6 @@ impl Context {
             .await?
             .unwrap_or_default();
 
-        let configured_inbox_folder = self
-            .get_config(Config::ConfiguredInboxFolder)
-            .await?
-            .unwrap_or_else(|| "<unset>".to_string());
         let configured_sentbox_folder = self
             .get_config(Config::ConfiguredSentboxFolder)
             .await?
@@ -614,9 +447,9 @@ impl Context {
         res.insert("entered_account_settings", l.to_string());
         res.insert("used_account_settings", l2.to_string());
 
-        if let Some(server_id) = &*self.server_id.read().await {
-            res.insert("imap_server_id", format!("{:?}", server_id));
-        }
+        let server_id = self.server_id.read().await;
+        res.insert("imap_server_id", format!("{:?}", server_id));
+        drop(server_id);
 
         res.insert("secondary_addrs", secondary_addrs);
         res.insert(
@@ -645,7 +478,6 @@ impl Context {
         res.insert("mvbox_move", mvbox_move.to_string());
         res.insert("only_fetch_mvbox", only_fetch_mvbox.to_string());
         res.insert("folders_configured", folders_configured.to_string());
-        res.insert("configured_inbox_folder", configured_inbox_folder);
         res.insert("configured_sentbox_folder", configured_sentbox_folder);
         res.insert("configured_mvbox_folder", configured_mvbox_folder);
         res.insert("mdns_enabled", mdns_enabled.to_string());
@@ -699,12 +531,6 @@ impl Context {
                 .await?
                 .to_string(),
         );
-        res.insert(
-            "authserv_id_candidates",
-            self.get_config(Config::AuthservIdCandidates)
-                .await?
-                .unwrap_or_default(),
-        );
 
         let elapsed = self.creation_time.elapsed();
         res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));
@@ -811,7 +637,7 @@ impl Context {
                         ON m.chat_id=c.id
                  WHERE m.chat_id>9
                    AND m.hidden=0
-                   AND c.blocked!=1
+                   AND c.blocked=0
                    AND ct.blocked=0
                    AND m.txt LIKE ?
                  ORDER BY m.id DESC LIMIT 1000",
@@ -864,8 +690,6 @@ mod tests {
     use crate::chat::{
         get_chat_contacts, get_chat_msgs, send_msg, set_muted, Chat, ChatId, MuteDuration,
     };
-    use crate::chatlist::Chatlist;
-    use crate::constants::Chattype;
     use crate::contact::ContactId;
     use crate::message::{Message, Viewtype};
     use crate::receive_imf::receive_imf;
@@ -881,7 +705,7 @@ mod tests {
         let tmp = tempfile::tempdir()?;
         let dbfile = tmp.path().join("db.sqlite");
         tokio::fs::write(&dbfile, b"123").await?;
-        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await?;
+        let res = Context::new(&dbfile, 1, Events::new()).await?;
 
         // Broken database is indistinguishable from encrypted one.
         assert_eq!(res.is_open().await, false);
@@ -1027,9 +851,7 @@ mod tests {
     async fn test_blobdir_exists() {
         let tmp = tempfile::tempdir().unwrap();
         let dbfile = tmp.path().join("db.sqlite");
-        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
-            .await
-            .unwrap();
+        Context::new(&dbfile, 1, Events::new()).await.unwrap();
         let blobdir = tmp.path().join("db.sqlite-blobs");
         assert!(blobdir.is_dir());
     }
@@ -1040,7 +862,7 @@ mod tests {
         let dbfile = tmp.path().join("db.sqlite");
         let blobdir = tmp.path().join("db.sqlite-blobs");
         tokio::fs::write(&blobdir, b"123").await.unwrap();
-        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await;
+        let res = Context::new(&dbfile, 1, Events::new()).await;
         assert!(res.is_err());
     }
 
@@ -1050,9 +872,7 @@ mod tests {
         let subdir = tmp.path().join("subdir");
         let dbfile = subdir.join("db.sqlite");
         let dbfile2 = dbfile.clone();
-        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
-            .await
-            .unwrap();
+        Context::new(&dbfile, 1, Events::new()).await.unwrap();
         assert!(subdir.is_dir());
         assert!(dbfile2.is_file());
     }
@@ -1062,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(), StockStrings::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
         assert!(res.is_err());
     }
 
@@ -1071,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(), StockStrings::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
         assert!(res.is_err());
     }
 
@@ -1201,59 +1021,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_search_unaccepted_requests() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        receive_imf(
-            &t,
-            b"From: BobBar <bob@example.org>\n\
-                 To: alice@example.org\n\
-                 Subject: foo\n\
-                 Message-ID: <msg1234@example.org>\n\
-                 Chat-Version: 1.0\n\
-                 Date: Tue, 25 Oct 2022 13:37:00 +0000\n\
-                 \n\
-                 hello bob, foobar test!\n",
-            false,
-        )
-        .await?;
-        let chat_id = t.get_last_msg().await.get_chat_id();
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_type(), Chattype::Single);
-        assert!(chat.is_contact_request());
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            1
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
-
-        chat_id.block(&t).await?;
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 0);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            0
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 0);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 0);
-
-        let contact_ids = get_chat_contacts(&t, chat_id).await?;
-        Contact::unblock(&t, *contact_ids.first().unwrap()).await?;
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            1
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_limit_search_msgs() -> Result<()> {
         let alice = TestContext::new_alice().await;
@@ -1293,7 +1060,7 @@ mod tests {
         let dbfile = dir.path().join("db.sqlite");
 
         let id = 1;
-        let context = Context::new_closed(&dbfile, id, Events::new(), StockStrings::new())
+        let context = Context::new_closed(&dbfile, id, Events::new())
             .await
             .context("failed to create context")?;
         assert_eq!(context.open("foo".to_string()).await?, true);
@@ -1301,7 +1068,7 @@ mod tests {
         drop(context);
 
         let id = 2;
-        let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
+        let context = Context::new(&dbfile, id, Events::new())
             .await
             .context("failed to create context")?;
         assert_eq!(context.is_open().await, false);

src/decrypt.rs

@@ -5,12 +5,11 @@ use std::collections::HashSet;
 use anyhow::{Context as _, Result};
 use mailparse::ParsedMail;
 
-use crate::aheader::{Aheader, EncryptPreference};
-use crate::authres::handle_authres;
-use crate::authres::{self, DkimResults};
+use crate::aheader::Aheader;
 use crate::contact::addr_cmp;
 use crate::context::Context;
-use crate::headerdef::{HeaderDef, HeaderDefMap};
+use crate::headerdef::HeaderDef;
+use crate::headerdef::HeaderDefMap;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
 use crate::log::LogExt;
@@ -56,62 +55,31 @@ pub async fn try_decrypt(
     .await
 }
 
-pub(crate) async fn prepare_decryption(
+pub async fn create_decryption_info(
     context: &Context,
     mail: &ParsedMail<'_>,
-    from: &str,
     message_time: i64,
-    is_thunderbird: bool,
 ) -> Result<DecryptionInfo> {
-    if mail.headers.get_header(HeaderDef::ListPost).is_some() {
-        if mail.headers.get_header(HeaderDef::Autocrypt).is_some() {
-            info!(
-                context,
-                "Ignoring autocrypt header since this is a mailing list message. \
-                NOTE: For privacy reasons, the mailing list software should remove Autocrypt headers."
-            );
-        }
-        return Ok(DecryptionInfo {
-            from: from.to_string(),
-            autocrypt_header: None,
-            peerstate: None,
-            message_time,
-            dkim_results: DkimResults {
-                dkim_passed: false,
-                dkim_should_work: false,
-                allow_keychange: true,
-            },
-        });
-    }
+    let from = mail
+        .headers
+        .get_header(HeaderDef::From_)
+        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
+        .and_then(|from| from.extract_single_info())
+        .map(|from| from.addr)
+        .unwrap_or_default();
 
-    let mut autocrypt_header = Aheader::from_headers(from, &mail.headers)
+    let autocrypt_header = Aheader::from_headers(&from, &mail.headers)
         .ok_or_log_msg(context, "Failed to parse Autocrypt header")
         .flatten();
 
-    if is_thunderbird {
-        if let Some(autocrypt_header) = &mut autocrypt_header {
-            autocrypt_header.prefer_encrypt = EncryptPreference::Mutual;
-        }
-    }
-
-    let dkim_results = handle_authres(context, mail, from, message_time).await?;
-
-    let peerstate = get_autocrypt_peerstate(
-        context,
-        from,
-        autocrypt_header.as_ref(),
-        message_time,
-        // Disallowing keychanges is disabled for now:
-        true, // dkim_results.allow_keychange,
-    )
-    .await?;
+    let peerstate =
+        get_autocrypt_peerstate(context, &from, autocrypt_header.as_ref(), message_time).await?;
 
     Ok(DecryptionInfo {
-        from: from.to_string(),
+        from,
         autocrypt_header,
         peerstate,
         message_time,
-        dkim_results,
     })
 }
 
@@ -128,7 +96,6 @@ pub struct DecryptionInfo {
     /// means out-of-order message arrival, We don't modify the
     /// peerstate in this case.
     pub message_time: i64,
-    pub(crate) dkim_results: authres::DkimResults,
 }
 
 /// Returns a reference to the encrypted payload of a ["Mixed
@@ -296,16 +263,12 @@ fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublic
 /// If we already know this fingerprint from another contact's peerstate, return that
 /// peerstate in order to make AEAP work, but don't save it into the db yet.
 ///
-/// The param `allow_change` is used to prevent the autocrypt key from being changed
-/// if we suspect that the message may be forged and have a spoofed sender identity.
-///
 /// Returns updated peerstate.
 pub(crate) async fn get_autocrypt_peerstate(
     context: &Context,
     from: &str,
     autocrypt_header: Option<&Aheader>,
     message_time: i64,
-    allow_change: bool,
 ) -> Result<Option<Peerstate>> {
     let mut peerstate;
 
@@ -326,15 +289,8 @@ pub(crate) async fn get_autocrypt_peerstate(
 
         if let Some(ref mut peerstate) = peerstate {
             if addr_cmp(&peerstate.addr, from) {
-                if allow_change {
-                    peerstate.apply_header(header, message_time);
-                    peerstate.save_to_db(&context.sql).await?;
-                } else {
-                    info!(
-                        context,
-                        "Refusing to update existing peerstate of {}", &peerstate.addr
-                    );
-                }
+                peerstate.apply_header(header, message_time);
+                peerstate.save_to_db(&context.sql, false).await?;
             }
             // If `peerstate.addr` and `from` differ, this means that
             // someone is using the same key but a different addr, probably
@@ -344,7 +300,7 @@ pub(crate) async fn get_autocrypt_peerstate(
             // to the database.
         } else {
             let p = Peerstate::from_header(header, message_time);
-            p.save_to_db(&context.sql).await?;
+            p.save_to_db(&context.sql, true).await?;
             peerstate = Some(p);
         }
     } else {

src/download.rs

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

src/e2ee.rs

@@ -147,6 +147,7 @@ mod tests {
     use crate::chat;
     use crate::message::{Message, Viewtype};
     use crate::param::Param;
+    use crate::peerstate::ToSave;
     use crate::test_utils::{bob_keypair, TestContext};
 
     use super::*;
@@ -296,6 +297,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
             gossip_key_fingerprint: Some(pub_key.fingerprint()),
             verified_key: Some(pub_key.clone()),
             verified_key_fingerprint: Some(pub_key.fingerprint()),
+            to_save: Some(ToSave::All),
             fingerprint_changed: false,
         };
         vec![(Some(peerstate), addr)]