Prepare 1.107.0

fix node readme

.cargo/config.toml

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

.gitattributes

@@ -4,7 +4,7 @@
 
 # This directory contains email messages verbatim, and changing CRLF to
 # LF will corrupt them.
-test-data/* text=false
+test-data/** text=false
 
 # binary files should be detected by git, however, to be sure, you can add them here explicitly
 *.png  binary

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -25,23 +25,20 @@ jobs:
           override: true
       - run: rustup component add rustfmt
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v1
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        uses: swatinem/rust-cache@v2
+      - run: cargo fmt --all -- --check
 
   run_clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: stable
             components: clippy
             override: true
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v1
+        uses: swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -54,7 +51,7 @@ jobs:
       RUSTDOCFLAGS: -Dwarnings
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -63,33 +60,31 @@ jobs:
           components: rust-docs
           override: true
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v1
+        uses: swatinem/rust-cache@v2
       - name: Rustdoc
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --document-private-items --no-deps
+        run: cargo doc --document-private-items --no-deps
 
   build_and_test:
     name: Build and test
     strategy:
+      fail-fast: false
       matrix:
         include:
-          # Currently used Rust version, same as in `rust-toolchain` file.
+          # Currently used Rust version.
           - os: ubuntu-latest
-            rust: 1.61.0
+            rust: 1.64.0
             python: 3.9
           - os: windows-latest
-            rust: 1.61.0
+            rust: 1.64.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.56.1
+          # Minimum Supported Rust Version = 1.63.0
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.63.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
@@ -102,24 +97,16 @@ jobs:
         override: true
 
     - name: Cache rust cargo artifacts
-      uses: swatinem/rust-cache@v1
+      uses: swatinem/rust-cache@v2
 
     - name: check
-      uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: --all --bins --examples --tests --features repl --benches
+      run: cargo check --all --bins --examples --tests --features repl --benches
 
     - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all
+      run: cargo test --all
 
     - name: test cargo vendor
-      uses: actions-rs/cargo@v1
-      with:
-        command: vendor
+      run: cargo vendor
 
     - name: install python
       if: ${{ matrix.python }}
@@ -133,10 +120,7 @@ jobs:
 
     - name: build C library
       if: ${{ matrix.python }}
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: -p deltachat_ffi --features jsonrpc
+      run: cargo build -p deltachat_ffi --features jsonrpc
 
     - name: run python tests
       if: ${{ matrix.python }}
@@ -147,6 +131,21 @@ 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,lint
+
     - name: install pypy
       if: ${{ matrix.python }}
       uses: actions/setup-python@v4

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

@@ -0,0 +1,83 @@
+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,23 +8,19 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUST_MIN_STACK: "8388608"
 
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
       - name: Add Rust cache
-        uses: Swatinem/rust-cache@v1.3.0
+        uses: Swatinem/rust-cache@v2
       - name: npm install
         run: |
           cd deltachat-jsonrpc/typescript

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

@@ -15,7 +15,7 @@ jobs:
       id: getid
       run: |
         export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-        echo ::set-output name=prid::$PULLREQUEST_ID
+        echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
     - 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@v1
+    - uses: actions/checkout@v3
 
     - name: Use Node.js 16.x
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       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@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         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@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry/
@@ -58,7 +58,7 @@ jobs:
           tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
 
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         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@v2
+        uses: actions/checkout@v3
       - 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@v1
+        uses: actions/upload-artifact@v3
         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@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         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@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry/
@@ -52,16 +52,20 @@ jobs:
           npm install --verbose
 
       - name: Test
+        timeout-minutes: 10
         if: runner.os != 'Windows'
         run: |
           cd node
           npm run test
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
       - name: Run tests on Windows, except lint
+        timeout-minutes: 10
         if: runner.os == 'Windows'
         run: |
           cd node
           npm run test:mocha
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'

.github/workflows/repl.yml

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

.github/workflows/upload-docs.yml

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

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

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

.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,13 +2,300 @@
 
 ## Unreleased
 
+## Changes
+
+## Fixes
+
+## API-Changes
+
+
+## 1.107.0
+
+### Changes
+- Pipeline SMTP commands #3924
+- Cache DNS results #3970
+
+### Fixes
+- Securejoin: Fix adding and handling Autocrypt-Gossip headers #3914
+- fix verifier-by addr was empty string intead of None #3961
+- Emit DC_EVENT_MSGS_CHANGED for DC_CHAT_ID_ARCHIVED_LINK when the number of archived chats with
+  unread messages increases #3959
+- Fix Peerstate comparison #3962
+- Log SOCKS5 configuration for IMAP like already done for SMTP #3964
+- Fix SOCKS5 usage for IMAP #3965
+- Exit from recently seen loop on interrupt channel errors to avoid busy looping #3966
+
 ### API-Changes
+- jsonrpc: add verified-by information to `Contact`-Object
+- Remove `attach_selfavatar` config #3951
+
+
+## 1.106.0
+
+### Changes
+- Only send IncomingMsgBunch if there are more than 0 new messages #3941
+
+### Fixes
+- fix: only send contact changed event for recently seen if it is relevant (not too old to matter) #3938
+- Immediately save `accounts.toml` if it was modified by a migration from absolute paths to relative paths #3943
+- Do not treat invalid email addresses as an exception #3942
+- Add timeouts to HTTP requests #3948
+
+
+## 1.105.0
+
+### Changes
+- Validate signatures in try_decrypt() even if the message isn't encrypted #3859
+- Don't parse the message again after detached signatures validation #3862
+- Move format=flowed support to a separate crate #3869
+- cargo: bump quick-xml from 0.23.0 to 0.26.0 #3722
+- Add fuzzing tests #3853
+- Add mappings for some file types to Viewtype / MIME type #3881
+- Buffer IMAP client writes #3888
+- move `DC_CHAT_ID_ARCHIVED_LINK` to the top of chat lists
+  and make `dc_get_fresh_msg_cnt()` work for `DC_CHAT_ID_ARCHIVED_LINK` #3918
+- make `dc_marknoticed_chat()` work for `DC_CHAT_ID_ARCHIVED_LINK` #3919
+- Update provider database
+
+### API-Changes
+- jsonrpc: add python API for webxdc updates #3872
+- jsonrpc: add fresh message count to ChatListItemFetchResult::ArchiveLink
+- Add ffi functions to retrieve `verified by` information #3786
+- resultify `Message::get_filebytes()` #3925
+
+### Fixes
+- Do not add an error if the message is encrypted but not signed #3860
+- Do not strip leading spaces from message lines #3867
+- Fix uncaught exception in JSON-RPC tests #3884
+- Fix STARTTLS connection and add a test for it #3907
+- Trigger reconnection when failing to fetch existing messages #3911
+- Do not retry fetching existing messages after failure, prevents infinite reconnection loop #3913
+- Ensure format=flowed formatting is always reversible on the receiver side #3880
+
+
+## 1.104.0
+
+### Changes
+- Don't use deprecated `chrono` functions #3798
+- Document accounts manager #3837
+- If a classical-email-user sends an email to a group and adds new recipients,
+  add the new recipients as group members #3781
+- Remove `pytest-async` plugin #3846
+- Only send the message about ephemeral timer change if the chat is promoted #3847
+- Use relative paths in `accounts.toml` #3838
+
+### Fixes
+- Set read/write timeouts for IMAP over SOCKS5 #3833
+- Treat attached PGP keys as peer keys with mutual encryption preference #3832
+- fix migration of old databases #3842
+- Fix cargo clippy and doc errors after Rust update to 1.66 #3850
+- Don't send GroupNameChanged message if the group name doesn't change in terms of
+  `improve_single_line_input()` #3852
+- Prefer encryption for the peer if the message is encrypted or signed with the known key #3849
+
+
+## 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

Cargo.toml

@@ -1,33 +1,37 @@
 [package]
 name = "deltachat"
-version = "1.95.0"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
+version = "1.107.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [profile.dev]
 debug = 0
 panic = 'abort'
 opt-level = 1
 
+[profile.test]
+opt-level = 0
+
 [profile.release]
 lto = true
 panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
+format-flowed = { path = "./format-flowed" }
+ratelimit = { path = "./deltachat-ratelimit" }
 
 ansi_term = { version = "0.12.1", optional = true }
 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.21"
+async-smtp = { version = "0.6", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
+trust-dns-resolver = "0.22"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 backtrace = "0.3"
-base64 = "0.13"
+base64 = "0.20"
 bitflags = "1.3"
 chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
 dirs = { version = "4", optional=true }
@@ -36,25 +40,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.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.5", 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"
+mailparse = "0.14"
 native-tls = "0.2"
-num_cpus = "1.13"
+num_cpus = "1.15"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.13.1"
-percent-encoding = "2.0"
-pgp = { version = "0.8", default-features = false }
+once_cell = "1.17.0"
+percent-encoding = "2.2"
+pgp = { version = "0.9", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.23"
+quick-xml = "0.27"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
 rand = "0.8"
-regex = "1.6"
+regex = "1.7"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustyline = { version = "10", optional = true }
@@ -71,19 +75,20 @@ toml = "0.5"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 fast-socks5 = "0.8"
-humansize = "1"
+humansize = "2"
 qrcodegen = "1.7.0"
-tagger = "4.3.3"
-textwrap = "0.15.0"
-async-channel = "1.6.1"
+tagger = "4.3.4"
+textwrap = "0.16.0"
+async-channel = "1.8.0"
 futures-lite = "1.12.0"
-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"] }
+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"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.3.6", features = ["async_tokio"] }
+criterion = { version = "0.4.0", features = ["async_tokio"] }
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
@@ -95,7 +100,10 @@ tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc"
+  "deltachat-jsonrpc",
+  "deltachat-rpc-server",
+  "deltachat-ratelimit",
+  "format-flowed",
 ]
 
 [[example]]

README.md

@@ -115,20 +115,54 @@ use the `--ignored` argument to the test binary (not to cargo itself):
 $ cargo test -- --ignored
 ```
 
+### Fuzzing
+
+Install [`cargo-bolero`](https://github.com/camshaft/bolero) with
+```sh
+$ cargo install cargo-bolero
+```
+
+Run fuzzing tests with
+```sh
+$ cd fuzz
+$ cargo bolero test fuzz_mailparse --release=false -s NONE
+```
+
+Corpus is created at `fuzz/fuzz_targets/corpus`,
+you can add initial inputs there.
+For `fuzz_mailparse` target corpus can be populated with
+`../test-data/message/*.eml`.
+
+To run with AFL instead of libFuzzer:
+```sh
+$ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
+```
+
 ## Features
 
 - `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** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+- **Node.js** 
+  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
+  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 
 The following "frontend" projects make use of the Rust-library
@@ -140,3 +174,5 @@ or its language bindings:
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**
+
+[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

assets/icon-archive.svg

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="60"
+   height="60"
+   viewBox="0 0 60 60"
+   fill="none"
+   stroke="currentColor"
+   stroke-width="2"
+   stroke-linecap="round"
+   stroke-linejoin="round"
+   class="feather feather-archive"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon-archive.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   inkscape:export-filename="icon-archive.png"
+   inkscape:export-xdpi="409.60001"
+   inkscape:export-ydpi="409.60001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="6.4597151"
+     inkscape:cx="24.459283"
+     inkscape:cy="32.509174"
+     inkscape:window-width="1457"
+     inkscape:window-height="860"
+     inkscape:window-x="55"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <g
+     id="g846"
+     transform="translate(0.558605,0.464417)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:1.78186;stroke-dasharray:none;stroke-opacity:1"
+       d="M 38.749006,25.398867 V 38.843194 H 20.133784 V 25.398867"
+       id="path847" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:1.78186;stroke-dasharray:none;stroke-opacity:1"
+       d="m 18.065427,20.227972 h 22.751936 v 5.170894 H 18.065427 Z"
+       id="path845" />
+    <path
+       style="fill:#ff0000;fill-opacity:1;stroke:#808080;stroke-width:1.78186;stroke-dasharray:none;stroke-opacity:1"
+       d="m 27.373036,29.535581 h 4.136718"
+       id="line6" />
+  </g>
+</svg>

benches/contacts.rs

@@ -1,6 +1,7 @@
 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;
 
@@ -8,7 +9,9 @@ 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()).await.unwrap();
+    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
+        .await
+        .unwrap();
 
     let book = (0..n)
         .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))

benches/create_account.rs

@@ -1,6 +1,7 @@
+use std::path::PathBuf;
+
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
-use std::path::PathBuf;
 use tempfile::tempdir;
 
 async fn create_accounts(n: u32) {

benches/get_chat_msgs.rs

@@ -1,15 +1,17 @@
 use std::path::Path;
 
 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()).await.unwrap();
+    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
+        .await
+        .unwrap();
 
     for c in chats.iter().take(10) {
         black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
@@ -23,7 +25,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())
+            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
                 .await
                 .unwrap();
             let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();

benches/get_chatlist.rs

@@ -1,9 +1,9 @@
 use std::path::Path;
 
 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) {
@@ -16,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())
+            Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
                 .await
                 .unwrap()
         });

benches/receive_emails.rs

@@ -6,6 +6,7 @@ use deltachat::{
     context::Context,
     imex::{imex, ImexMode},
     receive_imf::receive_imf,
+    stock_str::StockStrings,
     Events,
 };
 use tempfile::tempdir;
@@ -37,11 +38,66 @@ 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, id, Events::new()).await.unwrap();
+    let context = Context::new(dbfile.as_path(), id, Events::new(), StockStrings::new())
+        .await
+        .unwrap();
 
     let backup: PathBuf = std::env::current_dir()
         .unwrap()
@@ -49,7 +105,7 @@ async fn create_context() -> Context {
 
     if backup.exists() {
         println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, &backup, None)
+        imex(&context, ImexMode::ImportBackup, backup.as_path(), None)
             .await
             .unwrap();
     }
@@ -80,6 +136,20 @@ 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,11 +1,13 @@
+use std::path::Path;
+
 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())
+    let context = Context::new(dbfile.as_ref(), id, Events::new(), StockStrings::new())
         .await
         .unwrap();
 

deltachat-ffi/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "deltachat_ffi"
-version = "1.95.0"
+version = "1.107.0"
 description = "Deltachat FFI"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
 license = "MPL-2.0"
@@ -25,7 +24,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.13.1"
+once_cell = "1.17.0"
 
 [features]
 default = ["vendored"]

deltachat-ffi/deltachat.h

@@ -11,16 +11,17 @@ 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_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_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_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
 
@@ -991,6 +992,34 @@ 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.
  *
@@ -1198,7 +1227,11 @@ int             dc_get_msg_cnt               (dc_context_t* context, uint32_t ch
  * 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,
+ * As muted archived chats are not unarchived automatically,
+ * a similar information is needed for the @ref dc_get_chatlist() "archive link" as well:
+ * here, the number of archived chats containing fresh messages is returned.
+ *
+ * If the specified chat is muted or the @ref dc_get_chatlist() "archive link",
  * the UI should show the badge counter "less obtrusive",
  * e.g. using "gray" instead of "red" color.
  *
@@ -2027,8 +2060,9 @@ char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t co
 
 
 /**
- * Delete a contact. The contact is deleted from the local device. It may happen that this is not
- * possible as the contact is in use. In this case, the contact can be blocked.
+ * Delete a contact so that it disappears from the corresponding lists.
+ * Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
+ * The contact is deleted from the local device.
  *
  * May result in a #DC_EVENT_CONTACTS_CHANGED event.
  *
@@ -4068,9 +4102,19 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 
 
 // DC_INFO* uses the same values as SystemMessage in rust-land
-#define         DC_INFO_PROTECTION_ENABLED     11
-#define         DC_INFO_PROTECTION_DISABLED    12
-
+#define         DC_INFO_UNKNOWN                    0
+#define         DC_INFO_GROUP_NAME_CHANGED         2
+#define         DC_INFO_GROUP_IMAGE_CHANGED        3
+#define         DC_INFO_MEMBER_ADDED_TO_GROUP      4
+#define         DC_INFO_MEMBER_REMOVED_FROM_GROUP  5
+#define         DC_INFO_AUTOCRYPT_SETUP_MESSAGE    6
+#define         DC_INFO_SECURE_JOIN_MESSAGE        7
+#define         DC_INFO_LOCATIONSTREAMING_ENABLED  8
+#define         DC_INFO_LOCATION_ONLY              9
+#define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
+#define         DC_INFO_PROTECTION_ENABLED        11
+#define         DC_INFO_PROTECTION_DISABLED       12
+#define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 
 /**
  * Check if a message is still in creation. A message is in creation between
@@ -4695,6 +4739,37 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 int             dc_contact_is_verified       (dc_contact_t* contact);
 
 
+
+/**
+ * Return the address that verified a contact
+ *
+ * The UI may use this in addition to a checkmark showing the verification status
+ *
+ * @memberof dc_contact_t
+ * @param contact The contact object.
+ * @return 
+ *    A string containing the verifiers address. If it is the same address as the contact itself,
+ *    we verified the contact ourself. If it is an empty string, we don't have verifier 
+ *    information or the contact is not verified.
+ */
+char*           dc_contact_get_verifier_addr       (dc_contact_t* contact);
+
+
+/**
+ * Return the `ContactId` that verified a contact
+ *
+ * The UI may use this in addition to a checkmark showing the verification status
+ *
+ * @memberof dc_contact_t
+ * @param contact The contact object.
+ * @return 
+ *    The `ContactId` of the verifiers address. If it is the same address as the contact itself,
+ *    we verified the contact ourself. If it is 0, we don't have verifier information or 
+ *    the contact is not verified.
+ */
+uint32_t       dc_contact_get_verifier_id      (dc_contact_t* contact);
+
+
 /**
  * @class dc_provider_t
  *
@@ -4882,7 +4957,49 @@ 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);
+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);
 
 
 /**
@@ -5533,6 +5650,15 @@ 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.
@@ -5544,6 +5670,17 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_INCOMING_MSG             2005
 
+/**
+ * Downloading a bunch of messages just finished. This is an experimental
+ * event to allow the UI to only show one notification per message bunch,
+ * instead of cluttering the user with many notifications.
+ * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
+ * 
+ * @param data1 0
+ * @param data2 (char*) msg_ids, a json object with the message ids.
+ */
+#define DC_EVENT_INCOMING_MSG_BUNCH       2006
+
 
 /**
  * Messages were marked noticed or seen.
@@ -5674,7 +5811,7 @@ void dc_event_unref(dc_event_t* event);
  * @param data2 (int) The 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.
+ *     800=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
  *     1000=Protocol finished for this contact.
  */
 #define DC_EVENT_SECUREJOIN_INVITER_PROGRESS      2060

deltachat-ffi/src/dc_array.rs

@@ -1,5 +1,6 @@
 use crate::chat::ChatItem;
 use crate::constants::DC_MSG_ID_DAYMARKER;
+use crate::contact::ContactId;
 use crate::location::Location;
 use crate::message::MsgId;
 
@@ -7,6 +8,7 @@ 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>),
@@ -16,6 +18,7 @@ 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,
@@ -28,6 +31,7 @@ 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),
@@ -40,6 +44,7 @@ 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)
@@ -60,6 +65,7 @@ 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(),
@@ -83,6 +89,12 @@ 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

@@ -23,13 +23,6 @@ use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
 use anyhow::Context as _;
-use deltachat::qr_code_generator::get_securejoin_qr_svg;
-use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
-use rand::Rng;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;
-
 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, ContactId, Origin};
@@ -37,19 +30,28 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
+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};
+use num_traits::{FromPrimitive, ToPrimitive};
+use once_cell::sync::Lazy;
+use rand::Rng;
+use tokio::runtime::Runtime;
+use tokio::sync::RwLock;
 use tokio::task::JoinHandle;
 
 mod dc_array;
 mod lot;
 
 mod string;
-use self::string::*;
 use deltachat::chatlist::Chatlist;
 
+use self::string::*;
+
 // as C lacks a good and portable error handling,
 // in general, the C Interface is forgiving wrt to bad parameters.
 // - objects returned by some functions
@@ -65,6 +67,8 @@ 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
@@ -98,7 +102,12 @@ 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()))
+        block_on(Context::new(
+            as_path(dbfile),
+            id,
+            Events::new(),
+            StockStrings::new(),
+        ))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
         return ptr::null_mut();
@@ -122,7 +131,12 @@ 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())) {
+    match block_on(Context::new_closed(
+        as_path(dbfile),
+        id,
+        Events::new(),
+        StockStrings::new(),
+    )) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
             eprintln!("failed to create context: {:#}", err);
@@ -487,7 +501,9 @@ 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,
@@ -529,8 +545,10 @@ 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, .. }
@@ -584,9 +602,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::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, .. }
@@ -626,6 +646,7 @@ 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 { .. }
@@ -653,6 +674,11 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = file.to_c_string().unwrap_or_default();
             data2.into_raw()
         }
+        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
+            .unwrap_or_default()
+            .to_c_string()
+            .unwrap_or_default()
+            .into_raw(),
     }
 }
 
@@ -937,6 +963,48 @@ 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,
@@ -1591,7 +1659,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")
@@ -2076,7 +2144,10 @@ pub unsafe extern "C" fn dc_delete_contact(
     block_on(async move {
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
-            Err(_) => 0,
+            Err(err) => {
+                error!(ctx, "cannot delete contact: {}", err);
+                0
+            }
         }
     })
 }
@@ -2111,7 +2182,7 @@ pub unsafe extern "C" fn dc_imex(
         eprintln!("ignoring careless call to dc_imex()");
         return;
     }
-    let what = match imex::ImexMode::from_i32(what_raw as i32) {
+    let what = match imex::ImexMode::from_i32(what_raw) {
         Some(what) => what,
         None => {
             eprintln!("ignoring invalid argument {} to dc_imex", what_raw);
@@ -2182,10 +2253,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
     msg_id: u32,
     setup_code: *const libc::c_char,
 ) -> libc::c_int {
-    if context.is_null()
-        || msg_id <= constants::DC_MSG_ID_LAST_SPECIAL as u32
-        || setup_code.is_null()
-    {
+    if context.is_null() || msg_id <= constants::DC_MSG_ID_LAST_SPECIAL || setup_code.is_null() {
         eprintln!("ignoring careless call to dc_continue_key_transfer()");
         return 0;
     }
@@ -2376,15 +2444,9 @@ pub unsafe extern "C" fn dc_get_locations(
     };
 
     block_on(async move {
-        let res = location::get_range(
-            ctx,
-            chat_id,
-            contact_id,
-            timestamp_begin as i64,
-            timestamp_end as i64,
-        )
-        .await
-        .unwrap_or_log_default(ctx, "Failed get_locations");
+        let res = location::get_range(ctx, chat_id, contact_id, timestamp_begin, timestamp_end)
+            .await
+            .unwrap_or_log_default(ctx, "Failed get_locations");
         Box::into_raw(Box::new(dc_array_t::from(res)))
     })
 }
@@ -2631,7 +2693,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
     }
     let ffi_list = &*chatlist;
     let ctx = &*ffi_list.context;
-    match ffi_list.list.get_chat_id(index as usize) {
+    match ffi_list.list.get_chat_id(index) {
         Ok(chat_id) => chat_id.to_u32(),
         Err(err) => {
             warn!(ctx, "get_chat_id failed: {}", err);
@@ -2651,7 +2713,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
     }
     let ffi_list = &*chatlist;
     let ctx = &*ffi_list.context;
-    match ffi_list.list.get_msg_id(index as usize) {
+    match ffi_list.list.get_msg_id(index) {
         Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
         Err(err) => {
             warn!(ctx, "get_msg_id failed: {}", err);
@@ -2682,7 +2744,7 @@ pub unsafe extern "C" fn dc_chatlist_get_summary(
     block_on(async move {
         let summary = ffi_list
             .list
-            .get_summary(ctx, index as usize, maybe_chat)
+            .get_summary(ctx, index, maybe_chat)
             .await
             .log_err(ctx, "get_summary failed")
             .unwrap_or_default();
@@ -2792,7 +2854,11 @@ pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *
         return "".strdup();
     }
     let ffi_chat = &*chat;
-    ffi_chat.chat.get_mailinglist_addr().strdup()
+    ffi_chat
+        .chat
+        .get_mailinglist_addr()
+        .unwrap_or_default()
+        .strdup()
 }
 
 #[no_mangle]
@@ -3243,6 +3309,8 @@ pub unsafe extern "C" fn dc_msg_get_filebytes(msg: *mut dc_msg_t) -> u64 {
     let ctx = &*ffi_msg.context;
 
     block_on(ffi_msg.message.get_filebytes(ctx))
+        .unwrap_or_log_default(ctx, "Cannot get file size")
+        .unwrap_or_default()
 }
 
 #[no_mangle]
@@ -3897,6 +3965,37 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
         .unwrap_or_default() as libc::c_int
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_contact_get_verifier_addr(
+    contact: *mut dc_contact_t,
+) -> *mut libc::c_char {
+    if contact.is_null() {
+        eprintln!("ignoring careless call to dc_contact_get_verifier_addr()");
+        return "".strdup();
+    }
+    let ffi_contact = &*contact;
+    let ctx = &*ffi_contact.context;
+    block_on(ffi_contact.contact.get_verifier_addr(ctx))
+        .log_err(ctx, "failed to get verifier for contact")
+        .unwrap_or_default()
+        .strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t) -> u32 {
+    if contact.is_null() {
+        eprintln!("ignoring careless call to dc_contact_get_verifier_id()");
+        return 0;
+    }
+    let ffi_contact = &*contact;
+    let ctx = &*ffi_contact.context;
+    let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(ctx))
+        .log_err(ctx, "failed to get verifier")
+        .unwrap_or_default()
+        .unwrap_or_default();
+
+    verifier_contact_id.to_u32()
+}
 // dc_lot_t
 
 pub type dc_lot_t = lot::Lot;
@@ -3977,6 +4076,45 @@ 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 _)
@@ -4439,13 +4577,16 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
 
 #[cfg(feature = "jsonrpc")]
 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};
 
+    use super::*;
+
     pub struct dc_jsonrpc_instance_t {
         receiver: OutReceiver,
         handle: RpcSession<CommandApi>,
+        event_thread: JoinHandle<Result<(), anyhow::Error>>,
     }
 
     #[no_mangle]
@@ -4461,9 +4602,36 @@ 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 instance = dc_jsonrpc_instance_t { receiver, handle };
+        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,
+        };
 
         Box::into_raw(Box::new(instance))
     }
@@ -4474,8 +4642,8 @@ mod jsonrpc {
             eprintln!("ignoring careless call to dc_jsonrpc_unref()");
             return;
         }
-
-        Box::from_raw(jsonrpc_instance);
+        (*jsonrpc_instance).event_thread.abort();
+        drop(Box::from_raw(jsonrpc_instance));
     }
 
     #[no_mangle]

deltachat-ffi/src/lot.rs

@@ -1,10 +1,12 @@
 //! # Legacy generic return values for C API.
 
+use std::borrow::Cow;
+
+use anyhow::Error;
+
 use crate::message::MessageState;
 use crate::qr::Qr;
 use crate::summary::{Summary, SummaryPrefix};
-use anyhow::Error;
-use std::borrow::Cow;
 
 /// An object containing a set of values.
 /// The meaning of the values is defined by the function returning the object.

deltachat-ffi/src/string.rs

@@ -287,9 +287,10 @@ fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use libc::{free, strcmp};
 
+    use super::*;
+
     #[test]
     fn test_os_str_to_c_string_cwd() {
         let some_dir = std::env::current_dir().unwrap();

deltachat-jsonrpc/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.95.0"
+version = "1.107.0"
 description = "DeltaChat JSON-RPC API"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
@@ -19,19 +18,21 @@ num-traits = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.3.0"
 log = "0.4"
-async-channel = { version = "1.6.1" }
-futures = { version = "0.3.24" }
-serde_json = "1.0.85"
+async-channel = { version = "1.8.0" }
+futures = { version = "0.3.25" }
+serde_json = "1.0.91"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.3", features = ["json_value"] }
-tokio = { version = "1.19.2" }
+typescript-type-def = { version = "0.5.5", features = ["json_value"] }
+tokio = { version = "1.23.1" }
+sanitize-filename = "0.4"
+walkdir = "2.3.2"
 
 # optional dependencies
-axum = { version = "0.5.9", optional = true, features = ["ws"] }
-env_logger = { version = "0.9.0", optional = true }
+axum = { version = "0.6.1", optional = true, features = ["ws"] }
+env_logger = { version = "0.10.0", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.19.2", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.23.1", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api/events.rs

@@ -4,142 +4,383 @@ use serde_json::{json, Value};
 use typescript_type_def::TypeDef;
 
 pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    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),
-    };
-
-    let id: EventTypeName = event.typ.into();
+    let id: JSONRPCEventType = event.typ.into();
     json!({
-        "id": id,
+        "event": id,
         "contextId": event.id,
-        "field1": field1,
-        "field2": field2
     })
 }
 
 #[derive(Serialize, TypeDef)]
-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,
+#[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.
     ConnectivityChanged,
+
     SelfavatarChanged,
-    WebxdcStatusUpdate,
-    WebXdInstanceDeleted,
+
+    #[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,
+    },
 }
 
-impl From<EventType> for EventTypeName {
+impl From<EventType> for JSONRPCEventType {
     fn from(event: EventType) -> Self {
-        use EventTypeName::*;
+        use JSONRPCEventType::*;
         match event {
-            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::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::ConnectivityChanged => ConnectivityChanged,
             EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
-            EventType::WebxdcInstanceDeleted { .. } => WebXdInstanceDeleted,
+            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(),
+            },
         }
     }
 }
@@ -153,7 +394,8 @@ fn generate_events_ts_types_definition() {
             root_namespace: None,
             ..typescript_type_def::DefinitionFileOptions::default()
         };
-        typescript_type_def::write_definition_file::<_, EventTypeName>(&mut buf, options).unwrap();
+        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&mut buf, options)
+            .unwrap();
         String::from_utf8(buf).unwrap()
     };
     std::fs::write("typescript/generated/events.ts", events).unwrap();

deltachat-jsonrpc/src/api/mod.rs

@@ -1,34 +1,41 @@
-use anyhow::{anyhow, bail, Context, Result};
-use deltachat::{
-    chat::{
-        self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
-        remove_contact_from_chat, Chat, ChatId, ChatItem,
-    },
-    chatlist::Chatlist,
-    config::Config,
-    contact::{may_be_valid_addr, Contact, ContactId},
-    context::get_info,
-    message::{delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype},
-    provider::get_provider_info,
-    qr,
-    qr_code_generator::get_securejoin_qr_svg,
-    securejoin,
-    webxdc::StatusUpdateSerial,
-};
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::{collections::HashMap, str::FromStr};
-use tokio::sync::RwLock;
-use yerpc::rpc;
 
+use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
+use deltachat::{
+    chat::{
+        self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
+        remove_contact_from_chat, Chat, ChatId, ChatItem, ProtectionStatus,
+    },
+    chatlist::Chatlist,
+    config::Config,
+    constants::DC_MSG_ID_DAYMARKER,
+    contact::{may_be_valid_addr, Contact, ContactId, Origin},
+    context::get_info,
+    ephemeral::Timer,
+    imex, location,
+    message::{
+        self, delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    },
+    provider::get_provider_info,
+    qr,
+    qr_code_generator::get_securejoin_qr_svg,
+    reaction::send_reaction,
+    securejoin,
+    stock_str::StockMessage,
+    webxdc::StatusUpdateSerial,
+};
+use sanitize_filename::is_sanitized;
+use tokio::{fs, sync::RwLock};
+use walkdir::WalkDir;
+use yerpc::rpc;
 
 pub mod events;
 pub mod types;
 
-use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::QrObject;
-
+use num_traits::FromPrimitive;
 use types::account::Account;
 use types::chat::FullChat;
 use types::chat_list::ChatListEntry;
@@ -38,9 +45,14 @@ use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;
 
 use self::types::{
-    chat::{BasicChat, MuteDuration},
-    message::{MessageNotificationInfo, MessageViewtype},
+    chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
+    location::JsonrpcLocation,
+    message::{
+        JSONRPCMessageListItem, MessageNotificationInfo, MessageSearchResult, MessageViewtype,
+    },
 };
+use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
+use crate::api::types::qr::QrObject;
 
 #[derive(Clone, Debug)]
 pub struct CommandApi {
@@ -128,10 +140,32 @@ impl CommandApi {
         Ok(accounts)
     }
 
+    async fn start_io_for_all_accounts(&self) -> Result<()> {
+        self.accounts.read().await.start_io().await;
+        Ok(())
+    }
+
+    async fn stop_io_for_all_accounts(&self) -> Result<()> {
+        self.accounts.read().await.stop_io().await;
+        Ok(())
+    }
+
     // ---------------------------------------------
     // Methods that work on individual accounts
     // ---------------------------------------------
 
+    async fn start_io(&self, id: u32) -> Result<()> {
+        let ctx = self.get_context(id).await?;
+        ctx.start_io().await;
+        Ok(())
+    }
+
+    async fn stop_io(&self, id: u32) -> Result<()> {
+        let ctx = self.get_context(id).await?;
+        ctx.stop_io().await;
+        Ok(())
+    }
+
     /// Get top-level info for an account.
     async fn get_account_info(&self, account_id: u32) -> Result<Account> {
         let context_option = self.accounts.read().await.get_account(account_id);
@@ -145,6 +179,21 @@ impl CommandApi {
         }
     }
 
+    /// Get the combined filesize of an account in bytes
+    async fn get_account_file_size(&self, account_id: u32) -> Result<u64> {
+        let ctx = self.get_context(account_id).await?;
+        let dbfile = ctx.get_dbfile().metadata()?.len();
+        let total_size = WalkDir::new(ctx.get_blobdir())
+            .max_depth(2)
+            .into_iter()
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| entry.metadata().ok())
+            .filter(|metadata| metadata.is_file())
+            .fold(0, |acc, m| acc + m.len());
+
+        Ok(dbfile + total_size)
+    }
+
     /// Returns provider for the given domain.
     ///
     /// This function looks up domain in offline database.
@@ -233,6 +282,18 @@ impl CommandApi {
         Ok(result)
     }
 
+    async fn set_stock_strings(&self, strings: HashMap<u32, String>) -> Result<()> {
+        let accounts = self.accounts.read().await;
+        for (stock_id, stock_message) in strings {
+            if let Some(stock_id) = StockMessage::from_u32(stock_id) {
+                accounts
+                    .set_stock_translation(stock_id, stock_message)
+                    .await?;
+            }
+        }
+        Ok(())
+    }
+
     /// Configures this account with the currently set parameters.
     /// Setup the credential config before calling this.
     async fn configure(&self, account_id: u32) -> Result<()> {
@@ -256,6 +317,38 @@ impl CommandApi {
         Ok(())
     }
 
+    async fn export_self_keys(
+        &self,
+        account_id: u32,
+        path: String,
+        passphrase: Option<String>,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        imex::imex(
+            &ctx,
+            imex::ImexMode::ExportSelfKeys,
+            path.as_ref(),
+            passphrase,
+        )
+        .await
+    }
+
+    async fn import_self_keys(
+        &self,
+        account_id: u32,
+        path: String,
+        passphrase: Option<String>,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        imex::imex(
+            &ctx,
+            imex::ImexMode::ImportSelfKeys,
+            path.as_ref(),
+            passphrase,
+        )
+        .await
+    }
+
     /// 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.
@@ -288,16 +381,30 @@ impl CommandApi {
         ChatId::new(chat_id).get_fresh_msg_cnt(&ctx).await
     }
 
+    /// Estimate the number of messages that will be deleted
+    /// by the set_config()-options `delete_device_after` or `delete_server_after`.
+    /// This is typically used to show the estimated impact to the user
+    /// before actually enabling deletion of old messages.
+    async fn estimate_auto_deletion_count(
+        &self,
+        account_id: u32,
+        from_server: bool,
+        seconds: i64,
+    ) -> Result<usize> {
+        let ctx = self.get_context(account_id).await?;
+        message::estimate_deletion_cnt(&ctx, from_server, seconds).await
+    }
+
     // ---------------------------------------------
     //  autocrypt
     // ---------------------------------------------
 
-    async fn autocrypt_initiate_key_transfer(&self, account_id: u32) -> Result<String> {
+    async fn initiate_autocrypt_key_transfer(&self, account_id: u32) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
         deltachat::imex::initiate_key_transfer(&ctx).await
     }
 
-    async fn autocrypt_continue_key_transfer(
+    async fn continue_autocrypt_key_transfer(
         &self,
         account_id: u32,
         message_id: u32,
@@ -364,11 +471,7 @@ impl CommandApi {
     //  chat
     // ---------------------------------------------
 
-    async fn chatlist_get_full_chat_by_id(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-    ) -> Result<FullChat> {
+    async fn get_full_chat_by_id(&self, account_id: u32, chat_id: u32) -> Result<FullChat> {
         let ctx = self.get_context(account_id).await?;
         FullChat::try_from_dc_chat_id(&ctx, chat_id).await
     }
@@ -407,9 +510,7 @@ impl CommandApi {
     ///   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)
-    // TODO fix doc comment after adding dc_remove_contact_from_chat
+    /// To leave a chat explicitly, use leave_group()
     async fn delete_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         ChatId::new(chat_id).delete(&ctx).await
@@ -431,7 +532,7 @@ impl CommandApi {
     ///
     /// 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()
+    /// an out-of-band-verification can be joined using `secure_join()`
     ///
     /// chat_id: If set to a group-chat-id,
     ///     the Verified-Group-Invite protocol is offered in the QR code;
@@ -441,7 +542,6 @@ impl CommandApi {
     ///     for details about both protocols.
     ///
     /// return format: `[code, svg]`
-    // TODO fix doc comment after adding dc_join_securejoin
     async fn get_chat_securejoin_qr_code_svg(
         &self,
         account_id: u32,
@@ -455,6 +555,33 @@ impl CommandApi {
         ))
     }
 
+    /// Continue a Setup-Contact or Verified-Group-Invite protocol
+    /// started on another device with `get_chat_securejoin_qr_code_svg()`.
+    /// This function is typically called when `check_qr()` returns
+    /// type=AskVerifyContact or type=AskVerifyGroup.
+    ///
+    /// The function returns immediately and the handshake runs in background,
+    /// sending and receiving several messages.
+    /// During the handshake, info messages are added to the chat,
+    /// showing progress, success or errors.
+    ///
+    /// Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
+    ///
+    /// See https://countermitm.readthedocs.io/en/latest/new.html
+    /// for details about both protocols.
+    ///
+    /// **qr**: The text of the scanned QR code. Typically, the same string as given
+    ///     to `check_qr()`.
+    ///
+    /// **returns**: The chat ID of the joined chat, the UI may redirect to the this chat.
+    ///         A returned chat ID does not guarantee that the chat is protected or the belonging contact is verified.
+    ///
+    async fn secure_join(&self, account_id: u32, qr: String) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        let chat_id = securejoin::join_securejoin(&ctx, &qr).await?;
+        Ok(chat_id.to_u32())
+    }
+
     async fn leave_group(&self, account_id: u32, chat_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         remove_contact_from_chat(&ctx, ChatId::new(chat_id), ContactId::SELF).await
@@ -494,6 +621,153 @@ impl CommandApi {
         add_contact_to_chat(&ctx, ChatId::new(chat_id), ContactId::new(contact_id)).await
     }
 
+    /// Get the contact IDs belonging to a chat.
+    ///
+    /// - for normal chats, the function always returns exactly one contact,
+    ///   DC_CONTACT_ID_SELF is returned only for SELF-chats.
+    ///
+    /// - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
+    ///   explicitly as it may happen that oneself gets removed from a still existing
+    ///   group
+    ///
+    /// - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
+    ///
+    /// - for mailing lists, the behavior is not documented currently, we will decide on that later.
+    ///   for now, the UI should not show the list for mailing lists.
+    ///   (we do not know all members and there is not always a global mailing list address,
+    ///   so we could return only SELF or the known members; this is not decided yet)
+    async fn get_chat_contacts(&self, account_id: u32, chat_id: u32) -> Result<Vec<u32>> {
+        let ctx = self.get_context(account_id).await?;
+        let contacts = chat::get_chat_contacts(&ctx, ChatId::new(chat_id)).await?;
+        Ok(contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>())
+    }
+
+    /// Create a new group chat.
+    ///
+    /// After creation,
+    /// the group has one member with the ID DC_CONTACT_ID_SELF
+    /// and is in _unpromoted_ state.
+    /// This means, you can add or remove members, change the name,
+    /// the group image and so on without messages being sent to all group members.
+    ///
+    /// This changes as soon as the first message is sent to the group members
+    /// and the group becomes _promoted_.
+    /// After that, all changes are synced with all group members
+    /// by sending status message.
+    ///
+    /// To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of `BasicChat` or `FullChat`.
+    /// This may be useful if you want to show some help for just created groups.
+    ///
+    /// @param protect If set to 1 the function creates group with protection initially enabled.
+    ///     Only verified members are allowed in these groups
+    ///     and end-to-end-encryption is always enabled.
+    async fn create_group_chat(&self, account_id: u32, name: String, protect: bool) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        let protect = match protect {
+            true => ProtectionStatus::Protected,
+            false => ProtectionStatus::Unprotected,
+        };
+        chat::create_group_chat(&ctx, protect, &name)
+            .await
+            .map(|id| id.to_u32())
+    }
+
+    /// Create a new broadcast list.
+    ///
+    /// Broadcast lists are similar to groups on the sending device,
+    /// however, recipients get the messages in normal one-to-one chats
+    /// and will not be aware of other members.
+    ///
+    /// Replies to broadcasts go only to the sender
+    /// and not to all broadcast recipients.
+    /// Moreover, replies will not appear in the broadcast list
+    /// but in the one-to-one chat with the person answering.
+    ///
+    /// The name and the image of the broadcast list is set automatically
+    /// and is visible to the sender only.
+    /// Not asking for these data allows more focused creation
+    /// and we bypass the question who will get which data.
+    /// Also, many users will have at most one broadcast list
+    /// so, a generic name and image is sufficient at the first place.
+    ///
+    /// Later on, however, the name can be changed using dc_set_chat_name().
+    /// The image cannot be changed to have a unique, recognizable icon in the chat lists.
+    /// All in all, this is also what other messengers are doing here.
+    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        chat::create_broadcast_list(&ctx)
+            .await
+            .map(|id| id.to_u32())
+    }
+
+    /// Set group name.
+    ///
+    /// 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.
+    async fn set_chat_name(&self, account_id: u32, chat_id: u32, new_name: String) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        chat::set_chat_name(&ctx, ChatId::new(chat_id), &new_name).await
+    }
+
+    /// Set group profile image.
+    ///
+    /// 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.
+    ///
+    /// To find out the profile image of a chat, use dc_chat_get_profile_image()
+    ///
+    /// @param image_path Full path of the image to use as the group image. The image will immediately be copied to the
+    ///     `blobdir`; the original image will not be needed anymore.
+    ///      If you pass null here, the group image is deleted (for promoted groups, all members are informed about
+    ///      this change anyway).
+    async fn set_chat_profile_image(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        image_path: Option<String>,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        chat::set_chat_profile_image(&ctx, ChatId::new(chat_id), &image_path.unwrap_or_default())
+            .await
+    }
+
+    async fn set_chat_visibility(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        visibility: JSONRPCChatVisibility,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+
+        ChatId::new(chat_id)
+            .set_visibility(&ctx, visibility.into_core_type())
+            .await
+    }
+
+    async fn set_chat_ephemeral_timer(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        timer: u32,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        ChatId::new(chat_id)
+            .set_ephemeral_timer(&ctx, Timer::from_u32(timer))
+            .await
+    }
+
+    async fn get_chat_ephemeral_timer(&self, account_id: u32, chat_id: u32) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        Ok(ChatId::new(chat_id)
+            .get_ephemeral_timer(&ctx)
+            .await?
+            .to_u32())
+    }
+
     // for now only text messages, because we only used text messages in desktop thusfar
     async fn add_device_message(
         &self,
@@ -604,29 +878,45 @@ impl CommandApi {
         markseen_msgs(&ctx, msg_ids.into_iter().map(MsgId::new).collect()).await
     }
 
-    async fn message_list_get_message_ids(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        flags: u32,
-    ) -> Result<Vec<u32>> {
+    async fn get_message_ids(&self, account_id: u32, chat_id: u32, flags: u32) -> Result<Vec<u32>> {
         let ctx = self.get_context(account_id).await?;
         let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
         Ok(msg
             .iter()
-            .filter_map(|chat_item| match chat_item {
-                deltachat::chat::ChatItem::Message { msg_id } => Some(msg_id.to_u32()),
-                _ => None,
+            .map(|chat_item| -> u32 {
+                match chat_item {
+                    deltachat::chat::ChatItem::Message { msg_id } => msg_id.to_u32(),
+                    deltachat::chat::ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
+                }
             })
             .collect())
     }
 
-    async fn message_get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
+    async fn get_message_list_items(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        flags: u32,
+    ) -> Result<Vec<JSONRPCMessageListItem>> {
+        let ctx = self.get_context(account_id).await?;
+        let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
+        Ok(msg
+            .iter()
+            .map(|chat_item| (*chat_item).into())
+            .collect::<Vec<JSONRPCMessageListItem>>())
+    }
+
+    async fn get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
         let ctx = self.get_context(account_id).await?;
         MessageObject::from_message_id(&ctx, message_id).await
     }
 
-    async fn message_get_messages(
+    async fn get_message_html(&self, account_id: u32, message_id: u32) -> Result<Option<String>> {
+        let ctx = self.get_context(account_id).await?;
+        MsgId::new(message_id).get_html(&ctx).await
+    }
+
+    async fn get_messages(
         &self,
         account_id: u32,
         message_ids: Vec<u32>,
@@ -643,7 +933,7 @@ impl CommandApi {
     }
 
     /// Fetch info desktop needs for creating a notification for a message
-    async fn message_get_notification_info(
+    async fn get_message_notification_info(
         &self,
         account_id: u32,
         message_id: u32,
@@ -670,16 +960,71 @@ impl CommandApi {
         get_msg_info(&ctx, MsgId::new(message_id)).await
     }
 
+    /// Asks the core to start downloading a message fully.
+    /// This function is typically called when the user hits the "Download" button
+    /// that is shown by the UI in case `download_state` is `'Available'` or `'Failure'`
+    ///
+    /// On success, the @ref DC_MSG "view type of the message" may change
+    /// or the message may be replaced completely by one or more messages with other message IDs.
+    /// That may happen e.g. in cases where the message was encrypted
+    /// and the type could not be determined without fully downloading.
+    /// Downloaded content can be accessed as usual after download.
+    ///
+    /// To reflect these changes a @ref DC_EVENT_MSGS_CHANGED event will be emitted.
+    async fn download_full_message(&self, account_id: u32, message_id: u32) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        MsgId::new(message_id).download_full(&ctx).await
+    }
+
+    /// Search messages containing the given query string.
+    /// Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
+    ///
+    /// Global chat results are typically displayed using dc_msg_get_summary(), chat
+    /// search results may just hilite the corresponding messages and present a
+    /// prev/next button.
+    ///
+    /// For global search, result is limited to 1000 messages,
+    /// this allows incremental search done fast.
+    /// So, when getting exactly 1000 results, the result may be truncated;
+    /// the UIs may display sth. as "1000+ messages found" in this case.
+    /// Chat search (if a chat_id is set) is not limited.
+    async fn search_messages(
+        &self,
+        account_id: u32,
+        query: String,
+        chat_id: Option<u32>,
+    ) -> Result<Vec<u32>> {
+        let ctx = self.get_context(account_id).await?;
+        let messages = ctx.search_msgs(chat_id.map(ChatId::new), &query).await?;
+        Ok(messages
+            .iter()
+            .map(|msg_id| msg_id.to_u32())
+            .collect::<Vec<u32>>())
+    }
+
+    async fn message_ids_to_search_results(
+        &self,
+        account_id: u32,
+        message_ids: Vec<u32>,
+    ) -> Result<HashMap<u32, MessageSearchResult>> {
+        let ctx = self.get_context(account_id).await?;
+        let mut results: HashMap<u32, MessageSearchResult> =
+            HashMap::with_capacity(message_ids.len());
+        for id in message_ids {
+            results.insert(
+                id,
+                MessageSearchResult::from_msg_id(&ctx, MsgId::new(id)).await?,
+            );
+        }
+        Ok(results)
+    }
+
     // ---------------------------------------------
     //  contact
     // ---------------------------------------------
 
     /// Get a single contact options by ID.
-    async fn contacts_get_contact(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<ContactObject> {
+    async fn get_contact(&self, account_id: u32, contact_id: u32) -> Result<ContactObject> {
         let ctx = self.get_context(account_id).await?;
         let contact_id = ContactId::new(contact_id);
 
@@ -693,7 +1038,7 @@ impl CommandApi {
     /// Add a single contact as a result of an explicit user action.
     ///
     /// Returns contact id of the created or existing contact
-    async fn contacts_create_contact(
+    async fn create_contact(
         &self,
         account_id: u32,
         email: String,
@@ -710,11 +1055,7 @@ impl CommandApi {
     }
 
     /// Returns contact id of the created or existing DM chat with that contact
-    async fn contacts_create_chat_by_contact_id(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<u32> {
+    async fn create_chat_by_contact_id(&self, account_id: u32, contact_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         let contact = Contact::get_by_id(&ctx, ContactId::new(contact_id)).await?;
         ChatId::create_for_contact(&ctx, contact.id)
@@ -722,17 +1063,17 @@ impl CommandApi {
             .map(|id| id.to_u32())
     }
 
-    async fn contacts_block(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn block_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         Contact::block(&ctx, ContactId::new(contact_id)).await
     }
 
-    async fn contacts_unblock(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn unblock_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         Contact::unblock(&ctx, ContactId::new(contact_id)).await
     }
 
-    async fn contacts_get_blocked(&self, account_id: u32) -> Result<Vec<ContactObject>> {
+    async fn get_blocked_contacts(&self, account_id: u32) -> Result<Vec<ContactObject>> {
         let ctx = self.get_context(account_id).await?;
         let blocked_ids = Contact::get_all_blocked(&ctx).await?;
         let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
@@ -748,7 +1089,7 @@ impl CommandApi {
         Ok(contacts)
     }
 
-    async fn contacts_get_contact_ids(
+    async fn get_contact_ids(
         &self,
         account_id: u32,
         list_flags: u32,
@@ -761,7 +1102,7 @@ impl CommandApi {
 
     /// Get a list of contacts.
     /// (formerly called getContacts2 in desktop)
-    async fn contacts_get_contacts(
+    async fn get_contacts(
         &self,
         account_id: u32,
         list_flags: u32,
@@ -782,7 +1123,7 @@ impl CommandApi {
         Ok(contacts)
     }
 
-    async fn contacts_get_contacts_by_ids(
+    async fn get_contacts_by_ids(
         &self,
         account_id: u32,
         ids: Vec<u32>,
@@ -803,6 +1144,28 @@ impl CommandApi {
         Ok(contacts)
     }
 
+    async fn delete_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let contact_id = ContactId::new(contact_id);
+
+        Contact::delete(&ctx, contact_id).await?;
+        Ok(())
+    }
+
+    async fn change_contact_name(
+        &self,
+        account_id: u32,
+        contact_id: u32,
+        name: String,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let contact_id = ContactId::new(contact_id);
+        let contact = Contact::load_from_db(&ctx, contact_id).await?;
+        let addr = contact.get_addr();
+        Contact::create(&ctx, &name, addr).await?;
+        Ok(())
+    }
+
     /// 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.
@@ -815,6 +1178,21 @@ impl CommandApi {
         Contact::get_encrinfo(&ctx, ContactId::new(contact_id)).await
     }
 
+    /// Check if an e-mail address belongs to a known and unblocked contact.
+    /// To get a list of all known and unblocked contacts, use contacts_get_contacts().
+    ///
+    /// To validate an e-mail address independently of the contact database
+    /// use check_email_validity().
+    async fn lookup_contact_id_by_addr(
+        &self,
+        account_id: u32,
+        addr: String,
+    ) -> Result<Option<u32>> {
+        let ctx = self.get_context(account_id).await?;
+        let contact_id = Contact::lookup_id_by_addr(&ctx, &addr, Origin::IncomingReplyTo).await?;
+        Ok(contact_id.map(|id| id.to_u32()))
+    }
+
     // ---------------------------------------------
     //                   chat
     // ---------------------------------------------
@@ -828,7 +1206,7 @@ impl CommandApi {
     ///
     /// Setting `chat_id` to `None` (`null` in typescript) means get messages with media
     /// from any chat of the currently used account.
-    async fn chat_get_media(
+    async fn get_chat_media(
         &self,
         account_id: u32,
         chat_id: Option<u32>,
@@ -856,7 +1234,7 @@ impl CommandApi {
     ///
     /// one combined call for getting chat::get_next_media for both directions
     /// the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-    async fn chat_get_neighboring_media(
+    async fn get_neighboring_chat_media(
         &self,
         account_id: u32,
         msg_id: u32,
@@ -895,6 +1273,45 @@ impl CommandApi {
         Ok((prev, next))
     }
 
+    // ---------------------------------------------
+    //                   backup
+    // ---------------------------------------------
+
+    async fn export_backup(
+        &self,
+        account_id: u32,
+        destination: String,
+        passphrase: Option<String>,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        ctx.stop_io().await;
+        let result = imex::imex(
+            &ctx,
+            imex::ImexMode::ExportBackup,
+            destination.as_ref(),
+            passphrase,
+        )
+        .await;
+        ctx.start_io().await;
+        result
+    }
+
+    async fn import_backup(
+        &self,
+        account_id: u32,
+        path: String,
+        passphrase: Option<String>,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        imex::imex(
+            &ctx,
+            imex::ImexMode::ImportBackup,
+            path.as_ref(),
+            passphrase,
+        )
+        .await
+    }
+
     // ---------------------------------------------
     //                connectivity
     // ---------------------------------------------
@@ -939,11 +1356,37 @@ impl CommandApi {
         ctx.get_connectivity_html().await
     }
 
+    // ---------------------------------------------
+    //                  locations
+    // ---------------------------------------------
+
+    async fn get_locations(
+        &self,
+        account_id: u32,
+        chat_id: Option<u32>,
+        contact_id: Option<u32>,
+        timestamp_begin: i64,
+        timestamp_end: i64,
+    ) -> Result<Vec<JsonrpcLocation>> {
+        let ctx = self.get_context(account_id).await?;
+
+        let locations = location::get_range(
+            &ctx,
+            chat_id.map(ChatId::new),
+            contact_id,
+            timestamp_begin,
+            timestamp_end,
+        )
+        .await?;
+
+        Ok(locations.into_iter().map(|l| l.into()).collect())
+    }
+
     // ---------------------------------------------
     //                   webxdc
     // ---------------------------------------------
 
-    async fn webxdc_send_status_update(
+    async fn send_webxdc_status_update(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -955,7 +1398,7 @@ impl CommandApi {
             .await
     }
 
-    async fn webxdc_get_status_updates(
+    async fn get_webxdc_status_updates(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -970,7 +1413,7 @@ impl CommandApi {
     }
 
     /// Get info from a webxdc message
-    async fn message_get_webxdc_info(
+    async fn get_webxdc_info(
         &self,
         account_id: u32,
         instance_msg_id: u32,
@@ -996,6 +1439,38 @@ impl CommandApi {
         forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
     }
 
+    async fn send_sticker(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        sticker_path: String,
+    ) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+
+        let mut msg = Message::new(Viewtype::Sticker);
+        msg.set_file(&sticker_path, None);
+
+        let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
+        Ok(message_id.to_u32())
+    }
+
+    /// Send a reaction to message.
+    ///
+    /// Reaction is a string of emojis separated by spaces. Reaction to a
+    /// single message can be sent multiple times. The last reaction
+    /// received overrides all previously received reactions. It is
+    /// possible to remove all reactions by sending an empty string.
+    async fn send_reaction(
+        &self,
+        account_id: u32,
+        message_id: u32,
+        reaction: Vec<String>,
+    ) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        let message_id = send_reaction(&ctx, MsgId::new(message_id), &reaction.join(" ")).await?;
+        Ok(message_id.to_u32())
+    }
+
     // ---------------------------------------------
     //           functions for the composer
     //    the composer is the message input field
@@ -1018,17 +1493,121 @@ impl CommandApi {
         }
     }
 
+    async fn send_videochat_invitation(&self, account_id: u32, chat_id: u32) -> Result<u32> {
+        let ctx = self.get_context(account_id).await?;
+        chat::send_videochat_invitation(&ctx, ChatId::new(chat_id))
+            .await
+            .map(|msg_id| msg_id.to_u32())
+    }
+
     // ---------------------------------------------
     //           misc prototyping functions
     //       that might get removed later again
     // ---------------------------------------------
 
+    async fn misc_get_sticker_folder(&self, account_id: u32) -> Result<String> {
+        let ctx = self.get_context(account_id).await?;
+        let account_folder = ctx
+            .get_dbfile()
+            .parent()
+            .context("account folder not found")?;
+        let sticker_folder_path = account_folder.join("stickers");
+        fs::create_dir_all(&sticker_folder_path).await?;
+        sticker_folder_path
+            .to_str()
+            .map(|s| s.to_owned())
+            .context("path conversion to string failed")
+    }
+
+    /// save a sticker to a collection/folder in the account's sticker folder
+    async fn misc_save_sticker(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        collection: String,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
+        ensure!(
+            message.get_viewtype() == Viewtype::Sticker,
+            "message {} is not a sticker",
+            msg_id
+        );
+        let account_folder = ctx
+            .get_dbfile()
+            .parent()
+            .context("account folder not found")?;
+        ensure!(
+            is_sanitized(&collection),
+            "illegal characters in collection name"
+        );
+        let destination_path = account_folder.join("stickers").join(collection);
+        fs::create_dir_all(&destination_path).await?;
+        let file = message.get_file(&ctx).context("no file")?;
+        fs::copy(
+            &file,
+            destination_path.join(format!(
+                "{}.{}",
+                msg_id,
+                file.extension()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+            )),
+        )
+        .await?;
+        Ok(())
+    }
+
+    /// for desktop, get stickers from stickers folder,
+    /// grouped by the collection/folder they are in.
+    async fn misc_get_stickers(&self, account_id: u32) -> Result<HashMap<String, Vec<String>>> {
+        let ctx = self.get_context(account_id).await?;
+        let account_folder = ctx
+            .get_dbfile()
+            .parent()
+            .context("account folder not found")?;
+        let sticker_folder_path = account_folder.join("stickers");
+        fs::create_dir_all(&sticker_folder_path).await?;
+        let mut result = HashMap::new();
+
+        let mut packs = tokio::fs::read_dir(sticker_folder_path).await?;
+        while let Some(entry) = packs.next_entry().await? {
+            if !entry.file_type().await?.is_dir() {
+                continue;
+            }
+            let pack_name = entry.file_name().into_string().unwrap_or_default();
+            let mut stickers = tokio::fs::read_dir(entry.path()).await?;
+            let mut sticker_paths = Vec::new();
+            while let Some(sticker_entry) = stickers.next_entry().await? {
+                if !sticker_entry.file_type().await?.is_file() {
+                    continue;
+                }
+                let sticker_name = sticker_entry.file_name().into_string().unwrap_or_default();
+                if sticker_name.ends_with(".png") || sticker_name.ends_with(".webp") {
+                    sticker_paths.push(
+                        sticker_entry
+                            .path()
+                            .to_str()
+                            .map(|s| s.to_owned())
+                            .context("path conversion to string failed")?,
+                    );
+                }
+            }
+            if !sticker_paths.is_empty() {
+                result.insert(pack_name, sticker_paths);
+            }
+        }
+
+        Ok(result)
+    }
+
     /// Returns the messageid of the sent message
     async fn misc_send_text_message(
         &self,
         account_id: u32,
-        text: String,
         chat_id: u32,
+        text: String,
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
 
@@ -1134,8 +1713,11 @@ async fn set_config(
     if key.starts_with("ui.") {
         ctx.set_ui_config(key, value).await?;
     } else {
-        ctx.set_config(Config::from_str(key).context("unknown key")?, value)
-            .await?;
+        ctx.set_config(
+            Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?,
+            value,
+        )
+        .await?;
 
         match key {
             "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
@@ -1154,7 +1736,7 @@ async fn get_config(
     if key.starts_with("ui.") {
         ctx.get_ui_config(key).await
     } else {
-        ctx.get_config(Config::from_str(key).context("unknown key")?)
+        ctx.get_config(Config::from_str(key).with_context(|| format!("unknown key {:?}", key))?)
             .await
     }
 }

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

@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};
 
 use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts};
+use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
@@ -37,7 +37,7 @@ pub struct FullChat {
     ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
     can_send: bool,
     was_seen_recently: bool,
-    mailing_list_address: String,
+    mailing_list_address: Option<String>,
 }
 
 impl FullChat {
@@ -81,7 +81,7 @@ impl FullChat {
             false
         };
 
-        let mailing_list_address = chat.get_mailinglist_addr().to_string();
+        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
 
         Ok(FullChat {
             id: chat_id,
@@ -193,3 +193,21 @@ 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/chat_list.rs

@@ -48,12 +48,10 @@ pub enum ChatListItemFetchResult {
         dm_chat_contact: Option<u32>,
         was_seen_recently: bool,
     },
-    ArchiveLink,
     #[serde(rename_all = "camelCase")]
-    Error {
-        id: u32,
-        error: String,
-    },
+    ArchiveLink { fresh_message_counter: usize },
+    #[serde(rename_all = "camelCase")]
+    Error { id: u32, error: String },
 }
 
 pub(crate) async fn get_chat_list_item_by_id(
@@ -66,8 +64,12 @@ pub(crate) async fn get_chat_list_item_by_id(
         _ => Some(MsgId::new(entry.1)),
     };
 
+    let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
+
     if chat_id.is_archived_link() {
-        return Ok(ChatListItemFetchResult::ArchiveLink);
+        return Ok(ChatListItemFetchResult::ArchiveLink {
+            fresh_message_counter,
+        });
     }
 
     let chat = Chat::load_from_db(ctx, chat_id).await?;
@@ -111,7 +113,6 @@ pub(crate) async fn get_chat_list_item_by_id(
         (None, false)
     };
 
-    let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
     let color = color_int_to_hex_string(chat.get_color(ctx).await?);
 
     Ok(ChatListItemFetchResult::ChatListItem {

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

@@ -20,6 +20,10 @@ pub struct ContactObject {
     name_and_addr: String,
     is_blocked: bool,
     is_verified: bool,
+    /// the address that verified this contact
+    verifier_addr: Option<String>,
+    /// the id of the contact that verified this contact
+    verifier_id: Option<u32>,
     /// the contact's last seen timestamp
     last_seen: i64,
     was_seen_recently: bool,
@@ -36,6 +40,18 @@ impl ContactObject {
         };
         let is_verified = contact.is_verified(context).await? == VerifiedStatus::BidirectVerified;
 
+        let (verifier_addr, verifier_id) = if is_verified {
+            (
+                contact.get_verifier_addr(context).await?,
+                contact
+                    .get_verifier_id(context)
+                    .await?
+                    .map(|contact_id| contact_id.to_u32()),
+            )
+        } else {
+            (None, None)
+        };
+
         Ok(ContactObject {
             address: contact.get_addr().to_owned(),
             color: color_int_to_hex_string(contact.get_color()),
@@ -48,6 +64,8 @@ impl ContactObject {
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
             is_verified,
+            verifier_addr,
+            verifier_id,
             last_seen: contact.last_seen(),
             was_seen_recently: contact.was_seen_recently(),
         })

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

@@ -0,0 +1,47 @@
+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,11 +1,14 @@
 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;
@@ -13,6 +16,7 @@ use typescript_type_def::TypeDef;
 
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
+use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;
 
 #[derive(Serialize, TypeDef)]
@@ -30,6 +34,9 @@ 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,
@@ -41,6 +48,8 @@ pub struct MessageObject {
     is_setupmessage: bool,
     is_info: bool,
     is_forwarded: bool,
+    /// when is_info is true this describes what type of system message it is
+    system_message_type: SystemMessageType,
 
     duration: i32,
     dimensions_height: i32,
@@ -62,6 +71,8 @@ pub struct MessageObject {
     webxdc_info: Option<WebxdcMessageInfo>,
 
     download_state: DownloadState,
+
+    reactions: Option<JSONRPCReactions>,
 }
 
 #[derive(Serialize, TypeDef)]
@@ -79,6 +90,7 @@ enum MessageQuote {
         override_sender_name: Option<String>,
         image: Option<String>,
         is_forwarded: bool,
+        view_type: MessageViewtype,
     },
 }
 
@@ -93,7 +105,7 @@ impl MessageObject {
 
         let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
         let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
-        let file_bytes = message.get_filebytes(context).await;
+        let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
         let override_sender_name = message.get_override_sender_name();
 
         let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
@@ -118,6 +130,7 @@ impl MessageObject {
                         override_sender_name: quote.get_override_sender_name(),
                         image: if quote.get_viewtype() == Viewtype::Image
                             || quote.get_viewtype() == Viewtype::Gif
+                            || quote.get_viewtype() == Viewtype::Sticker
                         {
                             match quote.get_file(context) {
                                 Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
@@ -127,6 +140,7 @@ impl MessageObject {
                             None
                         },
                         is_forwarded: quote.is_forwarded(),
+                        view_type: quote.get_viewtype().into(),
                     })
                 }
                 None => Some(MessageQuote::JustText { text: quoted_text }),
@@ -135,6 +149,13 @@ impl MessageObject {
             None
         };
 
+        let reactions = get_msg_reactions(context, msg_id).await?;
+        let reactions = if reactions.is_empty() {
+            None
+        } else {
+            Some(reactions.into())
+        };
+
         Ok(MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
@@ -149,6 +170,7 @@ 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(),
@@ -160,6 +182,7 @@ impl MessageObject {
             is_setupmessage: message.is_setupmessage(),
             is_info: message.is_info(),
             is_forwarded: message.is_forwarded(),
+            system_message_type: message.get_info_type().into(),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -189,6 +212,8 @@ impl MessageObject {
             webxdc_info,
 
             download_state,
+
+            reactions,
         })
     }
 }
@@ -288,6 +313,61 @@ impl From<download::DownloadState> for DownloadState {
     }
 }
 
+#[derive(Serialize, TypeDef)]
+pub enum SystemMessageType {
+    Unknown,
+    GroupNameChanged,
+    GroupImageChanged,
+    MemberAddedToGroup,
+    MemberRemovedFromGroup,
+    AutocryptSetupMessage,
+    SecurejoinMessage,
+    LocationStreamingEnabled,
+    LocationOnly,
+
+    /// Chat ephemeral message timer is changed.
+    EphemeralTimerChanged,
+
+    // Chat protection state changed
+    ChatProtectionEnabled,
+    ChatProtectionDisabled,
+
+    /// Self-sent-message that contains only json used for multi-device-sync;
+    /// if possible, we attach that to other messages as for locations.
+    MultiDeviceSync,
+
+    // Sync message that contains a json payload
+    // sent to the other webxdc instances
+    // These messages are not shown in the chat.
+    WebxdcStatusUpdate,
+
+    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
+    WebxdcInfoMessage,
+}
+
+impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
+    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
+        use deltachat::mimeparser::SystemMessage;
+        match system_message_type {
+            SystemMessage::Unknown => SystemMessageType::Unknown,
+            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
+            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
+            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
+            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
+            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
+            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
+            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
+            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
+            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
+            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
+            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
+            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
+            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
+            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
+        }
+    }
+}
+
 #[derive(Serialize, TypeDef)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageNotificationInfo {
@@ -345,3 +425,68 @@ impl MessageNotificationInfo {
         })
     }
 }
+
+#[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,13 +1,12 @@
-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 {
@@ -21,213 +20,3 @@ fn maybe_empty_string_to_option(string: String) -> Option<String> {
         Some(string)
     }
 }
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    Login {
-        address: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}

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

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

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

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

deltachat-jsonrpc/src/lib.rs

@@ -4,12 +4,13 @@ pub use yerpc;
 
 #[cfg(test)]
 mod tests {
-    use super::api::{Accounts, CommandApi};
     use async_channel::unbounded;
     use futures::StreamExt;
     use tempfile::TempDir;
     use yerpc::{RpcClient, RpcSession};
 
+    use super::api::{Accounts, CommandApi};
+
     #[tokio::test(flavor = "multi_thread")]
     async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
         let tmp_dir = TempDir::new().unwrap().path().into();

deltachat-jsonrpc/src/webserver.rs

@@ -1,6 +1,7 @@
-use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
 use std::net::SocketAddr;
 use std::path::PathBuf;
+
+use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
 use yerpc::axum::handle_ws_rpc;
 use yerpc::{RpcClient, RpcSession};
 

deltachat-jsonrpc/typescript/.gitignore

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

deltachat-jsonrpc/typescript/example/example.ts

@@ -1,4 +1,4 @@
-import { DeltaChat, DeltaChatEvent } from "../deltachat.js";
+import { DcEvent, DeltaChat } 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", event => {
-    onIncomingEvent(event)
-  })
+  client.on("ALL", (accountId, event) => {
+    onIncomingEvent(accountId, 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.chatlistGetFullChatById(
+      const chat = await client.rpc.getFullChatById(
         selectedAccount,
         chatId
       );
       write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.messageListGetMessageIds(
+      const messageIds = await client.rpc.getMessageIds(
         selectedAccount,
         chatId,
         0
       );
-      const messages = await client.rpc.messageGetMessages(
+      const messages = await client.rpc.getMessages(
         selectedAccount,
         messageIds
       );
@@ -88,14 +88,15 @@ async function run() {
     }
   }
 
-  function onIncomingEvent(event: DeltaChatEvent) {
+  function onIncomingEvent(accountId: number, event: DcEvent) {
     write(
       $side,
       `
         <p class="message">
-          [<strong>${event.id}</strong> on account ${event.contextId}]<br>
-          <em>f1:</em> ${JSON.stringify(event.field1)}<br>
-          <em>f2:</em> ${JSON.stringify(event.field2)}
+          [<strong>${event.type}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { type: undefined })
+          )}
         </p>`
     );
   }

deltachat-jsonrpc/typescript/generated/client.ts

@@ -1,623 +0,0 @@
-// 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>>;
-  }
-
-  /**
-   * Fetch info desktop needs for creating a notification for a message
-   */
-  public messageGetNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
-    return (this._transport.request('message_get_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
-  }
-
-  /**
-   * Delete messages. The messages are deleted on the current device and
-   * on the IMAP server.
-   */
-  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)[]>;
-  }
-
-  /**
-   * Search next/previous message based on a given message and a list of types.
-   * Typically used to implement the "next" and "previous" buttons
-   * in a gallery or in a media player.
-   *
-   * one combined call for getting chat::get_next_media for both directions
-   * the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-   */
-  public chatGetNeighboringMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
-    return (this._transport.request('chat_get_neighboring_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
-  }
-
-  /**
-   * Indicate that the network likely has come back.
-   * or just that the network conditions might have changed
-   */
-  public maybeNetwork(): Promise<null> {
-    return (this._transport.request('maybe_network', [] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
-   * One of:
-   * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
-   * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
-   * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
-   * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
-   *
-   * We don't use exact values but ranges here so that we can split up
-   * states into multiple states in the future.
-   *
-   * Meant as a rough overview that can be shown
-   * e.g. in the title of the main screen.
-   *
-   * If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   */
-  public getConnectivity(accountId: T.U32): Promise<T.U32> {
-    return (this._transport.request('get_connectivity', [accountId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Get an overview of the current connectivity, and possibly more statistics.
-   * Meant to give the user more insight about the current status than
-   * the basic connectivity info returned by get_connectivity(); show this
-   * e.g., if the user taps on said basic connectivity info.
-   *
-   * If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
-   *
-   * This comes as an HTML from the core so that we can easily improve it
-   * and the improvement instantly reaches all UIs.
-   */
-  public getConnectivityHtml(accountId: T.U32): Promise<string> {
-    return (this._transport.request('get_connectivity_html', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public webxdcSendStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('webxdc_send_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
-  }
-
-
-  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

@@ -1,3 +0,0 @@
-// 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

@@ -1,10 +0,0 @@
-// 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

@@ -1,150 +0,0 @@
-// 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;})|({"type":"login";}&{"address":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;"mailingListAddress":string;};
-
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-export type BasicChat=
-/**
- * cheaper version of fullchat, omits:
- * - contacts
- * - contact_ids
- * - fresh_message_counter
- * - ephemeral_timer
- * - self_in_group
- * - was_seen_recently
- * - can_send
- * 
- * used when you only need the basic metadata of a chat like type, name, profile picture
- */
-{"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
-export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
-export type MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;}));
-export type 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 DownloadState=("Done"|"Available"|"Failure"|"InProgress");
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);"downloadState":DownloadState;};
-export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"image":(string|null);"imageMimeType":(string|null);"chatName":string;"chatProfileImage":(string|null);
-/**
- * also known as summary_text1
- */
-"summaryPrefix":(string|null);
-/**
- * also known as summary_text2
- */
-"summaryText":string;};
-export type F64=number;
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,U32,(U32)[],U32,U32,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,string,U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],null,U32,U32,U32,string,U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,null,U32,U32,(Message|null),U32,string,U32,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];

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 build:tsc build:bundle",
+    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
     "build:tsc": "tsc",
     "docs": "typedoc --out docs deltachat.ts",
@@ -36,16 +36,17 @@
     "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
     "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
     "example:start": "http-server .",
+    "extract-constants": "node ./scripts/generate-constants.js",
     "generate-bindings": "cargo test",
     "prettier:check": "prettier --check **.ts",
     "prettier:fix": "prettier --write **.ts",
     "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --features webserver --bin deltachat-jsonrpc-server",
+    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
     "test:report-coverage": "node report_api_coverage.mjs",
     "test:run": "mocha dist/test",
     "test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.95.0"
+  "version": "1.107.0"
 }

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

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

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,40 +1,59 @@
 import * as T from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { EventTypeName } from "../generated/events.js";
+import { Event } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "tiny-emitter";
+import { TinyEmitter } from "@deltachat/tiny-emitter";
 
-export type DeltaChatEvent = {
-  id: EventTypeName;
+type DCWireEvent<T extends Event> = {
+  event: T;
   contextId: number;
-  field1: any;
-  field2: any;
 };
-export type Events = Record<
-  EventTypeName | "ALL",
-  (event: DeltaChatEvent) => void
->;
+// 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 class BaseDeltaChat<
   Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
   rpc: RawClient;
   account?: T.Account;
-  private contextEmitters: TinyEmitter<Events>[] = [];
+  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
   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 DeltaChatEvent;
-        this.emit(event.id, event);
-        this.emit("ALL", 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);
 
         if (this.contextEmitters[event.contextId]) {
-          this.contextEmitters[event.contextId].emit(event.id, event);
-          this.contextEmitters[event.contextId].emit("ALL", event);
+          this.contextEmitters[event.contextId].emit(
+            event.event.type,
+            //@ts-ignore
+            event.event as any
+          );
+          this.contextEmitters[event.contextId].emit("ALL", event.event);
         }
       }
     });
@@ -70,8 +89,39 @@ 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,3 +4,4 @@ export * from "../generated/events.js";
 export { RawClient } from "../generated/client.js";
 export * from "./client.js";
 export * as yerpc from "yerpc";
+export { C } from "../generated/constants.js";

deltachat-jsonrpc/typescript/test/basic.ts

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

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,12 +1,8 @@
 import { assert, expect } from "chai";
-import { DeltaChat, DeltaChatEvent, EventTypeName } from "../deltachat.js";
-import {
-  RpcServerHandle,
-  createTempUser,
-  startServer,
-} from "./test_base.js";
+import { StdioDeltaChat as DeltaChat, DcEvent } 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;
@@ -16,7 +12,7 @@ describe("online tests", function () {
   let accountId1: number, accountId2: number;
 
   before(async function () {
-    this.timeout(12000)
+    this.timeout(60000);
     if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
@@ -31,10 +27,10 @@ describe("online tests", function () {
       this.skip();
     }
     serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url)
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
 
-    dc.on("ALL", ({ id, contextId }) => {
-      if (id !== "Info") console.log(contextId, id);
+    dc.on("ALL", (contextId, { type }) => {
+      if (type !== "Info") console.log(contextId, type);
     });
 
     account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
@@ -74,7 +70,7 @@ describe("online tests", function () {
       addr: account2.email,
       mail_pw: account2.password,
     });
-    await dc.rpc.configure(accountId2)
+    await dc.rpc.configure(accountId2);
     accountsConfigured = true;
   });
 
@@ -84,28 +80,28 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const contactId = await dc.rpc.contactsCreateContact(
+    const contactId = await dc.rpc.createContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
 
-    await dc.rpc.miscSendTextMessage(accountId1, "Hello", chatId);
-    const { field1: chatIdOnAccountB } = await eventPromise;
+    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
+    const { chatId: chatIdOnAccountB } = await eventPromise;
     await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
+    const messageList = await dc.rpc.getMessageIds(
       accountId2,
       chatIdOnAccountB,
       0
     );
 
     expect(messageList).have.length(1);
-    const message = await dc.rpc.messageGetMessage(accountId2, messageList[0]);
+    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
     expect(message.text).equal("Hello");
   });
 
@@ -116,30 +112,30 @@ describe("online tests", function () {
     this.timeout(10000);
 
     // send message from A to B
-    const contactId = await dc.rpc.contactsCreateContact(
+    const contactId = await dc.rpc.createContact(
       accountId1,
       account2.email,
       null
     );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = Promise.race([
       waitForEvent(dc, "MsgsChanged", accountId2),
       waitForEvent(dc, "IncomingMsg", accountId2),
     ]);
-    dc.rpc.miscSendTextMessage(accountId1, "Hello2", chatId);
+    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
     // wait for message from A
     console.log("wait for message from A");
 
     const event = await eventPromise;
-    const { field1: chatIdOnAccountB } = event;
+    const { chatId: chatIdOnAccountB } = event;
 
     await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
+    const messageList = await dc.rpc.getMessageIds(
       accountId2,
       chatIdOnAccountB,
       0
     );
-    const message = await dc.rpc.messageGetMessage(
+    const message = await dc.rpc.getMessage(
       accountId2,
       messageList.reverse()[0]
     );
@@ -149,14 +145,14 @@ describe("online tests", function () {
       waitForEvent(dc, "MsgsChanged", accountId1),
       waitForEvent(dc, "IncomingMsg", accountId1),
     ]);
-    dc.rpc.miscSendTextMessage(accountId2, "super secret message", chatId);
+    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
     // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (
-      await dc.rpc.messageListGetMessageIds(accountId1, chatId, 0)
+      await dc.rpc.getMessageIds(accountId1, chatId, 0)
     ).reverse()[0];
-    const message2 = await dc.rpc.messageGetMessage(accountId1, messageId);
+    const message2 = await dc.rpc.getMessage(accountId1, messageId);
     expect(message2.text).equal("super secret message");
     expect(message2.showPadlock).equal(true);
   });
@@ -179,22 +175,22 @@ describe("online tests", function () {
   });
 });
 
-async function waitForEvent(
+async function waitForEvent<T extends DcEvent["type"]>(
   dc: DeltaChat,
-  eventType: EventTypeName,
+  eventType: T,
   accountId: number,
   timeout: number = EVENT_TIMEOUT
-): Promise<DeltaChatEvent> {
+): Promise<Extract<DcEvent, { type: T }>> {
   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 = (event: DeltaChatEvent) => {
-      if (event.contextId == accountId) {
+    );
+    const callback = (contextId: number, event: DcEvent) => {
+      if (contextId == accountId) {
         dc.off(eventType, callback);
-        clearTimeout(rejectTimeout)
-        resolve(event);
+        clearTimeout(rejectTimeout);
+        resolve(event as any);
       }
     };
     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";
-
-export const RPC_SERVER_PORT = 20808;
+import { Readable, Writable } from "node:stream";
 
 export type RpcServerHandle = {
-  url: string,
-  close: () => Promise<void>
-}
+  stdin: Writable;
+  stdout: Readable;
+  close: () => Promise<void>;
+};
 
-export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcServerHandle> {
+export async function startServer(): Promise<RpcServerHandle> {
   const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
 
-  const pathToServerBinary = resolve(join(await getTargetDir(), "debug/deltachat-jsonrpc-server"));
-  console.log('using server binary: ' + pathToServerBinary);
-
-  if (!existsSync(pathToServerBinary)) {
-    throw new Error(
-      "server executable does not exist, you need to build it first" +
-        "\nserver executable not found at " +
-        pathToServerBinary
-    );
-  }
+  const pathToServerBinary = resolve(
+    join(await getTargetDir(), "debug/deltachat-rpc-server")
+  );
 
   const server = spawn(pathToServerBinary, {
     cwd: tmpDir,
     env: {
       RUST_LOG: process.env.RUST_LOG || "info",
-      DC_PORT: '' + port
+      RUST_MIN_STACK: "8388608",
     },
   });
+
+  server.on("error", (err) => {
+    throw new Error(
+      "Failed to start server executable " +
+        pathToServerBinary +
+        ", make sure you built it first."
+    );
+  });
   let shouldClose = false;
 
   server.on("exit", () => {
@@ -43,12 +43,10 @@ export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcSe
   });
 
   server.stderr.pipe(process.stderr);
-  server.stdout.pipe(process.stdout)
-
-  const url = `ws://localhost:${port}/ws`
 
   return {
-    url,
+    stdin: server.stdin,
+    stdout: server.stdout,
     close: async () => {
       shouldClose = true;
       if (!server.kill()) {

deltachat-ratelimit/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "ratelimit"
+version = "1.0.0"
+description = "Token bucket implementation"
+edition = "2021"
+license = "MPL-2.0"
+
+[dependencies]

deltachat-ratelimit/src/lib.rs

@@ -7,7 +7,7 @@
 use std::time::{Duration, SystemTime};
 
 #[derive(Debug)]
-pub(crate) struct Ratelimit {
+pub struct Ratelimit {
     /// Time of the last update.
     last_update: SystemTime,
 
@@ -25,7 +25,7 @@ impl Ratelimit {
     /// Returns a new rate limiter with the given constraints.
     ///
     /// Rate limiter will allow to send no more than `quota` messages within duration `window`.
-    pub(crate) fn new(window: Duration, quota: f64) -> Self {
+    pub fn new(window: Duration, quota: f64) -> Self {
         Self::new_at(window, quota, SystemTime::now())
     }
 
@@ -57,7 +57,7 @@ impl Ratelimit {
     /// Returns true if can send another message now.
     ///
     /// This method takes mutable reference
-    pub(crate) fn can_send(&self) -> bool {
+    pub fn can_send(&self) -> bool {
         self.can_send_at(SystemTime::now())
     }
 
@@ -71,7 +71,7 @@ impl Ratelimit {
     /// It is possible to send message even if over quota, e.g. if the message sending is initiated
     /// by the user and should not be rate limited. However, sending messages when over quota
     /// further postpones the time when it will be allowed to send low priority messages.
-    pub(crate) fn send(&mut self) {
+    pub fn send(&mut self) {
         self.send_at(SystemTime::now())
     }
 
@@ -87,7 +87,7 @@ impl Ratelimit {
     }
 
     /// Calculates the time until `can_send` will return `true`.
-    pub(crate) fn until_can_send(&self) -> Duration {
+    pub fn until_can_send(&self) -> Duration {
         self.until_can_send_at(SystemTime::now())
     }
 }

deltachat-rpc-client/README.md

@@ -0,0 +1,41 @@
+# 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

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+"""Minimal echo bot example.
+
+it will echo back any text send to it, it also will print to console all Delta Chat core events.
+Pass --help to the CLI to see available options.
+"""
+import asyncio
+
+from deltachat_rpc_client import events, run_bot_cli
+
+hooks = events.HookCollection()
+
+
+@hooks.on(events.RawEvent)
+async def log_event(event):
+    print(event)
+
+
+@hooks.on(events.NewMessage)
+async def echo(event):
+    snapshot = event.message_snapshot
+    await snapshot.chat.send_text(snapshot.text)
+
+
+if __name__ == "__main__":
+    asyncio.run(run_bot_cli(hooks))

deltachat-rpc-client/examples/echobot_advanced.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+"""Advanced echo bot example.
+
+it will echo back any message that has non-empty text and also supports the /help command.
+"""
+import asyncio
+import logging
+import sys
+
+from deltachat_rpc_client import Bot, DeltaChat, EventType, Rpc, events
+
+hooks = events.HookCollection()
+
+
+@hooks.on(events.RawEvent)
+async def log_event(event):
+    if event.type == EventType.INFO:
+        logging.info(event.msg)
+    elif event.type == EventType.WARNING:
+        logging.warning(event.msg)
+
+
+@hooks.on(events.RawEvent(EventType.ERROR))
+async def log_error(event):
+    logging.error(event.msg)
+
+
+@hooks.on(events.MemberListChanged)
+async def on_memberlist_changed(event):
+    logging.info("member %s was %s", event.member, "added" if event.member_added else "removed")
+
+
+@hooks.on(events.GroupImageChanged)
+async def on_group_image_changed(event):
+    logging.info("group image %s", "deleted" if event.image_deleted else "changed")
+
+
+@hooks.on(events.GroupNameChanged)
+async def on_group_name_changed(event):
+    logging.info("group name changed, old name: %s", event.old_name)
+
+
+@hooks.on(events.NewMessage(func=lambda e: not e.command))
+async def echo(event):
+    snapshot = event.message_snapshot
+    if snapshot.text or snapshot.file:
+        await snapshot.chat.send_message(text=snapshot.text, file=snapshot.file)
+
+
+@hooks.on(events.NewMessage(command="/help"))
+async def help_command(event):
+    snapshot = event.message_snapshot
+    await snapshot.chat.send_text("Send me any message and I will echo it back")
+
+
+async def main():
+    async with Rpc() as rpc:
+        deltachat = 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()
+
+        bot = Bot(account, hooks)
+        if not await bot.is_configured():
+            asyncio.create_task(bot.configure(email=sys.argv[1], password=sys.argv[2]))
+        await bot.run_forever()
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    asyncio.run(main())

deltachat-rpc-client/examples/echobot_no_hooks.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+"""
+Example echo bot without using hooks
+"""
+import asyncio
+import logging
+import sys
+
+from deltachat_rpc_client import DeltaChat, EventType, Rpc
+
+
+async def main():
+    async with Rpc() as rpc:
+        deltachat = 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"] == EventType.INFO:
+                logging.info("%s", event["msg"])
+            elif event["type"] == EventType.WARNING:
+                logging.warning("%s", event["msg"])
+            elif event["type"] == EventType.ERROR:
+                logging.error("%s", event["msg"])
+            elif event["type"] == EventType.INCOMING_MSG:
+                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

@@ -0,0 +1,39 @@
+[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"
+
+[tool.black]
+line-length = 120
+
+[tool.ruff]
+select = ["E", "F", "W", "N", "YTT", "B", "C4", "ISC", "ICN", "PT", "RET", "SIM", "TID", "ARG", "DTZ", "ERA", "PLC", "PLE", "PLW", "PIE", "COM"]
+line-length = 120
+
+[tool.isort]
+profile = "black"

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

@@ -0,0 +1,25 @@
+"""Delta Chat asynchronous high-level API"""
+from ._utils import AttrDict, run_bot_cli, run_client_cli
+from .account import Account
+from .chat import Chat
+from .client import Bot, Client
+from .const import EventType
+from .contact import Contact
+from .deltachat import DeltaChat
+from .message import Message
+from .rpc import Rpc
+
+__all__ = [
+    "Account",
+    "AttrDict",
+    "Bot",
+    "Chat",
+    "Client",
+    "Contact",
+    "DeltaChat",
+    "EventType",
+    "Message",
+    "Rpc",
+    "run_bot_cli",
+    "run_client_cli",
+]

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

@@ -0,0 +1,169 @@
+import argparse
+import asyncio
+import re
+import sys
+from typing import TYPE_CHECKING, Callable, Iterable, Optional, Tuple, Type, Union
+
+if TYPE_CHECKING:
+    from .client import Client
+    from .events import EventFilter
+
+
+def _camel_to_snake(name: str) -> str:
+    name = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
+    name = re.sub("__([A-Z])", r"_\1", name)
+    name = re.sub("([a-z0-9])([A-Z])", r"\1_\2", name)
+    return name.lower()
+
+
+def _to_attrdict(obj):
+    if isinstance(obj, AttrDict):
+        return obj
+    if isinstance(obj, dict):
+        return AttrDict(obj)
+    if isinstance(obj, list):
+        return [_to_attrdict(elem) for elem in obj]
+    return obj
+
+
+class AttrDict(dict):
+    """Dictionary that allows accessing values usin the "dot notation" as attributes."""
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__({_camel_to_snake(key): _to_attrdict(value) for key, value in dict(*args, **kwargs).items()})
+
+    def __getattr__(self, attr):
+        if attr in self:
+            return self[attr]
+        raise AttributeError("Attribute not found: " + str(attr))
+
+    def __setattr__(self, attr, val):
+        if attr in self:
+            raise AttributeError("Attribute-style access is read only")
+        super().__setattr__(attr, val)
+
+
+async def run_client_cli(
+    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
+    argv: Optional[list] = None,
+    **kwargs,
+) -> None:
+    """Run a simple command line app, using the given hooks.
+
+    Extra keyword arguments are passed to the internal Rpc object.
+    """
+    from .client import Client
+
+    await _run_cli(Client, hooks, argv, **kwargs)
+
+
+async def run_bot_cli(
+    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
+    argv: Optional[list] = None,
+    **kwargs,
+) -> None:
+    """Run a simple bot command line using the given hooks.
+
+    Extra keyword arguments are passed to the internal Rpc object.
+    """
+    from .client import Bot
+
+    await _run_cli(Bot, hooks, argv, **kwargs)
+
+
+async def _run_cli(
+    client_type: Type["Client"],
+    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
+    argv: Optional[list] = None,
+    **kwargs,
+) -> None:
+    from .deltachat import DeltaChat
+    from .rpc import Rpc
+
+    if argv is None:
+        argv = sys.argv
+
+    parser = argparse.ArgumentParser(prog=argv[0] if argv else None)
+    parser.add_argument(
+        "accounts_dir",
+        help="accounts folder (default: current working directory)",
+        nargs="?",
+    )
+    parser.add_argument("--email", action="store", help="email address")
+    parser.add_argument("--password", action="store", help="password")
+    args = parser.parse_args(argv[1:])
+
+    async with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
+        deltachat = DeltaChat(rpc)
+        core_version = (await deltachat.get_system_info()).deltachat_core_version
+        accounts = await deltachat.get_all_accounts()
+        account = accounts[0] if accounts else await deltachat.add_account()
+
+        client = client_type(account, hooks)
+        client.logger.debug("Running deltachat core %s", core_version)
+        if not await client.is_configured():
+            assert args.email, "Account is not configured and email must be provided"
+            assert args.password, "Account is not configured and password must be provided"
+            asyncio.create_task(client.configure(email=args.email, password=args.password))
+        await client.run_forever()
+
+
+def extract_addr(text: str) -> str:
+    """extract email address from the given text."""
+    match = re.match(r".*\((.+@.+)\)", text)
+    if match:
+        text = match.group(1)
+    text = text.rstrip(".")
+    return text.strip()
+
+
+def parse_system_image_changed(text: str) -> Optional[Tuple[str, bool]]:
+    """return image changed/deleted info from parsing the given system message text."""
+    text = text.lower()
+    match = re.match(r"group image (changed|deleted) by (.+).", text)
+    if match:
+        action, actor = match.groups()
+        return (extract_addr(actor), action == "deleted")
+    return None
+
+
+def parse_system_title_changed(text: str) -> Optional[Tuple[str, str]]:
+    text = text.lower()
+    match = re.match(r'group name changed from "(.+)" to ".+" by (.+).', text)
+    if match:
+        old_title, actor = match.groups()
+        return (extract_addr(actor), old_title)
+    return None
+
+
+def parse_system_add_remove(text: str) -> Optional[Tuple[str, str, str]]:
+    """return add/remove info from parsing the given system message text.
+
+    returns a (action, affected, actor) tuple.
+    """
+    # You removed member a@b.
+    # You added member a@b.
+    # Member Me (x@y) removed by a@b.
+    # Member x@y added by a@b
+    # Member With space (tmp1@x.org) removed by tmp2@x.org.
+    # Member With space (tmp1@x.org) removed by Another member (tmp2@x.org).",
+    # Group left by some one (tmp1@x.org).
+    # Group left by tmp1@x.org.
+    text = text.lower()
+
+    match = re.match(r"member (.+) (removed|added) by (.+)", text)
+    if match:
+        affected, action, actor = match.groups()
+        return action, extract_addr(affected), extract_addr(actor)
+
+    match = re.match(r"you (removed|added) member (.+)", text)
+    if match:
+        action, affected = match.groups()
+        return action, extract_addr(affected), "me"
+
+    if text.startswith("group left by "):
+        addr = extract_addr(text[13:])
+        if addr:
+            return "removed", addr, addr
+
+    return None

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

@@ -0,0 +1,255 @@
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
+
+from ._utils import AttrDict
+from .chat import Chat
+from .const import ChatlistFlag, ContactFlag, SpecialContactId
+from .contact import Contact
+from .message import Message
+from .rpc import Rpc
+
+if TYPE_CHECKING:
+    from .deltachat import DeltaChat
+
+
+class Account:
+    """Delta Chat account."""
+
+    def __init__(self, manager: "DeltaChat", account_id: int) -> None:
+        self.manager = manager
+        self.id = account_id
+
+    @property
+    def _rpc(self) -> Rpc:
+        return self.manager.rpc
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Account):
+            return False
+        return self.id == other.id and self.manager == other.manager
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Account id={self.id}>"
+
+    async def wait_for_event(self) -> AttrDict:
+        """Wait until the next event and return it."""
+        return AttrDict(await self._rpc.wait_for_event(self.id))
+
+    async def remove(self) -> None:
+        """Remove the account."""
+        await self._rpc.remove_account(self.id)
+
+    async def start_io(self) -> None:
+        """Start the account I/O."""
+        await self._rpc.start_io(self.id)
+
+    async def stop_io(self) -> None:
+        """Stop the account I/O."""
+        await self._rpc.stop_io(self.id)
+
+    async def get_info(self) -> AttrDict:
+        """Return dictionary of this account configuration parameters."""
+        return AttrDict(await self._rpc.get_info(self.id))
+
+    async def get_size(self) -> int:
+        """Get the combined filesize of an account in bytes."""
+        return await self._rpc.get_account_file_size(self.id)
+
+    async def is_configured(self) -> bool:
+        """Return True if this account is configured."""
+        return await self._rpc.is_configured(self.id)
+
+    async def set_config(self, key: str, value: Optional[str] = None) -> None:
+        """Set configuration value."""
+        await self._rpc.set_config(self.id, key, value)
+
+    async def get_config(self, key: str) -> Optional[str]:
+        """Get configuration value."""
+        return await self._rpc.get_config(self.id, key)
+
+    async def update_config(self, **kwargs) -> None:
+        """update config values."""
+        for key, value in kwargs.items():
+            await self.set_config(key, value)
+
+    async def set_avatar(self, img_path: Optional[str] = None) -> None:
+        """Set self avatar.
+
+        Passing None will discard the currently set avatar.
+        """
+        await self.set_config("selfavatar", img_path)
+
+    async def get_avatar(self) -> Optional[str]:
+        """Get self avatar."""
+        return await self.get_config("selfavatar")
+
+    async def configure(self) -> None:
+        """Configure an account."""
+        await self._rpc.configure(self.id)
+
+    async def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
+        """Create a new Contact or return an existing one.
+
+        Calling this method will always result in the same
+        underlying contact id.  If there already is a Contact
+        with that e-mail address, it is unblocked and its display
+        name is updated if specified.
+
+        :param obj: email-address or contact id.
+        :param name: (optional) display name for this contact.
+        """
+        if isinstance(obj, int):
+            obj = Contact(self, obj)
+        if isinstance(obj, Contact):
+            obj = (await obj.get_snapshot()).address
+        return Contact(self, await self._rpc.create_contact(self.id, obj, name))
+
+    def get_contact_by_id(self, contact_id: int) -> Contact:
+        """Return Contact instance for the given contact ID."""
+        return Contact(self, contact_id)
+
+    async def get_contact_by_addr(self, address: str) -> Optional[Contact]:
+        """Check if an e-mail address belongs to a known and unblocked contact."""
+        contact_id = await self._rpc.lookup_contact_id_by_addr(self.id, address)
+        return contact_id and Contact(self, contact_id)
+
+    async def get_blocked_contacts(self) -> List[AttrDict]:
+        """Return a list with snapshots of all blocked contacts."""
+        contacts = await self._rpc.get_blocked_contacts(self.id)
+        return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
+
+    async def get_contacts(
+        self,
+        query: Optional[str] = None,
+        with_self: bool = False,
+        verified_only: bool = False,
+        snapshot: bool = False,
+    ) -> Union[List[Contact], List[AttrDict]]:
+        """Get a filtered list of contacts.
+
+        :param query: if a string is specified, only return contacts
+                      whose name or e-mail matches query.
+        :param with_self: if True the self-contact is also included if it matches the query.
+        :param only_verified: if True only return verified contacts.
+        :param snapshot: If True return a list of contact snapshots instead of Contact instances.
+        """
+        flags = 0
+        if verified_only:
+            flags |= ContactFlag.VERIFIED_ONLY
+        if with_self:
+            flags |= ContactFlag.ADD_SELF
+
+        if snapshot:
+            contacts = await self._rpc.get_contacts(self.id, flags, query)
+            return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
+        contacts = await self._rpc.get_contact_ids(self.id, flags, query)
+        return [Contact(self, contact_id) for contact_id in contacts]
+
+    @property
+    def self_contact(self) -> Contact:
+        """This account's identity as a Contact."""
+        return Contact(self, SpecialContactId.SELF)
+
+    async def get_chatlist(
+        self,
+        query: Optional[str] = None,
+        contact: Optional[Contact] = None,
+        archived_only: bool = False,
+        for_forwarding: bool = False,
+        no_specials: bool = False,
+        alldone_hint: bool = False,
+        snapshot: bool = False,
+    ) -> Union[List[Chat], List[AttrDict]]:
+        """Return list of chats.
+
+        :param query: if a string is specified only chats matching this query are returned.
+        :param contact: if a contact is specified only chats including this contact are returned.
+        :param archived_only: if True only archived chats are returned.
+        :param for_forwarding: if True the chat list is sorted with "Saved messages" at the top
+                               and withot "Device chat" and contact requests.
+        :param no_specials: if True archive link is not added to the list.
+        :param alldone_hint: if True the "all done hint" special chat will be added to the list
+                             as needed.
+        :param snapshot: If True return a list of chat snapshots instead of Chat instances.
+        """
+        flags = 0
+        if archived_only:
+            flags |= ChatlistFlag.ARCHIVED_ONLY
+        if for_forwarding:
+            flags |= ChatlistFlag.FOR_FORWARDING
+        if no_specials:
+            flags |= ChatlistFlag.NO_SPECIALS
+        if alldone_hint:
+            flags |= ChatlistFlag.ADD_ALLDONE_HINT
+
+        entries = await self._rpc.get_chatlist_entries(self.id, flags, query, contact and contact.id)
+        if not snapshot:
+            return [Chat(self, entry[0]) for entry in entries]
+
+        items = await self._rpc.get_chatlist_items_by_entries(self.id, entries)
+        chats = []
+        for item in items.values():
+            item["chat"] = Chat(self, item["id"])
+            chats.append(AttrDict(item))
+        return chats
+
+    async def create_group(self, name: str, protect: bool = False) -> Chat:
+        """Create a new group chat.
+
+        After creation, the group has only self-contact as member and is in unpromoted state.
+        """
+        return Chat(self, await self._rpc.create_group_chat(self.id, name, protect))
+
+    def get_chat_by_id(self, chat_id: int) -> Chat:
+        """Return the Chat instance with the given ID."""
+        return Chat(self, chat_id)
+
+    async def secure_join(self, qrdata: str) -> Chat:
+        """Continue a Setup-Contact or Verified-Group-Invite protocol started on
+        another device.
+
+        The function returns immediately and the handshake runs in background, sending
+        and receiving several messages.
+        Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
+        See https://countermitm.readthedocs.io/en/latest/new.html for protocol details.
+
+        :param qrdata: The text of the scanned QR code.
+        """
+        return Chat(self, await self._rpc.secure_join(self.id, qrdata))
+
+    async def get_qr_code(self) -> Tuple[str, str]:
+        """Get Setup-Contact QR Code text and SVG data.
+
+        this data needs to be transferred to another Delta Chat account
+        in a second channel, typically used by mobiles with QRcode-show + scan UX.
+        """
+        return await self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
+
+    def get_message_by_id(self, msg_id: int) -> Message:
+        """Return the Message instance with the given ID."""
+        return Message(self, msg_id)
+
+    async def mark_seen_messages(self, messages: List[Message]) -> None:
+        """Mark the given set of messages as seen."""
+        await self._rpc.markseen_msgs(self.id, [msg.id for msg in messages])
+
+    async def delete_messages(self, messages: List[Message]) -> None:
+        """Delete messages (local and remote)."""
+        await self._rpc.delete_messages(self.id, [msg.id for msg in messages])
+
+    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.id)
+        return [Message(self, 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.id))
+        return [Message(self, msg_id) for msg_id in fresh_msg_ids]

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

@@ -0,0 +1,247 @@
+import calendar
+from datetime import datetime
+from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
+
+from ._utils import AttrDict
+from .const import ChatVisibility
+from .contact import Contact
+from .message import Message
+from .rpc import Rpc
+
+if TYPE_CHECKING:
+    from .account import Account
+
+
+class Chat:
+    """Chat object which manages members and through which you can send and retrieve messages."""
+
+    def __init__(self, account: "Account", chat_id: int) -> None:
+        self.account = account
+        self.id = chat_id
+
+    @property
+    def _rpc(self) -> Rpc:
+        return self.account._rpc
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Chat):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Chat id={self.id} account={self.account.id}>"
+
+    async def delete(self) -> None:
+        """Delete this chat and all its messages.
+
+        Note:
+
+        - does not delete messages on server
+        - the chat or contact is not blocked, new message will arrive
+        """
+        await self._rpc.delete_chat(self.account.id, self.id)
+
+    async def block(self) -> None:
+        """Block this chat."""
+        await self._rpc.block_chat(self.account.id, self.id)
+
+    async def accept(self) -> None:
+        """Accept this contact request chat."""
+        await self._rpc.accept_chat(self.account.id, self.id)
+
+    async def leave(self) -> None:
+        """Leave this chat."""
+        await self._rpc.leave_group(self.account.id, self.id)
+
+    async def mute(self, duration: Optional[int] = None) -> None:
+        """Mute this chat, if a duration is not provided the chat is muted forever.
+
+        :param duration: mute duration from now in seconds. Must be greater than zero.
+        """
+        if duration is not None:
+            assert duration > 0, "Invalid duration"
+            dur: Union[str, dict] = {"Until": duration}
+        else:
+            dur = "Forever"
+        await self._rpc.set_chat_mute_duration(self.account.id, self.id, dur)
+
+    async def unmute(self) -> None:
+        """Unmute this chat."""
+        await self._rpc.set_chat_mute_duration(self.account.id, self.id, "NotMuted")
+
+    async def pin(self) -> None:
+        """Pin this chat."""
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.PINNED)
+
+    async def unpin(self) -> None:
+        """Unpin this chat."""
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
+
+    async def archive(self) -> None:
+        """Archive this chat."""
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.ARCHIVED)
+
+    async def unarchive(self) -> None:
+        """Unarchive this chat."""
+        await self._rpc.set_chat_visibility(self.account.id, self.id, ChatVisibility.NORMAL)
+
+    async def set_name(self, name: str) -> None:
+        """Set name of this chat."""
+        await self._rpc.set_chat_name(self.account.id, self.id, name)
+
+    async def set_ephemeral_timer(self, timer: int) -> None:
+        """Set ephemeral timer of this chat."""
+        await self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)
+
+    async def get_encryption_info(self) -> str:
+        """Return encryption info for this chat."""
+        return await self._rpc.get_chat_encryption_info(self.account.id, self.id)
+
+    async def get_qr_code(self) -> Tuple[str, str]:
+        """Get Join-Group QR code text and SVG data."""
+        return await self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
+
+    async def get_basic_snapshot(self) -> AttrDict:
+        """Get a chat snapshot with basic info about this chat."""
+        info = await self._rpc.get_basic_chat_info(self.account.id, self.id)
+        return AttrDict(chat=self, **info)
+
+    async def get_full_snapshot(self) -> AttrDict:
+        """Get a full snapshot of this chat."""
+        info = await self._rpc.get_full_chat_by_id(self.account.id, self.id)
+        return AttrDict(chat=self, **info)
+
+    async def send_message(
+        self,
+        text: Optional[str] = None,
+        file: Optional[str] = None,
+        location: Optional[Tuple[float, float]] = None,
+        quoted_msg: Optional[Union[int, Message]] = None,
+    ) -> Message:
+        """Send a message and return the resulting Message instance."""
+        if isinstance(quoted_msg, Message):
+            quoted_msg = quoted_msg.id
+
+        msg_id, _ = await self._rpc.misc_send_msg(self.account.id, self.id, text, file, location, quoted_msg)
+        return Message(self.account, msg_id)
+
+    async def send_text(self, text: str) -> Message:
+        """Send a text message and return the resulting Message instance."""
+        msg_id = await self._rpc.misc_send_text_message(self.account.id, self.id, text)
+        return Message(self.account, msg_id)
+
+    async def send_videochat_invitation(self) -> Message:
+        """Send a videochat invitation and return the resulting Message instance."""
+        msg_id = await self._rpc.send_videochat_invitation(self.account.id, self.id)
+        return Message(self.account, msg_id)
+
+    async def send_sticker(self, path: str) -> Message:
+        """Send an sticker and return the resulting Message instance."""
+        msg_id = await self._rpc.send_sticker(self.account.id, self.id, path)
+        return Message(self.account, msg_id)
+
+    async def forward_messages(self, messages: List[Message]) -> None:
+        """Forward a list of messages to this chat."""
+        msg_ids = [msg.id for msg in messages]
+        await self._rpc.forward_messages(self.account.id, msg_ids, self.id)
+
+    async def set_draft(
+        self,
+        text: Optional[str] = None,
+        file: Optional[str] = None,
+        quoted_msg: Optional[int] = None,
+    ) -> None:
+        """Set draft message."""
+        if isinstance(quoted_msg, Message):
+            quoted_msg = quoted_msg.id
+        await self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg)
+
+    async def remove_draft(self) -> None:
+        """Remove draft message."""
+        await self._rpc.remove_draft(self.account.id, self.id)
+
+    async def get_draft(self) -> Optional[AttrDict]:
+        """Get draft message."""
+        snapshot = await self._rpc.get_draft(self.account.id, self.id)
+        if not snapshot:
+            return None
+        snapshot = AttrDict(snapshot)
+        snapshot["chat"] = Chat(self.account, snapshot.chat_id)
+        snapshot["sender"] = Contact(self.account, snapshot.from_id)
+        snapshot["message"] = Message(self.account, snapshot.id)
+        return snapshot
+
+    async def get_messages(self, flags: int = 0) -> List[Message]:
+        """get the list of messages in this chat."""
+        msgs = await self._rpc.get_message_ids(self.account.id, self.id, flags)
+        return [Message(self.account, msg_id) for msg_id in msgs]
+
+    async def get_fresh_message_count(self) -> int:
+        """Get number of fresh messages in this chat"""
+        return await self._rpc.get_fresh_msg_cnt(self.account.id, self.id)
+
+    async def mark_noticed(self) -> None:
+        """Mark all messages in this chat as noticed."""
+        await self._rpc.marknoticed_chat(self.account.id, self.id)
+
+    async def add_contact(self, *contact: Union[int, str, Contact]) -> None:
+        """Add contacts to this group."""
+        for cnt in contact:
+            if isinstance(cnt, str):
+                cnt = (await self.account.create_contact(cnt)).id
+            elif not isinstance(cnt, int):
+                cnt = cnt.id
+            await self._rpc.add_contact_to_chat(self.account.id, self.id, cnt)
+
+    async def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
+        """Remove members from this group."""
+        for cnt in contact:
+            if isinstance(cnt, str):
+                cnt = (await self.account.create_contact(cnt)).id
+            elif not isinstance(cnt, int):
+                cnt = cnt.id
+            await self._rpc.remove_contact_from_chat(self.account.id, self.id, cnt)
+
+    async def get_contacts(self) -> List[Contact]:
+        """Get the contacts belonging to this chat.
+
+        For single/direct chats self-address is not included.
+        """
+        contacts = await self._rpc.get_chat_contacts(self.account.id, self.id)
+        return [Contact(self.account, contact_id) for contact_id in contacts]
+
+    async def set_image(self, path: str) -> None:
+        """Set profile image of this chat.
+
+        :param path: Full path of the image to use as the group image.
+        """
+        await self._rpc.set_chat_profile_image(self.account.id, self.id, path)
+
+    async def remove_image(self) -> None:
+        """Remove profile image of this chat."""
+        await self._rpc.set_chat_profile_image(self.account.id, self.id, None)
+
+    async def get_locations(
+        self,
+        contact: Optional[Contact] = None,
+        timestamp_from: Optional[datetime] = None,
+        timestamp_to: Optional[datetime] = None,
+    ) -> List[AttrDict]:
+        """Get list of location snapshots for the given contact in the given timespan."""
+        time_from = calendar.timegm(timestamp_from.utctimetuple()) if timestamp_from else 0
+        time_to = calendar.timegm(timestamp_to.utctimetuple()) if timestamp_to else 0
+        contact_id = contact.id if contact else 0
+
+        result = await self._rpc.get_locations(self.account.id, self.id, contact_id, time_from, time_to)
+        locations = []
+        contacts: Dict[int, Contact] = {}
+        for loc in result:
+            loc = AttrDict(loc)
+            loc["chat"] = self
+            loc["contact"] = contacts.setdefault(loc.contact_id, Contact(self.account, loc.contact_id))
+            loc["message"] = Message(self.account, loc.msg_id)
+            locations.append(loc)
+        return locations

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

@@ -0,0 +1,203 @@
+"""Event loop implementations offering high level event handling/hooking."""
+import inspect
+import logging
+from typing import (
+    Callable,
+    Coroutine,
+    Dict,
+    Iterable,
+    Optional,
+    Set,
+    Tuple,
+    Type,
+    Union,
+)
+
+from deltachat_rpc_client.account import Account
+
+from ._utils import (
+    AttrDict,
+    parse_system_add_remove,
+    parse_system_image_changed,
+    parse_system_title_changed,
+)
+from .const import COMMAND_PREFIX, EventType, SystemMessageType
+from .events import (
+    EventFilter,
+    GroupImageChanged,
+    GroupNameChanged,
+    MemberListChanged,
+    NewMessage,
+    RawEvent,
+)
+
+
+class Client:
+    """Simple Delta Chat client that listen to events of a single account."""
+
+    def __init__(
+        self,
+        account: Account,
+        hooks: Optional[Iterable[Tuple[Callable, Union[type, EventFilter]]]] = None,
+        logger: Optional[logging.Logger] = None,
+    ) -> None:
+        self.account = account
+        self.logger = logger or logging
+        self._hooks: Dict[type, Set[tuple]] = {}
+        self._should_process_messages = 0
+        self.add_hooks(hooks or [])
+
+    def add_hooks(self, hooks: Iterable[Tuple[Callable, Union[type, EventFilter]]]) -> None:
+        for hook, event in hooks:
+            self.add_hook(hook, event)
+
+    def add_hook(self, hook: Callable, event: Union[type, EventFilter] = RawEvent) -> None:
+        """Register hook for the given event filter."""
+        if isinstance(event, type):
+            event = event()
+        assert isinstance(event, EventFilter)
+        self._should_process_messages += int(
+            isinstance(
+                event,
+                (NewMessage, MemberListChanged, GroupImageChanged, GroupNameChanged),
+            ),
+        )
+        self._hooks.setdefault(type(event), set()).add((hook, event))
+
+    def remove_hook(self, hook: Callable, event: Union[type, EventFilter]) -> None:
+        """Unregister hook from the given event filter."""
+        if isinstance(event, type):
+            event = event()
+        self._should_process_messages -= int(
+            isinstance(
+                event,
+                (NewMessage, MemberListChanged, GroupImageChanged, GroupNameChanged),
+            ),
+        )
+        self._hooks.get(type(event), set()).remove((hook, event))
+
+    async def is_configured(self) -> bool:
+        return await self.account.is_configured()
+
+    async def configure(self, email: str, password: str, **kwargs) -> None:
+        await self.account.set_config("addr", email)
+        await self.account.set_config("mail_pw", password)
+        for key, value in kwargs.items():
+            await self.account.set_config(key, value)
+        await self.account.configure()
+        self.logger.debug("Account configured")
+
+    async def run_forever(self) -> None:
+        """Process events forever."""
+        await self.run_until(lambda _: False)
+
+    async def run_until(self, func: Callable[[AttrDict], Union[bool, Coroutine]]) -> AttrDict:
+        """Process events until the given callable evaluates to True.
+
+        The callable should accept an AttrDict object representing the
+        last processed event. The event is returned when the callable
+        evaluates to True.
+        """
+        self.logger.debug("Listening to incoming events...")
+        if await self.is_configured():
+            await self.account.start_io()
+        await self._process_messages()  # Process old messages.
+        while True:
+            event = await self.account.wait_for_event()
+            event["type"] = EventType(event.type)
+            event["account"] = self.account
+            await self._on_event(event)
+            if event.type == EventType.INCOMING_MSG:
+                await self._process_messages()
+
+            stop = func(event)
+            if inspect.isawaitable(stop):
+                stop = await stop
+            if stop:
+                return event
+
+    async def _on_event(self, event: AttrDict, filter_type: Type[EventFilter] = RawEvent) -> None:
+        for hook, evfilter in self._hooks.get(filter_type, []):
+            if await evfilter.filter(event):
+                try:
+                    await hook(event)
+                except Exception as ex:
+                    self.logger.exception(ex)
+
+    async def _parse_command(self, event: AttrDict) -> None:
+        cmds = [hook[1].command for hook in self._hooks.get(NewMessage, []) if hook[1].command]
+        parts = event.message_snapshot.text.split(maxsplit=1)
+        payload = parts[1] if len(parts) > 1 else ""
+        cmd = parts.pop(0)
+
+        if "@" in cmd:
+            suffix = "@" + (await self.account.self_contact.get_snapshot()).address
+            if cmd.endswith(suffix):
+                cmd = cmd[: -len(suffix)]
+            else:
+                return
+
+        parts = cmd.split("_")
+        _payload = payload
+        while parts:
+            _cmd = "_".join(parts)
+            if _cmd in cmds:
+                break
+            _payload = (parts.pop() + " " + _payload).rstrip()
+
+        if parts:
+            cmd = _cmd
+            payload = _payload
+
+        event["command"], event["payload"] = cmd, payload
+
+    async def _on_new_msg(self, snapshot: AttrDict) -> None:
+        event = AttrDict(command="", payload="", message_snapshot=snapshot)
+        if not snapshot.is_info and snapshot.text.startswith(COMMAND_PREFIX):
+            await self._parse_command(event)
+        await self._on_event(event, NewMessage)
+
+    async def _handle_info_msg(self, snapshot: AttrDict) -> None:
+        event = AttrDict(message_snapshot=snapshot)
+
+        img_changed = parse_system_image_changed(snapshot.text)
+        if img_changed:
+            _, event["image_deleted"] = img_changed
+            await self._on_event(event, GroupImageChanged)
+            return
+
+        title_changed = parse_system_title_changed(snapshot.text)
+        if title_changed:
+            _, event["old_name"] = title_changed
+            await self._on_event(event, GroupNameChanged)
+            return
+
+        members_changed = parse_system_add_remove(snapshot.text)
+        if members_changed:
+            action, event["member"], _ = members_changed
+            event["member_added"] = action == "added"
+            await self._on_event(event, MemberListChanged)
+            return
+
+        self.logger.warning(
+            "ignoring unsupported system message id=%s text=%s",
+            snapshot.id,
+            snapshot.text,
+        )
+
+    async def _process_messages(self) -> None:
+        if self._should_process_messages:
+            for message in await self.account.get_fresh_messages_in_arrival_order():
+                snapshot = await message.get_snapshot()
+                await self._on_new_msg(snapshot)
+                if snapshot.is_info and snapshot.system_message_type != SystemMessageType.WEBXDC_INFO_MESSAGE:
+                    await self._handle_info_msg(snapshot)
+                await snapshot.message.mark_seen()
+
+
+class Bot(Client):
+    """Simple bot implementation that listent to events of a single account."""
+
+    async def configure(self, email: str, password: str, **kwargs) -> None:
+        kwargs.setdefault("bot", "1")
+        await super().configure(email, password, **kwargs)

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

@@ -0,0 +1,122 @@
+from enum import Enum, IntEnum
+
+COMMAND_PREFIX = "/"
+
+
+class ContactFlag(IntEnum):
+    VERIFIED_ONLY = 0x01
+    ADD_SELF = 0x02
+
+
+class ChatlistFlag(IntEnum):
+    ARCHIVED_ONLY = 0x01
+    NO_SPECIALS = 0x02
+    ADD_ALLDONE_HINT = 0x04
+    FOR_FORWARDING = 0x08
+
+
+class SpecialContactId(IntEnum):
+    SELF = 1
+    INFO = 2  # centered messages as "member added", used in all chats
+    DEVICE = 5  #  messages "update info" in the device-chat
+    LAST_SPECIAL = 9
+
+
+class EventType(str, Enum):
+    """Core event types"""
+
+    INFO = "Info"
+    SMTP_CONNECTED = "SmtpConnected"
+    IMAP_CONNECTED = "ImapConnected"
+    SMTP_MESSAGE_SENT = "SmtpMessageSent"
+    IMAP_MESSAGE_DELETED = "ImapMessageDeleted"
+    IMAP_MESSAGE_MOVED = "ImapMessageMoved"
+    NEW_BLOB_FILE = "NewBlobFile"
+    DELETED_BLOB_FILE = "DeletedBlobFile"
+    WARNING = "Warning"
+    ERROR = "Error"
+    ERROR_SELF_NOT_IN_GROUP = "ErrorSelfNotInGroup"
+    MSGS_CHANGED = "MsgsChanged"
+    REACTIONS_CHANGED = "ReactionsChanged"
+    INCOMING_MSG = "IncomingMsg"
+    INCOMING_MSG_BUNCH = "IncomingMsgBunch"
+    MSGS_NOTICED = "MsgsNoticed"
+    MSG_DELIVERED = "MsgDelivered"
+    MSG_FAILED = "MsgFailed"
+    MSG_READ = "MsgRead"
+    CHAT_MODIFIED = "ChatModified"
+    CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
+    CONTACTS_CHANGED = "ContactsChanged"
+    LOCATION_CHANGED = "LocationChanged"
+    CONFIGURE_PROGRESS = "ConfigureProgress"
+    IMEX_PROGRESS = "ImexProgress"
+    IMEX_FILE_WRITTEN = "ImexFileWritten"
+    SECUREJOIN_INVITER_PROGRESS = "SecurejoinInviterProgress"
+    SECUREJOIN_JOINER_PROGRESS = "SecurejoinJoinerProgress"
+    CONNECTIVITY_CHANGED = "ConnectivityChanged"
+    SELFAVATAR_CHANGED = "SelfavatarChanged"
+    WEBXDC_STATUS_UPDATE = "WebxdcStatusUpdate"
+    WEBXDC_INSTANCE_DELETED = "WebxdcInstanceDeleted"
+
+
+class ChatType(IntEnum):
+    """Chat types"""
+
+    UNDEFINED = 0
+    SINGLE = 100
+    GROUP = 120
+    MAILINGLIST = 140
+    BROADCAST = 160
+
+
+class ChatVisibility(str, Enum):
+    """Chat visibility types"""
+
+    NORMAL = "Normal"
+    ARCHIVED = "Archived"
+    PINNED = "Pinned"
+
+
+class DownloadState(str, Enum):
+    """Message download state"""
+
+    DONE = "Done"
+    AVAILABLE = "Available"
+    FAILURE = "Failure"
+    IN_PROGRESS = "InProgress"
+
+
+class ViewType(str, Enum):
+    """Message view type."""
+
+    UNKNOWN = "Unknown"
+    TEXT = "Text"
+    IMAGE = "Image"
+    GIF = "Gif"
+    STICKER = "Sticker"
+    AUDIO = "Audio"
+    VOICE = "Voice"
+    VIDEO = "Video"
+    FILE = "File"
+    VIDEOCHAT_INVITATION = "VideochatInvitation"
+    WEBXDC = "Webxdc"
+
+
+class SystemMessageType(str, Enum):
+    """System message type."""
+
+    UNKNOWN = "Unknown"
+    GROUP_NAME_CHANGED = "GroupNameChanged"
+    GROUP_IMAGE_CHANGED = "GroupImageChanged"
+    MEMBER_ADDED_TO_GROUP = "MemberAddedToGroup"
+    MEMBER_REMOVED_FROM_GROUP = "MemberRemovedFromGroup"
+    AUTOCRYPT_SETUP_MESSAGE = "AutocryptSetupMessage"
+    SECUREJOIN_MESSAGE = "SecurejoinMessage"
+    LOCATION_STREAMING_ENABLED = "LocationStreamingEnabled"
+    LOCATION_ONLY = "LocationOnly"
+    CHAT_PROTECTION_ENABLED = "ChatProtectionEnabled"
+    CHAT_PROTECTION_DISABLED = "ChatProtectionDisabled"
+    WEBXDC_STATUS_UPDATE = "WebxdcStatusUpdate"
+    EPHEMERAL_TIMER_CHANGED = "EphemeralTimerChanged"
+    MULTI_DEVICE_SYNC = "MultiDeviceSync"
+    WEBXDC_INFO_MESSAGE = "WebxdcInfoMessage"

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

@@ -0,0 +1,72 @@
+from typing import TYPE_CHECKING
+
+from ._utils import AttrDict
+from .rpc import Rpc
+
+if TYPE_CHECKING:
+    from .account import Account
+    from .chat import Chat
+
+
+class Contact:
+    """
+    Contact API.
+
+    Essentially a wrapper for RPC, account ID and a contact ID.
+    """
+
+    def __init__(self, account: "Account", contact_id: int) -> None:
+        self.account = account
+        self.id = contact_id
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Contact):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Contact id={self.id} account={self.account.id}>"
+
+    @property
+    def _rpc(self) -> Rpc:
+        return self.account._rpc
+
+    async def block(self) -> None:
+        """Block contact."""
+        await self._rpc.block_contact(self.account.id, self.id)
+
+    async def unblock(self) -> None:
+        """Unblock contact."""
+        await self._rpc.unblock_contact(self.account.id, self.id)
+
+    async def delete(self) -> None:
+        """Delete contact."""
+        await self._rpc.delete_contact(self.account.id, self.id)
+
+    async def set_name(self, name: str) -> None:
+        """Change the name of this contact."""
+        await self._rpc.change_contact_name(self.account.id, self.id, name)
+
+    async def get_encryption_info(self) -> str:
+        """Get a multi-line encryption info, containing your fingerprint and
+        the fingerprint of the contact.
+        """
+        return await self._rpc.get_contact_encryption_info(self.account.id, self.id)
+
+    async def get_snapshot(self) -> AttrDict:
+        """Return a dictionary with a snapshot of all contact properties."""
+        snapshot = AttrDict(await self._rpc.get_contact(self.account.id, self.id))
+        snapshot["contact"] = self
+        return snapshot
+
+    async def create_chat(self) -> "Chat":
+        """Create or get an existing 1:1 chat for this contact."""
+        from .chat import Chat
+
+        return Chat(
+            self.account,
+            await self._rpc.create_chat_by_contact_id(self.account.id, self.id),
+        )

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

@@ -0,0 +1,47 @@
+from typing import Dict, List
+
+from ._utils import AttrDict
+from .account import Account
+from .rpc import Rpc
+
+
+class DeltaChat:
+    """
+    Delta Chat accounts 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:
+        """Create a new account database."""
+        account_id = await self.rpc.add_account()
+        return Account(self, account_id)
+
+    async def get_all_accounts(self) -> List[Account]:
+        """Return a list of all available accounts."""
+        account_ids = await self.rpc.get_all_account_ids()
+        return [Account(self, account_id) for account_id in account_ids]
+
+    async def start_io(self) -> None:
+        """Start the I/O of all accounts."""
+        await self.rpc.start_io_for_all_accounts()
+
+    async def stop_io(self) -> None:
+        """Stop the I/O of all accounts."""
+        await self.rpc.stop_io_for_all_accounts()
+
+    async def maybe_network(self) -> None:
+        """Indicate that the network likely has come back or just that the network
+        conditions might have changed.
+        """
+        await self.rpc.maybe_network()
+
+    async def get_system_info(self) -> AttrDict:
+        """Get information about the Delta Chat core in this system."""
+        return AttrDict(await self.rpc.get_system_info())
+
+    async def set_translations(self, translations: Dict[str, str]) -> None:
+        """Set stock translation strings."""
+        await self.rpc.set_stock_strings(translations)

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

@@ -0,0 +1,270 @@
+"""High-level classes for event processing and filtering."""
+import inspect
+import re
+from abc import ABC, abstractmethod
+from typing import Callable, Iterable, Iterator, Optional, Set, Tuple, Union
+
+from ._utils import AttrDict
+from .const import EventType
+
+
+def _tuple_of(obj, type_: type) -> tuple:
+    if not obj:
+        return ()
+    if isinstance(obj, type_):
+        obj = (obj,)
+
+    if not all(isinstance(elem, type_) for elem in obj):
+        raise TypeError()
+    return tuple(obj)
+
+
+class EventFilter(ABC):
+    """The base event filter.
+
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __init__(self, func: Optional[Callable] = None):
+        self.func = func
+
+    @abstractmethod
+    def __hash__(self) -> int:
+        """Object's unique hash"""
+
+    @abstractmethod
+    def __eq__(self, other) -> bool:
+        """Return True if two event filters are equal."""
+
+    def __ne__(self, other):
+        return not self == other
+
+    async def _call_func(self, event) -> bool:
+        if not self.func:
+            return True
+        res = self.func(event)
+        if inspect.isawaitable(res):
+            return await res
+        return res
+
+    @abstractmethod
+    async def filter(self, event):
+        """Return True-like value if the event passed the filter and should be
+        used, or False-like value otherwise.
+        """
+
+
+class RawEvent(EventFilter):
+    """Matches raw core events.
+
+    :param types: The types of event to match.
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __init__(self, types: Union[None, EventType, Iterable[EventType]] = None, **kwargs):
+        super().__init__(**kwargs)
+        try:
+            self.types = _tuple_of(types, EventType)
+        except TypeError as err:
+            raise TypeError(f"Invalid event type given: {types}") from err
+
+    def __hash__(self) -> int:
+        return hash((self.types, self.func))
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, RawEvent):
+            return (self.types, self.func) == (other.types, other.func)
+        return False
+
+    async def filter(self, event: AttrDict) -> bool:
+        if self.types and event.type not in self.types:
+            return False
+        return await self._call_func(event)
+
+
+class NewMessage(EventFilter):
+    """Matches whenever a new message arrives.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param pattern: if set, this Pattern will be used to filter the message by its text
+                    content.
+    :param command: If set, only match messages with the given command (ex. /help).
+                    Setting this property implies `is_info==False`.
+    :param is_info: If set to True only match info/system messages, if set to False
+                    only match messages that are not info/system messages. If omitted
+                    info/system messages as well as normal messages will be matched.
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __init__(
+        self,
+        pattern: Union[
+            None,
+            str,
+            Callable[[str], bool],
+            re.Pattern,
+        ] = None,
+        command: Optional[str] = None,
+        is_info: Optional[bool] = None,
+        func: Optional[Callable[[AttrDict], bool]] = None,
+    ) -> None:
+        super().__init__(func=func)
+        self.is_info = is_info
+        if command is not None and not isinstance(command, str):
+            raise TypeError("Invalid command")
+        self.command = command
+        if self.is_info and self.command:
+            raise AttributeError("Can not use command and is_info at the same time.")
+        if isinstance(pattern, str):
+            pattern = re.compile(pattern)
+        if isinstance(pattern, re.Pattern):
+            self.pattern: Optional[Callable] = pattern.match
+        elif not pattern or callable(pattern):
+            self.pattern = pattern
+        else:
+            raise TypeError("Invalid pattern type")
+
+    def __hash__(self) -> int:
+        return hash((self.pattern, self.func))
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, NewMessage):
+            return (self.pattern, self.command, self.is_info, self.func) == (
+                other.pattern,
+                other.command,
+                other.is_info,
+                other.func,
+            )
+        return False
+
+    async def filter(self, event: AttrDict) -> bool:
+        if self.is_info is not None and self.is_info != event.message_snapshot.is_info:
+            return False
+        if self.command and self.command != event.command:
+            return False
+        if self.pattern:
+            match = self.pattern(event.message_snapshot.text)
+            if inspect.isawaitable(match):
+                match = await match
+            if not match:
+                return False
+        return await super()._call_func(event)
+
+
+class MemberListChanged(EventFilter):
+    """Matches when a group member is added or removed.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param added: If set to True only match if a member was added, if set to False
+                  only match if a member was removed. If omitted both, member additions
+                  and removals, will be matched.
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __init__(self, added: Optional[bool] = None, **kwargs):
+        super().__init__(**kwargs)
+        self.added = added
+
+    def __hash__(self) -> int:
+        return hash((self.added, self.func))
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, MemberListChanged):
+            return (self.added, self.func) == (other.added, other.func)
+        return False
+
+    async def filter(self, event: AttrDict) -> bool:
+        if self.added is not None and self.added != event.member_added:
+            return False
+        return await self._call_func(event)
+
+
+class GroupImageChanged(EventFilter):
+    """Matches when the group image is changed.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param deleted: If set to True only match if the image was deleted, if set to False
+                    only match if a new image was set. If omitted both, image changes and
+                    removals, will be matched.
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __init__(self, deleted: Optional[bool] = None, **kwargs):
+        super().__init__(**kwargs)
+        self.deleted = deleted
+
+    def __hash__(self) -> int:
+        return hash((self.deleted, self.func))
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, GroupImageChanged):
+            return (self.deleted, self.func) == (other.deleted, other.func)
+        return False
+
+    async def filter(self, event: AttrDict) -> bool:
+        if self.deleted is not None and self.deleted != event.image_deleted:
+            return False
+        return await self._call_func(event)
+
+
+class GroupNameChanged(EventFilter):
+    """Matches when the group name is changed.
+
+    Warning: registering a handler for this event will cause the messages
+    to be marked as read. Its usage is mainly intended for bots.
+
+    :param func: A Callable (async or not) function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+    """
+
+    def __hash__(self) -> int:
+        return hash((GroupNameChanged, self.func))
+
+    def __eq__(self, other) -> bool:
+        if isinstance(other, GroupNameChanged):
+            return self.func == other.func
+        return False
+
+    async def filter(self, event: AttrDict) -> bool:
+        return await self._call_func(event)
+
+
+class HookCollection:
+    """
+    Helper class to collect event hooks that can later be added to a Delta Chat client.
+    """
+
+    def __init__(self) -> None:
+        self._hooks: Set[Tuple[Callable, Union[type, EventFilter]]] = set()
+
+    def __iter__(self) -> Iterator[Tuple[Callable, Union[type, EventFilter]]]:
+        return iter(self._hooks)
+
+    def on(self, event: Union[type, EventFilter]) -> Callable:  # noqa
+        """Register decorated function as listener for the given event."""
+        if isinstance(event, type):
+            event = event()
+        assert isinstance(event, EventFilter), "Invalid event filter"
+
+        def _decorator(func) -> Callable:
+            self._hooks.add((func, event))
+            return func
+
+        return _decorator

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

@@ -0,0 +1,62 @@
+import json
+from typing import TYPE_CHECKING, Union
+
+from ._utils import AttrDict
+from .contact import Contact
+from .rpc import Rpc
+
+if TYPE_CHECKING:
+    from .account import Account
+
+
+class Message:
+    """Delta Chat Message object."""
+
+    def __init__(self, account: "Account", msg_id: int) -> None:
+        self.account = account
+        self.id = msg_id
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Message):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Message id={self.id} account={self.account.id}>"
+
+    @property
+    def _rpc(self) -> Rpc:
+        return self.account._rpc
+
+    async def send_reaction(self, *reaction: str):
+        """Send a reaction to this message."""
+        await self._rpc.send_reaction(self.account.id, self.id, reaction)
+
+    async def get_snapshot(self) -> AttrDict:
+        """Get a snapshot with the properties of this message."""
+        from .chat import Chat
+
+        snapshot = AttrDict(await self._rpc.get_message(self.account.id, self.id))
+        snapshot["chat"] = Chat(self.account, snapshot.chat_id)
+        snapshot["sender"] = Contact(self.account, snapshot.from_id)
+        snapshot["message"] = self
+        return snapshot
+
+    async def mark_seen(self) -> None:
+        """Mark the message as seen."""
+        await self._rpc.markseen_msgs(self.account.id, [self.id])
+
+    async def send_webxdc_status_update(self, update: Union[dict, str], description: str) -> None:
+        """Send a webxdc status update. This message must be a webxdc."""
+        if not isinstance(update, str):
+            update = json.dumps(update)
+        await self._rpc.send_webxdc_status_update(self.account.id, self.id, update, description)
+
+    async def get_webxdc_status_updates(self, last_known_serial: int = 0) -> list:
+        return json.loads(await self._rpc.get_webxdc_status_updates(self.account.id, self.id, last_known_serial))
+
+    async def get_webxdc_info(self) -> dict:
+        return await self._rpc.get_webxdc_info(self.account.id, self.id)

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

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

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

@@ -0,0 +1,106 @@
+import json
+import os
+from typing import AsyncGenerator, List, Optional
+
+import aiohttp
+import pytest_asyncio
+
+from . import Account, AttrDict, Bot, Client, DeltaChat, EventType, Message
+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"
+
+    # Replace default 5 minute timeout with a 1 minute timeout.
+    timeout = aiohttp.ClientTimeout(total=60)
+    async with aiohttp.ClientSession() as session:
+        async with session.post(url, timeout=timeout) as response:
+            return json.loads(await response.text())
+
+
+class ACFactory:
+    def __init__(self, deltachat: DeltaChat) -> None:
+        self.deltachat = deltachat
+
+    async def get_unconfigured_account(self) -> Account:
+        return await self.deltachat.add_account()
+
+    async def get_unconfigured_bot(self) -> Bot:
+        return Bot(await self.get_unconfigured_account())
+
+    async def new_preconfigured_account(self) -> Account:
+        """Make a new account with configuration options set, but configuration not started."""
+        credentials = await get_temp_credentials()
+        account = await self.get_unconfigured_account()
+        await account.set_config("addr", credentials["email"])
+        await account.set_config("mail_pw", credentials["password"])
+        assert not await account.is_configured()
+        return account
+
+    async def new_configured_account(self) -> Account:
+        account = await self.new_preconfigured_account()
+        await account.configure()
+        assert await account.is_configured()
+        return account
+
+    async def new_configured_bot(self) -> Bot:
+        credentials = await get_temp_credentials()
+        bot = await self.get_unconfigured_bot()
+        await bot.configure(credentials["email"], credentials["password"])
+        return bot
+
+    async def get_online_accounts(self, num: int) -> List[Account]:
+        accounts = [await self.new_configured_account() for _ in range(num)]
+        for account in accounts:
+            await account.start_io()
+        return accounts
+
+    async def send_message(
+        self,
+        to_account: Account,
+        from_account: Optional[Account] = None,
+        text: Optional[str] = None,
+        file: Optional[str] = None,
+        group: Optional[str] = None,
+    ) -> Message:
+        if not from_account:
+            from_account = (await self.get_online_accounts(1))[0]
+        to_contact = await from_account.create_contact(await to_account.get_config("addr"))
+        if group:
+            to_chat = await from_account.create_group(group)
+            await to_chat.add_contact(to_contact)
+        else:
+            to_chat = await to_contact.create_chat()
+        return await to_chat.send_message(text=text, file=file)
+
+    async def process_message(
+        self,
+        to_client: Client,
+        from_account: Optional[Account] = None,
+        text: Optional[str] = None,
+        file: Optional[str] = None,
+        group: Optional[str] = None,
+    ) -> AttrDict:
+        await self.send_message(
+            to_account=to_client.account,
+            from_account=from_account,
+            text=text,
+            file=file,
+            group=group,
+        )
+
+        return await to_client.run_until(lambda e: e.type == EventType.INCOMING_MSG)
+
+
+@pytest_asyncio.fixture
+async def rpc(tmp_path) -> AsyncGenerator:
+    rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
+    async with rpc_server:
+        yield rpc_server
+
+
+@pytest_asyncio.fixture
+async def acfactory(rpc) -> AsyncGenerator:
+    yield ACFactory(DeltaChat(rpc))

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

@@ -0,0 +1,102 @@
+import asyncio
+import json
+import os
+from typing import Any, Dict, Optional
+
+
+class JsonRpcError(Exception):
+    pass
+
+
+class Rpc:
+    def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
+        """The given arguments will be passed to asyncio.create_subprocess_exec()"""
+        if accounts_dir:
+            kwargs["env"] = {
+                **kwargs.get("env", os.environ),
+                "DC_ACCOUNTS_PATH": str(accounts_dir),
+            }
+
+        self._kwargs = kwargs
+        self.process: asyncio.subprocess.Process
+        self.id: int
+        self.event_queues: Dict[int, asyncio.Queue]
+        # Map from request ID to `asyncio.Future` returning the response.
+        self.request_events: Dict[int, asyncio.Future]
+        self.reader_task: asyncio.Task
+
+    async def start(self) -> None:
+        self.process = await asyncio.create_subprocess_exec(
+            "deltachat-rpc-server",
+            stdin=asyncio.subprocess.PIPE,
+            stdout=asyncio.subprocess.PIPE,
+            **self._kwargs,
+        )
+        self.id = 0
+        self.event_queues = {}
+        self.request_events = {}
+        self.reader_task = asyncio.create_task(self.reader_loop())
+
+    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()  # noqa
+            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)  # noqa
+            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 None
+
+        return method

deltachat-rpc-client/tests/test_something.py

@@ -0,0 +1,262 @@
+from unittest.mock import MagicMock
+
+import pytest
+
+from deltachat_rpc_client import EventType, events
+from deltachat_rpc_client.rpc import JsonRpcError
+
+
+@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 == EventType.CONFIGURE_PROGRESS:
+            assert event.progress != 0  # Progress 0 indicates error.
+            if event.progress == 1000:  # Success
+                break
+        else:
+            print(event)
+    print("Successful configuration")
+
+
+@pytest.mark.asyncio()
+async def test_configure_starttls(acfactory) -> None:
+    account = await acfactory.new_preconfigured_account()
+
+    # Use STARTTLS
+    await account.set_config("mail_security", "2")
+    await account.configure()
+    assert await account.is_configured()
+
+
+@pytest.mark.asyncio()
+async def test_account(acfactory) -> None:
+    alice, bob = await acfactory.get_online_accounts(2)
+
+    bob_addr = await bob.get_config("addr")
+    alice_contact_bob = await alice.create_contact(bob_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 == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
+
+    message = bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
+    await bob.mark_seen_messages([message])
+
+    assert alice != bob
+    assert repr(alice)
+    assert (await alice.get_info()).level
+    assert await alice.get_size()
+    assert await alice.is_configured()
+    assert not await alice.get_avatar()
+    assert await alice.get_contact_by_addr(bob_addr) == alice_contact_bob
+    assert await alice.get_contacts()
+    assert await alice.get_contacts(snapshot=True)
+    assert alice.self_contact
+    assert await alice.get_chatlist()
+    assert await alice.get_chatlist(snapshot=True)
+    assert await alice.get_qr_code()
+    await alice.get_fresh_messages()
+    await alice.get_fresh_messages_in_arrival_order()
+
+    group = await alice.create_group("test group")
+    await group.add_contact(alice_contact_bob)
+    group_msg = await group.send_message(text="hello")
+    assert group_msg == alice.get_message_by_id(group_msg.id)
+    assert group == alice.get_chat_by_id(group.id)
+    await alice.delete_messages([group_msg])
+
+    await alice.set_config("selfstatus", "test")
+    assert await alice.get_config("selfstatus") == "test"
+    await alice.update_config(selfstatus="test2")
+    assert await alice.get_config("selfstatus") == "test2"
+
+    assert not await alice.get_blocked_contacts()
+    await alice_contact_bob.block()
+    blocked_contacts = await alice.get_blocked_contacts()
+    assert blocked_contacts
+    assert blocked_contacts[0].contact == alice_contact_bob
+
+    await bob.remove()
+    await alice.stop_io()
+
+
+@pytest.mark.asyncio()
+async def test_chat(acfactory) -> None:
+    alice, bob = await acfactory.get_online_accounts(2)
+
+    bob_addr = await bob.get_config("addr")
+    alice_contact_bob = await alice.create_contact(bob_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 == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
+    message = bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
+    bob_chat_alice = bob.get_chat_by_id(chat_id)
+
+    assert alice_chat_bob != bob_chat_alice
+    assert repr(alice_chat_bob)
+    await alice_chat_bob.delete()
+    await bob_chat_alice.accept()
+    await bob_chat_alice.block()
+    bob_chat_alice = await snapshot.sender.create_chat()
+    await bob_chat_alice.mute()
+    await bob_chat_alice.unmute()
+    await bob_chat_alice.pin()
+    await bob_chat_alice.unpin()
+    await bob_chat_alice.archive()
+    await bob_chat_alice.unarchive()
+    with pytest.raises(JsonRpcError):  # can't set name for 1:1 chats
+        await bob_chat_alice.set_name("test")
+    await bob_chat_alice.set_ephemeral_timer(300)
+    await bob_chat_alice.get_encryption_info()
+
+    group = await alice.create_group("test group")
+    await group.add_contact(alice_contact_bob)
+    await group.get_qr_code()
+
+    snapshot = await group.get_basic_snapshot()
+    assert snapshot.name == "test group"
+    await group.set_name("new name")
+    snapshot = await group.get_full_snapshot()
+    assert snapshot.name == "new name"
+
+    msg = await group.send_message(text="hi")
+    assert (await msg.get_snapshot()).text == "hi"
+    await group.forward_messages([msg])
+
+    await group.set_draft(text="test draft")
+    draft = await group.get_draft()
+    assert draft.text == "test draft"
+    await group.remove_draft()
+    assert not await group.get_draft()
+
+    assert await group.get_messages()
+    await group.get_fresh_message_count()
+    await group.mark_noticed()
+    assert await group.get_contacts()
+    await group.remove_contact(alice_chat_bob)
+    await group.get_locations()
+
+
+@pytest.mark.asyncio()
+async def test_contact(acfactory) -> None:
+    alice, bob = await acfactory.get_online_accounts(2)
+
+    bob_addr = await bob.get_config("addr")
+    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
+
+    assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
+    assert repr(alice_contact_bob)
+    await alice_contact_bob.block()
+    await alice_contact_bob.unblock()
+    await alice_contact_bob.set_name("new name")
+    await alice_contact_bob.get_encryption_info()
+    snapshot = await alice_contact_bob.get_snapshot()
+    assert snapshot.address == bob_addr
+    await alice_contact_bob.create_chat()
+
+
+@pytest.mark.asyncio()
+async def test_message(acfactory) -> None:
+    alice, bob = await acfactory.get_online_accounts(2)
+
+    bob_addr = await bob.get_config("addr")
+    alice_contact_bob = await alice.create_contact(bob_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 == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
+
+    message = bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
+    assert repr(message)
+
+    with pytest.raises(JsonRpcError):  # chat is not accepted
+        await snapshot.chat.send_text("hi")
+    await snapshot.chat.accept()
+    await snapshot.chat.send_text("hi")
+
+    await message.mark_seen()
+    await message.send_reaction("😎")
+
+
+@pytest.mark.asyncio()
+async def test_bot(acfactory) -> None:
+    mock = MagicMock()
+    user = (await acfactory.get_online_accounts(1))[0]
+    bot = await acfactory.new_configured_bot()
+
+    assert await bot.is_configured()
+    assert await bot.account.get_config("bot") == "1"
+
+    hook = lambda e: mock.hook(e.msg_id), events.RawEvent(EventType.INCOMING_MSG)
+    bot.add_hook(*hook)
+    event = await acfactory.process_message(from_account=user, to_client=bot, text="Hello!")
+    mock.hook.assert_called_once_with(event.msg_id)
+    bot.remove_hook(*hook)
+
+    def track(e):
+        mock.hook(e.message_snapshot.id)
+
+    mock.hook.reset_mock()
+    hook = track, events.NewMessage(r"hello")
+    bot.add_hook(*hook)
+    bot.add_hook(track, events.NewMessage(command="/help"))
+    event = await acfactory.process_message(from_account=user, to_client=bot, text="hello")
+    mock.hook.assert_called_with(event.msg_id)
+    event = await acfactory.process_message(from_account=user, to_client=bot, text="hello!")
+    mock.hook.assert_called_with(event.msg_id)
+    await acfactory.process_message(from_account=user, to_client=bot, text="hey!")
+    assert len(mock.hook.mock_calls) == 2
+    bot.remove_hook(*hook)
+
+    mock.hook.reset_mock()
+    await acfactory.process_message(from_account=user, to_client=bot, text="hello")
+    event = await acfactory.process_message(from_account=user, to_client=bot, text="/help")
+    mock.hook.assert_called_once_with(event.msg_id)

deltachat-rpc-client/tests/test_webxdc.py

@@ -0,0 +1,48 @@
+import pytest
+
+from deltachat_rpc_client import EventType
+
+
+@pytest.mark.asyncio()
+async def test_webxdc(acfactory) -> None:
+    alice, bob = await acfactory.get_online_accounts(2)
+
+    bob_addr = await bob.get_config("addr")
+    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
+    alice_chat_bob = await alice_contact_bob.create_chat()
+    await alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
+
+    while True:
+        event = await bob.wait_for_event()
+        if event.type == EventType.INCOMING_MSG:
+            bob_chat_alice = bob.get_chat_by_id(event.chat_id)
+            message = bob.get_message_by_id(event.msg_id)
+            break
+
+    webxdc_info = await message.get_webxdc_info()
+    assert webxdc_info == {
+        "document": None,
+        "icon": "icon.png",
+        "internetAccess": False,
+        "name": "Chess Board",
+        "sourceCodeUrl": None,
+        "summary": None,
+    }
+
+    status_updates = await message.get_webxdc_status_updates()
+    assert status_updates == []
+
+    await bob_chat_alice.accept()
+    await message.send_webxdc_status_update({"payload": 42}, "")
+    await message.send_webxdc_status_update({"payload": "Second update"}, "description")
+
+    status_updates = await message.get_webxdc_status_updates()
+    assert status_updates == [
+        {"payload": 42, "serial": 1, "max_serial": 2},
+        {"payload": "Second update", "serial": 2, "max_serial": 2},
+    ]
+
+    status_updates = await message.get_webxdc_status_updates(1)
+    assert status_updates == [
+        {"payload": "Second update", "serial": 2, "max_serial": 2},
+    ]

deltachat-rpc-client/tox.ini

@@ -0,0 +1,29 @@
+[tox]
+isolated_build = true
+envlist =
+    py3
+    lint
+
+[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-asyncio
+    aiohttp
+    aiodns
+
+[testenv:lint]
+skipsdist = True
+skip_install = True
+deps =
+    ruff
+    black
+commands =
+    black --check src/ examples/ tests/
+    ruff src/ examples/ tests/

deltachat-rpc-server/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "deltachat-rpc-server"
+version = "1.107.0"
+description = "DeltaChat JSON-RPC server"
+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.91"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.23.1", features = ["io-std"] }
+yerpc = { version = "0.3.1", features = ["anyhow_expose"] }

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

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

deltachat_derive/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "deltachat_derive"
 version = "2.0.0"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"
 

deltachat_derive/src/lib.rs

@@ -1,9 +1,10 @@
 #![recursion_limit = "128"]
 extern crate proc_macro;
 
-use crate::proc_macro::TokenStream;
 use quote::quote;
 
+use crate::proc_macro::TokenStream;
+
 // For now, assume (not check) that these macroses are applied to enum without
 // data.  If this assumption is violated, compiler error will point to
 // generated code, which is not very user-friendly.

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://deltachat.github.io/webxdc_docs/) shows more detailed information
+The [Webxdc guidebook](https://docs.webxdc.org/) shows more detailed information
 when developing Webxdc apps.
 
 

examples/repl/cmdline.rs

@@ -20,6 +20,7 @@ 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::*;
@@ -407,6 +408,7 @@ 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\
@@ -552,7 +554,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
+            let listflags = if arg0 == "listarchived" {
+                DC_GCL_ARCHIVED_ONLY
+            } else {
+                0
+            };
             let time_start = std::time::SystemTime::now();
             let chatlist = Chatlist::try_load(
                 &context,
@@ -1121,6 +1127,12 @@ 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,6 +20,7 @@ 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};
@@ -71,6 +72,19 @@ 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()"));
         }
@@ -207,7 +221,7 @@ const CHAT_COMMANDS: [&str; 36] = [
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 8] = [
+const MESSAGE_COMMANDS: [&str; 9] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -216,6 +230,7 @@ const MESSAGE_COMMANDS: [&str; 8] = [
     "markseen",
     "delmsg",
     "download",
+    "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
     "listcontacts",
@@ -298,7 +313,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()).await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
 
     let events = context.get_event_emitter();
     tokio::task::spawn(async move {
@@ -431,7 +446,7 @@ async fn handle_cmd(
                 }
                 println!("{}", qr);
                 let output = Command::new("qrencode")
-                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                     .output()
                     .expect("failed to execute process");
                 io::stdout().write_all(&output.stdout).unwrap();

examples/simple.rs

@@ -1,12 +1,12 @@
-use tempfile::tempdir;
-
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::*;
 use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
+use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
+use tempfile::tempdir;
 
 fn cb(event: EventType) {
     match event {
@@ -36,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())
+    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
         .await
         .expect("Failed to create context");
     let info = ctx.get_info().await;

format-flowed/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "format-flowed"
+version = "1.0.0"
+description = "format=flowed support"
+edition = "2021"
+license = "MPL-2.0"
+
+keywords = ["email"]
+categories = ["email"]
+
+[dependencies]

format-flowed/src/lib.rs

@@ -24,10 +24,14 @@
 fn format_line_flowed(line: &str, prefix: &str) -> String {
     let mut result = String::new();
     let mut buffer = prefix.to_string();
-    let mut after_space = false;
+    let mut after_space = prefix.ends_with(' ');
 
     for c in line.chars() {
         if c == ' ' {
+            if buffer.is_empty() {
+                // Space stuffing, see RFC 3676
+                buffer.push(' ');
+            }
             buffer.push(c);
             after_space = true;
         } else if c == '>' {
@@ -51,14 +55,14 @@ fn format_line_flowed(line: &str, prefix: &str) -> String {
     result + &buffer
 }
 
-/// Returns text formatted according to RFC 3767 (format=flowed).
+/// Returns text formatted according to RFC 3676 (format=flowed).
 ///
 /// This function accepts text separated by LF, but returns text
 /// separated by CRLF.
 ///
 /// RFC 2646 technique is used to insert soft line breaks, so DelSp
 /// SHOULD be set to "no" when sending.
-pub(crate) fn format_flowed(text: &str) -> String {
+pub fn format_flowed(text: &str) -> String {
     let mut result = String::new();
 
     for line in text.split('\n') {
@@ -66,21 +70,20 @@ pub(crate) fn format_flowed(text: &str) -> String {
             result += "\r\n";
         }
 
-        let line_no_prefix = line.strip_prefix('>');
-        let is_quote = line_no_prefix.is_some();
-        let line = line_no_prefix.unwrap_or(line).trim();
-        let prefix = if is_quote { "> " } else { "" };
+        let line = line.trim_end();
+        let quote_depth = line.chars().take_while(|&c| c == '>').count();
+        let (prefix, mut line) = line.split_at(quote_depth);
 
-        if prefix.len() + line.len() > 78 {
-            result += &format_line_flowed(line, prefix);
-        } else {
-            result += prefix;
-            if prefix.is_empty() && line.starts_with('>') {
-                // Space stuffing, see RFC 3676
-                result.push(' ');
+        let mut prefix = prefix.to_string();
+
+        if quote_depth > 0 {
+            if let Some(s) = line.strip_prefix(' ') {
+                line = s;
+                prefix += " ";
             }
-            result += line;
         }
+
+        result += &format_line_flowed(line, &prefix);
     }
 
     result
@@ -105,9 +108,6 @@ pub fn format_flowed_quote(text: &str) -> String {
 ///
 /// Lines must be separated by single LF.
 ///
-/// Quote processing is not supported, it is assumed that they are
-/// deleted during simplification.
-///
 /// Signature separator line is not processed here, it is assumed to
 /// be stripped beforehand.
 pub fn unformat_flowed(text: &str, delsp: bool) -> String {
@@ -115,6 +115,12 @@ pub fn unformat_flowed(text: &str, delsp: bool) -> String {
     let mut skip_newline = true;
 
     for line in text.split('\n') {
+        let line = if !result.is_empty() && skip_newline {
+            line.trim_start_matches('>')
+        } else {
+            line
+        };
+
         // Revert space-stuffing
         let line = line.strip_prefix(' ').unwrap_or(line);
 
@@ -141,12 +147,23 @@ pub fn unformat_flowed(text: &str, delsp: bool) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::TestContext;
 
     #[test]
     fn test_format_flowed() {
+        let text = "";
+        assert_eq!(format_flowed(text), "");
+
         let text = "Foo bar baz";
-        assert_eq!(format_flowed(text), "Foo bar baz");
+        assert_eq!(format_flowed(text), text);
+
+        let text = ">Foo bar";
+        assert_eq!(format_flowed(text), text);
+
+        let text = "> Foo bar";
+        assert_eq!(format_flowed(text), text);
+
+        let text = ">\n\nA";
+        assert_eq!(format_flowed(text), ">\r\n\r\nA");
 
         let text = "This is the Autocrypt Setup Message used to transfer your key between clients.\n\
                     \n\
@@ -160,16 +177,45 @@ mod tests {
         let text = "> A quote";
         assert_eq!(format_flowed(text), "> A quote");
 
+        let text = "> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > A";
+        assert_eq!(
+            format_flowed(text),
+            "> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > \r\n> A"
+        );
+
         // Test space stuffing of wrapped lines
         let text = "> This is the Autocrypt Setup Message used to transfer your key between clients.\n\
                     >                               \n\
                     > To decrypt and use your key, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device.";
         let expected = "> This is the Autocrypt Setup Message used to transfer your key between \r\n\
                         > clients.\r\n\
-                        > \r\n\
+                        >\r\n\
                         > To decrypt and use your key, open the message in an Autocrypt-compliant \r\n\
                         > client and enter the setup code presented on the generating device.";
         assert_eq!(format_flowed(text), expected);
+
+        let text = ">> This is the Autocrypt Setup Message used to transfer your key between clients.\n\
+                    >>                               \n\
+                    >> To decrypt and use your key, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device.";
+        let expected = ">> This is the Autocrypt Setup Message used to transfer your key between \r\n\
+                        >> clients.\r\n\
+                        >>\r\n\
+                        >> To decrypt and use your key, open the message in an Autocrypt-compliant \r\n\
+                        >> client and enter the setup code presented on the generating device.";
+        assert_eq!(format_flowed(text), expected);
+
+        // Test space stuffing of spaces.
+        let text = " Foo bar baz";
+        assert_eq!(format_flowed(text), "  Foo bar baz");
+
+        let text = "   Foo bar baz";
+        assert_eq!(format_flowed(text), "    Foo bar baz");
+
+        let text =
+            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAA";
+        let expected =
+            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA \r\nAAAAAA";
+        assert_eq!(format_flowed(text), expected);
     }
 
     #[test]
@@ -180,6 +226,16 @@ mod tests {
             "this is a very long message that should be wrapped using format=flowed and \
                         unwrapped on the receiver";
         assert_eq!(unformat_flowed(text, false), expected);
+
+        let text = "  Foo bar";
+        let expected = " Foo bar";
+        assert_eq!(unformat_flowed(text, false), expected);
+
+        let text =
+            "> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > \n> A";
+        let expected =
+            "> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > A";
+        assert_eq!(unformat_flowed(text, false), expected);
     }
 
     #[test]
@@ -202,25 +258,4 @@ mod tests {
             > unwrapped on the receiver";
         assert_eq!(format_flowed_quote(quote), expected);
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_quotes() -> anyhow::Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-        let chat = alice.create_chat(&bob).await;
-
-        let sent = alice.send_text(chat.id, "> First quote").await;
-        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text.as_deref(), Some("> First quote"));
-        assert!(received.quoted_text().is_none());
-        assert!(received.quoted_message(&bob).await?.is_none());
-
-        let sent = alice.send_text(chat.id, "> Second quote").await;
-        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text.as_deref(), Some("> Second quote"));
-        assert!(received.quoted_text().is_none());
-        assert!(received.quoted_message(&bob).await?.is_none());
-
-        Ok(())
-    }
 }

fuzz/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+name = "deltachat-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[dev-dependencies]
+bolero = "0.8"
+
+[dependencies]
+mailparse = "0.13"
+deltachat = { path = ".." }
+format-flowed = { path = "../format-flowed" }
+
+[workspace]
+members = ["."]
+
+[[test]]
+name = "fuzz_dateparse"
+path = "fuzz_targets/fuzz_dateparse.rs"
+harness = false
+
+[[test]]
+name = "fuzz_simplify"
+path = "fuzz_targets/fuzz_simplify.rs"
+harness = false
+
+[[test]]
+name = "fuzz_mailparse"
+path = "fuzz_targets/fuzz_mailparse.rs"
+harness = false
+
+[[test]]
+name = "fuzz_format_flowed"
+path = "fuzz_targets/fuzz_format_flowed.rs"
+harness = false

fuzz/fuzz_targets/fuzz_dateparse.rs

@@ -0,0 +1,10 @@
+use bolero::check;
+
+fn main() {
+    check!().for_each(|data: &[u8]| match std::str::from_utf8(data) {
+        Ok(input) => {
+            mailparse::dateparse(input).ok();
+        }
+        Err(_err) => {}
+    });
+}

fuzz/fuzz_targets/fuzz_format_flowed.rs

@@ -0,0 +1,22 @@
+use bolero::check;
+use format_flowed::{format_flowed, unformat_flowed};
+
+fn round_trip(input: &str) -> String {
+    let mut input = format_flowed(input);
+    input.retain(|c| c != '\r');
+    unformat_flowed(&input, false)
+}
+
+fn main() {
+    check!().for_each(|data: &[u8]| {
+        if let Ok(input) = std::str::from_utf8(data.into()) {
+            let input = input.trim().to_string();
+
+            // Only consider inputs that are the result of unformatting format=flowed text.
+            // At least this means that lines don't contain any trailing whitespace.
+            let input = round_trip(&input);
+            let output = round_trip(&input);
+            assert_eq!(input, output);
+        }
+    });
+}

fuzz/fuzz_targets/fuzz_mailparse.rs

@@ -0,0 +1,7 @@
+use bolero::check;
+
+fn main() {
+    check!().for_each(|data: &[u8]| {
+        mailparse::parse_mail(data).ok();
+    });
+}

fuzz/fuzz_targets/fuzz_simplify.rs

@@ -0,0 +1,13 @@
+use bolero::check;
+
+use deltachat::fuzzing::simplify;
+
+fn main() {
+    check!().for_each(|data: &[u8]| match String::from_utf8(data.to_vec()) {
+        Ok(input) => {
+            simplify(input.clone(), true);
+            simplify(input, false);
+        }
+        Err(_err) => {}
+    });
+}

node/README.md

@@ -28,7 +28,7 @@ This code used to live at [`deltachat-node`](https://github.com/deltachat/deltac
 
 ## Install
 
-By default the installation will build try to use the bundled prebuilds in the
+By default the installation will try to use the bundled prebuilds in the
 npm package. If this fails it falls back to compile `../deltachat-core-rust` from
 this repository, using `scripts/rebuild-core.js`.
 

node/constants.js

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

node/events.js

@@ -14,7 +14,9 @@ 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',