feat: Don't send SystemMessage::Member* in unencrypted groups

Unencrypted groups are usually ones with other MUAs which don't understand Delta Chat system
messages and show them as weird emails.

Self-removal returns an error now, otherwise remaining members won't know about it. It should be
disabled in UIs and the user should resolve it on their own (e.g. by asking other members).

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Report something that isn't working.
+title: ''
+assignees: ''
+labels: bug
+---
+
+<!--
+This is the chatmail core's bug report tracker.
+For Delta Chat feature requests and support, please go to the forum: https://support.delta.chat
+Please fill out as much of this form as you can (leaving out stuff that is not applicable is ok).
+-->
+
+- Operating System (Linux/Mac/Windows/iOS/Android):
+- Core Version: 
+- Client Version:
+
+## Expected behavior
+
+*What did you try to achieve?*
+
+## Actual behavior
+
+*What happened instead?*
+
+### Steps to reproduce the problem
+
+1. 
+2. 
+
+### Screenshots
+
+### Logs
+

.github/workflows/ci.yml

@@ -16,21 +16,28 @@ on:
     branches:
       - main
 
+permissions: {}
+
 env:
   RUSTFLAGS: -Dwarnings
+  RUST_VERSION: 1.87.0
+
+  # Minimum Supported Rust Version
+  MSRV: 1.85.0
 
 jobs:
   lint_rust:
     name: Lint Rust
     runs-on: ubuntu-latest
-    env:
-      RUSTUP_TOOLCHAIN: 1.84.0
     steps:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
+        run: rustup toolchain install $RUST_VERSION --profile minimal --component rustfmt --component clippy
+      - run: rustup override set $RUST_VERSION
+        shell: bash
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Run rustfmt
@@ -42,18 +49,6 @@ jobs:
       - name: Check with only default features
         run: cargo check --all-targets
 
-  npm_constants:
-    name: Check if node constants are up to date
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - name: Rebuild constants
-        run: npm run build:core:constants
-      - name: Check that constants are not changed
-        run: git diff --exit-code
-
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
@@ -61,6 +56,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           arguments: --all-features --workspace
@@ -74,6 +70,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Check provider database
         run: scripts/update-provider-database.sh
 
@@ -86,6 +83,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Rustdoc
@@ -97,24 +95,36 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.84.0
+            rust: latest
           - os: windows-latest
-            rust: 1.84.0
+            rust: latest
           - os: macos-latest
-            rust: 1.84.0
+            rust: latest
 
-          # Minimum Supported Rust Version = 1.81.0
+          # Minimum Supported Rust Version
           - os: ubuntu-latest
-            rust: 1.81.0
+            rust: minimum
     runs-on: ${{ matrix.os }}
     steps:
+      - run:
+          echo "RUSTUP_TOOLCHAIN=$MSRV" >> $GITHUB_ENV
+        shell: bash
+        if: matrix.rust == 'minimum'
+      - run:
+          echo "RUSTUP_TOOLCHAIN=$RUST_VERSION" >> $GITHUB_ENV
+        shell: bash
+        if: matrix.rust == 'latest'
+
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
-      - run: rustup override set ${{ matrix.rust }}
+        run: rustup toolchain install --profile minimal $RUSTUP_TOOLCHAIN
+        shell: bash
+      - run: rustup override set $RUSTUP_TOOLCHAIN
+        shell: bash
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -147,6 +157,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -171,6 +182,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -192,6 +204,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Install tox
         run: pip install tox
@@ -234,6 +247,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Download libdeltachat.a
         uses: actions/download-artifact@v4
@@ -286,6 +300,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Install python
         uses: actions/setup-python@v5

.github/workflows/deltachat-rpc-server.yml

@@ -17,6 +17,8 @@ on:
   release:
     types: [published]
 
+permissions: {}
+
 jobs:
   # Build a version statically linked against musl libc
   # to avoid problems with glibc version incompatibility.
@@ -31,8 +33,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
@@ -55,8 +57,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
@@ -80,6 +82,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - name: Setup rust target
         run: rustup target add ${{ matrix.arch }}-apple-darwin
@@ -105,8 +108,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build deltachat-rpc-server binaries
         run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
@@ -132,8 +135,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Download Linux aarch64 binary
         uses: actions/download-artifact@v4
@@ -245,6 +248,10 @@ jobs:
           cp result/*.whl dist/
           nix build .#deltachat-rpc-server-win32-wheel
           cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
+          cp result/*.whl dist/
+          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
+          cp result/*.whl dist/
           nix build .#deltachat-rpc-server-source
           cp result/*.tar.gz dist/
           python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
@@ -258,8 +265,9 @@ jobs:
         if: github.event_name == 'release'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          REF_NAME: ${{ github.ref_name }}
         run: |
-          gh release upload ${{ github.ref_name }} \
+          gh release upload "$REF_NAME" \
             --repo ${{ github.repository }} \
             bin/* dist/*
 
@@ -280,6 +288,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
@@ -385,8 +394,9 @@ jobs:
         if: github.event_name == 'release'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          REF_NAME: ${{ github.ref_name }}
         run: |
-          gh release upload ${{ github.ref_name }} \
+          gh release upload "$REF_NAME" \
             --repo ${{ github.repository }} \
             deltachat-rpc-server/npm-package/*.tgz
 

.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.3.0
+        uses: dependabot/fetch-metadata@v2.4.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

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

@@ -4,10 +4,12 @@ on:
   release:
     types: [published]
 
+permissions: {}
+
 jobs:
   pack-module:
     name: "Publish @deltachat/jsonrpc-client"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
@@ -15,6 +17,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
 
       - uses: actions/setup-node@v4
         with:

.github/workflows/jsonrpc.yml

@@ -6,6 +6,8 @@ on:
   pull_request:
     branches: [main]
 
+permissions: {}
+
 env:
   CARGO_TERM_COLOR: always
   RUST_MIN_STACK: "8388608"
@@ -17,6 +19,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Use Node.js 18.x
         uses: actions/setup-node@v4
         with:
@@ -34,9 +37,6 @@ jobs:
         run: npm run test
         env:
           CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
-      - name: make sure websocket server version still builds
-        working-directory: deltachat-jsonrpc
-        run: cargo build --bin deltachat-jsonrpc-server --features webserver
       - name: Run linter
         working-directory: deltachat-jsonrpc/typescript
         run: npm run prettier:check

.github/workflows/nix.yml

@@ -12,6 +12,8 @@ on:
     branches:
       - main
 
+permissions: {}
+
 jobs:
   format:
     name: check flake formatting
@@ -20,8 +22,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix fmt
 
       # Check that formatting does not change anything.
@@ -53,7 +55,9 @@ jobs:
           - deltachat-rpc-server-aarch64-linux
           - deltachat-rpc-server-aarch64-linux-wheel
           - deltachat-rpc-server-arm64-v8a-android
+          - deltachat-rpc-server-arm64-v8a-android-wheel
           - deltachat-rpc-server-armeabi-v7a-android
+          - deltachat-rpc-server-armeabi-v7a-android-wheel
           - deltachat-rpc-server-armv6l-linux
           - deltachat-rpc-server-armv6l-linux-wheel
           - deltachat-rpc-server-armv7l-linux
@@ -80,8 +84,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build .#${{ matrix.installable }}
 
   build-macos:
@@ -91,14 +95,15 @@ jobs:
       fail-fast: false
       matrix:
         installable:
-          - deltachat-rpc-server-aarch64-darwin
+          - deltachat-rpc-server
 
           # Fails to bulid
+          # - deltachat-rpc-server-aarch64-darwin
           # - deltachat-rpc-server-x86_64-darwin
     steps:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build .#${{ matrix.installable }}

.github/workflows/node-docs.yml

@@ -1,41 +0,0 @@
-# GitHub Actions workflow to build
-# Node.js bindings documentation
-# and upload it to the web server.
-# Built documentation is available at <https://js.delta.chat/>
-
-name: Generate & upload node.js documentation
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-
-      - name: npm install and generate documentation
-        working-directory: node
-        run: |
-          npm i --ignore-scripts
-          npx typedoc
-          mv docs js
-
-      - name: Upload
-        uses: horochx/deploy-via-scp@1.1.0
-        with:
-          user: ${{ secrets.USERNAME }}
-          key: ${{ secrets.KEY }}
-          host: "delta.chat"
-          port: 22
-          local: "node/js"
-          remote: "/var/www/html/"

.github/workflows/node-package.yml

@@ -1,235 +0,0 @@
-name: "node.js build"
-on:
-  pull_request:
-  push:
-    tags:
-      - "*"
-      - "!py-*"
-
-jobs:
-  prebuild:
-    name: Prebuild
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: node
-        run: npm install --verbose
-
-      - name: Build Prebuild
-        working-directory: node
-        run: |
-          npm run prebuildify
-          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
-
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}
-          path: node/${{ matrix.os }}.tar.gz
-
-  prebuild-linux:
-    name: Prebuild Linux
-    runs-on: ubuntu-latest
-
-    # Build Linux prebuilds inside a container with old glibc for backwards compatibility.
-    # Debian 10 contained glibc 2.28: https://packages.debian.org/buster/libc6
-    container: debian:10
-    steps:
-      # Working directory is owned by 1001:1001 by default.
-      # Change it to our user.
-      - name: Change working directory owner
-        run: chown root:root .
-
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-      - run: apt-get update
-
-      # Python is needed for node-gyp
-      - name: Install curl, python and compilers
-        run: apt-get install -y curl build-essential python3
-      - name: Install Rust
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: node
-        run: npm install --verbose
-
-      - name: Build Prebuild
-        working-directory: node
-        run: |
-          npm run prebuildify
-          tar -zcvf "linux.tar.gz" -C prebuilds .
-
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux
-          path: node/linux.tar.gz
-
-  pack-module:
-    needs: [prebuild, prebuild-linux]
-    name: Package deltachat-node and upload to download.delta.chat
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install tree
-        run: sudo apt install tree
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-      - name: Get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pull Request ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ 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: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-          echo $DELTACHAT_NODE_TAR_GZ
-      - name: Download Linux prebuild
-        uses: actions/download-artifact@v4
-        with:
-          name: linux
-      - name: Download macOS prebuild
-        uses: actions/download-artifact@v4
-        with:
-          name: macos-latest
-      - name: Download Windows prebuild
-        uses: actions/download-artifact@v4
-        with:
-          name: windows-latest
-      - shell: bash
-        run: |
-          mkdir node/prebuilds
-          tar -xvzf linux.tar.gz -C node/prebuilds
-          tar -xvzf macos-latest.tar.gz -C node/prebuilds
-          tar -xvzf windows-latest.tar.gz -C node/prebuilds
-          tree node/prebuilds
-          rm -f linux.tar.gz macos-latest.tar.gz windows-latest.tar.gz
-      - name: Install dependencies without running scripts
-        run: |
-          npm install --ignore-scripts
-      - name: Build constants
-        run: |
-          npm run build:core:constants
-      - name: Build TypeScript part
-        run: |
-          npm run build:bindings:ts
-      - name: Package
-        shell: bash
-        run: |
-          mv node/README.md README.md
-          npm pack .
-          ls -lah
-          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
-      - name: Upload prebuild
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-node.tgz
-          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-node 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_NODE_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_NODE_TAR_GZ }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-node 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_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/node-tests.yml

@@ -1,68 +0,0 @@
-# GitHub Actions workflow
-# to test Node.js bindings.
-
-name: "node.js tests"
-
-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  tests:
-    name: Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: node
-        run: npm install --verbose
-
-      - name: Test
-        timeout-minutes: 10
-        working-directory: node
-        run: npm run test
-        env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
-          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

.github/workflows/publish-deltachat-rpc-client-pypi.yml

@@ -5,6 +5,8 @@ on:
   release:
     types: [published]
 
+permissions: {}
+
 jobs:
   build:
     name: Build distribution
@@ -14,6 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Install pypa/build
         run: python3 -m pip install build
       - name: Build a binary wheel and a source tarball

.github/workflows/repl.yml

@@ -7,6 +7,8 @@ name: Build Windows REPL .exe
 on:
   workflow_dispatch:
 
+permissions: {}
+
 jobs:
   build_repl:
     name: Build REPL example
@@ -15,8 +17,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build
         run: nix build .#deltachat-repl-win64
       - name: Upload binary

.github/workflows/upload-docs.yml

@@ -6,6 +6,8 @@ on:
       - main
       - build_jsonrpc_docs_ci
 
+permissions: {}
+
 jobs:
   build-rs:
     runs-on: ubuntu-latest
@@ -14,6 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat --no-deps --document-private-items
@@ -31,9 +34,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build Python documentation
         run: nix build .#python-docs
       - name: Upload to py.delta.chat
@@ -50,9 +53,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Build C documentation
         run: nix build .#docs
       - name: Upload to c.delta.chat
@@ -72,6 +75,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
           fetch-depth: 0 # Fetch history to calculate VCS version number.
       - name: Use Node.js
         uses: actions/setup-node@v4

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

@@ -9,6 +9,8 @@ on:
     branches:
       - main
 
+permissions: {}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -17,6 +19,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
+          persist-credentials: false
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat_ffi --no-deps

.github/workflows/zizmor-scan.yml

@@ -0,0 +1,31 @@
+name: GitHub Actions Security Analysis with zizmor
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+
+jobs:
+  zizmor:
+    name: zizmor latest via PyPI
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Run zizmor
+        run: uvx zizmor --format sarif . > results.sarif
+
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif
+          category: zizmor

.gitignore

@@ -1,7 +1,9 @@
-/target
+target/
 **/*.rs.bk
 /build
 /dist
+/fuzz/fuzz_targets/corpus/
+/fuzz/fuzz_targets/crashes/
 
 # ignore vi temporaries
 *~
@@ -51,3 +53,4 @@ result
 # direnv
 .envrc
 .direnv
+.aider*

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Bug reports
 
-If you found a bug, [report it on GitHub](https://github.com/deltachat/deltachat-core-rust/issues).
+If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
 If the bug you found is specific to
 [Android](https://github.com/deltachat/deltachat-android/issues),
 [iOS](https://github.com/deltachat/deltachat-ios/issues) or
@@ -67,7 +67,7 @@ If you want to contribute a code, follow this guide.
    BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
    ```
 
-4. [**Open a Pull Request**](https://github.com/deltachat/deltachat-core-rust/pulls).
+4. [**Open a Pull Request**](https://github.com/chatmail/core/pulls).
 
    Refer to the corresponding issue.
 
@@ -116,7 +116,7 @@ For other ways to contribute, refer to the [website](https://delta.chat/en/contr
 
 You can find the list of good first issues
 and a link to this guide
-on the contributing page: <https://github.com/deltachat/deltachat-core-rust/contribute>
+on the contributing page: <https://github.com/chatmail/core/contribute>
 
 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.155.3"
+version = "1.160.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.81"
-repository = "https://github.com/deltachat/deltachat-core-rust"
+rust-version = "1.85"
+repository = "https://github.com/chatmail/core"
 
 [profile.dev]
 debug = 0
@@ -18,6 +18,9 @@ opt-level = 1
 debug = 1
 opt-level = 0
 
+[profile.fuzz]
+inherits = "test"
+
 # Always optimize dependencies.
 # This does not apply to crates in the workspace.
 # <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
@@ -41,43 +44,40 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.2"
 async-channel = { workspace = true }
-async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.10.4", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.10.2", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
 base64 = { workspace = true }
-brotli = { version = "7", default-features=false, features = ["std"] }
+brotli = { version = "8", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-data-encoding = "2.7.0"
-email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-encoded-words = "0.2"
+data-encoding = "2.9.0"
 escaper = "0.1"
 fast-socks5 = "0.10"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.4"
-http-body-util = "0.1.2"
+hickory-resolver = "0.25.2"
+http-body-util = "0.1.3"
 humansize = "2"
 hyper = "1"
-hyper-util = "0.1.10"
-image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.32", default-features = false, features = ["net"] }
-iroh = { version = "0.32", default-features = false }
+hyper-util = "0.1.13"
+image = { version = "0.25.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
+iroh = { version = "0.35", default-features = false }
 kamadak-exif = "0.6.1"
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = { workspace = true }
-mailparse = "0.15"
+mail-builder = { version = "0.4.3", default-features = false }
+mailparse = { workspace = true }
 mime = "0.3.17"
-num_cpus = "1.16"
+num_cpus = "1.17"
 num-derive = "0.4"
 num-traits = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = "0.12"
+parking_lot = "0.12.4"
 percent-encoding = "2.3"
-pgp = { version = "0.15.0", default-features = false }
+pgp = { version = "0.16.0", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = "0.37"
@@ -86,7 +86,7 @@ rand = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.11.0"
+rustls-pki-types = "1.12.0"
 rustls = { version = "0.23.22", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
@@ -94,15 +94,15 @@ serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
-smallvec = "1.13.2"
-strum = "0.26"
-strum_macros = "0.26"
+shadowsocks = { version = "1.23.1", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
+smallvec = "1.15.0"
+strum = "0.27"
+strum_macros = "0.27"
 tagger = "4.3.4"
-textwrap = "0.16.1"
+textwrap = "0.16.2"
 thiserror = { workspace = true }
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.1", default-features = false }
+tokio-rustls = { version = "0.26.2", default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
@@ -111,11 +111,11 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 webpki-roots = "0.26.8"
-blake3 = "1.5.5"
+blake3 = "1.8.2"
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.5.1", features = ["async_tokio"] }
+criterion = { version = "0.6.0", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
@@ -136,6 +136,7 @@ members = [
   "deltachat-time",
   "format-flowed",
   "deltachat-contact-tools",
+  "fuzz",
 ]
 
 [[bench]]
@@ -159,6 +160,10 @@ harness = false
 name = "get_chat_msgs"
 harness = false
 
+[[bench]]
+name = "marknoticed_chat"
+harness = false
+
 [[bench]]
 name = "get_chatlist"
 harness = false
@@ -171,7 +176,7 @@ harness = false
 anyhow = "1"
 async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.39", default-features = false }
+chrono = { version = "0.4.41", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -179,27 +184,28 @@ futures = "0.3.31"
 futures-lite = "2.6.0"
 libc = "0.2"
 log = "0.4"
+mailparse = "0.16.1"
 nu-ansi-term = "0.46"
 num-traits = "0.2"
-once_cell = "1.20.2"
 rand = "0.8"
 regex = "1.10"
-rusqlite = "0.32"
+rusqlite = "0.36"
 sanitize-filename = "0.5"
 serde = "1.0"
 serde_json = "1"
-tempfile = "3.14.0"
+tempfile = "3.20.0"
 thiserror = "2"
 tokio = "1"
-tokio-util = "0.7.13"
+tokio-util = "0.7.14"
 tracing-subscriber = "0.3"
-yerpc = "0.6.2"
+yerpc = "0.6.4"
 
 [features]
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl"
+  "rusqlite/bundled-sqlcipher-vendored-openssl",
+  "async-native-tls/vendored"
 ]
 
 [lints.rust]

README.md

@@ -1,19 +1,41 @@
 <p align="center">
-  <img alt="Delta Chat Logo" height="200px" src="https://raw.githubusercontent.com/deltachat/deltachat-pages/master/assets/blog/rust-delta.png">
+<img alt="Chatmail logo" src="https://github.com/user-attachments/assets/25742da7-a837-48cd-a503-b303af55f10d" width="300" style="float:middle;" />
 </p>
 
 <p align="center">
-  <a href="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml">
-    <img alt="Rust CI" src="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg">
+  <a href="https://github.com/chatmail/core/actions/workflows/ci.yml">
+    <img alt="Rust CI" src="https://github.com/chatmail/core/actions/workflows/ci.yml/badge.svg">
   </a>
-  <a href="https://deps.rs/repo/github/deltachat/deltachat-core-rust">
-    <img alt="dependency status" src="https://deps.rs/repo/github/deltachat/deltachat-core-rust/status.svg">
+  <a href="https://deps.rs/repo/github/chatmail/core">
+    <img alt="dependency status" src="https://deps.rs/repo/github/chatmail/core/status.svg">
   </a>
 </p>
 
-<p align="center">
-The core library for Delta Chat, written in Rust
-</p>
+The chatmail core library implements low-level network and encryption protocols, 
+integrated by many chat bots and higher level applications, 
+allowing to securely participate in the globally scaled e-mail server network. 
+We provide reproducibly-built `deltachat-rpc-server` static binaries
+that offer a stdio-based high-level JSON-RPC API for instant messaging purposes. 
+
+The following protocols are handled without requiring API users to know much about them: 
+
+- secure TLS setup with DNS caching and shadowsocks/proxy support 
+
+- robust [SMTP](https://github.com/chatmail/async-imap) 
+  and [IMAP](https://github.com/chatmail/async-smtp) handling
+
+- safe and interoperable [MIME parsing](https://github.com/staktrace/mailparse) 
+  and [MIME building](https://github.com/stalwartlabs/mail-builder). 
+
+- security-audited end-to-end encryption with [rPGP](https://github.com/rpgp/rpgp)
+  and [Autocrypt and SecureJoin protocols](https://securejoin.rtfd.io)
+
+- ephemeral [Peer-to-Peer networking using Iroh](https://iroh.computer) for multi-device setup and
+  [webxdc realtime data](https://delta.chat/en/2024-11-20-webxdc-realtime). 
+
+- a simulation- and real-world tested [P2P group membership
+  protocol without requiring server state](https://github.com/chatmail/models/tree/main/group-membership). 
+
 
 ## Installing Rust and Cargo
 
@@ -27,12 +49,12 @@ $ curl https://sh.rustup.rs -sSf | sh
 
 ## Using the CLI client
 
-Compile and run Delta Chat Core command line utility, using `cargo`:
+Compile and run the command line utility, using `cargo`:
 
 ```
-$ cargo run --locked -p deltachat-repl -- ~/deltachat-db
+$ cargo run --locked -p deltachat-repl -- ~/profile-db
 ```
-where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
+where ~/profile-db is the database file. The utility will create it if it does not exist.
 
 Optionally, install `deltachat-repl` binary with
 ```
@@ -40,13 +62,13 @@ $ cargo install --locked --path deltachat-repl/
 ```
 and run as
 ```
-$ deltachat-repl ~/deltachat-db
+$ deltachat-repl ~/profile-db
 ```
 
 Configure your account (if not already configured):
 
 ```
-Delta Chat Core is awaiting your commands.
+Chatmail is awaiting your commands.
 > set addr your@email.org
 > set mail_pw yourpassword
 > configure
@@ -84,11 +106,6 @@ Single#10: yourfriends@email.org [yourfriends@email.org]
 Message sent.
 ```
 
-If `yourfriend@email.org` uses DeltaChat, but does not receive message just
-sent, it is advisable to check `Spam` folder. It is known that at least
-`gmx.com` treat such test messages as spam, unless told otherwise with web
-interface.
-
 List messages when inside a chat:
 
 ```
@@ -104,7 +121,7 @@ For more commands type:
 ## Installing libdeltachat system wide
 
 ```
-$ git clone https://github.com/deltachat/deltachat-core-rust.git
+$ git clone https://github.com/chatmail/core.git
 $ cd deltachat-core-rust
 $ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
 $ cmake --build build
@@ -145,7 +162,7 @@ $ cargo install cargo-bolero
 Run fuzzing tests with
 ```sh
 $ cd fuzz
-$ cargo bolero test fuzz_mailparse --release=false -s NONE
+$ cargo bolero test fuzz_mailparse -s NONE
 ```
 
 Corpus is created at `fuzz/fuzz_targets/corpus`,
@@ -153,11 +170,6 @@ 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.
@@ -165,20 +177,16 @@ $ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
 ## 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
-```
+[provider-db](https://github.com/chatmail/provider-db) to the core,
+check line `REV=` inside `./scripts/update-provider-database.sh`
+and then run the script.
 
 ## Language bindings and frontend projects
 
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **Node.js** 
-  - over JSON-RPC: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
-  - over CFFI[^1]: \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat/)\]
+- **JS**: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
 - **Go**
   - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]

RELEASE.md

@@ -2,12 +2,12 @@
 
 For example, to release version 1.116.0 of the core, do the following steps.
 
-1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/labels/blocker).
+1. Resolve all [blocker issues](https://github.com/chatmail/core/labels/blocker).
 
 2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
 
 3. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`
+  `[1.116.0]: https://github.com/chatmail/core/compare/v1.115.2...v1.116.0`
 
 4. Update the version by running `scripts/set_core_version.py 1.116.0`.
 

STYLE.md

@@ -84,6 +84,13 @@ This allows to run `RUST_BACKTRACE=1 cargo test`
 and get a backtrace with line numbers in resultified tests
 which return `anyhow::Result`.
 
+`unwrap` and `expect` are not used in the library
+because panics are difficult to debug on user devices.
+However, in the tests `.expect` may be used.
+Follow
+<https://doc.rust-lang.org/core/error/index.html#common-message-styles>
+for `.expect` message style.
+
 ## Logging
 
 For logging, use `info!`, `warn!` and `error!` macros.
@@ -96,3 +103,17 @@ Format anyhow errors with `{:#}` to print all the contexts like this:
 ```
 error!(context, "Failed to set selfavatar timestamp: {err:#}.");
 ```
+
+## Documentation comments
+
+All public modules, methods and fields should be documented.
+This is checked by [`missing_docs`](https://doc.rust-lang.org/rustdoc/lints.html#missing_docs) lint.
+
+Private items do not have to be documented,
+but CI uses `cargo doc --document-private-items`
+to build the documentation,
+so it is preferred that new items
+are documented.
+
+Follow Rust guidelines for the documentation comments:
+<https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#summary-sentence>

benches/contacts.rs

@@ -1,5 +1,7 @@
 #![recursion_limit = "256"]
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use std::hint::black_box;
+
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;

benches/create_account.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "256"]
+use std::hint::black_box;
 use std::path::PathBuf;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
 use tempfile::tempdir;
 

benches/get_chat_msgs.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "256"]
+use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;

benches/get_chatlist.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "256"]
+use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;

benches/marknoticed_chat.rs

@@ -0,0 +1,95 @@
+#![recursion_limit = "256"]
+use std::hint::black_box;
+use std::path::Path;
+
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use deltachat::chat::{self, ChatId};
+use deltachat::chatlist::Chatlist;
+use deltachat::context::Context;
+use deltachat::stock_str::StockStrings;
+use deltachat::Events;
+use futures_lite::future::block_on;
+use tempfile::tempdir;
+
+async fn marknoticed_chat_benchmark(context: &Context, chats: &[ChatId]) {
+    for c in chats.iter().take(20) {
+        chat::marknoticed_chat(context, *c).await.unwrap();
+    }
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
+    // messages, such as your primary account.
+    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+
+        let chats: Vec<_> = rt.block_on(async {
+            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+                .await
+                .unwrap();
+            let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
+            let len = chatlist.len();
+            (1..len).map(|i| chatlist.get_chat_id(i).unwrap()).collect()
+        });
+
+        // This mainly tests the performance of marknoticed_chat()
+        // when nothing has to be done
+        c.bench_function(
+            "chat::marknoticed_chat (mark 20 chats as noticed repeatedly)",
+            |b| {
+                let dir = tempdir().unwrap();
+                let dir = dir.path();
+                let new_db = dir.join("dc.db");
+                std::fs::copy(&path, &new_db).unwrap();
+
+                let context = block_on(async {
+                    Context::new(Path::new(&new_db), 100, Events::new(), StockStrings::new())
+                        .await
+                        .unwrap()
+                });
+
+                b.to_async(&rt)
+                    .iter(|| marknoticed_chat_benchmark(&context, black_box(&chats)))
+            },
+        );
+
+        // If the first 20 chats contain fresh messages or reactions,
+        // this tests the performance of marking them as noticed.
+        c.bench_function(
+            "chat::marknoticed_chat (mark 20 chats as noticed, resetting after every iteration)",
+            |b| {
+                b.to_async(&rt).iter_batched(
+                    || {
+                        let dir = tempdir().unwrap();
+                        let new_db = dir.path().join("dc.db");
+                        std::fs::copy(&path, &new_db).unwrap();
+
+                        let context = block_on(async {
+                            Context::new(
+                                Path::new(&new_db),
+                                100,
+                                Events::new(),
+                                StockStrings::new(),
+                            )
+                            .await
+                            .unwrap()
+                        });
+                        (dir, context)
+                    },
+                    |(_dir, context)| {
+                        let chats = &chats;
+                        async move {
+                            marknoticed_chat_benchmark(black_box(&context), black_box(chats)).await
+                        }
+                    },
+                    BatchSize::PerIteration,
+                );
+            },
+        );
+    } else {
+        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
+    }
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

benches/receive_emails.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "256"]
+use std::hint::black_box;
 use std::path::PathBuf;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::{
     config::Config,
     context::Context,

benches/search_msgs.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "256"]
+use std::hint::black_box;
 use std::path::Path;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
 use deltachat::Events;

benches/send_events.rs

@@ -3,15 +3,15 @@ use criterion::{criterion_group, criterion_main, Criterion};
 
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
-use deltachat::{info, Event, EventType, Events};
+use deltachat::{Event, EventType, Events};
 use tempfile::tempdir;
 
 async fn send_events_benchmark(context: &Context) {
     let emitter = context.get_event_emitter();
     for _i in 0..1_000_000 {
-        info!(context, "interesting event...");
+        context.emit_event(EventType::Info("interesting event...".to_string()));
     }
-    info!(context, "DONE");
+    context.emit_event(EventType::Info("DONE".to_string()));
 
     loop {
         match emitter.recv().await.unwrap() {

cliff.toml

@@ -11,7 +11,7 @@ filter_unconventional = false
 split_commits = false
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/deltachat/deltachat-core-rust/pull/${2}))"}, # replace pull request / issue numbers
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/chatmail/core/pull/${2}))"}, # replace pull request / issue numbers
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
@@ -82,11 +82,11 @@ footer = """
     {% if release.version -%}
         {% if release.previous.version -%}
             [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/deltachat/deltachat-core-rust\
+                https://github.com/chatmail/core\
                     /compare/{{ release.previous.version }}..{{ release.version }}
         {% endif -%}
     {% else -%}
-        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
+        [unreleased]: https://github.com/chatmail/core\
             /compare/{{ release.previous.version }}..HEAD
     {% endif -%}
 {% endfor %}

deltachat-contact-tools/Cargo.toml

@@ -9,7 +9,6 @@ license = "MPL-2.0"
 
 [dependencies]
 anyhow = { workspace = true }
-once_cell = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }

deltachat-contact-tools/src/lib.rs

@@ -29,203 +29,14 @@
 
 use std::fmt;
 use std::ops::Deref;
+use std::sync::LazyLock;
 
 use anyhow::bail;
-use anyhow::Context as _;
 use anyhow::Result;
-use chrono::{DateTime, NaiveDateTime};
-use once_cell::sync::Lazy;
 use regex::Regex;
 
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
-    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
-    pub authname: String,
-    /// The contact's public PGP key in Base64, vcard property `key`
-    pub key: Option<String>,
-    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
-    pub profile_image: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<i64>,
-}
-
-impl VcardContact {
-    /// Returns the contact's display name.
-    pub fn display_name(&self) -> &str {
-        match self.authname.is_empty() {
-            false => &self.authname,
-            true => &self.addr,
-        }
-    }
-}
-
-/// Returns a vCard containing given contacts.
-///
-/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
-pub fn make_vcard(contacts: &[VcardContact]) -> String {
-    fn format_timestamp(c: &VcardContact) -> Option<String> {
-        let timestamp = *c.timestamp.as_ref().ok()?;
-        let datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        let addr = &c.addr;
-        let display_name = c.display_name();
-        res += &format!(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:{addr}\n\
-             FN:{display_name}\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64,{key}\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\n");
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\n");
-        }
-        res += "END:VCARD\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
-    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
-        let start_of_s = s.get(..prefix.len())?;
-
-        if start_of_s.eq_ignore_ascii_case(prefix) {
-            s.get(prefix.len()..)
-        } else {
-            None
-        }
-    }
-    fn vcard_property<'a>(s: &'a str, property: &str) -> Option<&'a str> {
-        let remainder = remove_prefix(s, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
-        let (params, value) = remainder.split_once(':')?;
-        // In the example from above, `params` is now `;TYPE=work`
-        // and `value` is now `alice@example.com`
-
-        if params
-            .chars()
-            .next()
-            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
-            .is_some()
-        {
-            // `s` started with `property`, but the next character after it was not punctuation,
-            // so this line's property is actually something else
-            return None;
-        }
-        Some(value)
-    }
-    fn parse_datetime(datetime: &str) -> Result<i64> {
-        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
-        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
-        // ISO.8601, but fails to parse any of the examples given.
-        // So, instead just parse using a format string.
-
-        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
-        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
-            Ok(datetime) => datetime.timestamp(),
-            // Parses 19961022T140000.
-            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
-                Ok(datetime) => datetime
-                    .and_local_timezone(chrono::offset::Local)
-                    .single()
-                    .context("Could not apply local timezone to parsed date and time")?
-                    .timestamp(),
-                Err(_) => return Err(e.into()),
-            },
-        };
-        Ok(timestamp)
-    }
-
-    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\r?\n[\t ]").unwrap());
-    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
-
-    let mut lines = unfolded_lines.lines().peekable();
-    let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
-
-        let mut display_name = None;
-        let mut addr = None;
-        let mut key = None;
-        let mut photo = None;
-        let mut datetime = None;
-
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
-            if let Some(email) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some(name) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
-                .or_else(|| remove_prefix(line, "KEY;PREF=1:data:application/pgp-keys;base64,"))
-            {
-                key.get_or_insert(k);
-            } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=b;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=BASE64:"))
-                .or_else(|| remove_prefix(line, "PHOTO:data:image/jpeg;base64,"))
-            {
-                photo.get_or_insert(p);
-            } else if let Some(rev) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                break;
-            }
-        }
-
-        let (authname, addr) =
-            sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
-
-        contacts.push(VcardContact {
-            authname,
-            addr,
-            key: key.map(|s| s.to_string()),
-            profile_image: photo.map(|s| s.to_string()),
-            timestamp: datetime
-                .context("No timestamp in vcard")
-                .and_then(parse_datetime),
-        });
-    }
-
-    contacts
-}
+mod vcard;
+pub use vcard::{make_vcard, parse_vcard, VcardContact};
 
 /// Valid contact address.
 #[derive(Debug, Clone)]
@@ -265,7 +76,7 @@ impl ContactAddress {
 
 /// Allow converting [`ContactAddress`] to an SQLite type.
 impl rusqlite::types::ToSql for ContactAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
         let val = rusqlite::types::Value::Text(self.0.to_string());
         let out = rusqlite::types::ToSqlOutput::Owned(val);
         Ok(out)
@@ -277,7 +88,8 @@ impl rusqlite::types::ToSql for ContactAddress {
 /// - Removes special characters from the name, see [`sanitize_name()`]
 /// - Removes the name if it is equal to the address by setting it to ""
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
-    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
+    static ADDR_WITH_NAME_REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new("(.*)<(.*)>").unwrap());
     let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
         (
             if name.is_empty() {
@@ -470,7 +282,7 @@ impl EmailAddress {
 }
 
 impl rusqlite::types::ToSql for EmailAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
         let val = rusqlite::types::Value::Text(self.to_string());
         let out = rusqlite::types::ToSqlOutput::Owned(val);
         Ok(out)
@@ -479,124 +291,8 @@ impl rusqlite::types::ToSql for EmailAddress {
 
 #[cfg(test)]
 mod tests {
-    use chrono::TimeZone;
-
     use super::*;
 
-    #[test]
-    fn test_vcard_thunderbird() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:'Alice Mueller'
-EMAIL;PREF=1:alice.mueller@posteo.de
-UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
-END:VCARD
-BEGIN:VCARD
-VERSION:4.0
-FN:'bobzzz@freenet.de'
-EMAIL;PREF=1:bobzzz@freenet.de
-UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
-END:VCARD
-",
-        );
-
-        assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-        assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-        assert!(contacts[0].timestamp.is_err());
-
-        assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-        assert_eq!(contacts[1].authname, "".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-        assert!(contacts[1].timestamp.is_err());
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_simple_example() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:Alice Wonderland
-N:Wonderland;Alice;;;Ms.
-GENDER:W
-EMAIL;TYPE=work:alice@example.com
-KEY;TYPE=PGP;ENCODING=b:[base64-data]
-REV:20240418T184242Z
-
-END:VCARD",
-        );
-
-        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-        assert_eq!(contacts[0].profile_image, None);
-        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-        assert_eq!(contacts.len(), 1);
-    }
-
-    #[test]
-    fn test_make_and_parse_vcard() {
-        let contacts = [
-            VcardContact {
-                addr: "alice@example.org".to_string(),
-                authname: "Alice Wonderland".to_string(),
-                key: Some("[base64-data]".to_string()),
-                profile_image: Some("image in Base64".to_string()),
-                timestamp: Ok(1713465762),
-            },
-            VcardContact {
-                addr: "bob@example.com".to_string(),
-                authname: "".to_string(),
-                key: None,
-                profile_image: None,
-                timestamp: Ok(0),
-            },
-        ];
-        let items = [
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:alice@example.org\n\
-             FN:Alice Wonderland\n\
-             KEY:data:application/pgp-keys;base64,[base64-data]\n\
-             PHOTO:data:image/jpeg;base64,image in Base64\n\
-             REV:20240418T184242Z\n\
-             END:VCARD\n",
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:bob@example.com\n\
-             FN:bob@example.com\n\
-             REV:19700101T000000Z\n\
-             END:VCARD\n",
-        ];
-        let mut expected = "".to_string();
-        for len in 0..=contacts.len() {
-            let contacts = &contacts[0..len];
-            let vcard = make_vcard(contacts);
-            if len > 0 {
-                expected += items[len - 1];
-            }
-            assert_eq!(vcard, expected);
-            let parsed = parse_vcard(&vcard);
-            assert_eq!(parsed.len(), contacts.len());
-            for i in 0..parsed.len() {
-                assert_eq!(parsed[i].addr, contacts[i].addr);
-                assert_eq!(parsed[i].authname, contacts[i].authname);
-                assert_eq!(parsed[i].key, contacts[i].key);
-                assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
-                assert_eq!(
-                    parsed[i].timestamp.as_ref().unwrap(),
-                    contacts[i].timestamp.as_ref().unwrap()
-                );
-            }
-        }
-    }
-
     #[test]
     fn test_contact_address() -> Result<()> {
         let alice_addr = "alice@example.org";
@@ -643,112 +339,6 @@ END:VCARD",
         assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
     }
 
-    #[test]
-    fn test_vcard_android() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-TEL;CELL:+1-234-567-890
-EMAIL;HOME:bob@example.org
-END:VCARD
-BEGIN:VCARD
-VERSION:2.1
-N:;Alice;;;
-FN:Alice
-EMAIL;HOME:alice@example.org
-END:VCARD
-",
-        );
-
-        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-
-        assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[1].authname, "Alice".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_local_datetime() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-        );
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(
-            *contacts[0].timestamp.as_ref().unwrap(),
-            chrono::offset::Local
-                .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
-                .unwrap()
-                .timestamp()
-        );
-    }
-
-    #[test]
-    fn test_vcard_with_base64_avatar() {
-        // This is not an actual base64-encoded avatar, it's just to test the parsing.
-        // This one is Android-like.
-        let vcard0 = "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-EMAIL;HOME:bob@example.org
-PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
- AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
- L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
-
-END:VCARD
-";
-        // This one is DOS-like.
-        let vcard1 = vcard0.replace('\n', "\r\n");
-        for vcard in [vcard0, vcard1.as_str()] {
-            let contacts = parse_vcard(vcard);
-            assert_eq!(contacts.len(), 1);
-            assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-            assert_eq!(contacts[0].authname, "Bob".to_string());
-            assert_eq!(contacts[0].key, None);
-            assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
-        }
-    }
-
-    #[test]
-    fn test_protonmail_vcard() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-        );
-
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(&contacts[0].addr, "alice@example.org");
-        assert_eq!(&contacts[0].authname, "Alice Wonderland");
-        assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-        assert!(contacts[0].timestamp.is_err());
-        assert_eq!(contacts[0].profile_image, None);
-    }
-
     #[test]
     fn test_sanitize_name() {
         assert_eq!(&sanitize_name(" hello world   "), "hello world");

deltachat-contact-tools/src/vcard.rs

@@ -0,0 +1,247 @@
+use std::sync::LazyLock;
+
+use anyhow::Context as _;
+use anyhow::Result;
+use chrono::DateTime;
+use chrono::NaiveDateTime;
+use regex::Regex;
+
+use crate::sanitize_name_and_addr;
+
+#[derive(Debug)]
+/// A Contact, as represented in a VCard.
+pub struct VcardContact {
+    /// The email address, vcard property `email`
+    pub addr: String,
+    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
+    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
+    pub authname: String,
+    /// The contact's public PGP key in Base64, vcard property `key`
+    pub key: Option<String>,
+    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
+    pub profile_image: Option<String>,
+    /// The biography, stored in the vcard property `note`
+    pub biography: Option<String>,
+    /// The timestamp when the vcard was created / last updated, vcard property `rev`
+    pub timestamp: Result<i64>,
+}
+
+impl VcardContact {
+    /// Returns the contact's display name.
+    pub fn display_name(&self) -> &str {
+        match self.authname.is_empty() {
+            false => &self.authname,
+            true => &self.addr,
+        }
+    }
+}
+
+/// Returns a vCard containing given contacts.
+///
+/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
+pub fn make_vcard(contacts: &[VcardContact]) -> String {
+    fn format_timestamp(c: &VcardContact) -> Option<String> {
+        let timestamp = *c.timestamp.as_ref().ok()?;
+        let datetime = DateTime::from_timestamp(timestamp, 0)?;
+        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
+    }
+
+    fn escape(s: &str) -> String {
+        s.replace(',', "\\,")
+    }
+
+    let mut res = "".to_string();
+    for c in contacts {
+        // Mustn't contain ',', but it's easier to escape than to error out.
+        let addr = escape(&c.addr);
+        let display_name = escape(c.display_name());
+        res += &format!(
+            "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:{addr}\r\n\
+             FN:{display_name}\r\n"
+        );
+        if let Some(key) = &c.key {
+            res += &format!("KEY:data:application/pgp-keys;base64\\,{key}\r\n");
+        }
+        if let Some(profile_image) = &c.profile_image {
+            res += &format!("PHOTO:data:image/jpeg;base64\\,{profile_image}\r\n");
+        }
+        if let Some(biography) = &c.biography {
+            res += &format!("NOTE:{}\r\n", escape(biography));
+        }
+        if let Some(timestamp) = format_timestamp(c) {
+            res += &format!("REV:{timestamp}\r\n");
+        }
+        res += "END:VCARD\r\n";
+    }
+    res
+}
+
+/// Parses `VcardContact`s from a given `&str`.
+pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
+    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
+        let start_of_s = s.get(..prefix.len())?;
+
+        if start_of_s.eq_ignore_ascii_case(prefix) {
+            s.get(prefix.len()..)
+        } else {
+            None
+        }
+    }
+    /// Returns (parameters, raw value) tuple.
+    fn vcard_property_raw<'a>(line: &'a str, property: &str) -> Option<(&'a str, &'a str)> {
+        let remainder = remove_prefix(line, property)?;
+        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
+        // then `remainder` is now `;TYPE=work:alice@example.com`
+
+        // Note: This doesn't handle the case where there are quotes around a colon,
+        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
+        // This could be improved in the future, but for now, the parsing is good enough.
+        let (mut params, value) = remainder.split_once(':')?;
+        // In the example from above, `params` is now `;TYPE=work`
+        // and `value` is now `alice@example.com`
+
+        if params
+            .chars()
+            .next()
+            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
+            .is_some()
+        {
+            // `s` started with `property`, but the next character after it was not punctuation,
+            // so this line's property is actually something else
+            return None;
+        }
+        if let Some(p) = remove_prefix(params, ";") {
+            params = p;
+        }
+        if let Some(p) = remove_prefix(params, "PREF=1") {
+            params = p;
+        }
+        Some((params, value))
+    }
+    /// Returns (parameters, unescaped value) tuple.
+    fn vcard_property<'a>(line: &'a str, property: &str) -> Option<(&'a str, String)> {
+        let (params, value) = vcard_property_raw(line, property)?;
+        // Some fields can't contain commas, but unescape them everywhere for safety.
+        Some((params, value.replace("\\,", ",")))
+    }
+    fn base64_key(line: &str) -> Option<&str> {
+        let (params, value) = vcard_property_raw(line, "key")?;
+        if params.eq_ignore_ascii_case("PGP;ENCODING=BASE64")
+            || params.eq_ignore_ascii_case("TYPE=PGP;ENCODING=b")
+        {
+            return Some(value);
+        }
+        remove_prefix(value, "data:application/pgp-keys;base64\\,")
+            // Old Delta Chat format.
+            .or_else(|| remove_prefix(value, "data:application/pgp-keys;base64,"))
+    }
+    fn base64_photo(line: &str) -> Option<&str> {
+        let (params, value) = vcard_property_raw(line, "photo")?;
+        if params.eq_ignore_ascii_case("JPEG;ENCODING=BASE64")
+            || params.eq_ignore_ascii_case("ENCODING=BASE64;JPEG")
+            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=b")
+            || params.eq_ignore_ascii_case("ENCODING=b;TYPE=JPEG")
+            || params.eq_ignore_ascii_case("ENCODING=BASE64;TYPE=JPEG")
+            || params.eq_ignore_ascii_case("TYPE=JPEG;ENCODING=BASE64")
+        {
+            return Some(value);
+        }
+        remove_prefix(value, "data:image/jpeg;base64\\,")
+            // Old Delta Chat format.
+            .or_else(|| remove_prefix(value, "data:image/jpeg;base64,"))
+    }
+    fn parse_datetime(datetime: &str) -> Result<i64> {
+        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
+        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
+        // ISO.8601, but fails to parse any of the examples given.
+        // So, instead just parse using a format string.
+
+        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
+        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
+            Ok(datetime) => datetime.timestamp(),
+            // Parses 19961022T140000.
+            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
+                Ok(datetime) => datetime
+                    .and_local_timezone(chrono::offset::Local)
+                    .single()
+                    .context("Could not apply local timezone to parsed date and time")?
+                    .timestamp(),
+                Err(_) => return Err(e.into()),
+            },
+        };
+        Ok(timestamp)
+    }
+
+    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
+    static NEWLINE_AND_SPACE_OR_TAB: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new("\r?\n[\t ]").unwrap());
+    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
+
+    let mut lines = unfolded_lines.lines().peekable();
+    let mut contacts = Vec::new();
+
+    while lines.peek().is_some() {
+        // Skip to the start of the vcard:
+        for line in lines.by_ref() {
+            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
+                break;
+            }
+        }
+
+        let mut display_name = None;
+        let mut addr = None;
+        let mut key = None;
+        let mut photo = None;
+        let mut biography = None;
+        let mut datetime = None;
+
+        for mut line in lines.by_ref() {
+            if let Some(remainder) = remove_prefix(line, "item1.") {
+                // Remove the group name, if the group is called "item1".
+                // If necessary, we can improve this to also remove groups that are called something different that "item1".
+                //
+                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
+                line = remainder;
+            }
+
+            if let Some((_params, email)) = vcard_property(line, "email") {
+                addr.get_or_insert(email);
+            } else if let Some((_params, name)) = vcard_property(line, "fn") {
+                display_name.get_or_insert(name);
+            } else if let Some(k) = base64_key(line) {
+                key.get_or_insert(k);
+            } else if let Some(p) = base64_photo(line) {
+                photo.get_or_insert(p);
+            } else if let Some((_params, bio)) = vcard_property(line, "note") {
+                biography.get_or_insert(bio);
+            } else if let Some((_params, rev)) = vcard_property(line, "rev") {
+                datetime.get_or_insert(rev);
+            } else if line.eq_ignore_ascii_case("END:VCARD") {
+                let (authname, addr) = sanitize_name_and_addr(
+                    &display_name.unwrap_or_default(),
+                    &addr.unwrap_or_default(),
+                );
+
+                contacts.push(VcardContact {
+                    authname,
+                    addr,
+                    key: key.map(|s| s.to_string()),
+                    profile_image: photo.map(|s| s.to_string()),
+                    biography,
+                    timestamp: datetime
+                        .as_deref()
+                        .context("No timestamp in vcard")
+                        .and_then(parse_datetime),
+                });
+                break;
+            }
+        }
+    }
+
+    contacts
+}
+
+#[cfg(test)]
+mod vcard_tests;

deltachat-contact-tools/src/vcard/vcard_tests.rs

@@ -0,0 +1,278 @@
+use chrono::TimeZone as _;
+
+use super::*;
+
+#[test]
+fn test_vcard_thunderbird() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD
+VERSION:4.0
+FN:'Alice Mueller'
+EMAIL;PREF=1:alice.mueller@posteo.de
+UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:'bobzzz@freenet.de'
+EMAIL;PREF=1:bobzzz@freenet.de
+UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
+END:VCARD
+",
+    );
+
+    assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
+    assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
+    assert_eq!(contacts[0].key, None);
+    assert_eq!(contacts[0].profile_image, None);
+    assert!(contacts[0].timestamp.is_err());
+
+    assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
+    assert_eq!(contacts[1].authname, "".to_string());
+    assert_eq!(contacts[1].key, None);
+    assert_eq!(contacts[1].profile_image, None);
+    assert!(contacts[1].timestamp.is_err());
+
+    assert_eq!(contacts.len(), 2);
+}
+
+#[test]
+fn test_vcard_simple_example() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD
+VERSION:4.0
+FN:Alice Wonderland
+N:Wonderland;Alice;;;Ms.
+GENDER:W
+EMAIL;TYPE=work:alice@example.com
+KEY;TYPE=PGP;ENCODING=b:[base64-data]
+REV:20240418T184242Z
+
+END:VCARD",
+    );
+
+    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
+    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
+    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
+    assert_eq!(contacts[0].profile_image, None);
+    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
+
+    assert_eq!(contacts.len(), 1);
+}
+
+#[test]
+fn test_vcard_with_trailing_newline() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD\r
+VERSION:4.0\r
+FN:Alice Wonderland\r
+N:Wonderland;Alice;;;Ms.\r
+GENDER:W\r
+EMAIL;TYPE=work:alice@example.com\r
+KEY;TYPE=PGP;ENCODING=b:[base64-data]\r
+REV:20240418T184242Z\r
+END:VCARD\r
+\r",
+    );
+
+    assert_eq!(contacts[0].addr, "alice@example.com".to_string());
+    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
+    assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
+    assert_eq!(contacts[0].profile_image, None);
+    assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
+
+    assert_eq!(contacts.len(), 1);
+}
+
+#[test]
+fn test_make_and_parse_vcard() {
+    let contacts = [
+        VcardContact {
+            addr: "alice@example.org".to_string(),
+            authname: "Alice Wonderland".to_string(),
+            key: Some("[base64-data]".to_string()),
+            profile_image: Some("image in Base64".to_string()),
+            biography: Some("Hi, I'm Alice".to_string()),
+            timestamp: Ok(1713465762),
+        },
+        VcardContact {
+            addr: "bob@example.com".to_string(),
+            authname: "".to_string(),
+            key: None,
+            profile_image: None,
+            biography: None,
+            timestamp: Ok(0),
+        },
+    ];
+    let items = [
+        "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:alice@example.org\r\n\
+             FN:Alice Wonderland\r\n\
+             KEY:data:application/pgp-keys;base64\\,[base64-data]\r\n\
+             PHOTO:data:image/jpeg;base64\\,image in Base64\r\n\
+             NOTE:Hi\\, I'm Alice\r\n\
+             REV:20240418T184242Z\r\n\
+             END:VCARD\r\n",
+        "BEGIN:VCARD\r\n\
+             VERSION:4.0\r\n\
+             EMAIL:bob@example.com\r\n\
+             FN:bob@example.com\r\n\
+             REV:19700101T000000Z\r\n\
+             END:VCARD\r\n",
+    ];
+    let mut expected = "".to_string();
+    for len in 0..=contacts.len() {
+        let contacts = &contacts[0..len];
+        let vcard = make_vcard(contacts);
+        if len > 0 {
+            expected += items[len - 1];
+        }
+        assert_eq!(vcard, expected);
+        let parsed = parse_vcard(&vcard);
+        assert_eq!(parsed.len(), contacts.len());
+        for i in 0..parsed.len() {
+            assert_eq!(parsed[i].addr, contacts[i].addr);
+            assert_eq!(parsed[i].authname, contacts[i].authname);
+            assert_eq!(parsed[i].key, contacts[i].key);
+            assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
+            assert_eq!(
+                parsed[i].timestamp.as_ref().unwrap(),
+                contacts[i].timestamp.as_ref().unwrap()
+            );
+        }
+    }
+}
+
+#[test]
+fn test_vcard_android() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD
+VERSION:2.1
+N:;Bob;;;
+FN:Bob
+TEL;CELL:+1-234-567-890
+EMAIL;HOME:bob@example.org
+END:VCARD
+BEGIN:VCARD
+VERSION:2.1
+N:;Alice;;;
+FN:Alice
+EMAIL;HOME:alice@example.org
+END:VCARD
+",
+    );
+
+    assert_eq!(contacts[0].addr, "bob@example.org".to_string());
+    assert_eq!(contacts[0].authname, "Bob".to_string());
+    assert_eq!(contacts[0].key, None);
+    assert_eq!(contacts[0].profile_image, None);
+
+    assert_eq!(contacts[1].addr, "alice@example.org".to_string());
+    assert_eq!(contacts[1].authname, "Alice".to_string());
+    assert_eq!(contacts[1].key, None);
+    assert_eq!(contacts[1].profile_image, None);
+
+    assert_eq!(contacts.len(), 2);
+}
+
+#[test]
+fn test_vcard_local_datetime() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD\n\
+             VERSION:4.0\n\
+             FN:Alice Wonderland\n\
+             EMAIL;TYPE=work:alice@example.org\n\
+             REV:20240418T184242\n\
+             END:VCARD",
+    );
+    assert_eq!(contacts.len(), 1);
+    assert_eq!(contacts[0].addr, "alice@example.org".to_string());
+    assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
+    assert_eq!(
+        *contacts[0].timestamp.as_ref().unwrap(),
+        chrono::offset::Local
+            .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
+            .unwrap()
+            .timestamp()
+    );
+}
+
+#[test]
+fn test_vcard_with_base64_avatar() {
+    // This is not an actual base64-encoded avatar, it's just to test the parsing.
+    // This one is Android-like.
+    let vcard0 = "BEGIN:VCARD
+VERSION:2.1
+N:;Bob;;;
+FN:Bob
+EMAIL;HOME:bob@example.org
+PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
+ AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
+ L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
+
+END:VCARD
+";
+    // This one is DOS-like.
+    let vcard1 = vcard0.replace('\n', "\r\n");
+    for vcard in [vcard0, vcard1.as_str()] {
+        let contacts = parse_vcard(vcard);
+        assert_eq!(contacts.len(), 1);
+        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
+        assert_eq!(contacts[0].authname, "Bob".to_string());
+        assert_eq!(contacts[0].key, None);
+        assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
+    }
+}
+
+#[test]
+fn test_protonmail_vcard() {
+    let contacts = parse_vcard(
+        "BEGIN:VCARD
+VERSION:4.0
+FN;PREF=1:Alice Wonderland
+UID:proton-web-03747582-328d-38dc-5ddd-000000000000
+ITEM1.EMAIL;PREF=1:alice@example.org
+ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ITEM1.X-PM-ENCRYPT:true
+ITEM1.X-PM-SIGN:true
+END:VCARD",
+    );
+
+    assert_eq!(contacts.len(), 1);
+    assert_eq!(&contacts[0].addr, "alice@example.org");
+    assert_eq!(&contacts[0].authname, "Alice Wonderland");
+    assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    assert!(contacts[0].timestamp.is_err());
+    assert_eq!(contacts[0].profile_image, None);
+}
+
+/// Proton at some point slightly changed the format of their vcards.
+/// This also tests unescaped commas in PHOTO and KEY (old Delta Chat format).
+#[test]
+fn test_protonmail_vcard2() {
+    let contacts = parse_vcard(
+        r"BEGIN:VCARD
+VERSION:4.0
+FN;PREF=1:Alice
+PHOTO;PREF=1:data:image/jpeg;base64,/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z
+REV:Invalid Date
+ITEM1.EMAIL;PREF=1:alice@example.org
+KEY;PREF=1:data:application/pgp-keys;base64,xsaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==
+UID:proton-web-aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+END:VCARD",
+    );
+
+    assert_eq!(contacts.len(), 1);
+    assert_eq!(&contacts[0].addr, "alice@example.org");
+    assert_eq!(&contacts[0].authname, "Alice");
+    assert_eq!(contacts[0].key.as_ref().unwrap(), "xsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa==");
+    assert!(contacts[0].timestamp.is_err());
+    assert_eq!(contacts[0].profile_image.as_ref().unwrap(), "/9aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Z");
+}

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.155.3"
+version = "1.160.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -24,7 +24,6 @@ tokio = { workspace = true, features = ["rt-multi-thread"] }
 anyhow = { workspace = true }
 thiserror = { workspace = true }
 rand = { workspace = true }
-once_cell = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose"] }
 
 [features]

deltachat-ffi/DoxygenLayout.xml

@@ -1,5 +1,6 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.20 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<doxygenlayout version="2.0">
+  <!-- Generated by doxygen 1.13.2 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title=""/>
@@ -11,10 +12,16 @@
     </tab>
     <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
     <tab type="pages" visible="yes" title="" intro=""/>
+    <tab type="modules" visible="yes" title="" intro="">
+      <tab type="modulelist" visible="yes" title="" intro=""/>
+      <tab type="modulemembers" visible="yes" title="" intro=""/>
+    </tab>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>
     </tab>
+    <tab type="concepts" visible="yes" title="">
+    </tab>
     <tab type="interfaces" visible="yes" title="">
       <tab type="interfacelist" visible="yes" title="" intro=""/>
       <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
@@ -35,4 +42,228 @@
     </tab>
     <tab type="examples" visible="yes" title="" intro=""/>
   </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_HEADERFILE"/>
+    <inheritancegraph visible="yes"/>
+    <collaborationgraph visible="yes"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes visible="yes" title=""/>
+      <services visible="yes" title=""/>
+      <interfaces visible="yes" title=""/>
+      <publicslots visible="yes" title=""/>
+      <signals visible="yes" title=""/>
+      <publicmethods visible="yes" title=""/>
+      <publicstaticmethods visible="yes" title=""/>
+      <publicattributes visible="yes" title=""/>
+      <publicstaticattributes visible="yes" title=""/>
+      <protectedtypes visible="yes" title=""/>
+      <protectedslots visible="yes" title=""/>
+      <protectedmethods visible="yes" title=""/>
+      <protectedstaticmethods visible="yes" title=""/>
+      <protectedattributes visible="yes" title=""/>
+      <protectedstaticattributes visible="yes" title=""/>
+      <packagetypes visible="yes" title=""/>
+      <packagemethods visible="yes" title=""/>
+      <packagestaticmethods visible="yes" title=""/>
+      <packageattributes visible="yes" title=""/>
+      <packagestaticattributes visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <events visible="yes" title=""/>
+      <privatetypes visible="yes" title=""/>
+      <privateslots visible="yes" title=""/>
+      <privatemethods visible="yes" title=""/>
+      <privatestaticmethods visible="yes" title=""/>
+      <privateattributes visible="yes" title=""/>
+      <privatestaticattributes visible="yes" title=""/>
+      <friends visible="yes" title=""/>
+      <related visible="yes" title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+    <memberdef>
+      <inlineclasses visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <services visible="yes" title=""/>
+      <interfaces visible="yes" title=""/>
+      <constructors visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <related visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <events visible="yes" title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <interfaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <structs visible="yes" title=""/>
+      <exceptions visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <membergroups visible="yes" visible="yes"/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+    <memberdef>
+      <inlineclasses visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a concept page -->
+  <concept>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_HEADERFILE"/>
+    <definition visible="yes" title=""/>
+    <detaileddescription visible="yes" title=""/>
+    <authorsection visible="yes"/>
+  </concept>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="yes"/>
+    <includedbygraph visible="yes"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <interfaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <structs visible="yes" title=""/>
+      <exceptions visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <membergroups visible="yes" visible="yes"/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+    <memberdef>
+      <inlineclasses visible="yes" title=""/>
+      <defines visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="yes"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <modules visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <concepts visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <enumvalues visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <signals visible="yes" title=""/>
+      <publicslots visible="yes" title=""/>
+      <protectedslots visible="yes" title=""/>
+      <privateslots visible="yes" title=""/>
+      <events visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <friends visible="yes" title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses visible="yes" title=""/>
+      <defines visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <sequences visible="yes" title=""/>
+      <dictionaries visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <enumvalues visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <signals visible="yes" title=""/>
+      <publicslots visible="yes" title=""/>
+      <protectedslots visible="yes" title=""/>
+      <privateslots visible="yes" title=""/>
+      <events visible="yes" title=""/>
+      <properties visible="yes" title=""/>
+      <friends visible="yes" title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a C++20 module page -->
+  <module>
+    <briefdescription visible="yes"/>
+    <exportedmodules visible="yes"/>
+    <memberdecl>
+      <concepts visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <enums visible="yes" title=""/>
+      <typedefs visible="yes" title=""/>
+      <functions visible="yes" title=""/>
+      <variables visible="yes" title=""/>
+      <membergroups visible="yes" title=""/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+    <memberdecl>
+      <files visible="yes"/>
+    </memberdecl>
+  </module>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription visible="yes" title=""/>
+  </directory>
 </doxygenlayout>

deltachat-ffi/deltachat.h

@@ -220,7 +220,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
  * - Strings in function arguments or return values are usually UTF-8 encoded.
  *
  * - The issue-tracker for the core library is here:
- *   <https://github.com/deltachat/deltachat-core-rust/issues>
+ *   <https://github.com/chatmail/core/issues>
  *
  * If you need further assistance,
  * please do not hesitate to contact us
@@ -440,17 +440,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    also show all mails of confirmed contacts,
  *                    DC_SHOW_EMAILS_ALL (2)=
  *                    also show mails of unconfirmed contacts (default).
- * - `key_gen_type` = DC_KEY_GEN_DEFAULT (0)=
- *                    generate recommended key type (default),
- *                    DC_KEY_GEN_RSA2048 (1)=
- *                    generate RSA 2048 keypair
- *                    DC_KEY_GEN_ED25519 (2)=
- *                    generate Curve25519 keypair
- *                    DC_KEY_GEN_RSA4096 (3)=
- *                    generate RSA 4096 keypair
- * - `save_mime_headers` = 1=save mime headers
- *                    and make dc_get_mime_headers() work for subsequent calls,
- *                    0=do not save mime headers (default)
  * - `delete_device_after` = 0=do not delete messages from device automatically (default),
  *                    >=1=seconds, after which messages are deleted automatically from the device.
  *                    Messages in the "saved messages" chat (see dc_chat_is_self_talk()) are skipped.
@@ -975,7 +964,7 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
  * ~~~
  * dc_msg_t* msg = dc_msg_new(context, DC_MSG_IMAGE);
  *
- * dc_msg_set_file(msg, "/file/to/send.jpg", NULL);
+ * dc_msg_set_file_and_deduplicate(msg, "/file/to/send.jpg", NULL, NULL);
  * dc_send_msg(context, chat_id, msg);
  *
  * dc_msg_unref(msg);
@@ -1039,6 +1028,38 @@ uint32_t        dc_send_msg_sync                  (dc_context_t* context, uint32
 uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t chat_id, const char* text_to_send);
 
 
+/**
+ * Send chat members a request to edit the given message's text.
+ *
+ * Only outgoing messages sent by self can be edited.
+ * Edited messages should be flagged as such in the UI, see dc_msg_is_edited().
+ * UI is informed about changes using the event #DC_EVENT_MSGS_CHANGED.
+ * If the text is not changed, no event and no edit request message are sent.
+ *
+ * @memberof dc_context_t
+ * @param context The context object as returned from dc_context_new().
+ * @param msg_id The message ID of the message to edit.
+ * @param new_text The new text.
+ *      This must not be NULL nor empty.
+ */
+void            dc_send_edit_request         (dc_context_t* context, uint32_t msg_id, const char* new_text);
+
+
+/**
+ * Send chat members a request to delete the given messages.
+ *
+ * Only outgoing messages can be deleted this way
+ * and all messages must be in the same chat.
+ * No tombstone or sth. like that is left.
+ *
+ * @memberof dc_context_t
+ * @param context The context object as returned from dc_context_new().
+ * @param msg_ids An array of uint32_t containing all message IDs to delete.
+ * @param msg_cnt The number of messages IDs in the msg_ids array.
+ */
+ void            dc_send_delete_request       (dc_context_t* context, const uint32_t* msg_ids, int msg_cnt);
+
+
 /**
  * Send invitation to a videochat.
  *
@@ -1929,24 +1950,7 @@ void dc_download_full_msg (dc_context_t* context, int msg_id);
 
 
 /**
- * Get the raw mime-headers of the given message.
- * Raw headers are saved for incoming messages
- * only if `dc_set_config(context, "save_mime_headers", "1")`
- * was called before.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id The message ID, must be the ID of an incoming message.
- * @return Raw headers as a multi-line string, must be released using dc_str_unref() after usage.
- *     Returns NULL if there are no headers saved for the given message,
- *     e.g. because of save_mime_headers is not set
- *     or the message is not incoming.
- */
-char*           dc_get_mime_headers          (dc_context_t* context, uint32_t msg_id);
-
-
-/**
- * Delete messages. The messages are deleted on the current device and
+ * Delete messages. The messages are deleted on all devices and
  * on the IMAP server.
  *
  * @memberof dc_context_t
@@ -2128,7 +2132,10 @@ uint32_t        dc_lookup_contact_id_by_addr (dc_context_t* context, const char*
 uint32_t        dc_create_contact            (dc_context_t* context, const char* name, const char* addr);
 
 
-#define         DC_GCL_VERIFIED_ONLY         0x01
+
+// Deprecated 2025-05-20, setting this flag is a no-op.
+#define         DC_GCL_DEPRECATED_VERIFIED_ONLY         0x01
+
 #define         DC_GCL_ADD_SELF              0x02
 
 
@@ -2158,6 +2165,29 @@ uint32_t        dc_create_contact            (dc_context_t* context, const char*
 int             dc_add_address_book          (dc_context_t* context, const char* addr_book);
 
 
+/**
+ * Make a vCard.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param contact_id The ID of the contact to make the vCard of.
+ * @return vCard, must be released using dc_str_unref() after usage.
+ */
+char*           dc_make_vcard                (dc_context_t* context, uint32_t contact_id);
+
+
+/**
+ * Import a vCard.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param vcard vCard contents.
+ * @return Returns the IDs of the contacts in the order they appear in the vCard.
+ *         Must be dc_array_unref()'d after usage.
+ */
+dc_array_t*     dc_import_vcard              (dc_context_t* context, const char* vcard);
+
+
 /**
  * Returns known and unblocked contacts.
  *
@@ -2167,8 +2197,6 @@ int             dc_add_address_book          (dc_context_t* context, const char*
  * @param context The context object.
  * @param flags A combination of flags:
  *     - if the flag DC_GCL_ADD_SELF is set, SELF is added to the list unless filtered by other parameters
- *     - if the flag DC_GCL_VERIFIED_ONLY is set, only verified contacts are returned.
- *       if DC_GCL_VERIFIED_ONLY is not set, verified and unverified contacts are returned.
  * @param query A string to filter the list. Typically used to implement an
  *     incremental search. NULL for no filtering.
  * @return An array containing all contact IDs. Must be dc_array_unref()'d
@@ -2459,8 +2487,9 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_MISMATCH           220 // id=contact
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
 #define         DC_QR_ACCOUNT                250 // text1=domain
-#define         DC_QR_BACKUP                 251
+#define         DC_QR_BACKUP                 251 // deprecated
 #define         DC_QR_BACKUP2                252
+#define         DC_QR_BACKUP_TOO_NEW         255
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
 #define         DC_QR_PROXY                  271 // text1=address (e.g. "127.0.0.1:9050")
 #define         DC_QR_ADDR                   320 // id=contact
@@ -2507,11 +2536,14 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to create an account on the given domain,
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
- * - DC_QR_BACKUP:
  * - DC_QR_BACKUP2:
  *   ask the user if they want to set up a new device.
  *   If so, pass the qr-code to dc_receive_backup().
  *
+ * - DC_QR_BACKUP_TOO_NEW:
+ *   show a hint to the user that this backup comes from a newer Delta Chat version
+ *   and this device needs an update
+ *
  * - DC_QR_WEBRTC_INSTANCE with dc_lot_t::text1=domain:
  *   ask the user if they want to use the given service for video chats;
  *   if so, call dc_set_config_from_qr().
@@ -4432,6 +4464,20 @@ int             dc_msg_is_sent                (const dc_msg_t* msg);
 int             dc_msg_is_forwarded           (const dc_msg_t* msg);
 
 
+/**
+ * Check if the message was edited.
+ *
+ * Edited messages should be marked by the UI as such,
+ * e.g. by the text "Edited" beside the time.
+ * To edit messages, use dc_send_edit_request().
+ *
+ * @memberof dc_msg_t
+ * @param msg The message object.
+ * @return 1=message is edited, 0=message not edited.
+ */
+ int             dc_msg_is_edited             (const dc_msg_t* msg);
+
+
 /**
  * Check if the message is an informational message, created by the
  * device or by another users. Such messages are not "typed" by the user but
@@ -4461,6 +4507,11 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
  * UIs can display e.g. an icon based upon the type.
  *
  * Currently, the following types are defined:
+ * - DC_INFO_GROUP_NAME_CHANGED (2) - "Group name changd from OLD to BY by CONTACT"
+ * - DC_INFO_GROUP_IMAGE_CHANGED (3) - "Group image changd by CONTACT"
+ * - DC_INFO_MEMBER_ADDED_TO_GROUP (4) - "Member CONTACT added by OTHER_CONTACT"
+ * - DC_INFO_MEMBER_REMOVED_FROM_GROUP (5) - "Member CONTACT removed by OTHER_CONTACT"
+ * - DC_INFO_EPHEMERAL_TIMER_CHANGED (10) - "Disappearing messages CHANGED_TO by CONTACT"
  * - DC_INFO_PROTECTION_ENABLED (11) - Info-message for "Chat is now protected"
  * - DC_INFO_PROTECTION_DISABLED (12) - Info-message for "Chat is no longer protected"
  * - DC_INFO_INVALID_UNENCRYPTED_MAIL (13) - Info-message for "Provider requires end-to-end encryption which is not setup yet",
@@ -4468,6 +4519,10 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
  *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
  * - DC_INFO_WEBXDC_INFO_MESSAGE (32) - Info-message created by webxdc app sending `update.info`
  *
+ * For the messages that refer to a CONTACT,
+ * dc_msg_get_info_contact_id() returns the contact ID.
+ * The UI should open the contact's profile when tapping the info message.
+ *
  * Even when you display an icon,
  * you should still display the text of the informational message using dc_msg_get_text()
  *
@@ -4480,6 +4535,29 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
 int             dc_msg_get_info_type          (const dc_msg_t* msg);
 
 
+/**
+ * Return the contact ID of the profile to open when tapping the info message.
+ *
+ * - For DC_INFO_MEMBER_ADDED_TO_GROUP and DC_INFO_MEMBER_REMOVED_FROM_GROUP,
+ *   this is the contact being added/removed.
+ *   The contact that did the adding/removal is usually only a tap away
+ *   (as introducer and/or atop of the memberlist),
+ *   and usually more known anyways.
+ * - For DC_INFO_GROUP_NAME_CHANGED, DC_INFO_GROUP_IMAGE_CHANGED and DC_INFO_EPHEMERAL_TIMER_CHANGED
+ *   this is the contact who did the change.
+ *
+ * No need to check additionally for dc_msg_get_info_type(),
+ * unless you e.g. want to show the info message in another style.
+ *
+ * @memberof dc_msg_t
+ * @param msg The message object.
+ * @return If the info message refers to a contact,
+ *     this contact ID or DC_CONTACT_ID_SELF is returned.
+ *     Otherwise 0.
+ */
+uint32_t        dc_msg_get_info_contact_id    (const dc_msg_t* msg);
+
+
 // DC_INFO* uses the same values as SystemMessage in rust-land
 #define         DC_INFO_UNKNOWN                    0
 #define         DC_INFO_GROUP_NAME_CHANGED         2
@@ -4741,22 +4819,6 @@ void            dc_msg_set_subject            (dc_msg_t* msg, const char* subjec
 void            dc_msg_set_override_sender_name(dc_msg_t* msg, const char* name);
 
 
-/**
- * Set the file associated with a message object.
- * This does not alter any information in the database
- * nor copy or move the file or checks if the file exist.
- * All this can be done with dc_send_msg() later.
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @param file If the message object is used in dc_send_msg() later,
- *     this must be the full path of the image file to send.
- * @param filemime The MIME type of the file. NULL if you don't know or don't care.
- * @deprecated 2025-01-21 Use dc_msg_set_file_and_deduplicate instead
- */
-void            dc_msg_set_file               (dc_msg_t* msg, const char* file, const char* filemime);
-
-
 /**
  * Sets the file associated with a message.
  *
@@ -4784,7 +4846,7 @@ void            dc_msg_set_file_and_deduplicate(dc_msg_t* msg, const char* file,
 
 /**
  * Set the dimensions associated with message object.
- * Typically this is the width and the height of an image or video associated using dc_msg_set_file().
+ * Typically this is the width and the height of an image or video associated using dc_msg_set_file_and_deduplicate().
  * This does not alter any information in the database; this may be done by dc_send_msg() later.
  *
  * @memberof dc_msg_t
@@ -4797,7 +4859,7 @@ void            dc_msg_set_dimension          (dc_msg_t* msg, int width, int hei
 
 /**
  * Set the duration associated with message object.
- * Typically this is the duration of an audio or video associated using dc_msg_set_file().
+ * Typically this is the duration of an audio or video associated using dc_msg_set_file_and_deduplicate().
  * This does not alter any information in the database; this may be done by dc_send_msg() later.
  *
  * @memberof dc_msg_t
@@ -5436,7 +5498,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
  * If you want to define the type of a dc_msg_t object for sending,
  * use dc_msg_new().
  * Depending on the type, you will set more properties using e.g.
- * dc_msg_set_text() or dc_msg_set_file().
+ * dc_msg_set_text() or dc_msg_set_file_and_deduplicate().
  * To finally send the message, use dc_send_msg().
  *
  * To get the types of dc_msg_t objects received, use dc_msg_get_viewtype().
@@ -5457,7 +5519,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 /**
  * Image message.
  * If the image is an animated GIF, the type #DC_MSG_GIF should be used.
- * File, width, and height are set via dc_msg_set_file(), dc_msg_set_dimension()
+ * File, width, and height are set via dc_msg_set_file_and_deduplicate(), dc_msg_set_dimension()
  * and retrieved via dc_msg_get_file(), dc_msg_get_width(), and dc_msg_get_height().
  *
  * Before sending, the image is recoded to an reasonable size,
@@ -5470,7 +5532,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * Animated GIF message.
- * File, width, and height are set via dc_msg_set_file(), dc_msg_set_dimension()
+ * File, width, and height are set via dc_msg_set_file_and_deduplicate(), dc_msg_set_dimension()
  * and retrieved via dc_msg_get_file(), dc_msg_get_width(), and dc_msg_get_height().
  */
 #define DC_MSG_GIF       21
@@ -5488,7 +5550,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * Message containing an audio file.
- * File and duration are set via dc_msg_set_file(), dc_msg_set_duration()
+ * File and duration are set via dc_msg_set_file_and_deduplicate(), dc_msg_set_duration()
  * and retrieved via dc_msg_get_file(), and dc_msg_get_duration().
  */
 #define DC_MSG_AUDIO     40
@@ -5497,7 +5559,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 /**
  * A voice message that was directly recorded by the user.
  * For all other audio messages, the type #DC_MSG_AUDIO should be used.
- * File and duration are set via dc_msg_set_file(), dc_msg_set_duration()
+ * File and duration are set via dc_msg_set_file_and_deduplicate(), dc_msg_set_duration()
  * and retrieved via dc_msg_get_file(), and dc_msg_get_duration().
  */
 #define DC_MSG_VOICE     41
@@ -5506,7 +5568,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 /**
  * Video messages.
  * File, width, height, and duration
- * are set via dc_msg_set_file(), dc_msg_set_dimension(), dc_msg_set_duration()
+ * are set via dc_msg_set_file_and_deduplicate(), dc_msg_set_dimension(), dc_msg_set_duration()
  * and retrieved via
  * dc_msg_get_file(), dc_msg_get_width(),
  * dc_msg_get_height(), and dc_msg_get_duration().
@@ -5516,7 +5578,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * Message containing any file, e.g. a PDF.
- * The file is set via dc_msg_set_file()
+ * The file is set via dc_msg_set_file_and_deduplicate()
  * and retrieved via dc_msg_get_file().
  */
 #define DC_MSG_FILE      60
@@ -6280,6 +6342,18 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED 2021
 
 
+/**
+ * Chat was deleted.
+ * This event is emitted in response to dc_delete_chat()
+ * called on this or another device.
+ * The event is a good place to remove notifications or homescreen shortcuts.
+ *
+ * @param data1 (int) chat_id
+ * @param data2 (int) 0
+ */
+#define DC_EVENT_CHAT_DELETED             2023
+
+
 /**
  * Contact(s) created, renamed, verified, blocked or deleted.
  *
@@ -6520,15 +6594,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_MEDIA_QUALITY_WORSE    1
 
 
-/*
- * Values for dc_get|set_config("key_gen_type")
- */
-#define DC_KEY_GEN_DEFAULT 0
-#define DC_KEY_GEN_RSA2048 1
-#define DC_KEY_GEN_ED25519 2
-#define DC_KEY_GEN_RSA4096 3
-
-
 /**
  * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
  *
@@ -6848,12 +6913,12 @@ void dc_event_unref(dc_event_t* event);
 
 /// "Autocrypt Setup Message"
 ///
-/// Used in subjects of outgoing Autocrypt Setup Messages.
+/// @deprecated 2025-04
 #define DC_STR_AC_SETUP_MSG_SUBJECT       42
 
 /// "This is the Autocrypt Setup Message, open it in a compatible client to use your setup"
 ///
-/// Used as message text of outgoing Autocrypt Setup Messages.
+/// @deprecated 2025-04
 #define DC_STR_AC_SETUP_MSG_BODY          43
 
 /// "Cannot login as %1$s."
@@ -7528,9 +7593,14 @@ void dc_event_unref(dc_event_t* event);
 
 /// "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
 ///
-/// Used as info message.
+/// @deprecated 2025-03
 #define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
 
+/// "The contact must be online to proceed. This process will continue automatically in background."
+///
+/// Used as info message.
+#define DC_STR_SECUREJOIN_TAKES_LONGER 192
+
 /// "Contact". Deprecated, currently unused.
 #define DC_STR_CONTACT 200
 

deltachat-ffi/src/lib.rs

@@ -18,7 +18,7 @@ use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use std::time::{Duration, SystemTime};
 
 use anyhow::Context as _;
@@ -37,8 +37,8 @@ use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
 use deltachat_jsonrpc::api::CommandApi;
 use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
+use message::Viewtype;
 use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
 use rand::Rng;
 use tokio::runtime::Runtime;
 use tokio::sync::RwLock;
@@ -68,7 +68,8 @@ const DC_GCM_INFO_ONLY: u32 = 0x02;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
-static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));
+static RT: LazyLock<Runtime> =
+    LazyLock::new(|| Runtime::new().expect("unable to create tokio runtime"));
 
 fn block_on<T>(fut: T) -> T::Output
 where
@@ -234,7 +235,10 @@ pub unsafe extern "C" fn dc_set_config(
                 .log_err(ctx)
                 .is_ok() as libc::c_int
         } else {
-            match config::Config::from_str(&key) {
+            match config::Config::from_str(&key)
+                .context("Invalid config key")
+                .log_err(ctx)
+            {
                 Ok(key) => ctx
                     .set_config(key, value.as_deref())
                     .await
@@ -243,10 +247,7 @@ pub unsafe extern "C" fn dc_set_config(
                     })
                     .log_err(ctx)
                     .is_ok() as libc::c_int,
-                Err(_) => {
-                    warn!(ctx, "dc_set_config(): invalid key");
-                    0
-                }
+                Err(_) => 0,
             }
         }
     })
@@ -275,7 +276,10 @@ pub unsafe extern "C" fn dc_get_config(
                 .unwrap_or_default()
                 .strdup()
         } else {
-            match config::Config::from_str(&key) {
+            match config::Config::from_str(&key)
+                .with_context(|| format!("Invalid key {:?}", &key))
+                .log_err(ctx)
+            {
                 Ok(key) => ctx
                     .get_config(key)
                     .await
@@ -284,10 +288,7 @@ pub unsafe extern "C" fn dc_get_config(
                     .unwrap_or_default()
                     .unwrap_or_default()
                     .strdup(),
-                Err(_) => {
-                    warn!(ctx, "dc_get_config(): invalid key '{}'", &key);
-                    "".strdup()
-                }
+                Err(_) => "".strdup(),
             }
         }
     })
@@ -307,18 +308,17 @@ pub unsafe extern "C" fn dc_set_stock_translation(
     let ctx = &*context;
 
     block_on(async move {
-        match StockMessage::from_u32(stock_id) {
-            Some(id) => match ctx.set_stock_translation(id, msg).await {
-                Ok(()) => 1,
-                Err(err) => {
-                    warn!(ctx, "set_stock_translation failed: {err:#}");
-                    0
-                }
-            },
-            None => {
-                warn!(ctx, "invalid stock message id {stock_id}");
-                0
-            }
+        match StockMessage::from_u32(stock_id)
+            .with_context(|| format!("Invalid stock message ID {stock_id}"))
+            .log_err(ctx)
+        {
+            Ok(id) => ctx
+                .set_stock_translation(id, msg)
+                .await
+                .context("set_stock_translation failed")
+                .log_err(ctx)
+                .is_ok() as libc::c_int,
+            Err(_) => 0,
         }
     })
 }
@@ -335,15 +335,10 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
     let qr = to_string_lossy(qr);
     let ctx = &*context;
 
-    block_on(async move {
-        match qr::set_config_from_qr(ctx, &qr).await {
-            Ok(()) => 1,
-            Err(err) => {
-                error!(ctx, "Failed to create account from QR code: {err:#}");
-                0
-            }
-        }
-    })
+    block_on(qr::set_config_from_qr(ctx, &qr))
+        .context("Failed to create account from QR code")
+        .log_err(ctx)
+        .is_ok() as libc::c_int
 }
 
 #[no_mangle]
@@ -353,15 +348,13 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
         return "".strdup();
     }
     let ctx = &*context;
-    block_on(async move {
-        match ctx.get_info().await {
-            Ok(info) => render_info(info).unwrap_or_default().strdup(),
-            Err(err) => {
-                warn!(ctx, "failed to get info: {err:#}");
-                "".strdup()
-            }
-        }
-    })
+    match block_on(ctx.get_info())
+        .context("Failed to get info")
+        .log_err(ctx)
+    {
+        Ok(info) => render_info(info).unwrap_or_default().strdup(),
+        Err(_) => "".strdup(),
+    }
 }
 
 fn render_info(
@@ -394,15 +387,13 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
         return "".strdup();
     }
     let ctx = &*context;
-    block_on(async move {
-        match ctx.get_connectivity_html().await {
-            Ok(html) => html.strdup(),
-            Err(err) => {
-                error!(ctx, "Failed to get connectivity html: {err:#}");
-                "".strdup()
-            }
-        }
-    })
+    match block_on(ctx.get_connectivity_html())
+        .context("Failed to get connectivity html")
+        .log_err(ctx)
+    {
+        Ok(html) => html.strdup(),
+        Err(_) => "".strdup(),
+    }
 }
 
 #[no_mangle]
@@ -536,7 +527,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::IncomingReaction { .. } => 2002,
         EventType::IncomingWebxdcNotify { .. } => 2003,
         EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch { .. } => 2006,
+        EventType::IncomingMsgBunch => 2006,
         EventType::MsgsNoticed { .. } => 2008,
         EventType::MsgDelivered { .. } => 2010,
         EventType::MsgFailed { .. } => 2012,
@@ -544,6 +535,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::MsgDeleted { .. } => 2016,
         EventType::ChatModified(_) => 2020,
         EventType::ChatEphemeralTimerModified { .. } => 2021,
+        EventType::ChatDeleted { .. } => 2023,
         EventType::ContactsChanged(_) => 2030,
         EventType::LocationChanged(_) => 2035,
         EventType::ConfigureProgress { .. } => 2041,
@@ -593,7 +585,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
         | EventType::ConfigSynced { .. }
-        | EventType::IncomingMsgBunch { .. }
+        | EventType::IncomingMsgBunch
         | EventType::ErrorSelfNotInGroup(_)
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
@@ -610,7 +602,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgRead { chat_id, .. }
         | EventType::MsgDeleted { chat_id, .. }
         | EventType::ChatModified(chat_id)
-        | EventType::ChatEphemeralTimerModified { chat_id, .. } => chat_id.to_u32() as libc::c_int,
+        | EventType::ChatEphemeralTimerModified { chat_id, .. }
+        | EventType::ChatDeleted { chat_id } => chat_id.to_u32() as libc::c_int,
         EventType::ContactsChanged(id) | EventType::LocationChanged(id) => {
             let id = id.unwrap_or_default();
             id.to_u32() as libc::c_int
@@ -667,7 +660,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
         | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::IncomingMsgBunch { .. }
+        | EventType::IncomingMsgBunch
         | EventType::SelfavatarChanged
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
@@ -676,6 +669,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsItemChanged
         | EventType::ConfigSynced { .. }
         | EventType::ChatModified(_)
+        | EventType::ChatDeleted { .. }
         | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
@@ -767,7 +761,8 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::WebxdcInstanceDeleted { .. }
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatEphemeralTimerModified { .. }
-        | EventType::IncomingMsgBunch { .. }
+        | EventType::ChatDeleted { .. }
+        | EventType::IncomingMsgBunch
         | EventType::ChatlistItemChanged { .. }
         | EventType::ChatlistChanged
         | EventType::AccountsChanged
@@ -1041,6 +1036,42 @@ pub unsafe extern "C" fn dc_send_text_msg(
     })
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_send_edit_request(
+    context: *mut dc_context_t,
+    msg_id: u32,
+    new_text: *const libc::c_char,
+) {
+    if context.is_null() || new_text.is_null() {
+        eprintln!("ignoring careless call to dc_send_edit_request()");
+        return;
+    }
+    let ctx = &*context;
+    let new_text = to_string_lossy(new_text);
+
+    block_on(chat::send_edit_request(ctx, MsgId::new(msg_id), new_text))
+        .unwrap_or_log_default(ctx, "Failed to send text edit")
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_send_delete_request(
+    context: *mut dc_context_t,
+    msg_ids: *const u32,
+    msg_cnt: libc::c_int,
+) {
+    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
+        eprintln!("ignoring careless call to dc_send_delete_request()");
+        return;
+    }
+    let ctx = &*context;
+    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
+
+    block_on(message::delete_msgs_ex(ctx, &msg_ids, true))
+        .context("failed dc_send_delete_request() call")
+        .log_err(ctx)
+        .ok();
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_videochat_invitation(
     context: *mut dc_context_t,
@@ -1214,22 +1245,19 @@ pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32)
     }
     let ctx = &*context;
 
-    block_on(async move {
-        match ChatId::new(chat_id).get_draft(ctx).await {
-            Ok(Some(draft)) => {
-                let ffi_msg = MessageWrapper {
-                    context,
-                    message: draft,
-                };
-                Box::into_raw(Box::new(ffi_msg))
-            }
-            Ok(None) => ptr::null_mut(),
-            Err(err) => {
-                error!(ctx, "Failed to get draft for chat #{chat_id}: {err:#}");
-                ptr::null_mut()
-            }
+    match block_on(ChatId::new(chat_id).get_draft(ctx))
+        .with_context(|| format!("Failed to get draft for chat #{chat_id}"))
+        .unwrap_or_default()
+    {
+        Some(draft) => {
+            let ffi_msg = MessageWrapper {
+                context,
+                message: draft,
+            };
+            Box::into_raw(Box::new(ffi_msg))
         }
-    })
+        None => ptr::null_mut(),
+    }
 }
 
 #[no_mangle]
@@ -1485,10 +1513,7 @@ pub unsafe extern "C" fn dc_set_chat_visibility(
         1 => ChatVisibility::Archived,
         2 => ChatVisibility::Pinned,
         _ => {
-            warn!(
-                ctx,
-                "ignoring careless call to dc_set_chat_visibility(): unknown archived state",
-            );
+            eprintln!("ignoring careless call to dc_set_chat_visibility(): unknown archived state");
             return;
         }
     };
@@ -1618,6 +1643,7 @@ pub unsafe extern "C" fn dc_get_chat(context: *mut dc_context_t, chat_id: u32) -
         return ptr::null_mut();
     }
     let ctx = &*context;
+    let context: Context = ctx.clone();
 
     block_on(async move {
         match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
@@ -1641,10 +1667,11 @@ pub unsafe extern "C" fn dc_create_group_chat(
         return 0;
     }
     let ctx = &*context;
-    let protect = if let Some(s) = ProtectionStatus::from_i32(protect) {
-        s
-    } else {
-        warn!(ctx, "bad protect-value for dc_create_group_chat()");
+    let Some(protect) = ProtectionStatus::from_i32(protect)
+        .context("Bad protect-value for dc_create_group_chat()")
+        .log_err(ctx)
+        .ok()
+    else {
         return 0;
     };
 
@@ -1790,23 +1817,20 @@ pub unsafe extern "C" fn dc_set_chat_mute_duration(
         return 0;
     }
     let ctx = &*context;
-    let muteDuration = match duration {
+    let mute_duration = match duration {
         0 => MuteDuration::NotMuted,
         -1 => MuteDuration::Forever,
         n if n > 0 => SystemTime::now()
             .checked_add(Duration::from_secs(duration as u64))
             .map_or(MuteDuration::Forever, MuteDuration::Until),
         _ => {
-            warn!(
-                ctx,
-                "dc_chat_set_mute_duration(): Can not use negative duration other than -1",
-            );
+            eprintln!("dc_chat_set_mute_duration(): Can not use negative duration other than -1");
             return 0;
         }
     };
 
     block_on(async move {
-        chat::set_muted(ctx, ChatId::new(chat_id), muteDuration)
+        chat::set_muted(ctx, ChatId::new(chat_id), mute_duration)
             .await
             .map(|_| 1)
             .unwrap_or_log_default(ctx, "Failed to set mute duration")
@@ -1824,16 +1848,10 @@ pub unsafe extern "C" fn dc_get_chat_encrinfo(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        ChatId::new(chat_id)
-            .get_encryption_info(ctx)
-            .await
-            .map(|s| s.strdup())
-            .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
-                ptr::null_mut()
-            })
-    })
+    block_on(ChatId::new(chat_id).get_encryption_info(ctx))
+        .map(|s| s.strdup())
+        .log_err(ctx)
+        .unwrap_or(ptr::null_mut())
 }
 
 #[no_mangle]
@@ -1913,28 +1931,6 @@ pub unsafe extern "C" fn dc_get_msg_html(
         .strdup()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_mime_headers(
-    context: *mut dc_context_t,
-    msg_id: u32,
-) -> *mut libc::c_char {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_mime_headers()");
-        return ptr::null_mut(); // NULL explicitly defined as "no mime headers"
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        let mime = message::get_mime_headers(ctx, MsgId::new(msg_id))
-            .await
-            .unwrap_or_log_default(ctx, "failed to get mime headers");
-        if mime.is_empty() {
-            return ptr::null_mut();
-        }
-        mime.strdup()
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_delete_msgs(
     context: *mut dc_context_t,
@@ -2012,12 +2008,10 @@ pub unsafe extern "C" fn dc_resend_msgs(
     let ctx = &*context;
     let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
 
-    if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
-        error!(ctx, "Resending failed: {err:#}");
-        0
-    } else {
-        1
-    }
+    block_on(chat::resend_msgs(ctx, &msg_ids))
+        .context("Resending failed")
+        .log_err(ctx)
+        .is_ok() as libc::c_int
 }
 
 #[no_mangle]
@@ -2047,26 +2041,22 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
     }
     let ctx = &*context;
 
-    block_on(async move {
-        let message = match message::Message::load_from_db(ctx, MsgId::new(msg_id)).await {
-            Ok(msg) => msg,
-            Err(e) => {
-                if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
-                    // C-core API returns empty messages, do the same
-                    warn!(
-                        ctx,
-                        "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
-                    );
-                    message::Message::default()
-                } else {
-                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
-                    return ptr::null_mut();
-                }
+    let message = match block_on(message::Message::load_from_db(ctx, MsgId::new(msg_id)))
+        .with_context(|| format!("dc_get_msg could not rectieve msg_id {msg_id}"))
+        .log_err(ctx)
+    {
+        Ok(msg) => msg,
+        Err(_) => {
+            if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
+                // C-core API returns empty messages, do the same
+                message::Message::new(Viewtype::default())
+            } else {
+                return ptr::null_mut();
             }
-        };
-        let ffi_msg = MessageWrapper { context, message };
-        Box::into_raw(Box::new(ffi_msg))
-    })
+        }
+    };
+    let ffi_msg = MessageWrapper { context, message };
+    Box::into_raw(Box::new(ffi_msg))
 }
 
 #[no_mangle]
@@ -2151,6 +2141,48 @@ pub unsafe extern "C" fn dc_add_address_book(
     })
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_make_vcard(
+    context: *mut dc_context_t,
+    contact_id: u32,
+) -> *mut libc::c_char {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_make_vcard()");
+        return ptr::null_mut();
+    }
+    let ctx = &*context;
+    let contact_id = ContactId::new(contact_id);
+
+    block_on(contact::make_vcard(ctx, &[contact_id]))
+        .unwrap_or_log_default(ctx, "dc_make_vcard failed")
+        .strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_import_vcard(
+    context: *mut dc_context_t,
+    vcard: *const libc::c_char,
+) -> *mut dc_array::dc_array_t {
+    if context.is_null() || vcard.is_null() {
+        eprintln!("ignoring careless call to dc_import_vcard()");
+        return ptr::null_mut();
+    }
+    let ctx = &*context;
+
+    match block_on(contact::import_vcard(ctx, &to_string_lossy(vcard)))
+        .context("dc_import_vcard failed")
+        .log_err(ctx)
+    {
+        Ok(contact_ids) => Box::into_raw(Box::new(dc_array_t::from(
+            contact_ids
+                .iter()
+                .map(|id| id.to_u32())
+                .collect::<Vec<u32>>(),
+        ))),
+        Err(_) => ptr::null_mut(),
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_contacts(
     context: *mut dc_context_t,
@@ -2254,15 +2286,10 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        Contact::get_encrinfo(ctx, ContactId::new(contact_id))
-            .await
-            .map(|s| s.strdup())
-            .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
-                ptr::null_mut()
-            })
-    })
+    block_on(Contact::get_encrinfo(ctx, ContactId::new(contact_id)))
+        .map(|s| s.strdup())
+        .log_err(ctx)
+        .unwrap_or(ptr::null_mut())
 }
 
 #[no_mangle]
@@ -2277,15 +2304,10 @@ pub unsafe extern "C" fn dc_delete_contact(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        match Contact::delete(ctx, contact_id).await {
-            Ok(_) => 1,
-            Err(err) => {
-                error!(ctx, "cannot delete contact: {err:#}");
-                0
-            }
-        }
-    })
+    block_on(Contact::delete(ctx, contact_id))
+        .context("Cannot delete contact")
+        .log_err(ctx)
+        .is_ok() as libc::c_int
 }
 
 #[no_mangle]
@@ -2356,17 +2378,13 @@ pub unsafe extern "C" fn dc_imex_has_backup(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        match imex::has_backup(ctx, to_string_lossy(dir).as_ref()).await {
-            Ok(res) => res.strdup(),
-            Err(err) => {
-                // do not bubble up error to the user,
-                // the ui will expect that the file does not exist or cannot be accessed
-                warn!(ctx, "dc_imex_has_backup: {err:#}");
-                ptr::null_mut()
-            }
-        }
-    })
+    match block_on(imex::has_backup(ctx, to_string_lossy(dir).as_ref()))
+        .context("dc_imex_has_backup")
+        .log_err(ctx)
+    {
+        Ok(res) => res.strdup(),
+        Err(_) => ptr::null_mut(),
+    }
 }
 
 #[no_mangle]
@@ -2377,15 +2395,13 @@ pub unsafe extern "C" fn dc_initiate_key_transfer(context: *mut dc_context_t) ->
     }
     let ctx = &*context;
 
-    block_on(async move {
-        match imex::initiate_key_transfer(ctx).await {
-            Ok(res) => res.strdup(),
-            Err(err) => {
-                error!(ctx, "dc_initiate_key_transfer(): {err:#}");
-                ptr::null_mut()
-            }
-        }
-    })
+    match block_on(imex::initiate_key_transfer(ctx))
+        .context("dc_initiate_key_transfer()")
+        .log_err(ctx)
+    {
+        Ok(res) => res.strdup(),
+        Err(_) => ptr::null_mut(),
+    }
 }
 
 #[no_mangle]
@@ -2400,17 +2416,14 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        match imex::continue_key_transfer(ctx, MsgId::new(msg_id), &to_string_lossy(setup_code))
-            .await
-        {
-            Ok(()) => 1,
-            Err(err) => {
-                warn!(ctx, "dc_continue_key_transfer: {err:#}");
-                0
-            }
-        }
-    })
+    block_on(imex::continue_key_transfer(
+        ctx,
+        MsgId::new(msg_id),
+        &to_string_lossy(setup_code),
+    ))
+    .context("dc_continue_key_transfer")
+    .log_err(ctx)
+    .is_ok() as libc::c_int
 }
 
 #[no_mangle]
@@ -2854,12 +2867,14 @@ 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) {
+    match ffi_list
+        .list
+        .get_chat_id(index)
+        .context("get_chat_id failed")
+        .log_err(ctx)
+    {
         Ok(chat_id) => chat_id.to_u32(),
-        Err(err) => {
-            warn!(ctx, "get_chat_id failed: {err:#}");
-            0
-        }
+        Err(_) => 0,
     }
 }
 
@@ -2874,12 +2889,14 @@ 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) {
+    match ffi_list
+        .list
+        .get_msg_id(index)
+        .context("get_msg_id failed")
+        .log_err(ctx)
+    {
         Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
-        Err(err) => {
-            warn!(ctx, "get_msg_id failed: {err:#}");
-            0
-        }
+        Err(_) => 0,
     }
 }
 
@@ -2964,7 +2981,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ChatWrapper {
-    context: *const dc_context_t,
+    context: Context,
     chat: chat::Chat,
 }
 
@@ -3031,16 +3048,18 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
         return ptr::null_mut(); // NULL explicitly defined as "no image"
     }
     let ffi_chat = &*chat;
-    let ctx = &*ffi_chat.context;
 
     block_on(async move {
-        match ffi_chat.chat.get_profile_image(ctx).await {
-            Ok(Some(p)) => p.to_string_lossy().strdup(),
-            Ok(None) => ptr::null_mut(),
-            Err(err) => {
-                error!(ctx, "failed to get profile image: {err:#}");
-                ptr::null_mut()
-            }
+        match ffi_chat
+            .chat
+            .get_profile_image(&ffi_chat.context)
+            .await
+            .context("Failed to get profile image")
+            .log_err(&ffi_chat.context)
+            .unwrap_or_default()
+        {
+            Some(p) => p.to_string_lossy().strdup(),
+            None => ptr::null_mut(),
         }
     })
 }
@@ -3052,9 +3071,9 @@ pub unsafe extern "C" fn dc_chat_get_color(chat: *mut dc_chat_t) -> u32 {
         return 0;
     }
     let ffi_chat = &*chat;
-    let ctx = &*ffi_chat.context;
 
-    block_on(ffi_chat.chat.get_color(ctx)).unwrap_or_log_default(ctx, "Failed get_color")
+    block_on(ffi_chat.chat.get_color(&ffi_chat.context))
+        .unwrap_or_log_default(&ffi_chat.context, "Failed get_color")
 }
 
 #[no_mangle]
@@ -3118,10 +3137,9 @@ pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
         return 0;
     }
     let ffi_chat = &*chat;
-    let ctx = &*ffi_chat.context;
-    block_on(ffi_chat.chat.can_send(ctx))
+    block_on(ffi_chat.chat.can_send(&ffi_chat.context))
         .context("can_send failed")
-        .log_err(ctx)
+        .log_err(&ffi_chat.context)
         .unwrap_or_default() as libc::c_int
 }
 
@@ -3198,22 +3216,20 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
     let ctx = &*context;
 
     block_on(async move {
-        let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
-            Ok(chat) => chat,
-            Err(err) => {
-                error!(ctx, "dc_get_chat_info_json() failed to load chat: {err:#}");
-                return "".strdup();
-            }
+        let Ok(chat) = chat::Chat::load_from_db(ctx, ChatId::new(chat_id))
+            .await
+            .context("dc_get_chat_info_json() failed to load chat")
+            .log_err(ctx)
+        else {
+            return "".strdup();
         };
-        let info = match chat.get_info(ctx).await {
-            Ok(info) => info,
-            Err(err) => {
-                error!(
-                    ctx,
-                    "dc_get_chat_info_json() failed to get chat info: {err:#}"
-                );
-                return "".strdup();
-            }
+        let Ok(info) = chat
+            .get_info(ctx)
+            .await
+            .context("dc_get_chat_info_json() failed to get chat info")
+            .log_err(ctx)
+        else {
+            return "".strdup();
         };
         serde_json::to_string(&info)
             .unwrap_or_log_default(ctx, "dc_get_chat_info_json() failed to serialise to json")
@@ -3473,18 +3489,15 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc
     let ffi_msg = &*msg;
     let ctx = &*ffi_msg.context;
 
-    block_on(async move {
-        let info = match ffi_msg.message.get_webxdc_info(ctx).await {
-            Ok(info) => info,
-            Err(err) => {
-                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {err:#}");
-                return "".strdup();
-            }
-        };
-        serde_json::to_string(&info)
-            .unwrap_or_log_default(ctx, "dc_msg_get_webxdc_info() failed to serialise to json")
-            .strdup()
-    })
+    let Ok(info) = block_on(ffi_msg.message.get_webxdc_info(ctx))
+        .context("dc_msg_get_webxdc_info() failed to get info")
+        .log_err(ctx)
+    else {
+        return "".strdup();
+    };
+    serde_json::to_string(&info)
+        .unwrap_or_log_default(ctx, "dc_msg_get_webxdc_info() failed to serialise to json")
+        .strdup()
 }
 
 #[no_mangle]
@@ -3683,6 +3696,16 @@ pub unsafe extern "C" fn dc_msg_is_forwarded(msg: *mut dc_msg_t) -> libc::c_int
     ffi_msg.message.is_forwarded().into()
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_msg_is_edited(msg: *mut dc_msg_t) -> libc::c_int {
+    if msg.is_null() {
+        eprintln!("ignoring careless call to dc_msg_is_edited()");
+        return 0;
+    }
+    let ffi_msg = &*msg;
+    ffi_msg.message.is_edited().into()
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_is_info(msg: *mut dc_msg_t) -> libc::c_int {
     if msg.is_null() {
@@ -3703,6 +3726,20 @@ pub unsafe extern "C" fn dc_msg_get_info_type(msg: *mut dc_msg_t) -> libc::c_int
     ffi_msg.message.get_info_type() as libc::c_int
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_msg_get_info_contact_id(msg: *mut dc_msg_t) -> u32 {
+    if msg.is_null() {
+        eprintln!("ignoring careless call to dc_msg_get_info_contact_id()");
+        return 0;
+    }
+    let ffi_msg = &*msg;
+    let context = &*ffi_msg.context;
+    block_on(ffi_msg.message.get_info_contact_id(context))
+        .unwrap_or_default()
+        .map(|id| id.to_u32())
+        .unwrap_or_default()
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_get_webxdc_href(msg: *mut dc_msg_t) -> *mut libc::c_char {
     if msg.is_null() {
@@ -3818,23 +3855,6 @@ pub unsafe extern "C" fn dc_msg_set_override_sender_name(
         .set_override_sender_name(to_opt_string_lossy(name))
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_set_file(
-    msg: *mut dc_msg_t,
-    file: *const libc::c_char,
-    filemime: *const libc::c_char,
-) {
-    if msg.is_null() || file.is_null() {
-        eprintln!("ignoring careless call to dc_msg_set_file()");
-        return;
-    }
-    let ffi_msg = &mut *msg;
-    ffi_msg.message.set_file(
-        to_string_lossy(file),
-        to_opt_string_lossy(filemime).as_deref(),
-    )
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_set_file_and_deduplicate(
     msg: *mut dc_msg_t,
@@ -4507,13 +4527,10 @@ trait ResultExt<T, E> {
 
 impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
     fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T {
-        match self {
-            Ok(t) => t,
-            Err(err) => {
-                error!(context, "{message}: {err:#}");
-                Default::default()
-            }
-        }
+        self.map_err(|err| anyhow::anyhow!("{err:#}"))
+            .with_context(|| message.to_string())
+            .log_err(context)
+            .unwrap_or_default()
     }
 }
 

deltachat-ffi/src/lot.rs

@@ -34,7 +34,7 @@ pub enum Meaning {
 }
 
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<str>> {
+    pub fn get_text1(&self) -> Option<Cow<'_, str>> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
@@ -50,6 +50,7 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
                 Qr::Account { domain } => Some(Cow::Borrowed(domain)),
                 Qr::Backup2 { .. } => None,
+                Qr::BackupTooNew { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
                 Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
                 Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
@@ -65,7 +66,7 @@ impl Lot {
         }
     }
 
-    pub fn get_text2(&self) -> Option<Cow<str>> {
+    pub fn get_text2(&self) -> Option<Cow<'_, str>> {
         match self {
             Self::Summary(summary) => Some(summary.truncated_text(160)),
             Self::Qr(_) => None,
@@ -103,6 +104,7 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
                 Qr::Backup2 { .. } => LotState::QrBackup2,
+                Qr::BackupTooNew { .. } => LotState::QrBackupTooNew,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
@@ -129,6 +131,7 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::Backup2 { .. } => Default::default(),
+                Qr::BackupTooNew { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
                 Qr::Proxy { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
@@ -178,10 +181,10 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    QrBackup = 251,
-
     QrBackup2 = 252,
 
+    QrBackupTooNew = 255,
+
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,28 +1,19 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.155.3"
+version = "1.160.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
-default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
-repository = "https://github.com/deltachat/deltachat-core-rust"
-
-[[bin]]
-name = "deltachat-jsonrpc-server"
-path = "src/webserver.rs"
-required-features = ["webserver"]
+repository = "https://github.com/chatmail/core"
 
 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true }
 deltachat-contact-tools = { workspace = true }
 num-traits = { workspace = true }
-schemars = "0.8.21"
+schemars = "0.8.22"
 serde = { workspace = true, features = ["derive"] }
-tempfile = { workspace = true }
-log = { workspace = true }
 async-channel = { workspace = true }
-futures = { workspace = true }
 serde_json = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.13", features = ["json_value"] }
@@ -31,15 +22,12 @@ sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
 base64 = { workspace = true }
 
-# optional dependencies
-axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.6", optional = true }
-
 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
+tempfile = { workspace = true }
+futures = { workspace = true }
 
 
 [features]
 default = ["vendored"]
-webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]

deltachat-jsonrpc/README.md

@@ -4,46 +4,16 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte
 
 The JSON-RPC API is exposed in two fashions:
 
-* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
 
-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.
+We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.
 
 ## Usage
 
-#### Running the WebSocket server
-
-From within this folder, you can start the WebSocket server with the following command:
-
-```sh
-cargo run --features webserver
-```
-
-If you want to use the server in a production setup, first build it in release mode:
-
-```sh
-cargo build --features webserver --release
-```
-You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
-
-The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
-
-The server can be configured with environment variables:
-
-|variable|default|description|
-|-|-|-|
-|`DC_PORT`|`20808`|port to listen on|
-|`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
-
-If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
-
-```sh
-cross build --features=webserver --target armv7-linux-androideabi --release
-```
-
 #### Using the TypeScript/JavaScript client
 
-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 
 
 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
 ```sh
@@ -52,15 +22,7 @@ npm install
 npm run build
 ```
 
-The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
-
-
-```typescript
-import { DeltaChat } from './deltachat.bundle.js'
-const dc = new DeltaChat('ws://localhost:20808/ws')
-const accounts = await dc.rpc.getAllAccounts()
-console.log('accounts', accounts)
-```
+The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
 
 A script is included to build autogenerated documentation, which includes all RPC methods:
 ```sh
@@ -73,18 +35,6 @@ Then open the [`typescript/docs`](typescript/docs) folder in a web browser.
 
 #### Running the example app
 
-We include a small demo web application that talks to the WebSocket server. It can be used for testing. Feel invited to expand this.
-
-```sh
-cd typescript
-npm run build
-npm run example:build
-npm run example:start
-```
-Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
-
-Run `npm run example:dev` to live-rebuild the example app when files changes.
-
 ### Testing
 
 The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
@@ -104,14 +54,12 @@ cd typescript
 npm run test
 ```
 
-This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite.
 
-The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
-
-Then, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
+The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
 
 ```
-CHATMAIL_DOMAIN=chat.example.org npm run test
+CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
 ```
 
 #### Test Coverage

deltachat-jsonrpc/TODO.md

@@ -1,28 +0,0 @@
-# TODO
-
-- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
-
-## MVP - Websocket server&client
-
-For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
-
-- [ ] coverage for a majority of the API
-- [ ] Blobs served
-- [ ] Blob upload (for attachments, setting profile-picture, importing backup and so on)
-- [ ] other way blobs can be addressed when using websocket vs. jsonrpc over dc-node
-- [ ] Web push API? At least some kind of notification hook closure this lib can accept.
-
-### Other Ideas for the Websocket server
-
-- [ ] make sure there can only be one connection at a time to the ws
-  - why? , it could give problems if its commanded from multiple connections
-- [ ] encrypted connection?
-- [ ] authenticated connection?
-- [ ] Look into unit-testing for the proc macros?
-- [ ] proc macro taking over doc comments to generated typescript file
-
-## Desktop Apis
-
-Incomplete todo for desktop api porting, just some remainders for points that might need more work:
-
-- [ ] manual start/stop io functions in the api for context and accounts, so "not syncing all accounts" can still be done in desktop -> webserver should then not do start io on all accounts by default

deltachat-jsonrpc/src/api.rs

@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::str;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,6 +7,7 @@ use std::{collections::HashMap, str::FromStr};
 
 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
+use deltachat::blob::BlobObject;
 use deltachat::chat::{
     self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
     marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
@@ -18,10 +19,11 @@ use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
+use deltachat::imex;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
     leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -34,10 +36,10 @@ use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
-use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
+use types::login_param::EnteredLoginParam;
 use walkdir::WalkDir;
 use yerpc::rpc;
 
@@ -225,8 +227,9 @@ impl CommandApi {
     /// Get a list of all configured accounts.
     async fn get_all_accounts(&self) -> Result<Vec<Account>> {
         let mut accounts = Vec::new();
-        for id in self.accounts.read().await.get_all() {
-            let context_option = self.accounts.read().await.get_account(id);
+        let accounts_lock = self.accounts.read().await;
+        for id in accounts_lock.get_all() {
+            let context_option = accounts_lock.get_account(id);
             if let Some(ctx) = context_option {
                 accounts.push(Account::from_context(&ctx, id).await?)
             }
@@ -324,8 +327,12 @@ impl CommandApi {
             .get_config_bool(deltachat::config::Config::ProxyEnabled)
             .await?;
 
-        let provider_info =
-            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), proxy_enabled).await;
+        let provider_info = get_provider_info(
+            &ctx,
+            email.split('@').next_back().unwrap_or(""),
+            proxy_enabled,
+        )
+        .await;
         Ok(ProviderInfo::from_dc_type(provider_info))
     }
 
@@ -341,11 +348,19 @@ impl CommandApi {
         ctx.get_info().await
     }
 
+    /// Get the blob dir.
     async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
     }
 
+    /// Copy file to blob dir.
+    async fn copy_to_blob_dir(&self, account_id: u32, path: String) -> Result<PathBuf> {
+        let ctx = self.get_context(account_id).await?;
+        let file = Path::new(&path);
+        Ok(BlobObject::create_and_deduplicate(&ctx, file, file)?.to_abs_path())
+    }
+
     async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.draft_self_report().await?.to_u32())
@@ -422,6 +437,9 @@ impl CommandApi {
 
     /// Configures this account with the currently set parameters.
     /// Setup the credential config before calling this.
+    ///
+    /// Deprecated as of 2025-02; use `add_transport_from_qr()`
+    /// or `add_or_update_transport()` instead.
     async fn configure(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         ctx.stop_io().await;
@@ -436,6 +454,78 @@ impl CommandApi {
         Ok(())
     }
 
+    /// Configures a new email account using the provided parameters
+    /// and adds it as a transport.
+    ///
+    /// If the email address is the same as an existing transport,
+    /// then this existing account will be reconfigured instead of a new one being added.
+    ///
+    /// This function stops and starts IO as needed.
+    ///
+    /// Usually it will be enough to only set `addr` and `password`,
+    /// and all the other settings will be autoconfigured.
+    ///
+    /// During configuration, ConfigureProgress events are emitted;
+    /// they indicate a successful configuration as well as errors
+    /// and may be used to create a progress bar.
+    /// This function will return after configuration is finished.
+    ///
+    /// If configuration is successful,
+    /// the working server parameters will be saved
+    /// and used for connecting to the server.
+    /// The parameters entered by the user will be saved separately
+    /// so that they can be prefilled when the user opens the server-configuration screen again.
+    ///
+    /// See also:
+    /// - [Self::is_configured()] to check whether there is
+    ///   at least one working transport.
+    /// - [Self::add_transport_from_qr()] to add a transport
+    ///   from a server encoded in a QR code.
+    /// - [Self::list_transports()] to get a list of all configured transports.
+    /// - [Self::delete_transport()] to remove a transport.
+    async fn add_or_update_transport(
+        &self,
+        account_id: u32,
+        param: EnteredLoginParam,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        ctx.add_or_update_transport(&mut param.try_into()?).await
+    }
+
+    /// Deprecated 2025-04. Alias for [Self::add_or_update_transport()].
+    async fn add_transport(&self, account_id: u32, param: EnteredLoginParam) -> Result<()> {
+        self.add_or_update_transport(account_id, param).await
+    }
+
+    /// Adds a new email account as a transport
+    /// using the server encoded in the QR code.
+    /// See [Self::add_or_update_transport].
+    async fn add_transport_from_qr(&self, account_id: u32, qr: String) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        ctx.add_transport_from_qr(&qr).await
+    }
+
+    /// Returns the list of all email accounts that are used as a transport in the current profile.
+    /// Use [Self::add_or_update_transport()] to add or change a transport
+    /// and [Self::delete_transport()] to delete a transport.
+    async fn list_transports(&self, account_id: u32) -> Result<Vec<EnteredLoginParam>> {
+        let ctx = self.get_context(account_id).await?;
+        let res = ctx
+            .list_transports()
+            .await?
+            .into_iter()
+            .map(|t| t.into())
+            .collect();
+        Ok(res)
+    }
+
+    /// Removes the transport with the specified email address
+    /// (i.e. [EnteredLoginParam::addr]).
+    async fn delete_transport(&self, account_id: u32, addr: String) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        ctx.delete_transport(&addr).await
+    }
+
     /// Signal an ongoing process to stop.
     async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
@@ -1205,7 +1295,15 @@ impl CommandApi {
     async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs(&ctx, &msgs).await
+        delete_msgs_ex(&ctx, &msgs, false).await
+    }
+
+    /// Delete messages. The messages are deleted on the current device,
+    /// on the IMAP server and also for all chat members
+    async fn delete_messages_for_all(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
+        delete_msgs_ex(&ctx, &msgs, true).await
     }
 
     /// Get an informational text for a single message. The text is multiline and may
@@ -1305,6 +1403,12 @@ impl CommandApi {
         Ok(results)
     }
 
+    async fn save_msgs(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let message_ids: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
+        chat::save_msgs(&ctx, &message_ids).await
+    }
+
     // ---------------------------------------------
     //  contact
     // ---------------------------------------------
@@ -1447,6 +1551,7 @@ impl CommandApi {
         Ok(())
     }
 
+    /// Sets display name for existing contact.
     async fn change_contact_name(
         &self,
         account_id: u32,
@@ -1455,9 +1560,7 @@ impl CommandApi {
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let contact_id = ContactId::new(contact_id);
-        let contact = Contact::get_by_id(&ctx, contact_id).await?;
-        let addr = contact.get_addr();
-        Contact::create(&ctx, &name, addr).await?;
+        contact_id.set_name(&ctx, &name).await?;
         Ok(())
     }
 
@@ -1512,6 +1615,18 @@ impl CommandApi {
             .collect())
     }
 
+    /// Imports contacts from a vCard.
+    ///
+    /// Returns the ids of created/modified contacts in the order they appear in the vCard.
+    async fn import_vcard_contents(&self, account_id: u32, vcard: String) -> Result<Vec<u32>> {
+        let ctx = self.get_context(account_id).await?;
+        Ok(deltachat::contact::import_vcard(&ctx, &vcard)
+            .await?
+            .into_iter()
+            .map(|c| c.to_u32())
+            .collect())
+    }
+
     /// Returns a vCard containing contacts with the given ids.
     async fn make_vcard(&self, account_id: u32, contacts: Vec<u32>) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
@@ -1804,12 +1919,10 @@ impl CommandApi {
         instance_msg_id: u32,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        let fut = send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?;
-        if let Some(fut) = fut {
-            tokio::spawn(async move {
-                fut.await.ok();
-                info!(ctx, "send_webxdc_realtime_advertisement done")
-            });
+        if let Some(fut) =
+            send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?
+        {
+            tokio::spawn(fut);
         }
         Ok(())
     }
@@ -1845,13 +1958,9 @@ impl CommandApi {
 
     /// Get href from a WebxdcInfoMessage which might include a hash holding
     /// information about a specific position or state in a webxdc app (optional)
-    async fn get_webxdc_href(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-    ) -> Result<Option<String>> {
+    async fn get_webxdc_href(&self, account_id: u32, info_msg_id: u32) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
+        let message = Message::load_from_db(&ctx, MsgId::new(info_msg_id)).await?;
         Ok(message.get_webxdc_href())
     }
 
@@ -1944,7 +2053,7 @@ impl CommandApi {
         let ctx = self.get_context(account_id).await?;
 
         let mut msg = Message::new(Viewtype::Sticker);
-        msg.set_file(&sticker_path, None);
+        msg.set_file_and_deduplicate(&ctx, Path::new(&sticker_path), None, None)?;
 
         // JSON-rpc does not need heuristics to turn [Viewtype::Sticker] into [Viewtype::Image]
         msg.force_sticker();
@@ -1998,6 +2107,16 @@ impl CommandApi {
         Ok(msg_id)
     }
 
+    async fn send_edit_request(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        new_text: String,
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        chat::send_edit_request(&ctx, MsgId::new(msg_id), new_text).await
+    }
+
     /// Checks if messages can be sent to a given chat.
     async fn can_send(&self, account_id: u32, chat_id: u32) -> Result<bool> {
         let ctx = self.get_context(account_id).await?;
@@ -2164,12 +2283,45 @@ impl CommandApi {
 
     // mimics the old desktop call, will get replaced with something better in the composer rewrite,
     // the better version will just be sending the current draft, though there will be probably something similar with more options to this for the corner cases like setting a marker on the map
+    /// Send a message to a chat.
+    ///
+    /// This function returns after the message has been placed in the sending queue.
+    /// This does not imply that the message was really sent out yet.
+    /// However, from your view, you're done with the message.
+    /// Sooner or later it will find its way.
+    ///
+    /// **Attaching files:**
+    ///
+    /// Pass the file path in the `file` parameter.
+    /// If `file` is not in the blob directory yet,
+    /// it will be copied into the blob directory.
+    /// If you want, you can delete the file immediately after this function returns.
+    ///
+    /// You can also write the attachment directly into the blob directory
+    /// and then pass the path as the `file` parameter;
+    /// this will prevent an unnecessary copying of the file.
+    ///
+    /// In `filename`, you can pass the original name of the file,
+    /// which will then be shown in the UI.
+    /// in this case the current name of `file` on the filesystem will be ignored.
+    ///
+    /// In order to deduplicate files that contain the same data,
+    /// the file will be named `<hash>.<extension>`, e.g. `ce940175885d7b78f7b7e9f1396611f.jpg`.
+    ///
+    /// NOTE:
+    /// - This function will rename the file. To get the new file path, call `get_file()`.
+    /// - The file must not be modified after this function was called.
+    /// - Images etc. will NOT be recoded.
+    ///   In order to recode images,
+    ///   use `misc_set_draft` and pass `Image` as the viewtype.
+    #[expect(clippy::too_many_arguments)]
     async fn misc_send_msg(
         &self,
         account_id: u32,
         chat_id: u32,
         text: Option<String>,
         file: Option<String>,
+        filename: Option<String>,
         location: Option<(f64, f64)>,
         quoted_message_id: Option<u32>,
     ) -> Result<(u32, MessageObject)> {
@@ -2181,7 +2333,7 @@ impl CommandApi {
         });
         message.set_text(text.unwrap_or_default());
         if let Some(file) = file {
-            message.set_file(file, None);
+            message.set_file_and_deduplicate(&ctx, Path::new(&file), filename.as_deref(), None)?;
         }
         if let Some((latitude, longitude)) = location {
             message.set_location(latitude, longitude);
@@ -2209,12 +2361,14 @@ impl CommandApi {
     // the better version should support:
     // - changing viewtype to enable/disable compression
     // - keeping same message id as long as attachment does not change for webxdc messages
+    #[expect(clippy::too_many_arguments)]
     async fn misc_set_draft(
         &self,
         account_id: u32,
         chat_id: u32,
         text: Option<String>,
         file: Option<String>,
+        filename: Option<String>,
         quoted_message_id: Option<u32>,
         view_type: Option<MessageViewtype>,
     ) -> Result<()> {
@@ -2231,7 +2385,7 @@ impl CommandApi {
         ));
         draft.set_text(text.unwrap_or_default());
         if let Some(file) = file {
-            draft.set_file(file, None);
+            draft.set_file_and_deduplicate(&ctx, Path::new(&file), filename.as_deref(), None)?;
         }
         if let Some(id) = quoted_message_id {
             draft

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

@@ -84,45 +84,78 @@ pub enum EventType {
     /// - 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 },
+    MsgsChanged {
+        /// Set if only a single chat is affected by the changes, otherwise 0.
+        chat_id: u32,
+
+        /// Set if only a single message is affected by the changes, otherwise 0.
+        msg_id: u32,
+    },
 
     /// Reactions for the message changed.
     #[serde(rename_all = "camelCase")]
     ReactionsChanged {
+        /// ID of the chat which the message belongs to.
         chat_id: u32,
+
+        /// ID of the message for which reactions were changed.
         msg_id: u32,
+
+        /// ID of the contact whose reaction set is changed.
         contact_id: u32,
     },
 
-    /// Incoming reaction, should be notified.
+    /// A reaction to one's own sent message received.
+    /// Typically, the UI will show a notification for that.
+    ///
+    /// In addition to this event, ReactionsChanged is emitted.
     #[serde(rename_all = "camelCase")]
     IncomingReaction {
+        /// ID of the chat which the message belongs to.
         chat_id: u32,
+
+        /// ID of the contact whose reaction set is changed.
         contact_id: u32,
+
+        /// ID of the message for which reactions were changed.
         msg_id: u32,
+
+        /// The reaction.
         reaction: String,
     },
 
     /// Incoming webxdc info or summary update, should be notified.
     #[serde(rename_all = "camelCase")]
     IncomingWebxdcNotify {
+        /// ID of the chat.
         chat_id: u32,
+
+        /// ID of the contact sending.
         contact_id: u32,
+
+        /// ID of the added info message or webxdc instance in case of summary change.
         msg_id: u32,
+
+        /// Text to notify.
         text: String,
+
+        /// Link assigned to this notification, if any.
         href: Option<String>,
     },
 
-    /// There is a fresh message. Typically, the user will show an notification
+    /// There is a fresh message. Typically, the user will show a notification
     /// when receiving this message.
     ///
     /// There is no extra #DC_EVENT_MSGS_CHANGED event sent together with this event.
     #[serde(rename_all = "camelCase")]
-    IncomingMsg { chat_id: u32, msg_id: u32 },
+    IncomingMsg {
+        /// ID of the chat where the message is assigned.
+        chat_id: u32,
+
+        /// ID of the message.
+        msg_id: u32,
+    },
 
     /// Downloading a bunch of messages just finished. This is an
     /// event to allow the UI to only show one notification per message bunch,
@@ -138,21 +171,57 @@ pub enum EventType {
     /// 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 },
+    MsgDelivered {
+        /// ID of the chat which the message belongs to.
+        chat_id: u32,
+
+        /// ID of the message that was successfully sent.
+        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 },
+    MsgFailed {
+        /// ID of the chat which the message belongs to.
+        chat_id: u32,
+
+        /// ID of the message that could not be sent.
+        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 },
+    MsgRead {
+        /// ID of the chat which the message belongs to.
+        chat_id: u32,
 
-    /// A single message is deleted.
+        /// ID of the message that was read.
+        msg_id: u32,
+    },
+
+    /// A single message was deleted.
+    ///
+    /// This event means that the message will no longer appear in the messagelist.
+    /// UI should remove the message from the messagelist
+    /// in response to this event if the message is currently displayed.
+    ///
+    /// The message may have been explicitly deleted by the user or expired.
+    /// Internally the message may have been removed from the database,
+    /// moved to the trash chat or hidden.
+    ///
+    /// This event does not indicate the message
+    /// deletion from the server.
     #[serde(rename_all = "camelCase")]
-    MsgDeleted { chat_id: u32, msg_id: u32 },
+    MsgDeleted {
+        /// ID of the chat where the message was prior to deletion.
+        /// Never 0.
+        chat_id: u32,
+
+        /// ID of the deleted message. Never 0.
+        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.
@@ -166,21 +235,35 @@ pub enum EventType {
 
     /// Chat ephemeral timer changed.
     #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified { chat_id: u32, timer: u32 },
+    ChatEphemeralTimerModified {
+        /// Chat ID.
+        chat_id: u32,
+
+        /// New ephemeral timer value.
+        timer: u32,
+    },
+
+    /// Chat deleted.
+    ChatDeleted {
+        /// Chat ID.
+        chat_id: 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> },
+    ContactsChanged {
+        /// If set, this is the contact_id of an added contact that should be selected.
+        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> },
+    LocationChanged {
+        /// 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`.
+        contact_id: Option<u32>,
+    },
 
     /// Inform about the configuration progress started by configure().
     ConfigureProgress {
@@ -195,10 +278,11 @@ pub enum EventType {
 
     /// 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 },
+    ImexProgress {
+        /// 0=error, 1-999=progress in permille, 1000=success and done
+        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().
@@ -215,26 +299,34 @@ pub enum EventType {
     ///
     /// 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 },
+    SecurejoinInviterProgress {
+        /// ID of the contact that wants to join.
+        contact_id: u32,
+
+        /// 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=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
+        /// 1000=Protocol finished for this contact.
+        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 },
+    SecurejoinJoinerProgress {
+        /// ID of the inviting contact.
+        contact_id: u32,
+
+        /// 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)
+        /// 1000=vg-member-added/vc-contact-confirm received
+        progress: usize,
+    },
 
     /// The connectivity to the server changed.
     /// This means that you should refresh the connectivity view
@@ -255,22 +347,37 @@ pub enum EventType {
 
     #[serde(rename_all = "camelCase")]
     WebxdcStatusUpdate {
+        /// Message ID.
         msg_id: u32,
+
+        /// Status update ID.
         status_update_serial: u32,
     },
 
     /// Data received over an ephemeral peer channel.
     #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeData { msg_id: u32, data: Vec<u8> },
+    WebxdcRealtimeData {
+        /// Message ID.
+        msg_id: u32,
+
+        /// Realtime data.
+        data: Vec<u8>,
+    },
 
     /// Advertisement received over an ephemeral peer channel.
     /// This can be used by bots to initiate peer-to-peer communication from their side.
     #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeAdvertisementReceived { msg_id: u32 },
+    WebxdcRealtimeAdvertisementReceived {
+        /// Message ID of the webxdc instance.
+        msg_id: u32,
+    },
 
     /// Inform that a message containing a webxdc instance has been deleted
     #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted { msg_id: u32 },
+    WebxdcInstanceDeleted {
+        /// ID of the deleted message.
+        msg_id: u32,
+    },
 
     /// Tells that the Background fetch was completed (or timed out).
     /// This event acts as a marker, when you reach this event you can be sure
@@ -286,7 +393,10 @@ pub enum EventType {
     /// Inform that a single chat list item changed and needs to be rerendered.
     /// If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache.
     #[serde(rename_all = "camelCase")]
-    ChatlistItemChanged { chat_id: Option<u32> },
+    ChatlistItemChanged {
+        /// ID of the changed chat
+        chat_id: Option<u32>,
+    },
 
     /// Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
     ///
@@ -303,7 +413,10 @@ pub enum EventType {
     AccountsItemChanged,
 
     /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow { n: u64 },
+    EventChannelOverflow {
+        /// Number of events skipped.
+        n: u64,
+    },
 }
 
 impl From<CoreEventType> for EventType {
@@ -392,6 +505,9 @@ impl From<CoreEventType> for EventType {
                     timer: timer.to_u32(),
                 }
             }
+            CoreEventType::ChatDeleted { chat_id } => ChatDeleted {
+                chat_id: chat_id.to_u32(),
+            },
             CoreEventType::ContactsChanged(contact) => ContactsChanged {
                 contact_id: contact.map(|c| c.to_u32()),
             },

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

@@ -0,0 +1,203 @@
+use anyhow::Result;
+use deltachat::login_param as dc;
+use serde::Deserialize;
+use serde::Serialize;
+use yerpc::TypeDef;
+
+/// Login parameters entered by the user.
+///
+/// Usually it will be enough to only set `addr` and `password`,
+/// and all the other settings will be autoconfigured.
+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct EnteredLoginParam {
+    /// Email address.
+    pub addr: String,
+
+    /// Password.
+    pub password: String,
+
+    /// Imap server hostname or IP address.
+    pub imap_server: Option<String>,
+
+    /// Imap server port.
+    pub imap_port: Option<u16>,
+
+    /// Imap socket security.
+    pub imap_security: Option<Socket>,
+
+    /// Imap username.
+    pub imap_user: Option<String>,
+
+    /// SMTP server hostname or IP address.
+    pub smtp_server: Option<String>,
+
+    /// SMTP server port.
+    pub smtp_port: Option<u16>,
+
+    /// SMTP socket security.
+    pub smtp_security: Option<Socket>,
+
+    /// SMTP username.
+    pub smtp_user: Option<String>,
+
+    /// SMTP Password.
+    ///
+    /// Only needs to be specified if different than IMAP password.
+    pub smtp_password: Option<String>,
+
+    /// TLS options: whether to allow invalid certificates and/or
+    /// invalid hostnames.
+    /// Default: Automatic
+    pub certificate_checks: Option<EnteredCertificateChecks>,
+
+    /// If true, login via OAUTH2 (not recommended anymore).
+    /// Default: false
+    pub oauth2: Option<bool>,
+}
+
+impl From<dc::EnteredLoginParam> for EnteredLoginParam {
+    fn from(param: dc::EnteredLoginParam) -> Self {
+        let imap_security: Socket = param.imap.security.into();
+        let smtp_security: Socket = param.smtp.security.into();
+        let certificate_checks: EnteredCertificateChecks = param.certificate_checks.into();
+        Self {
+            addr: param.addr,
+            password: param.imap.password,
+            imap_server: param.imap.server.into_option(),
+            imap_port: param.imap.port.into_option(),
+            imap_security: imap_security.into_option(),
+            imap_user: param.imap.user.into_option(),
+            smtp_server: param.smtp.server.into_option(),
+            smtp_port: param.smtp.port.into_option(),
+            smtp_security: smtp_security.into_option(),
+            smtp_user: param.smtp.user.into_option(),
+            smtp_password: param.smtp.password.into_option(),
+            certificate_checks: certificate_checks.into_option(),
+            oauth2: param.oauth2.into_option(),
+        }
+    }
+}
+
+impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
+    type Error = anyhow::Error;
+
+    fn try_from(param: EnteredLoginParam) -> Result<Self> {
+        Ok(Self {
+            addr: param.addr,
+            imap: dc::EnteredServerLoginParam {
+                server: param.imap_server.unwrap_or_default(),
+                port: param.imap_port.unwrap_or_default(),
+                security: param.imap_security.unwrap_or_default().into(),
+                user: param.imap_user.unwrap_or_default(),
+                password: param.password,
+            },
+            smtp: dc::EnteredServerLoginParam {
+                server: param.smtp_server.unwrap_or_default(),
+                port: param.smtp_port.unwrap_or_default(),
+                security: param.smtp_security.unwrap_or_default().into(),
+                user: param.smtp_user.unwrap_or_default(),
+                password: param.smtp_password.unwrap_or_default(),
+            },
+            certificate_checks: param.certificate_checks.unwrap_or_default().into(),
+            oauth2: param.oauth2.unwrap_or_default(),
+        })
+    }
+}
+
+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub enum Socket {
+    /// Unspecified socket security, select automatically.
+    #[default]
+    Automatic,
+
+    /// TLS connection.
+    Ssl,
+
+    /// STARTTLS connection.
+    Starttls,
+
+    /// No TLS, plaintext connection.
+    Plain,
+}
+
+impl From<dc::Socket> for Socket {
+    fn from(value: dc::Socket) -> Self {
+        match value {
+            dc::Socket::Automatic => Self::Automatic,
+            dc::Socket::Ssl => Self::Ssl,
+            dc::Socket::Starttls => Self::Starttls,
+            dc::Socket::Plain => Self::Plain,
+        }
+    }
+}
+
+impl From<Socket> for dc::Socket {
+    fn from(value: Socket) -> Self {
+        match value {
+            Socket::Automatic => Self::Automatic,
+            Socket::Ssl => Self::Ssl,
+            Socket::Starttls => Self::Starttls,
+            Socket::Plain => Self::Plain,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema, Default, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub enum EnteredCertificateChecks {
+    /// `Automatic` means that provider database setting should be taken.
+    /// If there is no provider database setting for certificate checks,
+    /// check certificates strictly.
+    #[default]
+    Automatic,
+
+    /// Ensure that TLS certificate is valid for the server hostname.
+    Strict,
+
+    /// Accept certificates that are expired, self-signed
+    /// or otherwise not valid for the server hostname.
+    AcceptInvalidCertificates,
+}
+
+impl From<dc::EnteredCertificateChecks> for EnteredCertificateChecks {
+    fn from(value: dc::EnteredCertificateChecks) -> Self {
+        match value {
+            dc::EnteredCertificateChecks::Automatic => Self::Automatic,
+            dc::EnteredCertificateChecks::Strict => Self::Strict,
+            dc::EnteredCertificateChecks::AcceptInvalidCertificates => {
+                Self::AcceptInvalidCertificates
+            }
+            dc::EnteredCertificateChecks::AcceptInvalidCertificates2 => {
+                Self::AcceptInvalidCertificates
+            }
+        }
+    }
+}
+
+impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
+    fn from(value: EnteredCertificateChecks) -> Self {
+        match value {
+            EnteredCertificateChecks::Automatic => Self::Automatic,
+            EnteredCertificateChecks::Strict => Self::Strict,
+            EnteredCertificateChecks::AcceptInvalidCertificates => Self::AcceptInvalidCertificates,
+        }
+    }
+}
+
+trait IntoOption<T> {
+    fn into_option(self) -> Option<T>;
+}
+impl<T> IntoOption<T> for T
+where
+    T: Default + std::cmp::PartialEq,
+{
+    fn into_option(self) -> Option<T> {
+        if self == T::default() {
+            None
+        } else {
+            Some(self)
+        }
+    }
+}

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

@@ -1,3 +1,5 @@
+use std::path::Path;
+
 use crate::api::VcardContact;
 use anyhow::{Context as _, Result};
 use deltachat::chat::Chat;
@@ -17,10 +19,10 @@ 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, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase", tag = "kind")]
+#[expect(clippy::large_enum_variant)]
 pub enum MessageLoadResult {
     Message(MessageObject),
     LoadingError { error: String },
@@ -37,6 +39,8 @@ pub struct MessageObject {
 
     text: String,
 
+    is_edited: bool,
+
     /// Check if a message has a POI location bound to it.
     /// These locations are also returned by `get_locations` method.
     /// The UI may decide to display a special icon beside such messages.
@@ -66,6 +70,9 @@ pub struct MessageObject {
     /// when is_info is true this describes what type of system message it is
     system_message_type: SystemMessageType,
 
+    /// if is_info is set, this refers to the contact profile that should be opened when the info message is tapped.
+    info_contact_id: Option<u32>,
+
     duration: i32,
     dimensions_height: i32,
     dimensions_width: i32,
@@ -83,12 +90,14 @@ pub struct MessageObject {
     file_bytes: u64,
     file_name: Option<String>,
 
-    webxdc_info: Option<WebxdcMessageInfo>,
-
     webxdc_href: Option<String>,
 
     download_state: DownloadState,
 
+    original_msg_id: Option<u32>,
+
+    saved_message_id: Option<u32>,
+
     reactions: Option<JSONRPCReactions>,
 
     vcard_contact: Option<VcardContact>,
@@ -104,6 +113,9 @@ enum MessageQuote {
     WithMessage {
         text: String,
         message_id: u32,
+        /// The quoted message does not always belong
+        /// to the same chat, e.g. when "Reply Privately" is used.
+        chat_id: u32,
         author_display_name: String,
         author_display_color: String,
         override_sender_name: Option<String>,
@@ -128,12 +140,6 @@ impl MessageObject {
         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 {
-            Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
-        } else {
-            None
-        };
-
         let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
 
         let download_state = message.download_state().into();
@@ -147,6 +153,7 @@ impl MessageObject {
                     Some(MessageQuote::WithMessage {
                         text: quoted_text,
                         message_id: quote.get_id().to_u32(),
+                        chat_id: quote.get_chat_id().to_u32(),
                         author_display_name: quote_author.get_display_name().to_owned(),
                         author_display_color: color_int_to_hex_string(quote_author.get_color()),
                         override_sender_name: quote.get_override_sender_name(),
@@ -194,6 +201,7 @@ impl MessageObject {
             quote,
             parent_id,
             text: message.get_text(),
+            is_edited: message.is_edited(),
             has_location: message.has_location(),
             has_html: message.has_html(),
             view_type: message.get_viewtype().into(),
@@ -215,6 +223,10 @@ impl MessageObject {
             is_forwarded: message.is_forwarded(),
             is_bot: message.is_bot(),
             system_message_type: message.get_info_type().into(),
+            info_contact_id: message
+                .get_info_contact_id(context)
+                .await?
+                .map(|id| id.to_u32()),
 
             duration: message.get_duration(),
             dimensions_height: message.get_height(),
@@ -241,7 +253,6 @@ impl MessageObject {
             file_mime: message.get_filemime(),
             file_bytes,
             file_name: message.get_filename(),
-            webxdc_info,
 
             // On a WebxdcInfoMessage this might include a hash holding
             // information about a specific position or state in a webxdc app
@@ -249,6 +260,16 @@ impl MessageObject {
 
             download_state,
 
+            original_msg_id: message
+                .get_original_msg_id(context)
+                .await?
+                .map(|id| id.to_u32()),
+
+            saved_message_id: message
+                .get_saved_msg_id(context)
+                .await?
+                .map(|id| id.to_u32()),
+
             reactions,
 
             vcard_contact: vcard_contacts.first().cloned(),
@@ -589,6 +610,7 @@ pub struct MessageData {
     pub html: Option<String>,
     pub viewtype: Option<MessageViewtype>,
     pub file: Option<String>,
+    pub filename: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
     /// Quoted message id. Takes preference over `quoted_text` (see below).
@@ -613,7 +635,12 @@ impl MessageData {
             message.set_override_sender_name(self.override_sender_name);
         }
         if let Some(file) = self.file {
-            message.set_file(file, None);
+            message.set_file_and_deduplicate(
+                context,
+                Path::new(&file),
+                self.filename.as_deref(),
+                None,
+            )?;
         }
         if let Some((latitude, longitude)) = self.location {
             message.set_location(latitude, longitude);
@@ -644,7 +671,6 @@ pub struct MessageReadReceipt {
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageInfo {
-    rawtext: String,
     ephemeral_timer: EphemeralTimer,
     /// When message is ephemeral this contains the timestamp of the message expiry
     ephemeral_timestamp: Option<i64>,
@@ -657,7 +683,6 @@ pub struct MessageInfo {
 impl MessageInfo {
     pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
         let message = Message::load_from_db(context, msg_id).await?;
-        let rawtext = msg_id.rawtext(context).await?;
         let ephemeral_timer = message.get_ephemeral_timer().into();
         let ephemeral_timestamp = match message.get_ephemeral_timer() {
             deltachat::ephemeral::Timer::Disabled => None,
@@ -670,7 +695,6 @@ impl MessageInfo {
         let hop_info = msg_id.hop_info(context).await?;
 
         Ok(Self {
-            rawtext,
             ephemeral_timer,
             ephemeral_timestamp,
             error: message.error(),

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

@@ -5,6 +5,7 @@ pub mod contact;
 pub mod events;
 pub mod http;
 pub mod location;
+pub mod login_param;
 pub mod message;
 pub mod provider_info;
 pub mod qr;

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

@@ -63,6 +63,7 @@ pub enum QrObject {
         /// Iroh node address.
         node_addr: String,
     },
+    BackupTooNew {},
     /// Ask the user if they want to use the given service for video chats.
     WebrtcInstance {
         domain: String,
@@ -100,11 +101,15 @@ pub enum QrObject {
     /// URL scanned.
     ///
     /// Ask the user if they want to open a browser or copy the URL to clipboard.
-    Url { url: String },
+    Url {
+        url: String,
+    },
     /// Text scanned.
     ///
     /// Ask the user if they want to copy the text to clipboard.
-    Text { text: String },
+    Text {
+        text: String,
+    },
     /// Ask the user if they want to withdraw their own QR code.
     WithdrawVerifyContact {
         /// Contact ID.
@@ -160,7 +165,9 @@ pub enum QrObject {
     /// `dclogin:` scheme parameters.
     ///
     /// Ask the user if they want to login with the email address.
-    Login { address: String },
+    Login {
+        address: String,
+    },
 }
 
 impl From<Qr> for QrObject {
@@ -217,6 +224,7 @@ impl From<Qr> for QrObject {
                 node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
                 auth_token,
             },
+            Qr::BackupTooNew {} => QrObject::BackupTooNew {},
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,

deltachat-jsonrpc/src/webserver.rs

@@ -1,47 +0,0 @@
-#![recursion_limit = "256"]
-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};
-
-mod api;
-use api::{Accounts, CommandApi};
-
-const DEFAULT_PORT: u16 = 20808;
-
-#[tokio::main(flavor = "multi_thread")]
-async fn main() -> Result<(), std::io::Error> {
-    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());
-    let port = std::env::var("DC_PORT")
-        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
-        .unwrap_or(DEFAULT_PORT);
-    log::info!("Starting with accounts directory `{path}`.");
-    let writable = true;
-    let accounts = Accounts::new(PathBuf::from(&path), writable).await.unwrap();
-    let state = CommandApi::new(accounts);
-
-    let app = Router::new()
-        .route("/ws", get(handler))
-        .layer(Extension(state.clone()));
-
-    tokio::spawn(async move {
-        state.accounts.write().await.start_io().await;
-    });
-
-    let addr = SocketAddr::from(([127, 0, 0, 1], port));
-    log::info!("JSON-RPC WebSocket server listening on {}", addr);
-    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
-    axum::serve(listener, app).await.unwrap();
-
-    Ok(())
-}
-
-async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
-    let (client, out_receiver) = RpcClient::new();
-    let session = RpcSession::new(client.clone(), api.clone());
-    handle_ws_rpc(ws, out_receiver, session).await
-}

deltachat-jsonrpc/typescript/example.html

@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>DeltaChat JSON-RPC example</title>
-    <style>
-      body {
-        font-family: monospace;
-        background: black;
-        color: grey;
-      }
-      .grid {
-        display: grid;
-        grid-template-columns: 3fr 1fr;
-        grid-template-areas: "a a" "b c";
-      }
-      .message {
-        color: red;
-      }
-      #header {
-        grid-area: a;
-        color: white;
-        font-size: 1.2rem;
-      }
-      #header a {
-        color: white;
-        font-weight: bold;
-      }
-      #main {
-        grid-area: b;
-        color: green;
-      }
-      #main h2,
-      #main h3 {
-        color: blue;
-      }
-      #side {
-        grid-area: c;
-        color: #777;
-        overflow-y: auto;
-      }
-    </style>
-    <script type="module" src="dist/example.bundle.js"></script>
-  </head>
-  <body>
-    <h1>DeltaChat JSON-RPC example</h1>
-    <div class="grid">
-      <div id="header"></div>
-      <div id="main"></div>
-      <div id="side"><h2>log</h2></div>
-    </div>
-    <p>
-      Tip: open the dev console and use the client with
-      <code>window.client</code>
-    </p>
-  </body>
-</html>

deltachat-jsonrpc/typescript/example/example.ts

@@ -1,109 +0,0 @@
-import { DcEvent, DeltaChat } from "../deltachat.js";
-
-var SELECTED_ACCOUNT = 0;
-
-window.addEventListener("DOMContentLoaded", (_event) => {
-  (window as any).selectDeltaAccount = (id: string) => {
-    SELECTED_ACCOUNT = Number(id);
-    window.dispatchEvent(new Event("account-changed"));
-  };
-  console.log("launch run script...");
-  run().catch((err) => console.error("run failed", err));
-});
-
-async function run() {
-  const $main = document.getElementById("main")!;
-  const $side = document.getElementById("side")!;
-  const $head = document.getElementById("header")!;
-
-  const client = new DeltaChat("ws://localhost:20808/ws");
-
-  (window as any).client = client.rpc;
-
-  client.on("ALL", (accountId, event) => {
-    onIncomingEvent(accountId, event);
-  });
-
-  window.addEventListener("account-changed", async (_event: Event) => {
-    listChatsForSelectedAccount();
-  });
-
-  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
-
-  async function loadAccountsInHeader() {
-    console.log("load accounts");
-    const accounts = await client.rpc.getAllAccounts();
-    console.log("accounts loaded", accounts);
-    for (const account of accounts) {
-      if (account.kind === "Configured") {
-        write(
-          $head,
-          `<a href="#" onclick="selectDeltaAccount(${account.id})">
-          ${account.id}: ${account.addr!}
-          </a>&nbsp;`
-        );
-      } else {
-        write(
-          $head,
-          `<a href="#">
-          ${account.id}: (unconfigured)
-          </a>&nbsp;`
-        );
-      }
-    }
-  }
-
-  async function listChatsForSelectedAccount() {
-    clear($main);
-    const selectedAccount = SELECTED_ACCOUNT;
-    const info = await client.rpc.getAccountInfo(selectedAccount);
-    if (info.kind !== "Configured") {
-      return write($main, "Account is not configured");
-    }
-    write($main, `<h2>${info.addr!}</h2>`);
-    const chats = await client.rpc.getChatlistEntries(
-      selectedAccount,
-      0,
-      null,
-      null
-    );
-    for (const chatId of chats) {
-      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
-      write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.getMessageIds(
-        selectedAccount,
-        chatId,
-        false,
-        false
-      );
-      const messages = await client.rpc.getMessages(
-        selectedAccount,
-        messageIds
-      );
-      for (const [_messageId, message] of Object.entries(messages)) {
-        if (message.kind === "message") write($main, `<p>${message.text}</p>`);
-        else write($main, `<p>loading error: ${message.error}</p>`);
-      }
-    }
-  }
-
-  function onIncomingEvent(accountId: number, event: DcEvent) {
-    write(
-      $side,
-      `
-        <p class="message">
-          [<strong>${event.kind}</strong> on account ${accountId}]<br>
-          <em>f1:</em> ${JSON.stringify(
-            Object.assign({}, event, { kind: undefined })
-          )}
-        </p>`
-    );
-  }
-}
-
-function write(el: HTMLElement, html: string) {
-  el.innerHTML += html;
-}
-function clear(el: HTMLElement) {
-  el.innerHTML = "";
-}

deltachat-jsonrpc/typescript/example/node-add-account.js

@@ -1,29 +0,0 @@
-import { DeltaChat } from "../dist/deltachat.js";
-
-run().catch(console.error);
-
-async function run() {
-  const delta = new DeltaChat("ws://localhost:20808/ws");
-  delta.on("event", (event) => {
-    console.log("event", event.data);
-  });
-
-  const email = process.argv[2];
-  const password = process.argv[3];
-  if (!email || !password)
-    throw new Error(
-      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
-    );
-  console.log(`creating account for ${email}`);
-  const id = await delta.rpc.addAccount();
-  console.log(`created account id ${id}`);
-  await delta.rpc.setConfig(id, "addr", email);
-  await delta.rpc.setConfig(id, "mail_pw", password);
-  console.log("configuration updated");
-  await delta.rpc.configure(id);
-  console.log("account configured!");
-
-  const accounts = await delta.rpc.getAllAccounts();
-  console.log("accounts", accounts);
-  console.log("waiting for events...");
-}

deltachat-jsonrpc/typescript/example/node-demo.js

@@ -1,14 +0,0 @@
-import { DeltaChat } from "../dist/deltachat.js";
-
-run().catch(console.error);
-
-async function run() {
-  const delta = new DeltaChat();
-  delta.on("event", (event) => {
-    console.log("event", event.data);
-  });
-
-  const accounts = await delta.rpc.getAllAccounts();
-  console.log("accounts", accounts);
-  console.log("waiting for events...");
-}

deltachat-jsonrpc/typescript/package.json

@@ -2,24 +2,24 @@
   "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
-    "isomorphic-ws": "^4.0.1",
+    "isomorphic-ws": "^5.0.0",
     "yerpc": "^0.6.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.0.0",
-    "@types/ws": "^7.2.4",
-    "c8": "^7.10.0",
+    "@types/chai": "^4.3.10",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/mocha": "^10.0.4",
+    "@types/ws": "^8.5.9",
+    "c8": "^8.0.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.17.9",
+    "esbuild": "^0.25.5",
     "http-server": "^14.1.1",
-    "mocha": "^9.1.1",
+    "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
-    "typedoc": "^0.23.2",
-    "typescript": "^4.5.5",
+    "prettier": "^3.5.3",
+    "typedoc": "^0.28.5",
+    "typescript": "^5.8.3",
     "ws": "^8.5.0"
   },
   "exports": {
@@ -34,7 +34,7 @@
   "name": "@deltachat/jsonrpc-client",
   "repository": {
     "type": "git",
-    "url": "https://github.com/deltachat/deltachat-core-rust.git"
+    "url": "https://github.com/chatmail/core.git"
   },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
@@ -42,10 +42,6 @@
     "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
     "build:tsc": "tsc",
     "docs": "typedoc --out docs deltachat.ts",
-    "example": "run-s build example:build example:start",
-    "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 .",
@@ -58,5 +54,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.155.3"
+  "version": "1.160.0"
 }

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -5,24 +5,24 @@ const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =
   json[Object.keys(json).find((k) => k.includes(generatedFile))];
 const fnMap = Object.keys(jsonCoverage.fnMap).map(
-  (key) => jsonCoverage.fnMap[key]
+  (key) => jsonCoverage.fnMap[key],
 );
 const htmlCoverage = readFileSync(
   "./coverage/" + generatedFile + ".html",
-  "utf8"
+  "utf8",
 );
 const uncoveredLines = htmlCoverage
   .split("\n")
   .filter((line) => line.includes(`"function not covered"`));
 const uncoveredFunctions = uncoveredLines.map(
-  (line) => />([\w_]+)\(/.exec(line)[1]
+  (line) => />([\w_]+)\(/.exec(line)[1],
 );
 console.log(
   "\nUncovered api functions:\n" +
     uncoveredFunctions
       .map((uF) => fnMap.find(({ name }) => name === uF))
       .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
+        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`,
       )
-      .join("\n")
+      .join("\n"),
 );

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

@@ -24,7 +24,7 @@ while (null != (match = regex.exec(header_data))) {
 
 const constants = data
   .filter(
-    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
+    ({ key }) => key.toUpperCase()[0] === key[0], // check if define name is uppercase
   )
   .sort((lhs, rhs) => {
     if (lhs.key < rhs.key) return -1;
@@ -50,5 +50,5 @@ const constants = data
 
 writeFileSync(
   resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
+  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`,
 );

deltachat-jsonrpc/typescript/src/client.ts

@@ -2,19 +2,19 @@ import * as T from "../generated/types.js";
 import { EventType } from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { WebsocketTransport, BaseTransport, Request } from "yerpc";
+import { BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";
 
 type Events = { ALL: (accountId: number, event: EventType) => void } & {
   [Property in EventType["kind"]]: (
     accountId: number,
-    event: Extract<EventType, { kind: Property }>
+    event: Extract<EventType, { kind: Property }>,
   ) => void;
 };
 
 type ContextEvents = { ALL: (event: EventType) => void } & {
   [Property in EventType["kind"]]: (
-    event: Extract<EventType, { kind: Property }>
+    event: Extract<EventType, { kind: Property }>,
   ) => void;
 };
 
@@ -25,7 +25,7 @@ export type DcEventType<T extends EventType["kind"]> = Extract<
 >;
 
 export class BaseDeltaChat<
-  Transport extends BaseTransport<any>
+  Transport extends BaseTransport<any>,
 > extends TinyEmitter<Events> {
   rpc: RawClient;
   account?: T.Account;
@@ -34,7 +34,10 @@ export class BaseDeltaChat<
   //@ts-ignore
   private eventTask: Promise<void>;
 
-  constructor(public transport: Transport, startEventLoop: boolean) {
+  constructor(
+    public transport: Transport,
+    startEventLoop: boolean,
+  ) {
     super();
     this.rpc = new RawClient(this.transport);
     if (startEventLoop) {
@@ -53,7 +56,7 @@ export class BaseDeltaChat<
         this.contextEmitters[event.contextId].emit(
           event.event.kind,
           //@ts-ignore
-          event.event as any
+          event.event as any,
         );
         this.contextEmitters[event.contextId].emit("ALL", event.event as any);
       }
@@ -74,34 +77,6 @@ export class BaseDeltaChat<
   }
 }
 
-export type Opts = {
-  url: string;
-  startEventLoop: boolean;
-};
-
-export const DEFAULT_OPTS: Opts = {
-  url: "ws://localhost:20808/ws",
-  startEventLoop: true,
-};
-export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
-  opts: Opts;
-  close() {
-    this.transport.close();
-  }
-  constructor(opts?: Opts | string) {
-    if (typeof opts === "string") {
-      opts = { ...DEFAULT_OPTS, url: opts };
-    } else if (opts) {
-      opts = { ...DEFAULT_OPTS, ...opts };
-    } else {
-      opts = { ...DEFAULT_OPTS };
-    }
-    const transport = new WebsocketTransport(opts.url);
-    super(transport, opts.startEventLoop);
-    this.opts = opts;
-  }
-}
-
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
   close() {}
   constructor(input: any, output: any, startEventLoop: boolean) {
@@ -111,7 +86,10 @@ export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
 }
 
 export class StdioTransport extends BaseTransport {
-  constructor(public input: any, public output: any) {
+  constructor(
+    public input: any,
+    public output: any,
+  ) {
     super();
 
     var buffer = "";

deltachat-jsonrpc/typescript/test/basic.ts

@@ -1,4 +1,3 @@
-import { strictEqual } from "assert";
 import chai, { assert, expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
@@ -32,14 +31,14 @@ describe("basic tests", () => {
 
     expect(
       await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
+        validAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
+      ),
     ).to.not.contain(false);
 
     expect(
       await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
+        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email)),
+      ),
     ).to.not.contain(true);
   });
 
@@ -85,7 +84,7 @@ describe("basic tests", () => {
       const contactId = await dc.rpc.createContact(
         accountId,
         "example@delta.chat",
-        null
+        null,
       );
       expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
         .false;
@@ -127,7 +126,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config)
+        Object.keys(config),
       );
       expect(retrieved).to.deep.equal(config);
     });
@@ -139,7 +138,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config)
+        Object.keys(config),
       );
       expect(retrieved).to.deep.equal(config);
     });
@@ -153,7 +152,7 @@ describe("basic tests", () => {
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
         accountId,
-        Object.keys(config)
+        Object.keys(config),
       );
       expect(retrieved).to.deep.equal(config);
     });

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,5 +1,5 @@
 import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
+import { StdioDeltaChat as DeltaChat, DcEvent, C } from "../deltachat.js";
 import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
 
 const EVENT_TIMEOUT = 20000;
@@ -17,12 +17,12 @@ describe("online tests", function () {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
           "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN environment variable!\n\n",
-          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
+          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test",
         );
         process.exit(1);
       }
       console.log(
-        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests"
+        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests",
       );
       this.skip();
     }
@@ -36,7 +36,7 @@ describe("online tests", function () {
     account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
     if (!account1 || !account1.email || !account1.password) {
       console.log(
-        "We didn't got back an account from the api, skip integration tests"
+        "We didn't got back an account from the api, skip integration tests",
       );
       this.skip();
     }
@@ -44,7 +44,7 @@ describe("online tests", function () {
     account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
     if (!account2 || !account2.email || !account2.password) {
       console.log(
-        "We didn't got back an account2 from the api, skip integration tests"
+        "We didn't got back an account2 from the api, skip integration tests",
       );
       this.skip();
     }
@@ -80,11 +80,8 @@ describe("online tests", function () {
     }
     this.timeout(15000);
 
-    const contactId = await dc.rpc.createContact(
-      accountId1,
-      account2.email,
-      null
-    );
+    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
+    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
 
@@ -95,26 +92,24 @@ describe("online tests", function () {
       accountId2,
       chatIdOnAccountB,
       false,
-      false
+      false,
     );
 
     expect(messageList).have.length(1);
     const message = await dc.rpc.getMessage(accountId2, messageList[0]);
     expect(message.text).equal("Hello");
+    expect(message.showPadlock).equal(true);
   });
 
-  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
+  it("send and receive text message roundtrip", async function () {
     if (!accountsConfigured) {
       this.skip();
     }
     this.timeout(10000);
 
     // send message from A to B
-    const contactId = await dc.rpc.createContact(
-      accountId1,
-      account2.email,
-      null
-    );
+    const vcard = await dc.rpc.makeVcard(accountId2, [C.DC_CONTACT_ID_SELF]);
+    const contactId = (await dc.rpc.importVcardContents(accountId1, vcard))[0];
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
     const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
     dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
@@ -129,11 +124,11 @@ describe("online tests", function () {
       accountId2,
       chatIdOnAccountB,
       false,
-      false
+      false,
     );
     const message = await dc.rpc.getMessage(
       accountId2,
-      messageList.reverse()[0]
+      messageList.reverse()[0],
     );
     expect(message.text).equal("Hello2");
     // Send message back from B to A
@@ -155,7 +150,7 @@ describe("online tests", function () {
     const info = await dc.rpc.getProviderInfo(acc, "example.com");
     expect(info).to.be.not.null;
     expect(info?.overviewPage).to.equal(
-      "https://providers.delta.chat/example-com"
+      "https://providers.delta.chat/example-com",
     );
     expect(info?.status).to.equal(3);
   });
@@ -172,12 +167,12 @@ async function waitForEvent<T extends DcEvent["kind"]>(
   dc: DeltaChat,
   eventType: T,
   accountId: number,
-  timeout: number = EVENT_TIMEOUT
+  timeout: number = EVENT_TIMEOUT,
 ): Promise<Extract<DcEvent, { kind: T }>> {
   return new Promise((resolve, reject) => {
     const rejectTimeout = setTimeout(
       () => reject(new Error("Timeout reached before event came in")),
-      timeout
+      timeout,
     );
     const callback = (contextId: number, event: DcEvent) => {
       if (contextId == accountId) {

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -14,7 +14,7 @@ export async function startServer(): Promise<RpcServerHandle> {
   const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
 
   const pathToServerBinary = resolve(
-    join(await getTargetDir(), "debug/deltachat-rpc-server")
+    join(await getTargetDir(), "debug/deltachat-rpc-server"),
   );
 
   const server = spawn(pathToServerBinary, {
@@ -29,7 +29,7 @@ export async function startServer(): Promise<RpcServerHandle> {
     throw new Error(
       "Failed to start server executable " +
         pathToServerBinary +
-        ", make sure you built it first."
+        ", make sure you built it first.",
     );
   });
   let shouldClose = false;
@@ -83,7 +83,7 @@ function getTargetDir(): Promise<string> {
             reject(error);
           }
         }
-      }
+      },
     );
   });
 }

deltachat-jsonrpc/typescript/tsconfig.json

@@ -15,6 +15,6 @@
     "noImplicitAny": true,
     "isolatedModules": true
   },
-  "include": ["*.ts", "example/*.ts", "test/*.ts"],
+  "include": ["*.ts", "test/*.ts"],
   "compileOnSave": false
 }

deltachat-repl/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat-repl"
-version = "1.155.3"
+version = "1.160.0"
 license = "MPL-2.0"
 edition = "2021"
-repository = "https://github.com/deltachat/deltachat-core-rust"
+repository = "https://github.com/chatmail/core"
 
 [dependencies]
 anyhow = { workspace = true }
@@ -13,7 +13,7 @@ log = { workspace = true }
 nu-ansi-term = { workspace = true }
 qr2term = "0.3.3"
 rusqlite = { workspace = true }
-rustyline = "15"
+rustyline = "16"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 

deltachat-repl/src/cmdline.rs

@@ -92,7 +92,7 @@ async fn reset_tables(context: &Context, bits: i32) {
     context.emit_msgs_changed_without_ids();
 }
 
-async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
+async fn poke_eml_file(context: &Context, filename: &Path) -> Result<()> {
     let data = read_file(context, filename).await?;
 
     if let Err(err) = receive_imf(context, &data, false).await {
@@ -120,13 +120,13 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
     } else {
         let rs = context.sql().get_raw_config("import_spec").await.unwrap();
         if rs.is_none() {
-            error!(context, "Import: No file or folder given.");
+            eprintln!("Import: No file or folder given.");
             return false;
         }
         real_spec = rs.unwrap();
     }
     if let Some(suffix) = get_filesuffix_lc(&real_spec) {
-        if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
+        if suffix == "eml" && poke_eml_file(context, Path::new(&real_spec)).await.is_ok() {
             read_cnt += 1
         }
     } else {
@@ -140,13 +140,16 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
                 if name.ends_with(".eml") {
                     let path_plus_name = format!("{}/{}", &real_spec, name);
                     println!("Import: {path_plus_name}");
-                    if poke_eml_file(context, path_plus_name).await.is_ok() {
+                    if poke_eml_file(context, Path::new(&path_plus_name))
+                        .await
+                        .is_ok()
+                    {
                         read_cnt += 1
                     }
                 }
             }
         } else {
-            error!(context, "Import: Cannot open directory \"{}\".", &real_spec);
+            eprintln!("Import: Cannot open directory \"{}\".", &real_spec);
             return false;
         }
     }
@@ -490,7 +493,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "send-backup" => {
             let provider = BackupProvider::prepare(&context).await?;
             let qr = format_backup(&provider.qr())?;
-            println!("QR code: {}", qr);
+            println!("QR code: {qr}");
             qr2term::print_qr(qr.as_str())?;
             provider.await?;
         }
@@ -1159,17 +1162,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let reaction = arg2;
             send_reaction(&context, msg_id, reaction).await?;
         }
-        "listcontacts" | "contacts" | "listverified" => {
-            let contacts = Contact::get_all(
-                &context,
-                if arg0 == "listverified" {
-                    DC_GCL_VERIFIED_ONLY | DC_GCL_ADD_SELF
-                } else {
-                    DC_GCL_ADD_SELF
-                },
-                Some(arg1),
-            )
-            .await?;
+        "listcontacts" | "contacts" => {
+            let contacts = Contact::get_all(&context, DC_GCL_ADD_SELF, Some(arg1)).await?;
             log_contactlist(&context, &contacts).await?;
             println!("{} contacts.", contacts.len());
         }
@@ -1278,7 +1272,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "fileinfo" => {
             ensure!(!arg1.is_empty(), "Argument <file> missing.");
 
-            if let Ok(buf) = read_file(&context, &arg1).await {
+            if let Ok(buf) = read_file(&context, Path::new(arg1)).await {
                 let (width, height) = get_filemeta(&buf)?;
                 println!("width={width}, height={height}");
             } else {

deltachat-repl/src/main.rs

@@ -5,7 +5,6 @@
 //! Usage:  cargo run --example repl --release -- <databasefile>
 //! All further options can be set using the set-command (type ? for help).
 
-#[macro_use]
 extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
@@ -41,25 +40,25 @@ fn receive_event(event: EventType) {
     match event {
         EventType::Info(msg) => {
             /* do not show the event as this would fill the screen */
-            info!("{}", msg);
+            info!("{msg}");
         }
         EventType::SmtpConnected(msg) => {
-            info!("[SMTP_CONNECTED] {}", msg);
+            info!("[SMTP_CONNECTED] {msg}");
         }
         EventType::ImapConnected(msg) => {
-            info!("[IMAP_CONNECTED] {}", msg);
+            info!("[IMAP_CONNECTED] {msg}");
         }
         EventType::SmtpMessageSent(msg) => {
-            info!("[SMTP_MESSAGE_SENT] {}", msg);
+            info!("[SMTP_MESSAGE_SENT] {msg}");
         }
         EventType::Warning(msg) => {
-            warn!("{}", msg);
+            warn!("{msg}");
         }
         EventType::Error(msg) => {
-            error!("{}", msg);
+            error!("{msg}");
         }
         EventType::ErrorSelfNotInGroup(msg) => {
-            error!("[SELF_NOT_IN_GROUP] {}", msg);
+            error!("[SELF_NOT_IN_GROUP] {msg}");
         }
         EventType::MsgsChanged { chat_id, msg_id } => {
             info!(
@@ -124,7 +123,7 @@ fn receive_event(event: EventType) {
             );
         }
         _ => {
-            info!("Received {:?}", event);
+            info!("Received {event:?}");
         }
     }
 }
@@ -323,7 +322,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         }
     });
 
-    println!("Delta Chat Core is awaiting your commands.");
+    println!("Chatmail is awaiting your commands.");
 
     let config = Config::builder()
         .history_ignore_space(true)

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.155.3"
+version = "1.160.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -66,7 +66,18 @@ lint.select = [
 
   "RUF006" # asyncio-dangling-task
 ]
+lint.ignore = [
+  "PLC0415" # `import` should be at the top-level of a file
+]
 line-length = 120
 
 [tool.isort]
 profile = "black"
+
+[dependency-groups]
+dev = [
+    "imap-tools",
+    "pytest",
+    "pytest-timeout",
+    "pytest-xdist",
+]

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

@@ -1,4 +1,4 @@
-"""Delta Chat JSON-RPC high-level API"""
+"""Delta Chat JSON-RPC high-level API."""
 
 from ._utils import AttrDict, run_bot_cli, run_client_cli
 from .account import Account

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

@@ -1,4 +1,5 @@
 import argparse
+import os
 import re
 import sys
 from threading import Thread
@@ -89,8 +90,8 @@ def _run_cli(
         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")
+    parser.add_argument("--email", action="store", help="email address", default=os.getenv("DELTACHAT_EMAIL"))
+    parser.add_argument("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
     args = parser.parse_args(argv[1:])
 
     with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
@@ -114,7 +115,7 @@ def _run_cli(
 
 
 def extract_addr(text: str) -> str:
-    """extract email address from the given text."""
+    """Extract email address from the given text."""
     match = re.match(r".*\((.+@.+)\)", text)
     if match:
         text = match.group(1)
@@ -123,7 +124,7 @@ def extract_addr(text: str) -> str:
 
 
 def parse_system_image_changed(text: str) -> Optional[Tuple[str, bool]]:
-    """return image changed/deleted info from parsing the given system message text."""
+    """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:
@@ -142,7 +143,7 @@ def parse_system_title_changed(text: str) -> Optional[Tuple[str, str]]:
 
 
 def parse_system_add_remove(text: str) -> Optional[Tuple[str, str, str]]:
-    """return add/remove info from parsing the given system message text.
+    """Return add/remove info from parsing the given system message text.
 
     returns a (action, affected, actor) tuple.
     """

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

@@ -1,3 +1,5 @@
+"""Account module."""
+
 from __future__ import annotations
 
 from dataclasses import dataclass
@@ -26,18 +28,36 @@ class Account:
     def _rpc(self) -> "Rpc":
         return self.manager.rpc
 
-    def wait_for_event(self) -> AttrDict:
+    def wait_for_event(self, event_type=None) -> AttrDict:
         """Wait until the next event and return it."""
-        return AttrDict(self._rpc.wait_for_event(self.id))
+        while True:
+            next_event = AttrDict(self._rpc.wait_for_event(self.id))
+            if event_type is None or next_event.kind == event_type:
+                return next_event
 
     def clear_all_events(self):
-        """Removes all queued-up events for a given account. Useful for tests."""
+        """Remove all queued-up events for a given account.
+
+        Useful for tests.
+        """
         self._rpc.clear_all_events(self.id)
 
     def remove(self) -> None:
         """Remove the account."""
         self._rpc.remove_account(self.id)
 
+    def clone(self) -> "Account":
+        """Clone given account.
+
+        This uses backup-transfer via iroh, i.e. the 'Add second device' feature.
+        """
+        future = self._rpc.provide_backup.future(self.id)
+        qr = self._rpc.get_backup_qr(self.id)
+        new_account = self.manager.add_account()
+        new_account._rpc.get_backup(new_account.id, qr)
+        future()
+        return new_account
+
     def start_io(self) -> None:
         """Start the account I/O."""
         self._rpc.start_io(self.id)
@@ -67,7 +87,7 @@ class Account:
         return self._rpc.get_config(self.id, key)
 
     def update_config(self, **kwargs) -> None:
-        """update config values."""
+        """Update config values."""
         for key, value in kwargs.items():
             self.set_config(key, value)
 
@@ -83,9 +103,15 @@ class Account:
         return self.get_config("selfavatar")
 
     def check_qr(self, qr):
+        """Parse QR code contents.
+
+        This function takes the raw text scanned
+        and checks what can be done with it.
+        """
         return self._rpc.check_qr(self.id, qr)
 
     def set_config_from_qr(self, qr: str):
+        """Set configuration values from a QR code."""
         self._rpc.set_config_from_qr(self.id, qr)
 
     @futuremethod
@@ -93,15 +119,23 @@ class Account:
         """Configure an account."""
         yield self._rpc.configure.future(self.id)
 
+    @futuremethod
+    def add_or_update_transport(self, params):
+        """Add a new transport."""
+        yield self._rpc.add_or_update_transport.future(self.id, params)
+
+    @futuremethod
+    def list_transports(self):
+        """Return the list of all email accounts that are used as a transport in the current profile."""
+        transports = yield self._rpc.list_transports.future(self.id)
+        return transports
+
     def bring_online(self):
         """Start I/O and wait until IMAP becomes IDLE."""
         self.start_io()
-        while True:
-            event = self.wait_for_event()
-            if event.kind == EventType.IMAP_INBOX_IDLE:
-                break
+        self.wait_for_event(EventType.IMAP_INBOX_IDLE)
 
-    def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
+    def create_contact(self, obj: Union[int, str, Contact, "Account"], name: Optional[str] = None) -> Contact:
         """Create a new Contact or return an existing one.
 
         Calling this method will always result in the same
@@ -109,19 +143,42 @@ class Account:
         with that e-mail address, it is unblocked and its display
         name is updated if specified.
 
-        :param obj: email-address or contact id.
+        :param obj: email-address, contact id or account.
         :param name: (optional) display name for this contact.
         """
+        if isinstance(obj, Account):
+            vcard = obj.self_contact.make_vcard()
+            [contact] = self.import_vcard(vcard)
+            if name:
+                contact.set_name(name)
+            return contact
         if isinstance(obj, int):
             obj = Contact(self, obj)
         if isinstance(obj, Contact):
             obj = obj.get_snapshot().address
         return Contact(self, self._rpc.create_contact(self.id, obj, name))
 
+    def make_vcard(self, contacts: list[Contact]) -> str:
+        """Create vCard with the given contacts."""
+        assert all(contact.account == self for contact in contacts)
+        contact_ids = [contact.id for contact in contacts]
+        return self._rpc.make_vcard(self.id, contact_ids)
+
+    def import_vcard(self, vcard: str) -> list[Contact]:
+        """Import vCard.
+
+        Return created or modified contacts in the order they appear in vCard.
+        """
+        contact_ids = self._rpc.import_vcard_contents(self.id, vcard)
+        return [Contact(self, contact_id) for contact_id in contact_ids]
+
     def create_chat(self, account: "Account") -> Chat:
-        addr = account.get_config("addr")
-        contact = self.create_contact(addr)
-        return contact.create_chat()
+        """Create a 1:1 chat with another account."""
+        return self.create_contact(account).create_chat()
+
+    def get_device_chat(self) -> Chat:
+        """Return device chat."""
+        return self.device_contact.create_chat()
 
     def get_contact_by_id(self, contact_id: int) -> Contact:
         """Return Contact instance for the given contact ID."""
@@ -154,8 +211,8 @@ class Account:
     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.
@@ -163,12 +220,9 @@ class Account:
         :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
 
@@ -180,9 +234,14 @@ class Account:
 
     @property
     def self_contact(self) -> Contact:
-        """This account's identity as a Contact."""
+        """Account's identity as a Contact."""
         return Contact(self, SpecialContactId.SELF)
 
+    @property
+    def device_contact(self) -> Chat:
+        """Account's device contact."""
+        return Contact(self, SpecialContactId.DEVICE)
+
     def get_chatlist(
         self,
         query: Optional[str] = None,
@@ -238,8 +297,7 @@ class Account:
         return Chat(self, chat_id)
 
     def secure_join(self, qrdata: str) -> Chat:
-        """Continue a Setup-Contact or Verified-Group-Invite protocol started on
-        another device.
+        """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.
@@ -296,34 +354,40 @@ class Account:
 
     def wait_for_incoming_msg_event(self):
         """Wait for incoming message event and return it."""
-        while True:
-            event = self.wait_for_event()
-            if event.kind == EventType.INCOMING_MSG:
-                return event
+        return self.wait_for_event(EventType.INCOMING_MSG)
+
+    def wait_for_msgs_changed_event(self):
+        """Wait for messages changed event and return it."""
+        return self.wait_for_event(EventType.MSGS_CHANGED)
+
+    def wait_for_msgs_noticed_event(self):
+        """Wait for messages noticed event and return it."""
+        return self.wait_for_event(EventType.MSGS_NOTICED)
 
     def wait_for_incoming_msg(self):
         """Wait for incoming message and return it.
 
-        Consumes all events before the next incoming message event."""
+        Consumes all events before the next incoming message event.
+        """
         return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)
 
     def wait_for_securejoin_inviter_success(self):
+        """Wait until SecureJoin process finishes successfully on the inviter side."""
         while True:
             event = self.wait_for_event()
             if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
                 break
 
     def wait_for_securejoin_joiner_success(self):
+        """Wait until SecureJoin process finishes successfully on the joiner side."""
         while True:
             event = self.wait_for_event()
             if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
                 break
 
     def wait_for_reactions_changed(self):
-        while True:
-            event = self.wait_for_event()
-            if event.kind == EventType.REACTIONS_CHANGED:
-                return event
+        """Wait for reaction change event."""
+        return self.wait_for_event(EventType.REACTIONS_CHANGED)
 
     def get_fresh_messages_in_arrival_order(self) -> list[Message]:
         """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
@@ -352,3 +416,7 @@ class Account:
         """Import keys."""
         passphrase = ""  # Importing passphrase-protected keys is currently not supported.
         self._rpc.import_self_keys(self.id, str(path), passphrase)
+
+    def initiate_autocrypt_key_transfer(self) -> None:
+        """Send Autocrypt Setup Message."""
+        return self._rpc.initiate_autocrypt_key_transfer(self.id)

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

@@ -1,3 +1,5 @@
+"""Chat module."""
+
 from __future__ import annotations
 
 import calendar
@@ -89,7 +91,8 @@ class Chat:
     def set_ephemeral_timer(self, timer: int) -> None:
         """Set ephemeral timer of this chat in seconds.
 
-        0 means the timer is disabled, use 1 for immediate deletion."""
+        0 means the timer is disabled, use 1 for immediate deletion.
+        """
         self._rpc.set_chat_ephemeral_timer(self.account.id, self.id, timer)
 
     def get_encryption_info(self) -> str:
@@ -124,6 +127,7 @@ class Chat:
         html: Optional[str] = None,
         viewtype: Optional[ViewType] = None,
         file: Optional[str] = None,
+        filename: Optional[str] = None,
         location: Optional[tuple[float, float]] = None,
         override_sender_name: Optional[str] = None,
         quoted_msg: Optional[Union[int, Message]] = None,
@@ -137,6 +141,7 @@ class Chat:
             "html": html,
             "viewtype": viewtype,
             "file": file,
+            "filename": filename,
             "location": location,
             "overrideSenderName": override_sender_name,
             "quotedMessageId": quoted_msg,
@@ -172,13 +177,14 @@ class Chat:
         self,
         text: Optional[str] = None,
         file: Optional[str] = None,
+        filename: Optional[str] = None,
         quoted_msg: Optional[int] = None,
         viewtype: Optional[str] = None,
     ) -> None:
         """Set draft message."""
         if isinstance(quoted_msg, Message):
             quoted_msg = quoted_msg.id
-        self._rpc.misc_set_draft(self.account.id, self.id, text, file, quoted_msg, viewtype)
+        self._rpc.misc_set_draft(self.account.id, self.id, text, file, filename, quoted_msg, viewtype)
 
     def remove_draft(self) -> None:
         """Remove draft message."""
@@ -196,12 +202,12 @@ class Chat:
         return snapshot
 
     def get_messages(self, info_only: bool = False, add_daymarker: bool = False) -> list[Message]:
-        """get the list of messages in this chat."""
+        """Get the list of messages in this chat."""
         msgs = self._rpc.get_message_ids(self.account.id, self.id, info_only, add_daymarker)
         return [Message(self.account, msg_id) for msg_id in msgs]
 
     def get_fresh_message_count(self) -> int:
-        """Get number of fresh messages in this chat"""
+        """Get number of fresh messages in this chat."""
         return self._rpc.get_fresh_msg_cnt(self.account.id, self.id)
 
     def mark_noticed(self) -> None:

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

@@ -48,6 +48,7 @@ class Client:
         self.add_hooks(hooks or [])
 
     def add_hooks(self, hooks: Iterable[tuple[Callable, Union[type, EventFilter]]]) -> None:
+        """Register multiple hooks."""
         for hook, event in hooks:
             self.add_hook(hook, event)
 
@@ -77,9 +78,11 @@ class Client:
         self._hooks.get(type(event), set()).remove((hook, event))
 
     def is_configured(self) -> bool:
+        """Return True if the client is configured."""
         return self.account.is_configured()
 
     def configure(self, email: str, password: str, **kwargs) -> None:
+        """Configure the client."""
         self.account.set_config("addr", email)
         self.account.set_config("mail_pw", password)
         for key, value in kwargs.items():
@@ -198,5 +201,6 @@ class Bot(Client):
     """Simple bot implementation that listens to events of a single account."""
 
     def configure(self, email: str, password: str, **kwargs) -> None:
+        """Configure the bot."""
         kwargs.setdefault("bot", "1")
         super().configure(email, password, **kwargs)

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

@@ -1,14 +1,19 @@
+"""Constants module."""
+
 from enum import Enum, IntEnum
 
 COMMAND_PREFIX = "/"
 
 
 class ContactFlag(IntEnum):
-    VERIFIED_ONLY = 0x01
+    """Bit flags for get_contacts() method."""
+
     ADD_SELF = 0x02
 
 
 class ChatlistFlag(IntEnum):
+    """Bit flags for get_chatlist() method."""
+
     ARCHIVED_ONLY = 0x01
     NO_SPECIALS = 0x02
     ADD_ALLDONE_HINT = 0x04
@@ -16,6 +21,8 @@ class ChatlistFlag(IntEnum):
 
 
 class SpecialContactId(IntEnum):
+    """Special contact IDs."""
+
     SELF = 1
     INFO = 2  # centered messages as "member added", used in all chats
     DEVICE = 5  #  messages "update info" in the device-chat
@@ -23,7 +30,7 @@ class SpecialContactId(IntEnum):
 
 
 class EventType(str, Enum):
-    """Core event types"""
+    """Core event types."""
 
     INFO = "Info"
     SMTP_CONNECTED = "SmtpConnected"
@@ -48,6 +55,7 @@ class EventType(str, Enum):
     MSG_READ = "MsgRead"
     MSG_DELETED = "MsgDeleted"
     CHAT_MODIFIED = "ChatModified"
+    CHAT_DELETED = "ChatDeleted"
     CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
     CONTACTS_CHANGED = "ContactsChanged"
     LOCATION_CHANGED = "LocationChanged"
@@ -70,7 +78,7 @@ class EventType(str, Enum):
 
 
 class ChatId(IntEnum):
-    """Special chat ids"""
+    """Special chat IDs."""
 
     TRASH = 3
     ARCHIVED_LINK = 6
@@ -79,7 +87,7 @@ class ChatId(IntEnum):
 
 
 class ChatType(IntEnum):
-    """Chat types"""
+    """Chat type."""
 
     UNDEFINED = 0
     SINGLE = 100
@@ -89,7 +97,7 @@ class ChatType(IntEnum):
 
 
 class ChatVisibility(str, Enum):
-    """Chat visibility types"""
+    """Chat visibility types."""
 
     NORMAL = "Normal"
     ARCHIVED = "Archived"
@@ -97,7 +105,7 @@ class ChatVisibility(str, Enum):
 
 
 class DownloadState(str, Enum):
-    """Message download state"""
+    """Message download state."""
 
     DONE = "Done"
     AVAILABLE = "Available"
@@ -158,14 +166,14 @@ class MessageState(IntEnum):
 
 
 class MessageId(IntEnum):
-    """Special message ids"""
+    """Special message IDs."""
 
     DAYMARKER = 9
     LAST_SPECIAL = 9
 
 
 class CertificateChecks(IntEnum):
-    """Certificate checks mode"""
+    """Certificate checks mode."""
 
     AUTOMATIC = 0
     STRICT = 1
@@ -173,7 +181,7 @@ class CertificateChecks(IntEnum):
 
 
 class Connectivity(IntEnum):
-    """Connectivity states"""
+    """Connectivity states."""
 
     NOT_CONNECTED = 1000
     CONNECTING = 2000
@@ -182,7 +190,7 @@ class Connectivity(IntEnum):
 
 
 class KeyGenType(IntEnum):
-    """Type of the key to generate"""
+    """Type of the key to generate."""
 
     DEFAULT = 0
     RSA2048 = 1
@@ -192,21 +200,21 @@ class KeyGenType(IntEnum):
 
 # "Lp" means "login parameters"
 class LpAuthFlag(IntEnum):
-    """Authorization flags"""
+    """Authorization flags."""
 
     OAUTH2 = 0x2
     NORMAL = 0x4
 
 
 class MediaQuality(IntEnum):
-    """Media quality setting"""
+    """Media quality setting."""
 
     BALANCED = 0
     WORSE = 1
 
 
 class ProviderStatus(IntEnum):
-    """Provider status according to manual testing"""
+    """Provider status according to manual testing."""
 
     OK = 1
     PREPARATION = 2
@@ -214,7 +222,7 @@ class ProviderStatus(IntEnum):
 
 
 class PushNotifyState(IntEnum):
-    """Push notifications state"""
+    """Push notifications state."""
 
     NOT_CONNECTED = 0
     HEARTBEAT = 1
@@ -222,7 +230,7 @@ class PushNotifyState(IntEnum):
 
 
 class ShowEmails(IntEnum):
-    """Show emails mode"""
+    """Show emails mode."""
 
     OFF = 0
     ACCEPTED_CONTACTS = 1
@@ -230,7 +238,7 @@ class ShowEmails(IntEnum):
 
 
 class SocketSecurity(IntEnum):
-    """Socket security"""
+    """Socket security."""
 
     AUTOMATIC = 0
     SSL = 1
@@ -239,7 +247,7 @@ class SocketSecurity(IntEnum):
 
 
 class VideochatType(IntEnum):
-    """Video chat URL type"""
+    """Video chat URL type."""
 
     UNKNOWN = 0
     BASICWEBRTC = 1

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

@@ -1,3 +1,5 @@
+"""Contact module."""
+
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
@@ -11,8 +13,7 @@ if TYPE_CHECKING:
 
 @dataclass
 class Contact:
-    """
-    Contact API.
+    """Contact API.
 
     Essentially a wrapper for RPC, account ID and a contact ID.
     """
@@ -45,8 +46,9 @@ class Contact:
         self._rpc.change_contact_name(self.account.id, self.id, name)
 
     def get_encryption_info(self) -> str:
-        """Get a multi-line encryption info, containing your fingerprint and
-        the fingerprint of the contact.
+        """Get a multi-line encryption info.
+
+        Encryption info contains your fingerprint and the fingerprint of the contact.
         """
         return self._rpc.get_contact_encryption_info(self.account.id, self.id)
 
@@ -66,4 +68,5 @@ class Contact:
         )
 
     def make_vcard(self) -> str:
-        return self._rpc.make_vcard(self.account.id, [self.id])
+        """Make a vCard for the contact."""
+        return self.account.make_vcard([self])

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

@@ -1,3 +1,5 @@
+"""Account manager module."""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
@@ -10,12 +12,13 @@ if TYPE_CHECKING:
 
 
 class DeltaChat:
-    """
-    Delta Chat accounts manager.
+    """Delta Chat accounts manager.
+
     This is the root of the object oriented API.
     """
 
     def __init__(self, rpc: "Rpc") -> None:
+        """Initialize account manager."""
         self.rpc = rpc
 
     def add_account(self) -> Account:
@@ -37,9 +40,7 @@ class DeltaChat:
         self.rpc.stop_io_for_all_accounts()
 
     def maybe_network(self) -> None:
-        """Indicate that the network likely has come back or just that the network
-        conditions might have changed.
-        """
+        """Indicate that the network conditions might have changed."""
         self.rpc.maybe_network()
 
     def get_system_info(self) -> AttrDict:

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

@@ -36,7 +36,7 @@ class EventFilter(ABC):
 
     @abstractmethod
     def __hash__(self) -> int:
-        """Object's unique hash"""
+        """Object's unique hash."""
 
     @abstractmethod
     def __eq__(self, other) -> bool:
@@ -52,9 +52,7 @@ class EventFilter(ABC):
 
     @abstractmethod
     def filter(self, event):
-        """Return True-like value if the event passed the filter and should be
-        used, or False-like value otherwise.
-        """
+        """Return True-like value if the event passed the filter."""
 
 
 class RawEvent(EventFilter):
@@ -82,31 +80,17 @@ class RawEvent(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
+        """Filter an event.
+
+        Return true if the event should be processed.
+        """
         if self.types and event.kind not in self.types:
             return False
         return 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_bot: If set to True only match messages sent by bots, if set to None
-                   match messages from bots and users. If omitted or set to False
-                   only messages from users will be matched.
-    :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 function that should accept the event as input
-                 parameter, and return a bool value indicating whether the event
-                 should be dispatched or not.
-    """
+    """Matches whenever a new message arrives."""
 
     def __init__(
         self,
@@ -121,6 +105,25 @@ class NewMessage(EventFilter):
         is_info: Optional[bool] = None,
         func: Optional[Callable[["AttrDict"], bool]] = None,
     ) -> None:
+        """Initialize a new message filter.
+
+        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_bot: If set to True only match messages sent by bots, if set to None
+                   match messages from bots and users. If omitted or set to False
+                   only messages from users will be matched.
+        :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 function that should accept the event as input
+                 parameter, and return a bool value indicating whether the event
+                 should be dispatched or not.
+        """
         super().__init__(func=func)
         self.is_bot = is_bot
         self.is_info = is_info
@@ -159,6 +162,7 @@ class NewMessage(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
+        """Return true if if the event is a new message event."""
         if self.is_bot is not None and self.is_bot != event.message_snapshot.is_bot:
             return False
         if self.is_info is not None and self.is_info != event.message_snapshot.is_info:
@@ -199,6 +203,7 @@ class MemberListChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
+        """Return true if if the event is a member addition event."""
         if self.added is not None and self.added != event.member_added:
             return False
         return self._call_func(event)
@@ -231,6 +236,7 @@ class GroupImageChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
+        """Return True if event is matched."""
         if self.deleted is not None and self.deleted != event.image_deleted:
             return False
         return self._call_func(event)
@@ -256,13 +262,12 @@ class GroupNameChanged(EventFilter):
         return False
 
     def filter(self, event: "AttrDict") -> bool:
+        """Return True if event is matched."""
         return self._call_func(event)
 
 
 class HookCollection:
-    """
-    Helper class to collect event hooks that can later be added to a Delta Chat client.
-    """
+    """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()

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

@@ -1,3 +1,5 @@
+"""Message module."""
+
 import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union
@@ -45,6 +47,7 @@ class Message:
         return None
 
     def get_sender_contact(self) -> Contact:
+        """Return sender contact."""
         from_id = self.get_snapshot().from_id
         return self.account.get_contact_by_id(from_id)
 
@@ -52,6 +55,14 @@ class Message:
         """Mark the message as seen."""
         self._rpc.markseen_msgs(self.account.id, [self.id])
 
+    def continue_autocrypt_key_transfer(self, setup_code: str) -> None:
+        """Continue the Autocrypt Setup Message key transfer.
+
+        This function can be called on received Autocrypt Setup Message
+        to import the key encrypted with the provided setup code.
+        """
+        self._rpc.continue_autocrypt_key_transfer(self.account.id, self.id, setup_code)
+
     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):
@@ -59,9 +70,15 @@ class Message:
         self._rpc.send_webxdc_status_update(self.account.id, self.id, update, description)
 
     def get_webxdc_status_updates(self, last_known_serial: int = 0) -> list:
+        """Return a list of Webxdc status updates for Webxdc instance message."""
         return json.loads(self._rpc.get_webxdc_status_updates(self.account.id, self.id, last_known_serial))
 
+    def get_info(self) -> str:
+        """Return message info."""
+        return self._rpc.get_message_info(self.account.id, self.id)
+
     def get_webxdc_info(self) -> dict:
+        """Get info from a Webxdc message in JSON format."""
         return self._rpc.get_webxdc_info(self.account.id, self.id)
 
     def wait_until_delivered(self) -> None:
@@ -73,8 +90,10 @@ class Message:
 
     @futuremethod
     def send_webxdc_realtime_advertisement(self):
+        """Send an advertisement to join the realtime channel."""
         yield self._rpc.send_webxdc_realtime_advertisement.future(self.account.id, self.id)
 
     @futuremethod
     def send_webxdc_realtime_data(self, data) -> None:
+        """Send data to the realtime channel."""
         yield self._rpc.send_webxdc_realtime_data.future(self.account.id, self.id, list(data))

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

@@ -1,9 +1,12 @@
+"""Pytest plugin module."""
+
 from __future__ import annotations
 
 import os
 import random
 from typing import AsyncGenerator, Optional
 
+import py
 import pytest
 
 from . import Account, AttrDict, Bot, Chat, Client, DeltaChat, EventType, Message
@@ -11,55 +14,55 @@ from ._utils import futuremethod
 from .rpc import Rpc
 
 
-def get_temp_credentials() -> dict:
-    domain = os.getenv("CHATMAIL_DOMAIN")
-    username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
-    password = f"{username}${username}"
-    addr = f"{username}@{domain}"
-    return {"email": addr, "password": password}
-
-
 class ACFactory:
+    """Test account factory."""
+
     def __init__(self, deltachat: DeltaChat) -> None:
         self.deltachat = deltachat
 
     def get_unconfigured_account(self) -> Account:
+        """Create a new unconfigured account."""
         account = self.deltachat.add_account()
         account.set_config("verified_one_on_one_chats", "1")
         return account
 
     def get_unconfigured_bot(self) -> Bot:
+        """Create a new unconfigured bot."""
         return Bot(self.get_unconfigured_account())
 
-    def new_preconfigured_account(self) -> Account:
-        """Make a new account with configuration options set, but configuration not started."""
-        credentials = get_temp_credentials()
-        account = self.get_unconfigured_account()
-        account.set_config("addr", credentials["email"])
-        account.set_config("mail_pw", credentials["password"])
-        assert not account.is_configured()
-        return account
+    def get_credentials(self) -> (str, str):
+        """Generate new credentials for chatmail account."""
+        domain = os.getenv("CHATMAIL_DOMAIN")
+        username = "ci-" + "".join(random.choice("2345789acdefghjkmnpqrstuvwxyz") for i in range(6))
+        return f"{username}@{domain}", f"{username}${username}"
 
     @futuremethod
     def new_configured_account(self):
-        account = self.new_preconfigured_account()
-        yield account.configure.future()
+        """Create a new configured account."""
+        addr, password = self.get_credentials()
+        account = self.get_unconfigured_account()
+        params = {"addr": addr, "password": password}
+        yield account.add_or_update_transport.future(params)
+
         assert account.is_configured()
         return account
 
     def new_configured_bot(self) -> Bot:
-        credentials = get_temp_credentials()
+        """Create a new configured bot."""
+        addr, password = self.get_credentials()
         bot = self.get_unconfigured_bot()
-        bot.configure(credentials["email"], credentials["password"])
+        bot.configure(addr, password)
         return bot
 
     @futuremethod
     def get_online_account(self):
+        """Create a new account and start I/O."""
         account = yield self.new_configured_account.future()
         account.bring_online()
         return account
 
     def get_online_accounts(self, num: int) -> list[Account]:
+        """Create multiple online accounts."""
         futures = [self.get_online_account.future() for _ in range(num)]
         return [f() for f in futures]
 
@@ -74,6 +77,10 @@ class ACFactory:
         return ac_clone
 
     def get_accepted_chat(self, ac1: Account, ac2: Account) -> Chat:
+        """Create a new 1:1 chat between ac1 and ac2 accepted on both sides.
+
+        Returned chat is a chat with ac2 from ac1 point of view.
+        """
         ac2.create_chat(ac1)
         return ac1.create_chat(ac2)
 
@@ -85,9 +92,10 @@ class ACFactory:
         file: Optional[str] = None,
         group: Optional[str] = None,
     ) -> Message:
+        """Send a message."""
         if not from_account:
             from_account = (self.get_online_accounts(1))[0]
-        to_contact = from_account.create_contact(to_account.get_config("addr"))
+        to_contact = from_account.create_contact(to_account)
         if group:
             to_chat = from_account.create_group(group)
             to_chat.add_contact(to_contact)
@@ -103,6 +111,7 @@ class ACFactory:
         file: Optional[str] = None,
         group: Optional[str] = None,
     ) -> AttrDict:
+        """Send a message and wait until recipient processes it."""
         self.send_message(
             to_account=to_client.account,
             from_account=from_account,
@@ -116,6 +125,7 @@ class ACFactory:
 
 @pytest.fixture
 def rpc(tmp_path) -> AsyncGenerator:
+    """RPC client fixture."""
     rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
     with rpc_server:
         yield rpc_server
@@ -123,4 +133,52 @@ def rpc(tmp_path) -> AsyncGenerator:
 
 @pytest.fixture
 def acfactory(rpc) -> AsyncGenerator:
+    """Return account factory fixture."""
     return ACFactory(DeltaChat(rpc))
+
+
+@pytest.fixture
+def data():
+    """Test data."""
+
+    class Data:
+        def __init__(self) -> None:
+            for path in reversed(py.path.local(__file__).parts()):
+                datadir = path.join("test-data")
+                if datadir.isdir():
+                    self.path = datadir
+                    return
+            raise Exception("Data path cannot be found")
+
+        def get_path(self, bn):
+            """Return path of file or None if it doesn't exist."""
+            fn = os.path.join(self.path, *bn.split("/"))
+            assert os.path.exists(fn)
+            return fn
+
+        def read_path(self, bn, mode="r"):
+            fn = self.get_path(bn)
+            if fn is not None:
+                with open(fn, mode) as f:
+                    return f.read()
+            return None
+
+    return Data()
+
+
+@pytest.fixture
+def log():
+    """Log printer fixture."""
+
+    class Printer:
+        def section(self, msg: str) -> None:
+            print()
+            print("=" * 10, msg, "=" * 10)
+
+        def step(self, msg: str) -> None:
+            print("-" * 5, "step " + msg, "-" * 5)
+
+        def indent(self, msg: str) -> None:
+            print("  " + msg)
+
+    return Printer()

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

@@ -1,3 +1,5 @@
+"""JSON-RPC client module."""
+
 from __future__ import annotations
 
 import itertools
@@ -12,16 +14,19 @@ from typing import Any, Iterator, Optional
 
 
 class JsonRpcError(Exception):
-    pass
+    """JSON-RPC error."""
 
 
 class RpcFuture:
+    """RPC future waiting for RPC call result."""
+
     def __init__(self, rpc: "Rpc", request_id: int, event: Event):
         self.rpc = rpc
         self.request_id = request_id
         self.event = event
 
     def __call__(self):
+        """Wait for the future to return the result."""
         self.event.wait()
         response = self.rpc.request_results.pop(self.request_id)
         if "error" in response:
@@ -32,17 +37,19 @@ class RpcFuture:
 
 
 class RpcMethod:
+    """RPC method."""
+
     def __init__(self, rpc: "Rpc", name: str):
         self.rpc = rpc
         self.name = name
 
     def __call__(self, *args) -> Any:
-        """Synchronously calls JSON-RPC method."""
+        """Call JSON-RPC method synchronously."""
         future = self.future(*args)
         return future()
 
     def future(self, *args) -> Any:
-        """Asynchronously calls JSON-RPC method."""
+        """Call JSON-RPC method asynchronously."""
         request_id = next(self.rpc.id_iterator)
         request = {
             "jsonrpc": "2.0",
@@ -58,8 +65,13 @@ class RpcMethod:
 
 
 class Rpc:
+    """RPC client."""
+
     def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
-        """The given arguments will be passed to subprocess.Popen()"""
+        """Initialize RPC client.
+
+        The given arguments will be passed to subprocess.Popen().
+        """
         if accounts_dir:
             kwargs["env"] = {
                 **kwargs.get("env", os.environ),
@@ -81,6 +93,7 @@ class Rpc:
         self.events_thread: Thread
 
     def start(self) -> None:
+        """Start RPC server subprocess."""
         if sys.version_info >= (3, 11):
             self.process = subprocess.Popen(
                 "deltachat-rpc-server",
@@ -130,6 +143,7 @@ class Rpc:
         self.close()
 
     def reader_loop(self) -> None:
+        """Process JSON-RPC responses from the RPC server process output."""
         try:
             while line := self.process.stdout.readline():
                 response = json.loads(line)
@@ -157,12 +171,13 @@ class Rpc:
             logging.exception("Exception in the writer loop")
 
     def get_queue(self, account_id: int) -> Queue:
+        """Get event queue corresponding to the given account ID."""
         if account_id not in self.event_queues:
             self.event_queues[account_id] = Queue()
         return self.event_queues[account_id]
 
     def events_loop(self) -> None:
-        """Requests new events and distributes them between queues."""
+        """Request new events and distributes them between queues."""
         try:
             while True:
                 if self.closing:
@@ -178,12 +193,12 @@ class Rpc:
             logging.exception("Exception in the event loop")
 
     def wait_for_event(self, account_id: int) -> Optional[dict]:
-        """Waits for the next event from the given account and returns it."""
+        """Wait for the next event from the given account and returns it."""
         queue = self.get_queue(account_id)
         return queue.get()
 
     def clear_all_events(self, account_id: int):
-        """Removes all queued-up events for a given account. Useful for tests."""
+        """Remove all queued-up events for a given account. Useful for tests."""
         queue = self.get_queue(account_id)
         try:
             while True:

deltachat-rpc-client/tests/test_account_events.py

@@ -13,10 +13,11 @@ def test_event_on_configuration(acfactory: ACFactory) -> None:
     Test if ACCOUNTS_ITEM_CHANGED event is emitted on configure
     """
 
-    account = acfactory.new_preconfigured_account()
+    addr, password = acfactory.get_credentials()
+    account = acfactory.get_unconfigured_account()
     account.clear_all_events()
     assert not account.is_configured()
-    future = account.configure.future()
+    future = account.add_or_update_transport.future({"addr": addr, "password": password})
     while True:
         event = account.wait_for_event()
         if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -48,8 +48,7 @@ def test_delivery_status(acfactory: ACFactory) -> None:
     """
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
 
     alice.clear_all_events()
@@ -119,8 +118,7 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
     """
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("hi")
 
@@ -150,18 +148,13 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
 def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Account]:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("hi")
 
     bob.wait_for_incoming_msg_event()
 
-    alice_second_device: Account = acfactory.get_unconfigured_account()
-
-    alice._rpc.provide_backup.future(alice.id)
-    backup_code = alice._rpc.get_backup_qr(alice.id)
-    alice_second_device._rpc.get_backup(alice_second_device.id, backup_code)
+    alice_second_device = alice.clone()
     alice_second_device.start_io()
     alice.clear_all_events()
     alice_second_device.clear_all_events()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -175,17 +175,11 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):
 
     threading.Thread(target=thread_run, daemon=True).start()
 
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            n = int(bytes(event.data).decode())
-            break
+    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
+    n = int(bytes(event.data).decode())
 
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert int(bytes(event.data).decode()) > n
-            break
+    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
+    assert int(bytes(event.data).decode()) > n
 
 
 def test_no_reordering(acfactory, path_to_webxdc):
@@ -229,8 +223,5 @@ def test_advertisement_after_chatting(acfactory, path_to_webxdc):
     ac2_hello_msg_snapshot.chat.accept()
 
     ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    while 1:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
-            assert event.msg_id == ac1_webxdc_msg.id
-            break
+    event = ac1.wait_for_event(EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED)
+    assert event.msg_id == ac1_webxdc_msg.id

deltachat-rpc-client/tests/test_key_transfer.py

@@ -0,0 +1,53 @@
+import pytest
+
+from deltachat_rpc_client import EventType
+from deltachat_rpc_client.rpc import JsonRpcError
+
+
+def wait_for_autocrypt_setup_message(account):
+    while True:
+        event = account.wait_for_event()
+        if event.kind == EventType.MSGS_CHANGED and event.msg_id != 0:
+            msg_id = event.msg_id
+            msg = account.get_message_by_id(msg_id)
+            if msg.get_snapshot().is_setupmessage:
+                return msg
+
+
+def test_autocrypt_setup_message_key_transfer(acfactory):
+    alice1 = acfactory.get_online_account()
+
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.set_config("addr", alice1.get_config("addr"))
+    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
+    alice2.configure()
+    alice2.bring_online()
+
+    setup_code = alice1.initiate_autocrypt_key_transfer()
+    msg = wait_for_autocrypt_setup_message(alice2)
+
+    # Test that entering wrong code returns an error.
+    with pytest.raises(JsonRpcError):
+        msg.continue_autocrypt_key_transfer("7037-0673-6287-3013-4095-7956-5617-6806-6756")
+
+    msg.continue_autocrypt_key_transfer(setup_code)
+
+
+def test_ac_setup_message_twice(acfactory):
+    alice1 = acfactory.get_online_account()
+
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.set_config("addr", alice1.get_config("addr"))
+    alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
+    alice2.configure()
+    alice2.bring_online()
+
+    # Send the first Autocrypt Setup Message and ignore it.
+    _setup_code = alice1.initiate_autocrypt_key_transfer()
+    wait_for_autocrypt_setup_message(alice2)
+
+    # Send the second Autocrypt Setup Message and import it.
+    setup_code = alice1.initiate_autocrypt_key_transfer()
+    msg = wait_for_autocrypt_setup_message(alice2)
+
+    msg.continue_autocrypt_key_transfer(setup_code)

deltachat-rpc-client/tests/test_multidevice.py

@@ -0,0 +1,110 @@
+from imap_tools import AND
+
+from deltachat_rpc_client import EventType
+from deltachat_rpc_client.const import MessageState
+
+
+def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_clone = ac1.clone()
+    ac1_clone.bring_online()
+
+    log.section("send out message without bcc to ourselves")
+    ac1.set_config("bcc_self", "0")
+    chat = ac1.create_chat(ac2)
+    self_addr = ac1.get_config("addr")
+    other_addr = ac2.get_config("addr")
+
+    msg_out = chat.send_text("message1")
+    assert not msg_out.get_snapshot().is_forwarded
+
+    # wait for send out (no BCC)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    assert ac1.get_config("bcc_self") == "0"
+
+    assert self_addr not in ev.msg
+    assert other_addr in ev.msg
+
+    log.section("ac1: setting bcc_self=1")
+    ac1.set_config("bcc_self", "1")
+
+    log.section("send out message with bcc to ourselves")
+    msg_out = chat.send_text("message2")
+
+    # wait for send out (BCC)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    assert ac1.get_config("bcc_self") == "1"
+
+    # Second client receives only second message, but not the first.
+    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
+    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == msg_out.get_snapshot().text
+
+    # now make sure we are sending message to ourselves too
+    assert self_addr in ev.msg
+    assert self_addr in ev.msg
+
+    # BCC-self messages are marked as seen by the sender device.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and event.msg.endswith("Marked messages 1 in folder INBOX as seen."):
+            break
+
+    # Check that the message is marked as seen on IMAP.
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.connect()
+    ac1_direct_imap.select_folder("Inbox")
+    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True)))) == 1
+
+
+def test_multidevice_sync_seen(acfactory, log):
+    """Test that message marked as seen on one device is marked as seen on another."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_clone = ac1.clone()
+    ac1_clone.bring_online()
+
+    ac1.set_config("bcc_self", "1")
+    ac1_clone.set_config("bcc_self", "1")
+
+    ac1_chat = ac1.create_chat(ac2)
+    ac1_clone_chat = ac1_clone.create_chat(ac2)
+    ac2_chat = ac2.create_chat(ac1)
+
+    log.section("Send a message from ac2 to ac1 and check that it's 'fresh'")
+    ac2_chat.send_text("Hi")
+    ac1_message = ac1.wait_for_incoming_msg()
+    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
+    assert ac1_chat.get_fresh_message_count() == 1
+    assert ac1_clone_chat.get_fresh_message_count() == 1
+    assert ac1_message.get_snapshot().state == MessageState.IN_FRESH
+    assert ac1_clone_message.get_snapshot().state == MessageState.IN_FRESH
+
+    log.section("ac1 marks message as seen on the first device")
+    ac1.mark_seen_messages([ac1_message])
+    assert ac1_message.get_snapshot().state == MessageState.IN_SEEN
+
+    log.section("ac1 clone detects that message is marked as seen")
+    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
+    assert ev.chat_id == ac1_clone_chat.id
+
+    log.section("Send an ephemeral message from ac2 to ac1")
+    ac2_chat.set_ephemeral_timer(60)
+    ac1.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
+    ac1.wait_for_incoming_msg()
+    ac1_clone.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
+    ac1_clone.wait_for_incoming_msg()
+
+    ac2_chat.send_text("Foobar")
+    ac1_message = ac1.wait_for_incoming_msg()
+    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
+    assert "Expires: " not in ac1_clone_message.get_info()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
+    assert "Expires: " not in ac1_clone_message.get_info()
+
+    ac1_message.mark_seen()
+    assert "Expires: " in ac1_message.get_info()
+    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
+    assert ev.chat_id == ac1_clone_chat.id
+    assert ac1_clone_message.get_snapshot().state == MessageState.IN_SEEN
+    # Test that the timer is started on the second device after synchronizing the seen status.
+    assert "Expires: " in ac1_clone_message.get_info()

deltachat-rpc-client/tests/test_securejoin.py

@@ -4,6 +4,7 @@ import time
 import pytest
 
 from deltachat_rpc_client import Chat, EventType, SpecialContactId
+from deltachat_rpc_client.rpc import JsonRpcError
 
 
 def test_qr_setup_contact(acfactory, tmp_path) -> None:
@@ -26,17 +27,21 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
-    # Test that if Bob changes the key, backwards verification is lost.
+    # Test that if Bob imports a key,
+    # backwards verification is not lost
+    # because default key is not changed.
     logging.info("Bob 2 is created")
     bob2 = acfactory.new_configured_account()
     bob2.export_self_keys(tmp_path)
 
-    logging.info("Bob imports a key")
-    bob.import_self_keys(tmp_path)
+    logging.info("Bob tries to import a key")
+    # Importing a second key is not allowed.
+    with pytest.raises(JsonRpcError):
+        bob.import_self_keys(tmp_path)
 
-    assert bob.get_config("key_id") == "2"
+    assert bob.get_config("key_id") == "1"
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert not bob_contact_alice_snapshot.is_verified
+    assert bob_contact_alice_snapshot.is_verified
 
 
 def test_qr_setup_contact_svg(acfactory) -> None:
@@ -55,15 +60,12 @@ def test_qr_setup_contact_svg(acfactory) -> None:
 
 
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect, tmp_path):
+def test_qr_securejoin(acfactory, protect):
     alice, bob, fiona = acfactory.get_online_accounts(3)
 
     # Setup second device for Alice
     # to test observing securejoin protocol.
-    alice.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.import_backup(files[0])
+    alice2 = alice.clone()
 
     logging.info("Alice creates a group")
     alice_chat = alice.create_group("Group", protect=protect)
@@ -74,17 +76,11 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
     bob.secure_join(qr_code)
 
     # Alice deletes "vg-request".
-    while True:
-        event = alice.wait_for_event()
-        if event["kind"] == "ImapMessageDeleted":
-            break
+    alice.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
     alice.wait_for_securejoin_inviter_success()
     # Bob deletes "vg-auth-required", Alice deletes "vg-request-with-auth".
     for ac in [alice, bob]:
-        while True:
-            event = ac.wait_for_event()
-            if event["kind"] == "ImapMessageDeleted":
-                break
+        ac.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
     bob.wait_for_securejoin_joiner_success()
 
     # Test that Alice verified Bob's profile.
@@ -93,7 +89,7 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
     assert alice_contact_bob_snapshot.is_verified
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected == protect
 
     # Test that Bob verified Alice's profile.
@@ -121,8 +117,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
     """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -159,11 +154,8 @@ def test_qr_readreceipt(acfactory) -> None:
     logging.info("Alice creates a verified group")
     group = alice.create_group("Group", protect=True)
 
-    bob_addr = bob.get_config("addr")
-    charlie_addr = charlie.get_config("addr")
-
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-    alice_contact_charlie = alice.create_contact(charlie_addr, "Charlie")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_contact_charlie = alice.create_contact(charlie, "Charlie")
 
     group.add_contact(alice_contact_bob)
     group.add_contact(alice_contact_charlie)
@@ -190,7 +182,7 @@ def test_qr_readreceipt(acfactory) -> None:
     charlie_snapshot = charlie_message.get_snapshot()
     assert charlie_snapshot.text == "Hi from Bob!"
 
-    bob_contact_charlie = bob.create_contact(charlie_addr, "Charlie")
+    bob_contact_charlie = bob.create_contact(charlie, "Charlie")
     assert not bob.get_chat_by_contact(bob_contact_charlie)
 
     logging.info("Charlie reads Bob's message")
@@ -461,12 +453,12 @@ def test_qr_new_group_unblocked(acfactory):
     assert ac2_msg.chat.get_basic_snapshot().is_contact_request
 
 
+@pytest.mark.skip(reason="AEAP is disabled for now")
 def test_aeap_flow_verified(acfactory):
     """Test that a new address is added to a contact when it changes its address."""
     ac1, ac2 = acfactory.get_online_accounts(2)
 
-    # ac1new is only used to get a new address.
-    ac1new = acfactory.new_preconfigured_account()
+    addr, password = acfactory.get_credentials()
 
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
@@ -486,8 +478,8 @@ def test_aeap_flow_verified(acfactory):
     assert msg_in_1.text == msg_out.text
 
     logging.info("changing email account")
-    ac1.set_config("addr", ac1new.get_config("addr"))
-    ac1.set_config("mail_pw", ac1new.get_config("mail_pw"))
+    ac1.set_config("addr", addr)
+    ac1.set_config("mail_pw", password)
     ac1.stop_io()
     ac1.configure()
     ac1.start_io()
@@ -500,11 +492,9 @@ def test_aeap_flow_verified(acfactory):
     msg_in_2_snapshot = msg_in_2.get_snapshot()
     assert msg_in_2_snapshot.text == msg_out.text
     assert msg_in_2_snapshot.chat.id == msg_in_1.chat.id
-    assert msg_in_2.get_sender_contact().get_snapshot().address == ac1new.get_config("addr")
+    assert msg_in_2.get_sender_contact().get_snapshot().address == addr
     assert len(msg_in_2_snapshot.chat.get_contacts()) == 2
-    assert ac1new.get_config("addr") in [
-        contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()
-    ]
+    assert addr in [contact.get_snapshot().address for contact in msg_in_2_snapshot.chat.get_contacts()]
 
 
 def test_gossip_verification(acfactory) -> None:
@@ -520,9 +510,9 @@ def test_gossip_verification(acfactory) -> None:
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
-    bob_contact_alice = bob.create_contact(alice.get_config("addr"), "Alice")
-    bob_contact_carol = bob.create_contact(carol.get_config("addr"), "Carol")
-    carol_contact_alice = carol.create_contact(alice.get_config("addr"), "Alice")
+    bob_contact_alice = bob.create_contact(alice, "Alice")
+    bob_contact_carol = bob.create_contact(carol, "Carol")
+    carol_contact_alice = carol.create_contact(alice, "Alice")
 
     logging.info("Bob creates an Autocrypt group")
     bob_group_chat = bob.create_group("Autocrypt Group")
@@ -573,7 +563,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr"))
     ac1_qr_code = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
@@ -582,7 +572,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     ac2.wait_for_securejoin_joiner_success()
 
     # ac1 is verified for ac2.
-    ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "")
+    ac2_contact_ac1 = ac2.create_contact(ac1, "")
     assert ac2_contact_ac1.get_snapshot().is_verified
 
     # ac1 resetups the account.
@@ -597,7 +587,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     # header sent by old ac1.
     while True:
         # ac1 sends a message to ac2.
-        ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
+        ac1_contact_ac2 = ac1.create_contact(ac2, "")
         ac1_chat_ac2 = ac1_contact_ac2.create_chat()
         ac1_chat_ac2.send_text("Hello!")
 
@@ -653,12 +643,14 @@ def test_withdraw_securejoin_qr(acfactory):
     bob_chat = bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
+    alice.clear_all_events()
+
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected
     bob_chat.leave()
 
-    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    snapshot = alice.get_message_by_id(alice.wait_for_msgs_changed_event().msg_id).get_snapshot()
     assert snapshot.text == "Group left by {}.".format(bob.get_config("addr"))
 
     logging.info("Alice withdraws QR code.")

deltachat-rpc-client/tests/test_something.py

@@ -61,61 +61,102 @@ def test_acfactory(acfactory) -> None:
 
 
 def test_configure_starttls(acfactory) -> None:
-    account = acfactory.new_preconfigured_account()
-
-    # Use STARTTLS
-    account.set_config("mail_security", "2")
-    account.set_config("send_security", "2")
-    account.configure()
+    addr, password = acfactory.get_credentials()
+    account = acfactory.get_unconfigured_account()
+    account.add_or_update_transport(
+        {
+            "addr": addr,
+            "password": password,
+            "imapSecurity": "starttls",
+            "smtpSecurity": "starttls",
+        },
+    )
     assert account.is_configured()
 
 
+def test_lowercase_address(acfactory) -> None:
+    addr, password = acfactory.get_credentials()
+    addr_upper = addr.upper()
+    account = acfactory.get_unconfigured_account()
+    account.add_or_update_transport(
+        {
+            "addr": addr_upper,
+            "password": password,
+        },
+    )
+    assert account.is_configured()
+    assert addr_upper != addr
+    assert account.get_config("configured_addr") == addr
+    assert account.list_transports()[0]["addr"] == addr
+
+    for param in [
+        account.get_info()["used_account_settings"],
+        account.get_info()["entered_account_settings"],
+    ]:
+        assert addr in param
+        assert addr_upper not in param
+
+
 def test_configure_ip(acfactory) -> None:
-    account = acfactory.new_preconfigured_account()
+    addr, password = acfactory.get_credentials()
+    account = acfactory.get_unconfigured_account()
+    ip_address = socket.gethostbyname(addr.rsplit("@")[-1])
 
-    domain = account.get_config("addr").rsplit("@")[-1]
-    ip_address = socket.gethostbyname(domain)
-
-    # This should fail TLS check.
-    account.set_config("mail_server", ip_address)
     with pytest.raises(JsonRpcError):
-        account.configure()
+        account.add_or_update_transport(
+            {
+                "addr": addr,
+                "password": password,
+                # This should fail TLS check.
+                "imapServer": ip_address,
+            },
+        )
 
 
 def test_configure_alternative_port(acfactory) -> None:
     """Test that configuration with alternative port 443 works."""
-    account = acfactory.new_preconfigured_account()
-
-    account.set_config("mail_port", "443")
-    account.set_config("send_port", "443")
-
-    account.configure()
+    addr, password = acfactory.get_credentials()
+    account = acfactory.get_unconfigured_account()
+    account.add_or_update_transport(
+        {
+            "addr": addr,
+            "password": password,
+            "imapPort": 443,
+            "smtpPort": 443,
+        },
+    )
+    assert account.is_configured()
 
 
-def test_configure_username(acfactory) -> None:
-    account = acfactory.new_preconfigured_account()
-
-    addr = account.get_config("addr")
-    account.set_config("mail_user", addr)
-    account.configure()
-
-    assert account.get_config("configured_mail_user") == addr
+def test_list_transports(acfactory) -> None:
+    addr, password = acfactory.get_credentials()
+    account = acfactory.get_unconfigured_account()
+    account.add_or_update_transport(
+        {
+            "addr": addr,
+            "password": password,
+            "imapUser": addr,
+        },
+    )
+    transports = account.list_transports()
+    assert len(transports) == 1
+    params = transports[0]
+    assert params["addr"] == addr
+    assert params["password"] == password
+    assert params["imapUser"] == addr
 
 
 def test_account(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
     bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.INCOMING_MSG:
-            chat_id = event.chat_id
-            msg_id = event.msg_id
-            break
+    event = bob.wait_for_incoming_msg_event()
+    chat_id = event.chat_id
+    msg_id = event.msg_id
 
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
@@ -174,8 +215,7 @@ def test_account(acfactory) -> None:
 def test_chat(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -241,7 +281,7 @@ def test_contact(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
     bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
 
     assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
     assert repr(alice_contact_bob)
@@ -258,8 +298,7 @@ def test_contact(acfactory) -> None:
 def test_message(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
@@ -287,28 +326,74 @@ def test_message(acfactory) -> None:
     assert reactions == snapshot.reactions
 
 
+def test_selfavatar_sync(acfactory, data, log) -> None:
+    alice = acfactory.get_online_account()
+
+    log.section("Alice adds a second device")
+    alice2 = alice.clone()
+
+    log.section("Second device goes online")
+    alice2.start_io()
+
+    log.section("First device changes avatar")
+    image = data.get_path("image/avatar1000x1000.jpg")
+    alice.set_config("selfavatar", image)
+    avatar_config = alice.get_config("selfavatar")
+    avatar_hash = os.path.basename(avatar_config)
+    print("Info: avatar hash is ", avatar_hash)
+
+    log.section("First device receives avatar change")
+    alice2.wait_for_event(EventType.SELFAVATAR_CHANGED)
+    avatar_config2 = alice2.get_config("selfavatar")
+    avatar_hash2 = os.path.basename(avatar_config2)
+    print("Info: avatar hash on second device is ", avatar_hash2)
+    assert avatar_hash == avatar_hash2
+    assert avatar_config != avatar_config2
+
+
+def test_reaction_seen_on_another_dev(acfactory) -> None:
+    alice, bob = acfactory.get_online_accounts(2)
+    alice2 = alice.clone()
+    alice2.start_io()
+
+    alice_contact_bob = alice.create_contact(bob, "Bob")
+    alice_chat_bob = alice_contact_bob.create_chat()
+    alice_chat_bob.send_text("Hello!")
+
+    event = bob.wait_for_incoming_msg_event()
+    msg_id = event.msg_id
+
+    message = bob.get_message_by_id(msg_id)
+    snapshot = message.get_snapshot()
+    snapshot.chat.accept()
+    message.send_reaction("😎")
+    for a in [alice, alice2]:
+        a.wait_for_event(EventType.INCOMING_REACTION)
+
+    alice2.clear_all_events()
+    alice_chat_bob.mark_noticed()
+    chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id
+    alice2_chat_bob = alice2.create_chat(bob)
+    assert chat_id == alice2_chat_bob.id
+
+
 def test_is_bot(acfactory) -> None:
     """Test that we can recognize messages submitted by bots."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
 
     # Alice becomes a bot.
     alice.set_config("bot", "1")
     alice_chat_bob.send_text("Hello!")
 
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.INCOMING_MSG:
-            msg_id = event.msg_id
-            message = bob.get_message_by_id(msg_id)
-            snapshot = message.get_snapshot()
-            assert snapshot.chat_id == event.chat_id
-            assert snapshot.text == "Hello!"
-            assert snapshot.is_bot
-            break
+    event = bob.wait_for_incoming_msg_event()
+    message = bob.get_message_by_id(event.msg_id)
+    snapshot = message.get_snapshot()
+    assert snapshot.chat_id == event.chat_id
+    assert snapshot.text == "Hello!"
+    assert snapshot.is_bot
 
 
 def test_bot(acfactory) -> None:
@@ -355,9 +440,11 @@ def test_wait_next_messages(acfactory) -> None:
     alice = acfactory.new_configured_account()
 
     # Create a bot account so it does not receive device messages in the beginning.
-    bot = acfactory.new_preconfigured_account()
+    addr, password = acfactory.get_credentials()
+    bot = acfactory.get_unconfigured_account()
     bot.set_config("bot", "1")
-    bot.configure()
+    bot.add_or_update_transport({"addr": addr, "password": password})
+    assert bot.is_configured()
 
     # There are no old messages and the call returns immediately.
     assert not bot.wait_next_messages()
@@ -366,8 +453,7 @@ def test_wait_next_messages(acfactory) -> None:
         # Bot starts waiting for messages.
         next_messages_task = executor.submit(bot.wait_next_messages)
 
-        bot_addr = bot.get_config("addr")
-        alice_contact_bot = alice.create_contact(bot_addr, "Bot")
+        alice_contact_bot = alice.create_contact(bot, "Bot")
         alice_chat_bot = alice_contact_bot.create_chat()
         alice_chat_bot.send_text("Hello!")
 
@@ -391,9 +477,7 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
 def test_import_export_keys(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = alice_contact_bob.create_chat()
+    alice_chat_bob = alice.create_chat(bob)
     alice_chat_bob.send_text("Hello Bob!")
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
@@ -443,9 +527,7 @@ def test_provider_info(rpc) -> None:
 def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
 
     # Bob creates chat manually so chat with Alice is accepted.
     alice_chat_bob = alice_contact_bob.create_chat()
@@ -469,10 +551,7 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
 
     # Alice reads Bob's message.
     message.mark_seen()
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.MSG_READ:
-            break
+    bob.wait_for_event(EventType.MSG_READ)
 
     # Bob sends a message to Alice, it should also be encrypted.
     bob_chat_alice.send_text("Hi Alice!")
@@ -544,9 +623,13 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
     messages they refer to and thus dropped.
     """
     (ac1,) = acfactory.get_online_accounts(1)
-    ac2 = acfactory.new_preconfigured_account()
-    ac2.configure()
+
+    addr, password = acfactory.get_credentials()
+    ac2 = acfactory.get_unconfigured_account()
+    ac2.add_or_update_transport({"addr": addr, "password": password})
     ac2.set_config("mvbox_move", "1")
+    assert ac2.is_configured()
+
     ac2.bring_online()
     chat1 = acfactory.get_accepted_chat(ac1, ac2)
     ac2.stop_io()
@@ -590,9 +673,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
         chat.send_text("Hello Alice!")
         assert alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot().text == "Hello Alice!"
 
-        contact_addr = account.get_config("addr")
-        contact = alice.create_contact(contact_addr, "")
-
+        contact = alice.create_contact(account)
         alice_group.add_contact(contact)
 
     if n_accounts == 2:
@@ -623,7 +704,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
             assert snapshot.chat == bob_chat_alice
 
 
-def test_markseen_contact_request(acfactory, tmp_path):
+def test_markseen_contact_request(acfactory):
     """
     Test that seen status is synchronized for contact request messages
     even though read receipt is not sent.
@@ -631,10 +712,7 @@ def test_markseen_contact_request(acfactory, tmp_path):
     alice, bob = acfactory.get_online_accounts(2)
 
     # Bob sets up a second device.
-    bob.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    bob2 = acfactory.get_unconfigured_account()
-    bob2.import_backup(files[0])
+    bob2 = bob.clone()
     bob2.start_io()
 
     alice_chat_bob = alice.create_chat(bob)
@@ -645,10 +723,7 @@ def test_markseen_contact_request(acfactory, tmp_path):
     assert message2.get_snapshot().state == MessageState.IN_FRESH
 
     message.mark_seen()
-    while True:
-        event = bob2.wait_for_event()
-        if event.kind == EventType.MSGS_NOTICED:
-            break
+    bob2.wait_for_event(EventType.MSGS_NOTICED)
     assert message2.get_snapshot().state == MessageState.IN_SEEN
 
 
@@ -661,12 +736,11 @@ def test_get_http_response(acfactory):
 
 def test_configured_imap_certificate_checks(acfactory):
     alice = acfactory.new_configured_account()
-    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")
 
     # Certificate checks should be configured (not None)
-    assert configured_certificate_checks
+    assert "cert_automatic" in alice.get_info().used_account_settings
 
-    # 0 is the value old Delta Chat core versions used
+    # "cert_old_automatic" is the value old Delta Chat core versions used
     # to mean user entered "imap_certificate_checks=0" (Automatic)
     # and configuration failed to use strict TLS checks
     # so it switched strict TLS checks off.
@@ -677,4 +751,99 @@ def test_configured_imap_certificate_checks(acfactory):
     #
     # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
     # This test is a regression test to prevent this happening again.
-    assert configured_certificate_checks != "0"
+    assert "cert_old_automatic" not in alice.get_info().used_account_settings
+
+
+def test_no_old_msg_is_fresh(acfactory):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_clone = ac1.clone()
+    ac1_clone.start_io()
+
+    ac1.create_chat(ac2)
+    ac1_clone_chat = ac1_clone.create_chat(ac2)
+
+    ac1.get_device_chat().mark_noticed()
+
+    logging.info("Send a first message from ac2 to ac1 and check that it's 'fresh'")
+    first_msg = ac2.create_chat(ac1).send_text("Hi")
+    ac1.wait_for_incoming_msg_event()
+    assert ac1.create_chat(ac2).get_fresh_message_count() == 1
+    assert len(list(ac1.get_fresh_messages())) == 1
+
+    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
+
+    logging.info("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
+    ac1_clone_chat.send_text("Hi back")
+    ev = ac1.wait_for_msgs_noticed_event()
+
+    assert ev.chat_id == first_msg.get_snapshot().chat_id
+    assert ac1.create_chat(ac2).get_fresh_message_count() == 0
+    assert len(list(ac1.get_fresh_messages())) == 0
+
+
+def test_rename_synchronization(acfactory):
+    """Test synchronization of contact renaming."""
+    alice, bob = acfactory.get_online_accounts(2)
+    alice2 = alice.clone()
+    alice2.bring_online()
+
+    bob.set_config("displayname", "Bob")
+    bob.create_chat(alice).send_text("Hello!")
+    alice_msg = alice.wait_for_incoming_msg().get_snapshot()
+    alice2_msg = alice2.wait_for_incoming_msg().get_snapshot()
+
+    assert alice2_msg.sender.get_snapshot().display_name == "Bob"
+    alice_msg.sender.set_name("Bobby")
+    alice2.wait_for_event(EventType.CONTACTS_CHANGED)
+    assert alice2_msg.sender.get_snapshot().display_name == "Bobby"
+
+
+def test_rename_group(acfactory):
+    """Test renaming the group."""
+    alice, bob = acfactory.get_online_accounts(2)
+
+    alice_group = alice.create_group("Test group")
+    alice_contact_bob = alice.create_contact(bob)
+    alice_group.add_contact(alice_contact_bob)
+    alice_group.send_text("Hello!")
+
+    bob_msg = bob.wait_for_incoming_msg()
+    bob_chat = bob_msg.get_snapshot().chat
+    assert bob_chat.get_basic_snapshot().name == "Test group"
+
+    for name in ["Baz", "Foo bar", "Xyzzy"]:
+        alice_group.set_name(name)
+        bob.wait_for_incoming_msg_event()
+        assert bob_chat.get_basic_snapshot().name == name
+
+
+def test_get_all_accounts_deadlock(rpc):
+    """Regression test for get_all_accounts deadlock."""
+    for _ in range(100):
+        all_accounts = rpc.get_all_accounts.future()
+        rpc.add_account()
+        all_accounts()
+
+
+def test_delete_deltachat_folder(acfactory, direct_imap):
+    """Test that DeltaChat folder is recreated if user deletes it manually."""
+    ac1 = acfactory.new_configured_account()
+    ac1.set_config("mvbox_move", "1")
+    ac1.bring_online()
+
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.conn.folder.delete("DeltaChat")
+    assert "DeltaChat" not in ac1_direct_imap.list_folders()
+
+    # Wait until new folder is created and UIDVALIDITY is updated.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
+            break
+
+    ac2 = acfactory.get_online_account()
+    ac2.create_chat(ac1).send_text("hello")
+    msg = ac1.wait_for_incoming_msg().get_snapshot()
+    assert msg.text == "hello"
+
+    assert "DeltaChat" in ac1_direct_imap.list_folders()

deltachat-rpc-client/tests/test_vcard.py

@@ -1,8 +1,7 @@
 def test_vcard(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")
 
     alice_chat_bob = alice_contact_bob.create_chat()

deltachat-rpc-client/tests/test_webxdc.py

@@ -1,20 +1,13 @@
-from deltachat_rpc_client import EventType
-
-
 def test_webxdc(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.INCOMING_MSG:
-            bob_chat_alice = bob.get_chat_by_id(event.chat_id)
-            message = bob.get_message_by_id(event.msg_id)
-            break
+    event = bob.wait_for_incoming_msg_event()
+    bob_chat_alice = bob.get_chat_by_id(event.chat_id)
+    message = bob.get_message_by_id(event.msg_id)
 
     webxdc_info = message.get_webxdc_info()
     assert webxdc_info == {
@@ -51,8 +44,7 @@ def test_webxdc(acfactory) -> None:
 def test_webxdc_insert_lots_of_updates(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 

deltachat-rpc-client/tox.ini

@@ -12,11 +12,8 @@ setenv =
     RUST_MIN_STACK=8388608
 passenv =
     CHATMAIL_DOMAIN
-deps =
-    pytest
-    pytest-timeout
-    pytest-xdist
-    imap-tools
+dependency_groups =
+    dev
 
 [testenv:lint]
 skipsdist = True
@@ -24,7 +21,7 @@ skip_install = True
 deps =
     ruff
 commands =
-    ruff format --quiet --diff src/ examples/ tests/
+    ruff format --diff src/ examples/ tests/
     ruff check src/ examples/ tests/
 
 [pytest]

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.155.3"
+version = "1.160.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"

deltachat-rpc-server/README.md

@@ -5,13 +5,13 @@ over standard I/O.
 
 ## Install
 
-To download binary pre-builds check the [releases page](https://github.com/deltachat/deltachat-core-rust/releases).
+To download binary pre-builds check the [releases page](https://github.com/chatmail/core/releases).
 Rename the downloaded binary to `deltachat-rpc-server` and add it to your `PATH`.
 
 To install from source run:
 
 ```sh
-cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server
+cargo install --git https://github.com/chatmail/core/ deltachat-rpc-server
 ```
 
 The `deltachat-rpc-server` executable will be installed into `$HOME/.cargo/bin` that should be available

deltachat-rpc-server/npm-package/package.json

@@ -8,12 +8,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/deltachat/deltachat-core-rust.git"
+    "url": "https://github.com/chatmail/core.git"
   },
   "scripts": {
     "prepack": "node scripts/update_optional_dependencies_and_version.js"
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.155.3"
+  "version": "1.160.0"
 }

deltachat-rpc-server/npm-package/scripts/src/make_package.py

@@ -25,7 +25,7 @@ def write_package_json(platform_path, rust_target, my_binary_name):
         "license": "MPL-2.0",
         "repository": {
             "type": "git",
-            "url": "https://github.com/deltachat/deltachat-core-rust.git",
+            "url": "https://github.com/chatmail/core.git",
         },
     }
 

deltachat-rpc-server/npm-package/src/errors.js

@@ -2,7 +2,7 @@
 import { ENV_VAR_NAME } from "./const.js";
 
 const cargoInstallCommand =
-  "cargo install --git https://github.com/deltachat/deltachat-core-rust deltachat-rpc-server";
+  "cargo install --git https://github.com/chatmail/core deltachat-rpc-server";
 
 export function NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name) {
   return `deltachat-rpc-server not found:

deltachat-rpc-server/src/main.rs

@@ -30,7 +30,7 @@ async fn main() {
     // thread, and it is impossible to cancel that read. This can make shutdown of the runtime hang
     // until the user presses enter."
     if let Err(error) = &r {
-        log::error!("Fatal error: {error:#}.")
+        log::error!("Error: {error:#}.")
     }
     std::process::exit(if r.is_ok() { 0 } else { 1 });
 }
@@ -73,7 +73,7 @@ async fn main_impl() -> Result<()> {
         .init();
 
     let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
-    log::info!("Starting with accounts directory `{}`.", path);
+    log::info!("Starting with accounts directory `{path}`.");
     let writable = true;
     let accounts = Accounts::new(PathBuf::from(&path), writable).await?;
 
@@ -97,7 +97,7 @@ async fn main_impl() -> Result<()> {
                     Some(message) => serde_json::to_string(&message)?,
                 }
             };
-            log::trace!("RPC send {}", message);
+            log::trace!("RPC send {message}");
             println!("{message}");
         }
         Ok(())
@@ -141,7 +141,7 @@ async fn main_impl() -> Result<()> {
                     Some(message) => message,
                 }
             };
-            log::trace!("RPC recv {}", message);
+            log::trace!("RPC recv {message}");
             let session = session.clone();
             tokio::spawn(async move {
                 session.handle_incoming(&message).await;

deny.toml

@@ -1,7 +1,5 @@
 [advisories]
 ignore = [
-    "RUSTSEC-2020-0071",
-
     # Timing attack on RSA.
     # Delta Chat does not use RSA for new keys
     # and this requires precise measurement of the decryption time by the attacker.
@@ -9,11 +7,11 @@ ignore = [
     # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
     "RUSTSEC-2023-0071",
 
-    # Unmaintained encoding
-    "RUSTSEC-2021-0153",
-
     # Unmaintained instant
     "RUSTSEC-2024-0384",
+
+    # Unmaintained paste
+    "RUSTSEC-2024-0436",
 ]
 
 [bans]
@@ -23,36 +21,36 @@ ignore = [
 # Please keep this list alphabetically sorted.
 skip = [
      { name = "async-channel", version = "1.9.0" },
-     { name = "base64", version = "<0.21" },
-     { name = "base64", version = "0.21.7" },
      { name = "bitflags", version = "1.3.2" },
-     { name = "core-foundation", version = "0.9.4" },
+     { name = "derive_more-impl", version = "1.0.0" },
+     { name = "derive_more", version = "1.0.0" },
      { name = "event-listener", version = "2.5.3" },
      { name = "generator", version = "0.7.5" },
-     { name = "getrandom", version = "<0.2" },
+     { name = "getrandom", version = "0.2.12" },
+     { name = "hashbrown", version = "0.14.5" },
+     { name = "heck", version = "0.4.1" },
      { name = "http", version = "0.2.12" },
+     { name = "linux-raw-sys", version = "0.4.14" },
      { name = "loom", version = "0.5.6" },
+     { name = "lru", version = "0.12.3" },
      { name = "netlink-packet-route", version = "0.17.1" },
-     { name = "nix", version = "0.26.4" },
-     { name = "nix", version = "0.27.1" },
-     { name = "quick-error", version = "<2.0" },
-     { name = "rand_chacha", version = "<0.3" },
-     { name = "rand_core", version = "<0.6" },
-     { name = "rand", version = "<0.8" },
+     { name = "nom", version = "7.1.3" },
+     { name = "rand_chacha", version = "0.3.1" },
+     { name = "rand_core", version = "0.6.4" },
+     { name = "rand", version = "0.8.5" },
      { name = "redox_syscall", version = "0.3.5" },
+     { name = "redox_syscall", version = "0.4.1" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
-     { name = "rtnetlink", version = "0.13.1" },
-     { name = "security-framework", version = "2.11.1" },
-     { name = "sync_wrapper", version = "0.1.2" },
+     { name = "rustix", version = "0.38.44" },
+     { name = "serdect", version = "0.2.0" },
+     { name = "spin", version = "0.9.8" },
+     { name = "strum_macros", version = "0.26.2" },
+     { name = "strum", version = "0.26.2" },
      { name = "syn", version = "1.0.109" },
      { name = "thiserror-impl", version = "1.0.69" },
      { name = "thiserror", version = "1.0.69" },
-     { name = "time", version = "<0.3" },
-     { name = "tokio-tungstenite", version = "0.21.0" },
-     { name = "tungstenite", version = "0.21.0" },
-     { name = "unicode-width", version = "0.1.11" },
-     { name = "wasi", version = "<0.11" },
+     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
      { name = "windows" },
      { name = "windows_aarch64_gnullvm" },
      { name = "windows_aarch64_msvc" },
@@ -69,6 +67,7 @@ skip = [
      { name = "windows_x86_64_gnu" },
      { name = "windows_x86_64_gnullvm" },
      { name = "windows_x86_64_msvc" },
+     { name = "zerocopy", version = "0.7.32" },
 ]
 
 
@@ -83,9 +82,9 @@ allow = [
     "ISC",
     "MIT",
     "MPL-2.0",
-    "OpenSSL",
     "Unicode-3.0",
     "Unicode-DFS-2016",
+    "Unlicense",
     "Zlib",
 ]
 
@@ -95,9 +94,3 @@ expression = "MIT AND ISC AND OpenSSL"
 license-files = [
       { path = "LICENSE", hash = 0xbd0eed23 },
 ]
-
-[sources.allow-org]
-# Organisations which we allow git sources from.
-github = [
-       "deltachat",
-]

flake.lock

@@ -47,11 +47,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1737527504,
-        "narHash": "sha256-Z8S5gLPdIYeKwBXDaSxlJ72ZmiilYhu3418h3RSQZA0=",
+        "lastModified": 1747291057,
+        "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "aa13f23e3e91b95377a693ac655bbc6545ebec0d",
+        "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737453499,
-        "narHash": "sha256-fa5AJI9mjFU2oVXqdCq2oA2pripAXbHzkUkewJRQpxA=",
+        "lastModified": 1746889290,
+        "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "0b68402d781955d526b80e5d479e9e47addb4075",
+        "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -18,9 +18,9 @@
         manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
         androidSdk = android.sdk.${system} (sdkPkgs:
           builtins.attrValues {
-            inherit (sdkPkgs) ndk-27-0-11902837 cmdline-tools-latest;
+            inherit (sdkPkgs) ndk-27-2-12479018 cmdline-tools-latest;
           });
-        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.0.11902837";
+        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.2.12479018";
 
         rustSrc = nix-filter.lib {
           root = ./.;
@@ -30,6 +30,7 @@
           include = [
             ./benches
             ./assets
+            ./fuzz
             ./Cargo.lock
             ./Cargo.toml
             ./CMakeLists.txt
@@ -87,10 +88,6 @@
         };
         cargoLock = {
           lockFile = ./Cargo.lock;
-          outputHashes = {
-            "email-0.0.20" = "sha256-cfR3D5jFQpw32bGsgapK2Uwuxmht+rRK/n1ZUmCb2WA=";
-            "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
-          };
         };
         mkRustPackage = packageName:
           naersk'.buildPackage {
@@ -312,10 +309,41 @@
             LD = "${targetCc}";
           };
 
-        mkAndroidPackages = arch: {
-          "deltachat-rpc-server-${arch}-android" = mkAndroidRustPackage arch "deltachat-rpc-server";
-          "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
-        };
+        mkAndroidPackages = arch:
+          let
+            rpc-server = mkAndroidRustPackage arch "deltachat-rpc-server";
+          in
+          {
+            "deltachat-rpc-server-${arch}-android" = rpc-server;
+            "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
+            "deltachat-rpc-server-${arch}-android-wheel" =
+              pkgs.stdenv.mkDerivation {
+                pname = "deltachat-rpc-server-${arch}-android-wheel";
+                version = manifest.version;
+                src = nix-filter.lib {
+                  root = ./.;
+                  include = [
+                    "scripts/wheel-rpc-server.py"
+                    "deltachat-rpc-server/README.md"
+                    "LICENSE"
+                    "Cargo.toml"
+                  ];
+                };
+                nativeBuildInputs = [
+                  pkgs.python3
+                  pkgs.python3Packages.wheel
+                ];
+                buildInputs = [
+                  rpc-server
+                ];
+                buildPhase = ''
+                  mkdir tmp
+                  cp ${rpc-server}/bin/deltachat-rpc-server tmp/deltachat-rpc-server
+                  python3 scripts/wheel-rpc-server.py ${arch}-android tmp/deltachat-rpc-server
+                '';
+                installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out'';
+              };
+          };
 
         mkRustPackages = arch:
           let
@@ -556,6 +584,9 @@
               cargo-nextest
               perl # needed to build vendored OpenSSL
               git-cliff
+              (python3.withPackages (pypkgs: with pypkgs; [
+                tox
+              ]))
             ];
           };
       }