Use generated types

.github/workflows/ci.yml

@@ -14,7 +14,8 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - master
+      - stable
 
 env:
   RUSTFLAGS: -Dwarnings
@@ -24,11 +25,9 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.76.0
+      RUSTUP_TOOLCHAIN: 1.73.0
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
       - name: Install rustfmt and clippy
         run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
       - name: Cache rust cargo artifacts
@@ -40,13 +39,15 @@ jobs:
       - name: Check
         run: cargo check --workspace --all-targets --all-features
 
+      # Check with musl libc target which is used for `deltachat-rpc-server` releases.
+      - name: Check musl
+        run: scripts/zig-musl-check.sh
+
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           arguments: --all-features --workspace
@@ -57,9 +58,7 @@ jobs:
     name: Check provider database
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
       - name: Check provider database
         run: scripts/update-provider-database.sh
 
@@ -69,9 +68,8 @@ jobs:
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout sources
+        uses: actions/checkout@v3
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Rustdoc
@@ -83,20 +81,18 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.76.0
+            rust: 1.73.0
           - os: windows-latest
-            rust: 1.76.0
+            rust: 1.73.0
           - os: macos-latest
-            rust: 1.76.0
+            rust: 1.73.0
 
-          # Minimum Supported Rust Version = 1.70.0
+          # Minimum Supported Rust Version = 1.67.0
           - os: ubuntu-latest
-            rust: 1.70.0
+            rust: 1.67.0
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Install Rust ${{ matrix.rust }}
         run: rustup toolchain install --profile minimal ${{ matrix.rust }}
@@ -120,9 +116,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -131,7 +125,7 @@ jobs:
         run: cargo build -p deltachat_ffi --features jsonrpc
 
       - name: Upload C library
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-libdeltachat.a
           path: target/debug/libdeltachat.a
@@ -141,12 +135,10 @@ jobs:
     name: Build deltachat-rpc-server
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
@@ -155,19 +147,18 @@ jobs:
         run: cargo build -p deltachat-rpc-server
 
       - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-deltachat-rpc-server
-          path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || 'target/debug/deltachat-rpc-server' }}
+          path: target/debug/deltachat-rpc-server
           retention-days: 1
 
   python_lint:
     name: Python lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout sources
+        uses: actions/checkout@v3
 
       - name: Install tox
         run: pip install tox
@@ -180,8 +171,8 @@ jobs:
         working-directory: deltachat-rpc-client
         run: tox -e lint
 
-  cffi_python_tests:
-    name: CFFI Python tests
+  python_tests:
+    name: Python tests
     needs: ["c_library", "python_lint"]
     strategy:
       fail-fast: false
@@ -207,18 +198,16 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Download libdeltachat.a
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.os }}-libdeltachat.a
           path: target/debug
 
       - name: Install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -227,14 +216,14 @@ jobs:
 
       - name: Run python tests
         env:
-          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
         run: tox -e mypy,doc,py
 
-  rpc_python_tests:
-    name: JSON-RPC Python tests
+  aysnc_python_tests:
+    name: Async Python tests
     needs: ["python_lint", "rpc_server"]
     strategy:
       fail-fast: false
@@ -244,8 +233,6 @@ jobs:
             python: 3.12
           - os: macos-latest
             python: 3.12
-          - os: windows-latest
-            python: 3.12
 
           # PyPy tests
           - os: ubuntu-latest
@@ -259,12 +246,10 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -272,26 +257,19 @@ jobs:
         run: pip install tox
 
       - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.os }}-deltachat-rpc-server
           path: target/debug
 
       - name: Make deltachat-rpc-server executable
-        if: ${{ matrix.os != 'windows-latest' }}
         run: chmod +x target/debug/deltachat-rpc-server
 
       - name: Add deltachat-rpc-server to path
-        if: ${{ matrix.os != 'windows-latest' }}
         run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
 
-      - name: Add deltachat-rpc-server to path
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          "${{ github.workspace }}/target/debug" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
       - name: Run deltachat-rpc-client tests
         env:
-          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
         working-directory: deltachat-rpc-client
         run: tox -e py

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

@@ -21,27 +21,40 @@ jobs:
   # Build a version statically linked against musl libc
   # to avoid problems with glibc version incompatibility.
   build_linux:
-    name: Build deltachat-rpc-server for Linux
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
+    name: Cross-compile deltachat-rpc-server for x86_64, i686, aarch64 and armv7 Linux
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v3
 
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
+      - name: Build
+        run: sh scripts/zig-rpc-server.sh
 
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
+      - name: Upload x86_64 binary
+        uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux
-          path: result/bin/deltachat-rpc-server
+          name: deltachat-rpc-server-x86_64
+          path: target/x86_64-unknown-linux-musl/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload i686 binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-i686
+          path: target/i686-unknown-linux-musl/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload aarch64 binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-aarch64
+          path: target/aarch64-unknown-linux-musl/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload armv7 binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-armv7
+          path: target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server
           if-no-files-found: error
 
   build_windows:
@@ -49,146 +62,74 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [win32, win64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+        include:
+          - os: windows-latest
+            artifact: win32.exe
+            path: deltachat-rpc-server.exe
+            target: i686-pc-windows-msvc
 
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
+          - os: windows-latest
+            artifact: win64.exe
+            path: deltachat-rpc-server.exe
+            target: x86_64-pc-windows-msvc
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup rust target
+        run: rustup target add ${{ matrix.target }}
+
+      - name: Build
+        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.target }} --features vendored
 
       - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-${{ matrix.arch }}
-          path: result/bin/deltachat-rpc-server.exe
+          name: deltachat-rpc-server-${{ matrix.artifact }}
+          path: target/${{ matrix.target}}/release/${{ matrix.path }}
           if-no-files-found: error
 
   build_macos:
     name: Build deltachat-rpc-server for macOS
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x86_64, aarch64]
-
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
       - name: Setup rust target
-        run: rustup target add ${{ matrix.arch }}-apple-darwin
+        run: rustup target add x86_64-apple-darwin
 
       - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored
+        run: cargo build --release --package deltachat-rpc-server --target x86_64-apple-darwin --features vendored
 
       - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-macos
-          path: target/${{ matrix.arch }}-apple-darwin/release/deltachat-rpc-server
+          name: deltachat-rpc-server-x86_64-macos
+          path: target/x86_64-apple-darwin/release/deltachat-rpc-server
           if-no-files-found: error
 
   publish:
-    name: Build wheels and upload binaries to the release
-    needs: ["build_linux", "build_macos"]
+    name: Upload binaries to the release
+    needs: ["build_linux", "build_windows", "build_macos"]
     permissions:
       contents: write
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Download built binaries
+        uses: "actions/download-artifact@v3"
 
-      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-linux
-          path: deltachat-rpc-server-aarch64-linux.d
-
-      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv7l-linux
-          path: deltachat-rpc-server-armv7l-linux.d
-
-      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv6l-linux
-          path: deltachat-rpc-server-armv6l-linux.d
-
-      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-i686-linux
-          path: deltachat-rpc-server-i686-linux.d
-
-      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
-
-      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-macos
-          path: deltachat-rpc-server-x86_64-macos.d
-
-      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-macos
-          path: deltachat-rpc-server-aarch64-macos.d
-
-      - name: Flatten dist/ directory
+      - name: Compose dist/ directory
         run: |
-          mkdir -p dist
-          mv deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-aarch64-linux
-          mv deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-armv7l-linux
-          mv deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-armv6l-linux
-          mv deltachat-rpc-server-i686-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-i686-linux
-          mv deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server dist/deltachat-rpc-server-x86_64-linux
-          mv deltachat-rpc-server-win32.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win32.exe
-          mv deltachat-rpc-server-win64.d/deltachat-rpc-server.exe dist/deltachat-rpc-server-win64.exe
-          mv deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server dist/deltachat-rpc-server-x86_64-macos
-          mv deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server dist/deltachat-rpc-server-aarch64-macos
-
-      # Python 3.11 is needed for tomllib used in scripts/wheel-rpc-server.py
-      - name: Install python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
-
-      - name: Install wheel
-        run: pip install wheel
-
-      - name: Build deltachat-rpc-server Python wheels and source package
-        run: scripts/wheel-rpc-server.py
+          mkdir dist
+          for x in x86_64 i686 aarch64 armv7 win32.exe win64.exe x86_64-macos; do
+            mv "deltachat-rpc-server-$x"/* "dist/deltachat-rpc-server-$x"
+          done
 
       - name: List downloaded artifacts
         run: ls -l dist/
 
       - name: Upload binaries to the GitHub release
-        if: github.event_name == 'release'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         run: |

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

@@ -13,12 +13,11 @@ jobs:
     steps:
       - name: Install tree
         run: sudo apt install tree
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "16"
       - name: Get tag
         id: tag
         uses: dawidd6/action-get-tag@v1
@@ -50,7 +49,7 @@ jobs:
           ls -lah
           mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: deltachat-jsonrpc-client.tgz
           path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}

.github/workflows/jsonrpc.yml

@@ -2,9 +2,9 @@ name: JSON-RPC API Test
 
 on:
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
-    branches: [main]
+    branches: [master]
 
 env:
   CARGO_TERM_COLOR: always
@@ -14,13 +14,11 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - name: Use Node.js 18.x
+      - uses: actions/checkout@v3
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 16.x
       - name: Add Rust cache
         uses: Swatinem/rust-cache@v2
       - name: npm install
@@ -33,7 +31,7 @@ jobs:
         working-directory: deltachat-jsonrpc/typescript
         run: npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
       - name: make sure websocket server version still builds
         working-directory: deltachat-jsonrpc
         run: cargo build --bin deltachat-jsonrpc-server --features webserver

.github/workflows/node-docs.yml

@@ -8,20 +8,18 @@ name: Generate & upload node.js documentation
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 16.x
 
       - name: npm install and generate documentation
         working-directory: node

.github/workflows/node-package.yml

@@ -14,12 +14,11 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "16"
       - name: System info
         run: |
           rustc -vV
@@ -57,7 +56,7 @@ jobs:
           tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
 
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}
           path: node/${{ matrix.os }}.tar.gz
@@ -67,20 +66,21 @@ jobs:
     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
+    # Debian 10 contained glibc 2.28 at the time of the writing (2023-06-04): https://packages.debian.org/buster/libc6
+    # Ubuntu 18.04 is at the End of Standard Support since June 2023, but it contains glibc 2.27,
+    # so we are using it to support Ubuntu 18.04 setups that are still not upgraded.
+    container: ubuntu:18.04
     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
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "16"
       - run: apt-get update
 
       # Python is needed for node-gyp
@@ -127,7 +127,7 @@ jobs:
           tar -zcvf "linux.tar.gz" -C prebuilds .
 
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: linux
           path: node/linux.tar.gz
@@ -139,12 +139,11 @@ jobs:
     steps:
       - name: Install tree
         run: sudo apt install tree
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
-          node-version: "18"
+          node-version: "16"
       - name: Get tag
         id: tag
         uses: dawidd6/action-get-tag@v1
@@ -168,23 +167,23 @@ jobs:
           node --version
           echo $DELTACHAT_NODE_TAR_GZ
       - name: Download Linux prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
         with:
           name: linux
       - name: Download macOS prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
         with:
           name: macos-latest
       - name: Download Windows prebuild
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
         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
+          tar -xvzf linux/linux.tar.gz -C node/prebuilds
+          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
+          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
           tree node/prebuilds
           rm -rf linux macos-latest windows-latest
       - name: Install dependencies without running scripts
@@ -204,7 +203,7 @@ jobs:
           ls -lah
           mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
       - name: Upload prebuild
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: deltachat-node.tgz
           path: ${{ env.DELTACHAT_NODE_TAR_GZ }}

.github/workflows/node-tests.yml

@@ -13,7 +13,7 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   tests:
@@ -23,12 +23,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "16"
       - name: System info
         run: |
           rustc -vV
@@ -64,5 +63,5 @@ jobs:
         working-directory: node
         run: npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
           NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

.github/workflows/repl.yml

@@ -10,17 +10,15 @@ on:
 jobs:
   build_repl:
     name: Build REPL example
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v3
+
       - name: Build
-        run: nix build .#deltachat-repl-win64
+        run: cargo build -p deltachat-repl --features vendored
+
       - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: repl.exe
-          path: "result/bin/deltachat-repl.exe"
+          path: "target/debug/deltachat-repl.exe"

.github/workflows/upload-docs.yml

@@ -1,18 +1,17 @@
-name: Build & Deploy Documentation on rs.delta.chat, c.delta.chat, py.delta.chat
+name: Build & Deploy Documentation on rs.delta.chat
 
 on:
   push:
     branches:
-      - main
+      - master
+      - docs-gh-action
 
 jobs:
-  build-rs:
+  build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat --no-deps --document-private-items
@@ -24,41 +23,3 @@ jobs:
           HOST: "delta.chat"
           SOURCE: "target/doc"
           TARGET: "/var/www/html/rs/"
-
-  build-python:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: 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
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@py.delta.chat:/home/delta/build/master"
-
-  build-c:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: 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 py.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@c.delta.chat:/home/delta/build-c/master"

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

@@ -7,22 +7,23 @@ name: Build & Deploy Documentation on cffi.delta.chat
 on:
   push:
     branches:
-      - main
+      - master
+      - docs-gh-action
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
+      - uses: actions/checkout@v3
       - name: Build the documentation with cargo
         run: |
           cargo doc --package deltachat_ffi --no-deps
       - name: Upload to cffi.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc/ "${{ secrets.USERNAME }}@delta.chat:/var/www/html/cffi/"
+        uses: up9cloud/action-rsync@v1.3
+        env:
+          USER: ${{ secrets.USERNAME }}
+          KEY: ${{ secrets.KEY }}
+          HOST: "delta.chat"
+          SOURCE: "target/doc"
+          TARGET: "/var/www/html/cffi/"

.gitignore

@@ -1,7 +1,6 @@
 /target
 **/*.rs.bk
 /build
-/dist
 
 # ignore vi temporaries
 *~
@@ -19,9 +18,6 @@ python/.eggs
 __pycache__
 python/src/deltachat/capi*.so
 python/.venv/
-python/venv/
-venv/
-env/
 
 python/liveconfig*
 

CHANGELOG.md

@@ -1,715 +1,5 @@
 # Changelog
 
-## [1.135.1] - 2024-02-20
-
-### Features / Changes
-
-- Sync self-avatar across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-- Sync Config::Selfstatus across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-- Remove webxdc sending limit.
-
-### Fixes
-
-- Never encrypt `{vc,vg}-request` SecureJoin messages.
-- Apply Autocrypt headers if timestamp is unchanged.
-- `Context::get_info`: Report displayname as "displayname" (w/o underscore).
-
-### Tests
-
-- Mock `SystemTime::now()` for the tests.
-- Add a test on protection message sort timestamp ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-### Build system
-
-- Add flake.nix.
-- Add footer template for git-cliff.
-
-### CI
-
-- Update GitHub Actions `actions/upload-artifact`, `actions/download-artifact`, `actions/checkout`.
-- Build deltachat-repl for Windows with nix.
-- Build deltachat-rpc-server with nix.
-- Try to upload deltachat-rpc-server only on release.
-
-### Refactor
-
-- `create_keypair`: Remove unnecessary `map_err`.
-- Return error with a cause when failing to export keys.
-- Rename incorrectly named variables in `create_keypair`.
-
-## [1.135.1] - 2024-02-20
-
-### CI
-
-- Update actions/upload-artifact.
-- Use actions/download-artifact@v4.
-- Replace download-artifact v1 with v4.
-- Update to actions/checkout@v4.
-- Fixup node-package.yml after artifact actions upgrade.
-
-### Features / Changes
-
-- Mock SystemTime::now() for the tests.
-- Remove webxdc sending limit.
-- Sync self-avatar across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-- Sync Config::Selfstatus across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-
-### Fixes
-
-- Context::get_info: Report displayname as "displayname" (w/o underscore).
-- Never encrypt {vc,vg}-request.
-
-### Other
-
-- Cleanup changelog ([#5265](https://github.com/deltachat/deltachat-core-rust/pull/5265))
-
-somehow a whole issue sneaked in :).
-
-### Refactor
-
-- create_keypair: Remove unnecessary map_err.
-- Return error with a cause when failing to export keys.
-- Rename incorrectly named variables in create_keypair.
-
-### Tests
-
-- Add a test on protection message sort timestamp ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-## [1.135.0] - 2024-02-13
-
-### Features / Changes
-
-- Add wildcard pattern support to provider database.
-- Add device message about outgoing undecryptable messages ([#5164](https://github.com/deltachat/deltachat-core-rust/pull/5164)).
-- Context::set_config(): Restart IO scheduler if needed ([#5111](https://github.com/deltachat/deltachat-core-rust/pull/5111)).
-- Server_sent_unsolicited_exists(): Log folder name.
-- Cache system time instead of looking at the clock several times in a row.
-- Basic self-reporting ([#5129](https://github.com/deltachat/deltachat-core-rust/pull/5129)).
-
-### Fixes
-
-- Dehtml: Don't just truncate text when trying to decode ([#5223](https://github.com/deltachat/deltachat-core-rust/pull/5223)).
-- Mark the gossip keys from the message as verified, not the ones from the db ([#5247](https://github.com/deltachat/deltachat-core-rust/pull/5247)).
-- Guarantee immediate message deletion if delete_server_after == 0 ([#5201](https://github.com/deltachat/deltachat-core-rust/pull/5201)).
-- Never allow a message timestamp to be a lot in the future ([#5249](https://github.com/deltachat/deltachat-core-rust/pull/5249)).
-- Imap::configure_mvbox: Do select_with_uidvalidity() before return.
-- ImapSession::select_or_create_folder(): Don't fail if folder is created in parallel.
-- Emit ConfigSynced event on the second device.
-- Create mvbox on setting mvbox_move.
-- Use SystemTime instead of Instant everywhere.
-- Restore database rows removed in previous release; this ensures compatibility when adding second device or importing backup and not all devices run the new core ([#5254](https://github.com/deltachat/deltachat-core-rust/pull/5254))
-
-### Miscellaneous Tasks
-
-- cargo: Bump image from 0.24.7 to 0.24.8.
-- cargo: Bump chrono from 0.4.31 to 0.4.33.
-- cargo: Bump futures-lite from 2.1.0 to 2.2.0.
-- cargo: Bump pin-project from 1.1.3 to 1.1.4.
-- cargo: Bump iana-time-zone from yanked 0.1.59 to 0.1.60.
-- cargo: Bump smallvec from 1.11.2 to 1.13.1.
-- cargo: Bump base64 from 0.21.5 to 0.21.7.
-- cargo: Bump regex from 1.10.2 to 1.10.3.
-- cargo: Bump libc from 0.2.151 to 0.2.153.
-- cargo: Bump reqwest from 0.11.23 to 0.11.24.
-- cargo: Bump axum from 0.7.3 to 0.7.4.
-- cargo: Bump uuid from 1.6.1 to 1.7.0.
-- cargo: Bump fast-socks5 from 0.9.2 to 0.9.5.
-- cargo: Bump serde_json from 1.0.111 to 1.0.113.
-- cargo: Bump syn from 2.0.46 to 2.0.48.
-- cargo: Bump serde from 1.0.194 to 1.0.196.
-- cargo: Bump toml from 0.8.8 to 0.8.10.
-- cargo: Update to strum 0.26.
-- Cargo update.
-- scripts: Do not install deltachat-rpc-client twice.
-
-### Other
-
-- Update welcome image, thanks @paulaluap
-- Merge pull request #5243 from deltachat/dependabot/cargo/pin-project-1.1.4
-- Merge pull request #5241 from deltachat/dependabot/cargo/futures-lite-2.2.0
-- Merge pull request #5236 from deltachat/dependabot/cargo/chrono-0.4.33
-- Merge pull request #5235 from deltachat/dependabot/cargo/image-0.24.8
-
-
-### Refactor
-
-- Resultify token::exists.
-
-### Tests
-
-- Delete_server_after="1" should cause immediate message deletion ([#5201](https://github.com/deltachat/deltachat-core-rust/pull/5201)).
-
-## [1.134.0] - 2024-01-31
-
-### API-Changes
-
-- [**breaking**] JSON-RPC: device message api now requires `Option<MessageData>` instead of `String` for the message ([#5211](https://github.com/deltachat/deltachat-core-rust/pull/5211)).
-- CFFI: add `dc_accounts_background_fetch` and event `DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE`.
-- JSON-RPC: add `accounts_background_fetch`.
-
-### Features / Changes
-
-- `Qr::check_qr()`: Accept i.delta.chat invite links ([#5217](https://github.com/deltachat/deltachat-core-rust/pull/5217)).
-- Add support for IMAP METADATA, fetching `/shared/comment` and `/shared/admin` and displaying it in account info.
-
-### Fixes
-
-- Add tolerance for macOS and iOS changing `#` to `%23`.
-- Do not drop unknown report attachments, such as TLS reports.
-- Treat only "Auto-Submitted: auto-generated" messages as bot-sent ([#5213](https://github.com/deltachat/deltachat-core-rust/pull/5213)).
-- `Chat::resend_msgs`: Guarantee strictly increasing time in the `Date` header.
-- Delete resent messages on receiver side ([#5155](https://github.com/deltachat/deltachat-core-rust/pull/5155)).
-- Fix iOS build issue.
-
-### CI
-
-- Add/remove necessary newlines to fix Python lint.
-
-### Tests
-
-- `test_import_export_online_all`: Send the message to the existing address to avoid errors ([#5220](https://github.com/deltachat/deltachat-core-rust/pull/5220)).
-
-## [1.133.2] - 2024-01-24
-
-### Fixes
-
-- Downgrade OpenSSL from 3.2.0 to 3.1.4 ([#5206](https://github.com/deltachat/deltachat-core-rust/issues/5206))
-- No new chats for MDNs with alias ([#5196](https://github.com/deltachat/deltachat-core-rust/issues/5196)) ([#5199](https://github.com/deltachat/deltachat-core-rust/pull/5199)).
-
-## [1.133.1] - 2024-01-21
-
-### API-Changes
-
-- Add `is_bot` to cffi and jsonrpc ([#5197](https://github.com/deltachat/deltachat-core-rust/pull/5197)).
-
-### Features / Changes
-
-- Add system message when provider does not allow unencrypted messages ([#5195](https://github.com/deltachat/deltachat-core-rust/pull/5195)).
-
-### Fixes
-
-- `Chat::send_msg`: Remove encryption-related params from already sent message. This allows to send received encrypted `dc_msg_t` object to unencrypted chat, e.g. in a Python bot.
-- Set message download state to Failure on IMAP errors. This avoids partially downloaded messages getting stuck in "Downloading..." state without actually being in a download queue.
-- BCC-to-self even if server deletion is set to "at once". This is a workaround for SMTP servers which do not return response in time, BCC-self works as a confirmation that message was sent out successfully and does not need more retries.
-- node: Run tests with native ESM modules instead of `esm` ([#5194](https://github.com/deltachat/deltachat-core-rust/pull/5194)).
-- Use Quoted-Printable MIME encoding for the text part ([#3986](https://github.com/deltachat/deltachat-core-rust/pull/3986)).
-
-### Tests
-
-- python: Add `get_protected_chat` to testplugin.py.
-
-## [1.133.0] - 2024-01-14
-
-### Features / Changes
-
-- Securejoin protocol implementation refinements
-  - Track forward and backward verification separately ([#5089](https://github.com/deltachat/deltachat-core-rust/pull/5089)) to avoid inconsistent states.
-  - Mark 1:1 chat as verified for Bob early. 1:1 chat with Alice is verified as soon as Alice's key is verified rather than at the end of the protocol.
-- Put Message-ID into hidden headers and take it from there on receiver ([#4798](https://github.com/deltachat/deltachat-core-rust/pull/4798)). This works around servers which generate their own Message-ID and overwrite the one generated by Delta Chat.
-- deltachat-repl: Enable INFO logging by default and add timestamps.
-- Add `ConfigSynced` (`DC_EVENT_CONFIG_SYNCED`) event which is emitted when configuration is changed via synchronization message or synchronization message for configuration is sent. UI may refresh elments based on the configuration key which is a part of the event.
-- Sync contact creation/rename across devices ([#5163](https://github.com/deltachat/deltachat-core-rust/pull/5163)).
-- Encrypt MDNs ([#5175](https://github.com/deltachat/deltachat-core-rust/pull/5175)).
-- Only try to configure non-strict TLS checks if explicitly set ([#5181](https://github.com/deltachat/deltachat-core-rust/pull/5181)).
-
-### Build system
-
-- Use released version of iroh 0.4.2 for "setup second device" feature.
-
-### CI
-
-- Update to Rust 1.75.0.
-- Downgrade `chai` from 4.4.0 to 4.3.10.
-
-### Documentation
-
-- Add a link <https://www.ietf.org/archive/id/draft-bucksch-autoconfig-00.html> to autoconfig RFC draft.
-- Update securejoin link in `standards.md` from <https://countermitm.readthedocs.io/> to <https://securejoin.readthedocs.io>.
-- Restore "Constants" page in Doxygen >=1.9.8
-
-### Fixes
-
-- imap: Limit the rate of LOGIN attempts rather than connection attempts. This is to avoid having to wait for rate limiter right after switching from a bad or offline network to a working network while still guarding against reconnection loop.
-- Do not ignore `peerstate.save_to_db()` errors.
-- securejoin: Mark 1:1s as protected regardless of the Config::VerifiedOneOnOneChats.
-- Delete received outgoing messages from SMTP queue ([#5115](https://github.com/deltachat/deltachat-core-rust/pull/5115)).
-- imap: Fail fast on `LIST` errors to avoid busy loop when connection is lost.
-- Split SMTP jobs already in `chat::create_send_msg_jobs()` ([#5115](https://github.com/deltachat/deltachat-core-rust/pull/5115)).
-- Do not remove contents from unencrypted [Schleuder](https://schleuder.org/) mailing lists messages.
-- Reset message error when scheduling resending ([#5119](https://github.com/deltachat/deltachat-core-rust/pull/5119)).
-- Emit events more reliably when starting and stopping I/O ([#5101](https://github.com/deltachat/deltachat-core-rust/pull/5101)).
-- Fix timestamp of chat protection info message for correct message ordering after restoring a backup ([#5088](https://github.com/deltachat/deltachat-core-rust/pull/5088)).
-
-### Refactor
-
-- sql: Recreate `config` table with UNIQUE constraint.
-- sql: Recreate `keypairs` table to remove unused `addr` and `created` fields and move `is_default` flag to `config` table.
-- Send `Secure-Join-Fingerprint` only in `*-request-with-auth`.
-
-### Tests
-
-- Test joining non-protected group.
-- Test that read receipts don't degrade encryption.
-- Test that changing default private key breaks backward verification.
-- Test recovery from lost vc-contact-confirm.
-- Use `wait_for_incoming_msg_event()` more.
-
-## [1.132.1] - 2023-12-12
-
-### Features / Changes
-
-- Add "From:" to protected headers for signed-only messages.
-- Sync user actions for ad-hoc groups across devices ([#5065](https://github.com/deltachat/deltachat-core-rust/pull/5065)).
-
-### Fixes
-
-- Add padlock to empty part if the whole message is empty.
-- Renew IDLE timeout on keepalives and reduce it to 5 minutes.
-- connectivity: Return false from `all_work_done()` immediately after connecting (iOS notification fix).
-
-### API-Changes
-
-- deltachat-jsonrpc-client: add `Account.{import,export}_self_keys`.
-
-### CI
-
-- Update to Rust 1.74.1.
-
-## [1.132.0] - 2023-12-06
-
-### Features / Changes
-
-- Increase TCP timeouts from 30 to 60 seconds.
-
-### Fixes
-
-- Don't sort message creating a protected group over a protection message ([#4963](https://github.com/deltachat/deltachat-core-rust/pull/4963)).
-- Do not lock accounts.toml on iOS.
-- Protect groups even if some members are not verified and add `test_securejoin_after_contact_resetup` regression test.
-
-## [1.131.9] - 2023-12-02
-
-### API-Changes
-
-- Remove `dc_get_http_response()`, `dc_http_response_get_mimetype()`, `dc_http_response_get_encoding()`, `dc_http_response_get_blob()`, `dc_http_response_get_size()`, `dc_http_response_unref()` and `dc_http_response_t` from cffi.
-- Deprecate CFFI APIs `dc_send_reaction()`, `dc_get_msg_reactions()`, `dc_reactions_get_contacts()`, `dc_reactions_get_by_contact_id()`, `dc_reactions_unref` and `dc_reactions_t`.
-- Make `Contact.is_verified()` return bool.
-
-### Build system
-
-- Switch from fork of iroh to iroh 0.4.2 pre-release.
-
-### Features / Changes
-
-- Send `Chat-Verified` headers in 1:1 chats.
-- Ratelimit IMAP connections ([#4940](https://github.com/deltachat/deltachat-core-rust/pull/4940)).
-- Remove receiver limit on `.xdc` size.
-- Don't affect MimeMessage with "From" and secured headers from encrypted unsigned messages.
-- Sync `Config::{MdnsEnabled,ShowEmails}` across devices ([#4954](https://github.com/deltachat/deltachat-core-rust/pull/4954)).
-- Sync `Config::Displayname` across devices ([#4893](https://github.com/deltachat/deltachat-core-rust/pull/4893)).
-- `Chat::rename_ex`: Don't send sync message if usual message is sent.
-
-### Fixes
-
-- Lock the database when INSERTing a webxdc update, avoid "Database is locked" errors.
-- Use keyring with all private keys when decrypting a message ([#5046](https://github.com/deltachat/deltachat-core-rust/pull/5046)).
-
-### Tests
-
-- Make Result-returning tests produce a line number.
-- Add `test_utils::sync()`.
-- Test inserting lots of webxdc updates.
-- Split `test_sync_alter_chat()` into smaller tests.
-
-## [1.131.8] - 2023-11-27
-
-### Features / Changes
-
-- webxdc: Add unique IDs to status updates sent outside and deduplicate based on IDs.
-
-### Fixes
-
-- Allow IMAP servers not returning UIDNEXT on SELECT and STATUS such as mail.163.com.
-- Use the correct securejoin strings used in the UI, remove old TODO ([#5047](https://github.com/deltachat/deltachat-core-rust/pull/5047)).
-- Do not emit events about webxdc update events logged into debug log webxdc.
-
-### Tests
-
-- Check that `receive_status_update` has forward compatibility and unique webxdc IDs will be ignored by previous Delta Chat versions.
-
-## [1.131.7] - 2023-11-24
-
-### Fixes
-
-- Revert "fix: check UIDNEXT with a STATUS command before going IDLE". This attempts to fix mail.163.com which has broken STATUS command.
-
-## [1.131.6] - 2023-11-21
-
-### Fixes
-
-- Fail fast if IMAP FETCH cannot be parsed instead of getting stuck in infinite loop.
-
-### Documentation
-
-- Generate deltachat-rpc-client documentation and publish it to <https://py.delta.chat>.
-
-## [1.131.5] - 2023-11-20
-
-### API-Changes
-
-- deltachat-rpc-client: Add `Message.get_sender_contact()`.
-- Turn `ContactAddress` into an owned type.
-
-### Features / Changes
-
-- Lowercase addresses in Autocrypt and Autocrypt-Gossip headers.
-- Lowercase the address in member added/removed messages.
-- Lowercase `addr` when it is set.
-- Do not replace the message with an error in square brackets when the sender is not a member of the protected group.
-
-### Fixes
-
-- `Chat::sync_contacts()`: Fetch contact addresses in a single query.
-- `Chat::rename_ex()`: Sync improved chat name to other devices.
-- Recognize `Chat-Group-Member-Added` of self case-insensitively.
-- Compare verifier addr to peerstate addr case-insensitively.
-
-### Tests
-
-- Port [Secure-Join](https://securejoin.readthedocs.io/) tests to JSON-RPC.
-
-### CI
-
-- Test with Rust 1.74.
-
-
-## [1.131.4] - 2023-11-16
-
-### Documentation
-
-- Document DC_DOWNLOAD_UNDECIPHERABLE.
-
-### Fixes
-
-- Always add "Member added" as system message.
-
-## [1.131.3] - 2023-11-15
-
-### Fixes
-
-- Update async-imap to 0.9.4 which does not ignore EOF on FETCH.
-- Reset gossiped timestamp on securejoin.
-- sync: Ignore unknown sync items to provide forward compatibility and avoid creating empty message bubbles.
-- sync: Skip sync when chat name is set to the current one.
-- Return connectivity HTML with an error when IO is stopped.
-
-## [1.131.2] - 2023-11-14
-
-### API-Changes
-
-- deltachat-rpc-client: add `Account.get_chat_by_contact()`.
-
-### Features / Changes
-
-- Do not post "... verified" messages on QR scan success.
-- Never drop better message from `apply_group_changes()`.
-
-### Fixes
-
-- Assign MDNs to the trash chat early to prevent received MDNs from creating or unblocking 1:1 chats.
-- Allow to securejoin groups when 1:1 chat with the inviter is a contact request.
-- Add "setup changed" message for verified key before the message.
-- Ignore special chats when calculating similar chats.
-
-## [1.131.1] - 2023-11-13
-
-### Fixes
-
-- Do not skip actual message parts when group change messages are inserted.
-
-## [1.131.0] - 2023-11-13
-
-### Features / Changes
-
-- Sync chat contacts across devices ([#4953](https://github.com/deltachat/deltachat-core-rust/pull/4953)).
-- Sync creating broadcast lists across devices ([#4953](https://github.com/deltachat/deltachat-core-rust/pull/4953)).
-- Sync Chat::name across devices ([#4953](https://github.com/deltachat/deltachat-core-rust/pull/4953)).
-- Multi-device broadcast lists ([#4953](https://github.com/deltachat/deltachat-core-rust/pull/4953)).
-
-### Fixes
-
-- Encode chat name in the `List-ID` header to avoid SMTPUTF8 errors.
-- Ignore errors from generating sync messages.
-- `Context::execute_sync_items`: Ignore all errors ([#4817](https://github.com/deltachat/deltachat-core-rust/pull/4817)).
-- Allow to send unverified securejoin messages to protected chats ([#4982](https://github.com/deltachat/deltachat-core-rust/pull/4982)).
-
-## [1.130.0] - 2023-11-10
-
-### API-Changes
-
-- Emit JoinerProgress(1000) event when Bob verifies Alice.
-- JSON-RPC: add `ContactObject.is_profile_verified` property.
-- Hide `ChatId::get_for_contact()` from public API.
-
-### Features / Changes
-
-- Add secondary verified key.
-- Add info messages about implicitly added members.
-- Treat reset state as encryption not preferred.
-- Grow sleep durations on errors in Imap::fake_idle() ([#4424](https://github.com/deltachat/deltachat-core-rust/pull/4424)).
-
-### Fixes
-
-- Mark 1:1 chat as protected when joining a group.
-- Raise lower auto-download limit to 160k.
-- Remove `Reporting-UA` from read receipts.
-- Do not apply group changes to special chats. Avoid adding members to the trash chat.
-- imap: make `UidGrouper` robust against duplicate UIDs.
-- Do not return hidden chat from `dc_get_chat_id_by_contact_id`.
-- Smtp_loop(): Don't grow timeout if interrupted early ([#4833](https://github.com/deltachat/deltachat-core-rust/pull/4833)).
-
-### Refactor
-
-- imap: Do not FETCH right after `scan_folders()`.
-- deltachat-rpc-client: Use `itertools` instead of `Lock` for thread-safe request ID generation.
-
-### Tests
-
-- Remove unused `--liveconfig` option.
-- Test chatlist can load for corrupted chats ([#4979](https://github.com/deltachat/deltachat-core-rust/pull/4979)).
-
-### Miscellaneous Tasks
-
-- Update provider-db ([#4949](https://github.com/deltachat/deltachat-core-rust/pull/4949)).
-
-## [1.129.1] - 2023-11-06
-
-### Fixes
-
-- Update tokio-imap to fix Outlook STATUS parsing bug.
-- deltachat-rpc-client: Add the Lock around request ID.
-- `apply_group_changes`: Don't implicitly delete members locally, add absent ones instead ([#4934](https://github.com/deltachat/deltachat-core-rust/pull/4934)).
-- Partial messages do not change group state ([#4900](https://github.com/deltachat/deltachat-core-rust/pull/4900)).
-
-### Tests
-
-- Group chats device synchronisation.
-
-## [1.129.0] - 2023-11-06
-
-### API-Changes
-
-- Add JSON-RPC `get_chat_id_by_contact_id` API ([#4918](https://github.com/deltachat/deltachat-core-rust/pull/4918)).
-- [**breaking**] Remove deprecated `get_verifier_addr`.
-
-### Features / Changes
-
-- Sync chat `Blocked` state, chat visibility, chat mute duration and contact blocked status across devices ([#4817](https://github.com/deltachat/deltachat-core-rust/pull/4817)).
-- Add 'group created instructions' as info message ([#4916](https://github.com/deltachat/deltachat-core-rust/pull/4916)).
-- Add hardcoded fallback DNS cache.
-
-### Fixes
-
-- Switch to `EncryptionPreference::Mutual` on a receipt of encrypted+signed message ([#4707](https://github.com/deltachat/deltachat-core-rust/pull/4707)).
-- imap: Check UIDNEXT with a STATUS command before going IDLE.
-- Allow to change verified key via "member added" message.
-- json-rpc: Return verifier even if the contact is not "verified" (Autocrypt key does not equal Secure-Join key).
-
-### Documentation
-
-- Refine `Contact::get_verifier_id` and `Contact::is_verified` documentation ([#4922](https://github.com/deltachat/deltachat-core-rust/pull/4922)).
-- Contact profile view should not use `dc_contact_is_verified()`.
-- Remove documentation for non-existing `dc_accounts_new` `os_name` param.
-
-### Refactor
-
-- Remove unused or useless code paths in Secure-Join ([#4897](https://github.com/deltachat/deltachat-core-rust/pull/4897)).
-- Improve error handling in Secure-Join code.
-- Add hostname to "no DNS resolution results" error message.
-- Accept `&str` instead of `Option<String>` in idle().
-
-## [1.128.0] - 2023-11-02
-
-### Build system
-- [**breaking**] Upgrade nodejs version to 18 ([#4903](https://github.com/deltachat/deltachat-core-rust/pull/4903)).
-
-### Features / Changes
-
-- deltachat-rpc-client: Add `Account.wait_for_incoming_msg_event()`.
-- Decrease ratelimit for .testrun.org subdomains.
-
-### Fixes
-
-- Do not fail securejoin due to unrelated pending bobstate  ([#4896](https://github.com/deltachat/deltachat-core-rust/pull/4896)).
-- Allow other verified group recipients to be unverified, only check the sender verification.
-- Remove not working attempt to recover from verified key changes.
-
-## [1.127.2] - 2023-10-29
-
-### API-Changes
-
-- [**breaking**] Jsonrpc `misc_set_draft` now requires setting the viewtype.
-- jsonrpc: Add `get_message_info_object`.
-
-### Tests
-
-- deltachat-rpc-client: Move pytest option from pyproject.toml to tox.ini and set log level.
-- deltachat-rpc-client: Test securejoin.
-- Increase pytest timeout to 10 minutes.
-- Compile deltachat-rpc-server in debug mode for tests.
-
-## [1.127.1] - 2023-10-27
-
-### API-Changes
-
-- jsonrpc: add `.is_protection_broken` to `FullChat` and `BasicChat`.
-- jsonrpc: Add `id` to `ProviderInfo`.
-
-## [1.127.0] - 2023-10-26
-
-### API-Changes
-
-- [**breaking**] `dc_accounts_new` API is changed. Unused `os_name` argument is removed and `writable` argument is added.
-- jsonrpc: Add `resend_messages`.
-- [**breaking**] Remove unused function `is_verified_ex()` ([#4551](https://github.com/deltachat/deltachat-core-rust/pull/4551))
-- [**breaking**] Make `MsgId.delete_from_db()` private.
-- [**breaking**] deltachat-jsonrpc: use `kind` as a tag for all union types
-- json-rpc: Force stickers to be sent as stickers ([#4819](https://github.com/deltachat/deltachat-core-rust/pull/4819)).
-- Add mailto parse api ([#4829](https://github.com/deltachat/deltachat-core-rust/pull/4829)).
-- [**breaking**] Remove unused `DC_STR_PROTECTION_(EN)ABLED` strings
-- [**breaking**] Remove unused `dc_set_chat_protection()`
-- Hide `DcSecretKey` trait from the API.
-- Verified 1:1 chats ([#4315](https://github.com/deltachat/deltachat-core-rust/pull/4315)). Disabled by default, enable with `verified_one_on_one_chats` config.
-- Add api `chat::Chat::is_protection_broken`
-- Add `dc_chat_is_protection_broken()` C API.
-
-### CI
-
-- Run Rust tests with `RUST_BACKTRACE` set.
-- Replace `master` branch with `main`.  Run CI only on `main` branch pushes.
-- Test `deltachat-rpc-client` on Windows.
-
-### Documentation
-
-- Document how logs and error messages should be formatted in `CONTRIBUTING.md`.
-- Clarify transitive behaviour of `dc_contact_is_verfified()`.
-- Document `configured_addr`.
-
-### Features / Changes
-
-- Add lockfile to account manager ([#4314](https://github.com/deltachat/deltachat-core-rust/pull/4314)). 
-- Don't show a contact as verified if their key changed since the verification ([#4574](https://github.com/deltachat/deltachat-core-rust/pull/4574)).
-- deltachat-rpc-server: Add `--openrpc` option to print OpenRPC specification for JSON-RPC API. This specification can be used to generate JSON-RPC API clients.
-- Track whether contact is a bot or not ([#4821](https://github.com/deltachat/deltachat-core-rust/pull/4821)).
-- Replace `Config::SendSyncMsgs` with `SyncMsgs` ([#4817](https://github.com/deltachat/deltachat-core-rust/pull/4817)).
-
-### Fixes
-
-- Don't create 1:1 chat as protected for contact who doesn't prefer to encrypt ([#4538](https://github.com/deltachat/deltachat-core-rust/pull/4538)).
-- Allow to save a draft if the verification is broken ([#4542](https://github.com/deltachat/deltachat-core-rust/pull/4542)).
-- Fix info-message orderings of verified 1:1 chats ([#4545](https://github.com/deltachat/deltachat-core-rust/pull/4545)).
-- Fix example; this was changed some time ago, see https://docs.webxdc.org/spec.html#sendupdate
-- `receive_imf`: Update peerstate from db after handling Securejoin handshake ([#4600](https://github.com/deltachat/deltachat-core-rust/pull/4600)).
-- Sort old incoming messages below all outgoing ones ([#4621](https://github.com/deltachat/deltachat-core-rust/pull/4621)).
-- Do not mark non-verified group chats as verified when using securejoin.
-- `receive_imf`: Set protection only for Chattype::Single ([#4597](https://github.com/deltachat/deltachat-core-rust/pull/4597)).
-- Return from `dc_get_chatlist(DC_GCL_FOR_FORWARDING)` only chats where we can send ([#4616](https://github.com/deltachat/deltachat-core-rust/pull/4616)).
-- Clear VerifiedOneOnOneChats config on backup ([#4615](https://github.com/deltachat/deltachat-core-rust/pull/4615)).
-- Try removal of accounts multiple times with timeouts in case the database file is blocked (restore `try_many_times` workaround).
-
-### Build system
-
-- Remove examples/simple.rs.
-- Increase MSRV to 1.70.0.
-- Update dependencies.
-- Switch to iroh 0.4.x fork with updated dependencies.
-
-## [1.126.1] - 2023-10-24
-
-### Fixes
-
-- Do not hardcode version in deltachat-rpc-server source package.
-- Do not interrupt IMAP loop from `get_connectivity_html()`.
-
-### Features / Changes
-
-- imap: Buffer `STARTTLS` command.
-
-### Build system
-
-- Build `deltachat-rpc-server` binary for aarch64 macOS.
-- Build `deltachat-rpc-server` wheels for macOS and Windows.
-
-### Refactor
-
-- Remove job queue.
-
-### Miscellaneous Tasks
-
-- cargo: Update `ahash` to make `cargo-deny` happy.
-
-## [1.126.0] - 2023-10-22
-
-### API-Changes
-
-- Allow to filter by unread in `chatlist:try_load` ([#4824](https://github.com/deltachat/deltachat-core-rust/pull/4824)).
-- Add `misc_send_draft()` to JSON-RPC API ([#4839](https://github.com/deltachat/deltachat-core-rust/pull/4839)).
-
-### Features / Changes
-
-- [**breaking**] Make broadcast lists create their own chat ([#4644](https://github.com/deltachat/deltachat-core-rust/pull/4644)).
-  - This means that UIs need to ask for the name when creating a broadcast list, similar to <https://github.com/deltachat/deltachat-android/pull/2653>.
-- Add self-address to backup filename ([#4820](https://github.com/deltachat/deltachat-core-rust/pull/4820))
-
-### CI
-
-- Build Python wheels for deltachat-rpc-server.
-
-### Build system
-
-- Strip release binaries.
-- Workaround OpenSSL crate expecting libatomic to be available.
-
-### Fixes
-
-- Set `soft_heap_limit` on SQLite database.
-- imap: Fallback to `STATUS` if `SELECT` did not return UIDNEXT.
-
-## [1.125.0] - 2023-10-14
-
-### API-Changes
-
-- [**breaking**] deltachat-rpc-client: Replace `asyncio` with threads.
-- Validate boolean values passed to `set_config`. Attempts to set values other than `0` and `1` will result in an error.
-
-### CI
-
-- Reduce required Python version for deltachat-rpc-client from 3.8 to 3.7.
-
-### Features / Changes
-
-- Add developer option to disable IDLE.
-
-### Fixes
-
-- `deltachat-rpc-client`: Run `deltachat-rpc-server` in its own process group. This prevents reception of `SIGINT` by the server when the bot is terminated with `^C`.
-- python: Don't automatically set the displayname to "bot" when setting log level.
-- Don't update `timestamp`, `timestamp_rcvd`, `state` when replacing partially downloaded message ([#4700](https://github.com/deltachat/deltachat-core-rust/pull/4700)).
-- Assign encrypted partially downloaded group messages to 1:1 chat ([#4757](https://github.com/deltachat/deltachat-core-rust/pull/4757)).
-- Return all contacts from `Contact::get_all` for bots ([#4811](https://github.com/deltachat/deltachat-core-rust/pull/4811)).
-- Set connectivity status to "connected" during fake idle.
-- Return verifier contacts regardless of their origin.
-- Don't try to send more MDNs if there's a temporary SMTP error ([#4534](https://github.com/deltachat/deltachat-core-rust/pull/4534)).
-
-### Refactor
-
-- deltachat-rpc-client: Close stdin instead of sending `SIGTERM`.
-- deltachat-rpc-client: Remove print() calls. Standard `logging` package is for logging instead.
-
-### Tests
-
-- deltachat-rpc-client: Enable logs in pytest.
-
 ## [1.124.1] - 2023-10-05
 
 ### Fixes
@@ -1638,7 +928,7 @@ Bugfix release attempting to fix the [iOS build error](https://github.com/deltac
 
 ### Changes
 - Look at Authentication-Results. Don't accept Autocrypt key changes
-  if they come with negative authentication results while this contact
+  if they come with negative authentiation results while this contact
   sent emails with positive authentication results in the past. #3583
 - jsonrpc in cffi also sends events now #3662
 - jsonrpc: new format for events and better typescript autocompletion
@@ -3224,7 +2514,7 @@ Bugfix release attempting to fix the [iOS build error](https://github.com/deltac
 
 - delete all consumed secure-join handshake messagess #1209 #1212
 
-- Rust-level cleanups #1218 #1217 #1210 #1205
+- rust-level cleanups #1218 #1217 #1210 #1205
 
 - python-level cleanups #1204 #1202 #1201
 
@@ -3589,31 +2879,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.123.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.122.0...v1.123.0
 [1.124.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.123.0...v1.124.0
 [1.124.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.124.0...v1.124.1
-[1.125.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.124.1...v1.125.0
-[1.126.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.125.0...v1.126.0
-[1.126.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.126.0...v1.126.1
-[1.127.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.126.1...v1.127.0
-[1.127.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.127.0...v1.127.1
-[1.127.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.127.1...v1.127.2
-[1.128.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.127.2...v1.128.0
-[1.129.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.128.0...v1.129.0
-[1.129.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.129.0...v1.129.1
-[1.130.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.129.1...v1.130.0
-[1.131.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.130.0...v1.131.0
-[1.131.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.0...v1.131.1
-[1.131.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.1...v1.131.2
-[1.131.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.2...v1.131.3
-[1.131.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.3...v1.131.4
-[1.131.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.4...v1.131.5
-[1.131.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.5...v1.131.6
-[1.131.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.6...v1.131.7
-[1.131.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.7...v1.131.8
-[1.131.9]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.8...v1.131.9
-[1.132.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.9...v1.132.0
-[1.132.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.132.0...v1.132.1
-[1.133.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.132.1...v1.133.0
-[1.133.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.0...v1.133.1
-[1.133.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.1...v1.133.2
-[1.134.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.133.2...v1.134.0
-[1.135.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.134.0...v1.135.0
-[1.135.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.135.0...v1.135.1

CONTRIBUTING.md

@@ -86,17 +86,6 @@ For example:
 .with_context(|| format!("Unable to trash message {msg_id}"))
 ```
 
-All errors should be handled in one of these ways:
-- With `if let Err() =` (incl. logging them into `warn!()`/`err!()`).
-- With `.log_err().ok()`.
-- Bubbled up with `?`.
-
-`backtrace` feature is enabled for `anyhow` crate
-and `debug = 1` option is set in the test profile.
-This allows to run `RUST_BACKTRACE=1 cargo test`
-and get a backtrace with line numbers in resultified tests
-which return `anyhow::Result`.
-
 ### Logging
 
 For logging, use `info!`, `warn!` and `error!` macros.

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.135.1"
+version = "1.124.1"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.70"
+rust-version = "1.67"
 
 [profile.dev]
 debug = 0
@@ -11,10 +11,6 @@ panic = 'abort'
 opt-level = 1
 
 [profile.test]
-# Make anyhow `backtrace` feature useful.
-# With `debug = 0` there are no line numbers in the backtrace
-# produced with RUST_BACKTRACE=1.
-debug = 1
 opt-level = 0
 
 # Always optimize dependencies.
@@ -28,17 +24,19 @@ lto = true
 panic = 'abort'
 opt-level = "z"
 codegen-units = 1
-strip = true
+
+[patch.crates-io]
+quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
+quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
-deltachat-time = { path = "./deltachat-time" }
 format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }
 
 anyhow = "1"
-async-channel = "2.0.0"
-async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
+async-channel = "1.8.0"
+async-imap = { version = "0.9.1", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
@@ -49,15 +47,14 @@ chrono = { version = "0.4", default-features=false, features = ["clock", "std"]
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.9"
-fd-lock = "4"
+fast-socks5 = "0.8"
+fd-lock = "3.0.11"
 futures = "0.3"
-futures-lite = "2.2.0"
+futures-lite = "1.13.0"
 hex = "0.4.0"
-hickory-resolver = "0.24"
 humansize = "2"
-image = { version = "0.24.9", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh = { version = "0.4.2", default-features = false }
+image = { version = "0.24.7", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh = { version = "0.4.1", default-features = false }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -69,47 +66,45 @@ num-traits = "0.2"
 once_cell = "1.18.0"
 percent-encoding = "2.3"
 parking_lot = "0.12"
-pgp = { version = "0.11", default-features = false }
-pin-project = "1"
+pgp = { version = "0.10", default-features = false }
 pretty_env_logger = { version = "0.5", optional = true }
 qrcodegen = "1.7.0"
-quick-xml = "0.31"
-quoted_printable = "0.5"
+quick-xml = "0.30"
 rand = "0.8"
-regex = "1.10"
-reqwest = { version = "0.11.24", features = ["json"] }
-rusqlite = { version = "0.31", features = ["sqlcipher"] }
+regex = "1.9"
+reqwest = { version = "0.11.20", features = ["json"] }
+rusqlite = { version = "0.29", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 sanitize-filename = "0.5"
-serde_json = "1"
+serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
-strum = "0.26"
-strum_macros = "0.26"
+strum = "0.25"
+strum_macros = "0.25"
 tagger = "4.3.4"
-textwrap = "0.16.1"
+textwrap = "0.16.0"
 thiserror = "1"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.14", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = "0.7.9"
-toml = "0.8"
+toml = "0.7"
+trust-dns-resolver = "0.23"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-futures-lite = "2.2.0"
+futures-lite = "1.13"
 log = "0.4"
 pretty_env_logger = "0.5"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-testdir = "0.9.0"
+testdir = "0.8.0"
 tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"
 
@@ -121,7 +116,6 @@ members = [
   "deltachat-rpc-server",
   "deltachat-ratelimit",
   "deltachat-repl",
-  "deltachat-time",
   "format-flowed",
 ]
 

README.md

@@ -3,8 +3,8 @@
 </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/yoav-lavi/melody/actions/workflows/rust.yml">
+    <img alt="Rust CI" src="https://github.com/yoav-lavi/melody/actions/workflows/rust.yml/badge.svg">
   </a>
 </p>
 
@@ -27,7 +27,7 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ cargo run -p deltachat-repl -- ~/deltachat-db
+$ RUST_LOG=deltachat_repl=info cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
@@ -121,7 +121,7 @@ $ cargo build -p deltachat_ffi --release
 
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
-- `RUST_LOG=async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=deltachat_repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.
 
 ### Expensive tests

RELEASE.md

@@ -9,16 +9,13 @@ For example, to release version 1.116.0 of the core, do the following steps.
 
 3. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
 
-4. 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`
+4. Update the version by running `scripts/set_core_version.py 1.116.0`.
 
-5. Update the version by running `scripts/set_core_version.py 1.116.0`.
-
-6. Commit the changes as `chore(release): prepare for 1.116.0`.
+5. Commit the changes as `chore(release): prepare for 1.116.0`.
    Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.
 
-7. Tag the release: `git tag -a v1.116.0`.
+6. Tag the release: `git tag -a v1.116.0`.
 
-8. Push the release tag: `git push origin v1.116.0`.
+7. Push the release tag: `git push origin v1.116.0`.
 
-9. Create a GitHub release: `gh release create v1.116.0 -n ''`.
+8. Create a GitHub release: `gh release create v1.116.0 -n ''`.

cliff.toml

@@ -77,17 +77,3 @@ body = """
 """
 # remove the leading and trailing whitespace from the template
 trim = true
-footer = """
-{% for release in releases -%}
-    {% if release.version -%}
-        {% if release.previous.version -%}
-            [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/deltachat/deltachat-core-rust\
-                    /compare/{{ release.previous.version }}..{{ release.version }}
-        {% endif -%}
-    {% else -%}
-        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
-            /compare/{{ release.previous.version }}..HEAD
-    {% endif -%}
-{% endfor %}
-"""

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.135.1"
+version = "1.124.1"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-ffi/DoxygenLayout.xml

@@ -9,7 +9,7 @@
       <tab type="hierarchy" visible="no" title="" intro=""/>
       <tab type="classmembers" visible="no" title="" intro=""/>
     </tab>
-    <tab type="topics" visible="yes" title="Constants" intro="Here is a list of constants:"/>
+    <tab type="modules" visible="yes" title="Constants" intro="Here is a list of constants:"/>
     <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>

deltachat-ffi/deltachat.h

@@ -25,6 +25,7 @@ typedef struct _dc_event     dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
 typedef struct _dc_backup_provider dc_backup_provider_t;
+typedef struct _dc_http_response dc_http_response_t;
 
 // Alias for backwards compatibility, use dc_event_emitter_t instead.
 typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
@@ -383,12 +384,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 /**
  * Configure the context. The configuration is handled by key=value pairs as:
  *
- * - `addr`         = Email address to use for configuration.
- *                    If dc_configure() fails this is not the email address actually in use.
- *                    Use `configured_addr` to find out the email address actually in use.
- * - `configured_addr` = Email address actually in use.
- *                    Unless for testing, do not set this value using dc_set_config().
- *                    Instead, set `addr` and call dc_configure().
+ * - `addr`         = address to display (always needed)
  * - `mail_server`  = IMAP-server, guessed if left out
  * - `mail_user`    = IMAP-username, guessed if left out
  * - `mail_pw`      = IMAP-password (always needed)
@@ -423,16 +419,19 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    Sending messages to self is needed for a proper multi-account setup,
  *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
  * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
- *                    0=do not watch the `Sent`-folder (default).
+ *                    0=do not watch the `Sent`-folder (default),
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
  * - `mvbox_move`   = 1=detect chat messages,
  *                    move them to the `DeltaChat` folder,
  *                    and watch the `DeltaChat` folder for updates (default),
  *                    0=do not move chat-messages
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
  * - `only_fetch_mvbox` = 1=Do not fetch messages from folders other than the
  *                    `DeltaChat` folder. Messages will still be fetched from the
  *                    spam folder and `sendbox_watch` will also still be respected
  *                    if enabled.
  *                    0=watch all folders normally (default)
+ *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
  * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
  *                    show direct replies to chats only,
  *                    DC_SHOW_EMAILS_ACCEPTED_CONTACTS (1)=
@@ -493,9 +492,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
  *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
- * - `disable_idle` = 1=disable IMAP IDLE even if the server supports it,
- *                    0=use IMAP IDLE if the server supports it.
- *                    This is a developer option used for testing polling used as an IDLE fallback.
  * - `download_limit` = Messages up to this number of bytes are downloaded automatically.
  *                    For larger messages, only the header is downloaded and a placeholder is shown.
  *                    These messages can be downloaded fully using dc_download_full_msg() later.
@@ -504,9 +500,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    to not mess up with non-delivery-reports or read-receipts.
  *                    0=no limit (default).
  *                    Changes affect future messages only.
- * - `gossip_period` = How often to gossip Autocrypt keys in chats with multiple recipients, in
- *                    seconds. 2 days by default.
- *                    This is not supposed to be changed by UIs and only used for testing.
  * - `verified_one_on_one_chats` = Feature flag for verified 1:1 chats; the UI should set it
  *                    to 1 if it supports verified 1:1 chats.
  *                    Regardless of this setting, `dc_chat_is_protected()` returns true while the key is verified,
@@ -892,8 +885,7 @@ int             dc_preconfigure_keypair        (dc_context_t* context, const cha
  *     - if the flag DC_GCL_ADD_ALLDONE_HINT is set, DC_CHAT_ID_ALLDONE_HINT
  *       is added as needed.
  * @param query_str An optional query for filtering the list. Only chats matching this query
- *     are returned. Give NULL for no filtering. When `is:unread` is contained in the query,
- *     the chatlist is filtered such that only chats with unread messages show up.
+ *     are returned. Give NULL for no filtering.
  * @param query_id An optional contact ID for filtering the list. Only chats including this contact ID
  *     are returned. Give 0 for no filtering.
  * @return A chatlist as an dc_chatlist_t object.
@@ -1108,7 +1100,6 @@ uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);
  * received overrides all previously received reactions. It is
  * possible to remove all reactions by sending an empty string.
  *
- * @deprecated 2023-11-27, use jsonrpc method `send_reaction` instead
  * @memberof dc_context_t
  * @param context The context object.
  * @param msg_id ID of the message you react to.
@@ -1121,7 +1112,6 @@ uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reactio
 /**
  * Get a structure with reactions to the message.
  *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
  * @memberof dc_context_t
  * @param context The context object.
  * @param msg_id The message ID to get reactions for.
@@ -1710,12 +1700,24 @@ uint32_t        dc_create_group_chat         (dc_context_t* context, int protect
  * Create a new broadcast list.
  *
  * Broadcast lists are similar to groups on the sending device,
- * however, recipients get the messages in a read-only chat
- * and will see who the other members are.
+ * however, recipients get the messages in normal one-to-one chats
+ * and will not be aware of other members.
  *
- * For historical reasons, this function does not take a name directly,
- * instead you have to set the name using dc_set_chat_name()
- * after creating the broadcast list.
+ * Replies to broadcasts go only to the sender
+ * and not to all broadcast recipients.
+ * Moreover, replies will not appear in the broadcast list
+ * but in the one-to-one chat with the person answering.
+ *
+ * The name and the image of the broadcast list is set automatically
+ * and is visible to the sender only.
+ * Not asking for these data allows more focused creation
+ * and we bypass the question who will get which data.
+ * Also, many users will have at most one broadcast list
+ * so, a generic name and image is sufficient at the first place.
+ *
+ * Later on, however, the name can be changed using dc_set_chat_name().
+ * The image cannot be changed to have a unique, recognizable icon in the chat lists.
+ * All in all, this is also what other messengers are doing here.
  *
  * @memberof dc_context_t
  * @param context The context object.
@@ -2258,7 +2260,8 @@ dc_contact_t*   dc_get_contact               (dc_context_t* context, uint32_t co
  *   the backup is not encrypted.
  *   The backup contains all contacts, chats, images and other data and device independent settings.
  *   The backup does not contain device dependent settings as ringtones or LED notification settings.
- *   The name of the backup is `delta-chat-backup-<day>-<number>-<addr>.tar`.
+ *   The name of the backup is typically `delta-chat-<day>.tar`, if more than one backup is create on a day,
+ *   the format is `delta-chat-<day>-<number>.tar`
  *
  * - **DC_IMEX_IMPORT_BACKUP** (12) - `param1` is the file (not: directory) to import. `param2` is the passphrase.
  *   The file is normally created by DC_IMEX_EXPORT_BACKUP and detected by dc_imex_has_backup(). Importing a backup
@@ -2559,7 +2562,7 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
  *     the Verified-Group-Invite protocol is offered in the QR code;
  *     works for protected groups as well as for normal groups.
  *     If set to 0, the Setup-Contact protocol is offered in the QR code.
- *     See https://securejoin.readthedocs.io/en/latest/new.html
+ *     See https://countermitm.readthedocs.io/en/latest/new.html
  *     for details about both protocols.
  * @return The text that should go to the QR code,
  *     On errors, an empty QR code is returned, NULL is never returned.
@@ -2595,7 +2598,7 @@ char*           dc_get_securejoin_qr_svg         (dc_context_t* context, uint32_
  *
  * Subsequent calls of dc_join_securejoin() will abort previous, unfinished handshakes.
  *
- * See https://securejoin.readthedocs.io/en/latest/new.html
+ * See https://countermitm.readthedocs.io/en/latest/new.html
  * for details about both protocols.
  *
  * @memberof dc_context_t
@@ -2939,6 +2942,7 @@ int dc_receive_backup (dc_context_t* context, const char* qr);
  * use dc_accounts_remove_account().
  *
  * @memberof dc_accounts_t
+ * @param os_name
  * @param dir The directory to create the context-databases in.
  *     If the directory does not exist,
  *     dc_accounts_new() will try to create it.
@@ -3148,23 +3152,6 @@ void           dc_accounts_maybe_network        (dc_accounts_t* accounts);
 void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
 
 
-/**
- * Perform a background fetch for all accounts in parallel with a timeout.
- * Pauses the scheduler, fetches messages from imap and then resumes the scheduler.
- *
- * dc_accounts_background_fetch() was created for the iOS Background fetch.
- *
- * The `DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE` event is emitted at the end
- * even in case of timeout, unless the function fails and returns 0.
- * Process all events until you get this one and you can safely return to the background
- * without forgetting to create notifications caused by timing race conditions.
- *
- * @memberof dc_accounts_t
- * @param timeout The timeout in seconds
- * @return Return 1 if DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE was emitted and 0 otherwise.
- */
-int            dc_accounts_background_fetch    (dc_accounts_t* accounts, uint64_t timeout);
-
 /**
  * Create the event emitter that is used to receive events.
  *
@@ -3746,22 +3733,8 @@ int             dc_chat_can_send              (const dc_chat_t* chat);
 
 /**
  * Check if a chat is protected.
- *
- * End-to-end encryption is guaranteed in protected chats
- * and only verified contacts
- * as determined by dc_contact_is_verified()
- * can be added to protected chats.
- *
- * Protected chats are created using dc_create_group_chat()
- * by setting the 'protect' parameter to 1.
- * 1:1 chats become protected or unprotected automatically
- * if `verified_one_on_one_chats` setting is enabled.
- *
- * UI should display a green checkmark
- * in the chat title,
- * in the chatlist item
- * and in the chat profile
- * if chat protection is enabled.
+ * Protected chats contain only verified members and encryption is always enabled.
+ * Protected chats are created using dc_create_group_chat() by setting the 'protect' parameter to 1.
  *
  * @memberof dc_chat_t
  * @param chat The chat object.
@@ -3994,7 +3967,7 @@ int64_t          dc_msg_get_received_timestamp (const dc_msg_t* msg);
  * Get the message time used for sorting.
  * This function returns the timestamp that is used for sorting the message
  * into lists as returned e.g. by dc_get_chat_msgs().
- * This may be the received time, the sending time or another time.
+ * This may be the reveived time, the sending time or another time.
  *
  * To get the receiving time, use dc_msg_get_received_timestamp().
  * To get the sending time, use dc_msg_get_timestamp().
@@ -4411,9 +4384,6 @@ int             dc_msg_is_info                (const dc_msg_t* msg);
  * Currently, the following types are defined:
  * - 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",
- *   the UI should change the corresponding string using #DC_STR_INVALID_UNENCRYPTED_MAIL
- *   and also offer a way to fix the encryption, eg. by a button offering a QR scan
  *
  * Even when you display an icon,
  * you should still display the text of the informational message using dc_msg_get_text()
@@ -4440,7 +4410,6 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 #define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
 #define         DC_INFO_PROTECTION_ENABLED        11
 #define         DC_INFO_PROTECTION_DISABLED       12
-#define         DC_INFO_INVALID_UNENCRYPTED_MAIL  13
 #define         DC_INFO_WEBXDC_INFO_MESSAGE       32
 
 /**
@@ -4599,18 +4568,15 @@ int dc_msg_has_html (dc_msg_t* msg);
   * if they are larger than the limit set by the dc_set_config()-option `download_limit`.
   *
   * The function returns one of:
-  * - @ref DC_DOWNLOAD_DONE           - The message does not need any further download action
-  *                                     and should be rendered as usual.
-  * - @ref DC_DOWNLOAD_AVAILABLE      - There is additional content to download.
-  *                                     In addition to the usual message rendering,
-  *                                     the UI shall show a download button that calls dc_download_full_msg()
-  * - @ref DC_DOWNLOAD_IN_PROGRESS    - Download was started with dc_download_full_msg() and is still in progress.
-  *                                     If the download fails or succeeds,
-  *                                     the event @ref DC_EVENT_MSGS_CHANGED is emitted.
-  *
-  * - @ref DC_DOWNLOAD_UNDECIPHERABLE - The message does not need any futher download action.
-  *                                     It was fully downloaded, but we failed to decrypt it.
-  * - @ref DC_DOWNLOAD_FAILURE        - Download error, the user may start over calling dc_download_full_msg() again.
+  * - @ref DC_DOWNLOAD_DONE        - The message does not need any further download action
+  *                                  and should be rendered as usual.
+  * - @ref DC_DOWNLOAD_AVAILABLE   - There is additional content to download.
+  *                                  In addition to the usual message rendering,
+  *                                  the UI shall show a download button that calls dc_download_full_msg()
+  * - @ref DC_DOWNLOAD_IN_PROGRESS - Download was started with dc_download_full_msg() and is still in progress.
+  *                                  If the download fails or succeeds,
+  *                                  the event @ref DC_EVENT_MSGS_CHANGED is emitted.
+  * - @ref DC_DOWNLOAD_FAILURE     - Download error, the user may start over calling dc_download_full_msg() again.
   *
   * @memberof dc_msg_t
   * @param msg The message object.
@@ -5068,16 +5034,10 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 
 
 /**
- * Check if the contact
- * can be added to verified chats,
- * i.e. has a verified key
- * and Autocrypt key matches the verified key.
+ * Check if a contact was verified. E.g. by a secure-join QR code scan
+ * and if the key has not changed since this verification.
  *
- * If contact is verified
- * UI should display green checkmark after the contact name
- * in contact list items,
- * in chat member list items
- * and in profiles if no chat with the contact exist (otherwise, use dc_chat_is_protected()).
+ * The UI may draw a checkbox or something like that beside verified contacts.
  *
  * @memberof dc_contact_t
  * @param contact The contact object.
@@ -5086,29 +5046,33 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
  */
 int             dc_contact_is_verified       (dc_contact_t* contact);
 
+
+
 /**
- * Returns whether contact is a bot.
+ * Return the address that verified a contact
+ *
+ * The UI may use this in addition to a checkmark showing the verification status.
+ * In case of verification chains,
+ * the last contact in the chain is shown.
+ * This is because of privacy reasons, but also as it would not help the user
+ * to see a unknown name here - where one can mostly always ask the shown name
+ * as it is directly known.
  *
  * @memberof dc_contact_t
  * @param contact The contact object.
- * @return 0 if the contact is not a bot, 1 otherwise.
+ * @return 
+ *    A string containing the verifiers address. If it is the same address as the contact itself,
+ *    we verified the contact ourself. If it is an empty string, we don't have verifier 
+ *    information or the contact is not verified.
+ * @deprecated 2023-09-28, use dc_contact_get_verifier_id instead
  */
-int             dc_contact_is_bot            (dc_contact_t* contact);
+char*           dc_contact_get_verifier_addr       (dc_contact_t* contact);
 
 
 /**
- * Return the contact ID that verified a contact.
+ * Return the `ContactId` that verified a contact
  *
- * If the function returns non-zero result,
- * display green checkmark in the profile and "Introduced by ..." line
- * with the name and address of the contact
- * formatted by dc_contact_get_name_n_addr.
- *
- * If this function returns a verifier,
- * this does not necessarily mean
- * you can add the contact to verified chats.
- * Use dc_contact_is_verified() to check
- * if a contact can be added to a verified chat instead.
+ * The UI may use this in addition to a checkmark showing the verification status
  *
  * @memberof dc_contact_t
  * @param contact The contact object.
@@ -5213,6 +5177,72 @@ int             dc_provider_get_status                (const dc_provider_t* prov
 void            dc_provider_unref                     (dc_provider_t* provider);
 
 
+/**
+ * Return an HTTP(S) GET response.
+ * This function can be used to download remote content for HTML emails.
+ *
+ * @memberof dc_context_t
+ * @param context The context object to take proxy settings from.
+ * @param url HTTP or HTTPS URL.
+ * @return The response must be released using dc_http_response_unref() after usage.
+ *     NULL is returned on errors.
+ */
+dc_http_response_t*     dc_get_http_response      (const dc_context_t* context, const char* url);
+
+
+/**
+ * @class dc_http_response_t
+ *
+ * An object containing an HTTP(S) GET response.
+ * Created by dc_get_http_response().
+ */
+
+
+/**
+ * Returns HTTP response MIME type as a string, e.g. "text/plain" or "text/html".
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The string which must be released using dc_str_unref() after usage. May be NULL.
+ */
+char*                   dc_http_response_get_mimetype (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response encoding, e.g. "utf-8".
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The string which must be released using dc_str_unref() after usage. May be NULL.
+ */
+char*                   dc_http_response_get_encoding (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response contents.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The blob which must be released using dc_str_unref() after usage. NULL is never returned.
+ */
+uint8_t*                dc_http_response_get_blob     (const dc_http_response_t* response);
+
+/**
+ * Returns HTTP response content size.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ * @return The blob size.
+ */
+size_t                  dc_http_response_get_size     (const dc_http_response_t* response);
+
+/**
+ * Free an HTTP response object.
+ *
+ * @memberof dc_http_response_t
+ * @param response HTTP response as returned by dc_get_http_response().
+ */
+void                    dc_http_response_unref        (const dc_http_response_t* response);
+
+
 /**
  * @class dc_lot_t
  *
@@ -5312,7 +5342,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 /**
  * @class dc_reactions_t
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
  *
  * An object representing all reactions for a single message.
  */
@@ -5320,7 +5349,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
 /**
  * Returns array of contacts which reacted to the given message.
  *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
  * @memberof dc_reactions_t
  * @param reactions The object containing message reactions.
  * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
@@ -5332,7 +5360,6 @@ dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
 /**
  * Returns a string containing space-separated reactions of a single contact.
  *
- * @deprecated 2023-11-27, use jsonrpc method `get_message_reactions` instead
  * @memberof dc_reactions_t
  * @param reactions The object containing message reactions.
  * @param contact_id ID of the contact.
@@ -5348,7 +5375,6 @@ char*           dc_reactions_get_by_contact_id(dc_reactions_t* reactions, uint32
  *
  * Reactions objects are created by dc_get_msg_reactions().
  *
- * @deprecated 2023-11-27
  * @memberof dc_reactions_t
  * @param reactions The object to free.
  *     If NULL is given, nothing is done.
@@ -6209,7 +6235,6 @@ void dc_event_unref(dc_event_t* event);
  * @param data2 (int) The 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
  */
 #define DC_EVENT_SECUREJOIN_JOINER_PROGRESS       2061
 
@@ -6233,18 +6258,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_SELFAVATAR_CHANGED               2110
 
 
-/**
- * A multi-device synced config value changed. Maybe the app needs to refresh smth. For uniformity
- * this is emitted on the source device too. The value isn't reported, otherwise it would be logged
- * which might not be good for privacy. You can get the new value with
- * `dc_get_config(context, data2)`.
- *
- * @param data1 0
- * @param data2 (char*) Configuration key.
- */
-#define DC_EVENT_CONFIG_SYNCED                    2111
-
-
 /**
  * webxdc status update received.
  * To get the received status update, use dc_get_webxdc_status_updates() with
@@ -6269,16 +6282,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121
 
-/**
- * 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
- * that all events emitted during the background fetch were processed.
- * 
- * This event is only emitted by the account manager
- */
-
-#define DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE  2200
 
 /**
  * @}
@@ -6424,27 +6427,22 @@ void dc_event_unref(dc_event_t* event);
 /**
  * Download not needed, see dc_msg_get_download_state() for details.
  */
-#define DC_DOWNLOAD_DONE           0
+#define DC_DOWNLOAD_DONE          0
 
 /**
  * Download available, see dc_msg_get_download_state() for details.
  */
-#define DC_DOWNLOAD_AVAILABLE      10
+#define DC_DOWNLOAD_AVAILABLE    10
 
 /**
  * Download failed, see dc_msg_get_download_state() for details.
  */
-#define DC_DOWNLOAD_FAILURE        20
-
-/**
- * Download not needed, see dc_msg_get_download_state() for details.
- */
-#define DC_DOWNLOAD_UNDECIPHERABLE 30
+#define DC_DOWNLOAD_FAILURE      20
 
 /**
  * Download in progress, see dc_msg_get_download_state() for details.
  */
-#define DC_DOWNLOAD_IN_PROGRESS    1000
+#define DC_DOWNLOAD_IN_PROGRESS  1000
 
 
 
@@ -6609,7 +6607,7 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by the name of the verified contact
 #define DC_STR_CONTACT_VERIFIED           35
 
-/// "Cannot establish guaranteed end-to-end encryption with %1$s."
+/// "Cannot verify %1$s."
 ///
 /// Used in status messages.
 /// - %1$s will be replaced by the name of the contact that cannot be verified
@@ -7047,8 +7045,6 @@ void dc_event_unref(dc_event_t* event);
 /// "You added member %1$s."
 ///
 /// Used in status messages.
-///
-/// `%1$s` will be replaced by the added member's name.
 #define DC_STR_ADD_MEMBER_BY_YOU 128
 
 /// "Member %1$s added by %2$s."
@@ -7265,26 +7261,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used in info messages.
 #define DC_STR_CHAT_PROTECTION_DISABLED 171
 
-/// "Others will only see this group after you sent a first message."
-///
-/// Used as the first info messages in newly created groups.
-#define DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE 172
-
-/// "Member %1$s added."
-///
-/// Used as info messages.
-///
-/// `%1$s` will be replaced by the added member's name.
-#define DC_STR_MESSAGE_ADD_MEMBER 173
-
-/// "Your email provider %1$s requires end-to-end encryption which is not setup yet."
-///
-/// Used as info messages when a message cannot be sent because it cannot be encrypted.
-///
-/// `%1$s` will be replaced by the provider's domain.
-#define DC_STR_INVALID_UNENCRYPTED_MAIL 174
-
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -26,14 +26,16 @@ use anyhow::Context as _;
 use deltachat::chat::{ChatId, ChatVisibility, MessageListOptions, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, ContactId, Origin};
-use deltachat::context::{Context, ContextBuilder};
+use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
 use deltachat::key::preconfigure_keypair;
 use deltachat::message::MsgId;
+use deltachat::net::read_url_blob;
 use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
+use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
@@ -103,11 +105,12 @@ pub unsafe extern "C" fn dc_context_new(
     let ctx = if blobdir.is_null() || *blobdir == 0 {
         // generate random ID as this functionality is not yet available on the C-api.
         let id = rand::thread_rng().gen();
-        block_on(
-            ContextBuilder::new(as_path(dbfile).to_path_buf())
-                .with_id(id)
-                .open(),
-        )
+        block_on(Context::new(
+            as_path(dbfile),
+            id,
+            Events::new(),
+            StockStrings::new(),
+        ))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
         return ptr::null_mut();
@@ -131,11 +134,12 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
     }
 
     let id = rand::thread_rng().gen();
-    match block_on(
-        ContextBuilder::new(as_path(dbfile).to_path_buf())
-            .with_id(id)
-            .build(),
-    ) {
+    match block_on(Context::new_closed(
+        as_path(dbfile),
+        id,
+        Events::new(),
+        StockStrings::new(),
+    )) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
             eprintln!("failed to create context: {err:#}");
@@ -485,7 +489,7 @@ pub unsafe extern "C" fn dc_start_io(context: *mut dc_context_t) {
     if context.is_null() {
         return;
     }
-    let ctx = &mut *context;
+    let ctx = &*context;
 
     block_on(ctx.start_io())
 }
@@ -553,10 +557,8 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::SecurejoinJoinerProgress { .. } => 2061,
         EventType::ConnectivityChanged => 2100,
         EventType::SelfavatarChanged => 2110,
-        EventType::ConfigSynced { .. } => 2111,
         EventType::WebxdcStatusUpdate { .. } => 2120,
         EventType::WebxdcInstanceDeleted { .. } => 2121,
-        EventType::AccountsBackgroundFetchDone => 2200,
     }
 }
 
@@ -582,10 +584,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::Error(_)
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
-        | EventType::ConfigSynced { .. }
         | EventType::IncomingMsgBunch { .. }
-        | EventType::ErrorSelfNotInGroup(_)
-        | EventType::AccountsBackgroundFetchDone => 0,
+        | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
         | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
@@ -644,9 +644,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ConnectivityChanged
         | EventType::WebxdcInstanceDeleted { .. }
         | EventType::IncomingMsgBunch { .. }
-        | EventType::SelfavatarChanged
-        | EventType::AccountsBackgroundFetchDone
-        | EventType::ConfigSynced { .. } => 0,
+        | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
@@ -708,7 +706,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::SelfavatarChanged
         | EventType::WebxdcStatusUpdate { .. }
         | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::AccountsBackgroundFetchDone
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -726,10 +723,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             .to_c_string()
             .unwrap_or_default()
             .into_raw(),
-        EventType::ConfigSynced { key } => {
-            let data2 = key.to_string().to_c_string().unwrap_or_default();
-            data2.into_raw()
-        }
     }
 }
 
@@ -4120,26 +4113,27 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
     let ffi_contact = &*contact;
     let ctx = &*ffi_contact.context;
 
-    if block_on(ffi_contact.contact.is_verified(ctx))
+    block_on(ffi_contact.contact.is_verified(ctx))
         .context("is_verified failed")
         .log_err(ctx)
-        .unwrap_or_default()
-    {
-        // Return value is essentially a boolean,
-        // but we return 2 for true for backwards compatibility.
-        2
-    } else {
-        0
-    }
+        .unwrap_or_default() as libc::c_int
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_contact_is_bot(contact: *mut dc_contact_t) -> libc::c_int {
+pub unsafe extern "C" fn dc_contact_get_verifier_addr(
+    contact: *mut dc_contact_t,
+) -> *mut libc::c_char {
     if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_is_bot()");
-        return 0;
+        eprintln!("ignoring careless call to dc_contact_get_verifier_addr()");
+        return "".strdup();
     }
-    (*contact).contact.is_bot() as libc::c_int
+    let ffi_contact = &*contact;
+    let ctx = &*ffi_contact.context;
+    block_on(ffi_contact.contact.get_verifier_addr(ctx))
+        .context("failed to get verifier for contact")
+        .log_err(ctx)
+        .unwrap_or_default()
+        .strdup()
 }
 
 #[no_mangle]
@@ -4613,6 +4607,96 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
     // this may change once we start localizing string.
 }
 
+// dc_http_response_t
+
+pub type dc_http_response_t = net::HttpResponse;
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_get_http_response(
+    context: *const dc_context_t,
+    url: *const libc::c_char,
+) -> *mut dc_http_response_t {
+    if context.is_null() || url.is_null() {
+        eprintln!("ignoring careless call to dc_get_http_response()");
+        return ptr::null_mut();
+    }
+
+    let context = &*context;
+    let url = to_string_lossy(url);
+    if let Ok(response) = block_on(read_url_blob(context, &url))
+        .context("read_url_blob")
+        .log_err(context)
+    {
+        Box::into_raw(Box::new(response))
+    } else {
+        ptr::null_mut()
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_mimetype(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_mimetype()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    response.mimetype.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_encoding(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_encoding()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    response.encoding.strdup()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_blob(
+    response: *const dc_http_response_t,
+) -> *mut libc::c_char {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_blob()");
+        return ptr::null_mut();
+    }
+
+    let response = &*response;
+    let blob_len = response.blob.len();
+    let ptr = libc::malloc(blob_len);
+    libc::memcpy(ptr, response.blob.as_ptr() as *mut libc::c_void, blob_len);
+    ptr as *mut libc::c_char
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_get_size(
+    response: *const dc_http_response_t,
+) -> libc::size_t {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_get_size()");
+        return 0;
+    }
+
+    let response = &*response;
+    response.blob.len()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_http_response_unref(response: *mut dc_http_response_t) {
+    if response.is_null() {
+        eprintln!("ignoring careless call to dc_http_response_unref()");
+        return;
+    }
+    drop(Box::from_raw(response));
+}
+
 // -- Accounts
 
 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
@@ -4862,8 +4946,8 @@ pub unsafe extern "C" fn dc_accounts_start_io(accounts: *mut dc_accounts_t) {
         return;
     }
 
-    let accounts = &mut *accounts;
-    block_on(async move { accounts.write().await.start_io().await });
+    let accounts = &*accounts;
+    block_on(async move { accounts.read().await.start_io().await });
 }
 
 #[no_mangle]
@@ -4899,26 +4983,6 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
     block_on(async move { accounts.write().await.maybe_network_lost().await });
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_background_fetch(
-    accounts: *mut dc_accounts_t,
-    timeout_in_seconds: u64,
-) -> libc::c_int {
-    if accounts.is_null() || timeout_in_seconds <= 2 {
-        eprintln!("ignoring careless call to dc_accounts_background_fetch()");
-        return 0;
-    }
-
-    let accounts = &*accounts;
-    block_on(async move {
-        let accounts = accounts.read().await;
-        accounts
-            .background_fetch(Duration::from_secs(timeout_in_seconds))
-            .await;
-    });
-    1
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     accounts: *mut dc_accounts_t,

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.135.1"
+version = "1.124.1"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -17,24 +17,24 @@ deltachat = { path = ".." }
 num-traits = "0.2"
 schemars = "0.8.13"
 serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.10.1"
+tempfile = "3.8.0"
 log = "0.4"
-async-channel = { version = "2.0.0" }
-futures = { version = "0.3.30" }
-serde_json = "1"
+async-channel = { version = "1.8.0" }
+futures = { version = "0.3.28" }
+serde_json = "1.0.105"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.8", features = ["json_value"] }
-tokio = { version = "1.33.0" }
+tokio = { version = "1.32.0" }
 sanitize-filename = "0.5"
-walkdir = "2.5.0"
+walkdir = "2.3.3"
 base64 = "0.21"
 
 # optional dependencies
-axum = { version = "0.7", optional = true, features = ["ws"] }
+axum = { version = "0.6.20", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.33.0", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.32.0", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/README.md

@@ -108,10 +108,10 @@ 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.
+Then, set the `DCC_NEW_TMP_EMAIL` environment variable to your mailadm token before running the tests.
 
 ```
-CHATMAIL_DOMAIN=chat.example.org npm run test
+DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=yourtoken npm run test
 ```
 
 #### Test Coverage

deltachat-jsonrpc/src/api/mod.rs

@@ -47,7 +47,7 @@ use types::provider_info::ProviderInfo;
 use types::reactions::JSONRPCReactions;
 use types::webxdc::WebxdcMessageInfo;
 
-use self::types::message::{MessageInfo, MessageLoadResult};
+use self::types::message::MessageLoadResult;
 use self::types::{
     chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
     location::JsonrpcLocation,
@@ -221,27 +221,13 @@ impl CommandApi {
 
     /// Starts background tasks for all accounts.
     async fn start_io_for_all_accounts(&self) -> Result<()> {
-        self.accounts.write().await.start_io().await;
+        self.accounts.read().await.start_io().await;
         Ok(())
     }
 
     /// Stops background tasks for all accounts.
     async fn stop_io_for_all_accounts(&self) -> Result<()> {
-        self.accounts.write().await.stop_io().await;
-        Ok(())
-    }
-
-    /// Performs a background fetch for all accounts in parallel with a timeout.
-    ///
-    /// The `AccountsBackgroundFetchDone` event is emitted at the end even in case of timeout.
-    /// Process all events until you get this one and you can safely return to the background
-    /// without forgetting to create notifications caused by timing race conditions.
-    async fn accounts_background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
-        self.accounts
-            .write()
-            .await
-            .background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
-            .await;
+        self.accounts.read().await.stop_io().await;
         Ok(())
     }
 
@@ -325,11 +311,6 @@ impl CommandApi {
         ctx.get_info().await
     }
 
-    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())
-    }
-
     /// Sets the given configuration key.
     async fn set_config(&self, account_id: u32, key: String, value: Option<String>) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
@@ -697,7 +678,7 @@ impl CommandApi {
     ///     the Verified-Group-Invite protocol is offered in the QR code;
     ///     works for protected groups as well as for normal groups.
     ///     If not set, the Setup-Contact protocol is offered in the QR code.
-    ///     See https://securejoin.readthedocs.io/en/latest/new.html
+    ///     See https://countermitm.readthedocs.io/en/latest/new.html
     ///     for details about both protocols.
     ///
     /// return format: `[code, svg]`
@@ -726,7 +707,7 @@ impl CommandApi {
     ///
     /// Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
     ///
-    /// See https://securejoin.readthedocs.io/en/latest/new.html
+    /// See https://countermitm.readthedocs.io/en/latest/new.html
     /// for details about both protocols.
     ///
     /// **qr**: The text of the scanned QR code. Typically, the same string as given
@@ -834,12 +815,24 @@ impl CommandApi {
     /// Create a new broadcast list.
     ///
     /// Broadcast lists are similar to groups on the sending device,
-    /// however, recipients get the messages in a read-only chat
-    /// and will see who the other members are.
+    /// however, recipients get the messages in normal one-to-one chats
+    /// and will not be aware of other members.
     ///
-    /// For historical reasons, this function does not take a name directly,
-    /// instead you have to set the name using dc_set_chat_name()
-    /// after creating the broadcast list.
+    /// Replies to broadcasts go only to the sender
+    /// and not to all broadcast recipients.
+    /// Moreover, replies will not appear in the broadcast list
+    /// but in the one-to-one chat with the person answering.
+    ///
+    /// The name and the image of the broadcast list is set automatically
+    /// and is visible to the sender only.
+    /// Not asking for these data allows more focused creation
+    /// and we bypass the question who will get which data.
+    /// Also, many users will have at most one broadcast list
+    /// so, a generic name and image is sufficient at the first place.
+    ///
+    /// Later on, however, the name can be changed using dc_set_chat_name().
+    /// The image cannot be changed to have a unique, recognizable icon in the chat lists.
+    /// All in all, this is also what other messengers are doing here.
     async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         chat::create_broadcast_list(&ctx)
@@ -915,35 +908,19 @@ impl CommandApi {
             .to_u32())
     }
 
-    /// Add a message to the device-chat.
-    /// Device-messages usually contain update information
-    /// and some hints that are added during the program runs, multi-device etc.
-    /// The device-message may be defined by a label;
-    /// if a message with the same label was added or skipped before,
-    /// the message is not added again, even if the message was deleted in between.
-    /// If needed, the device-chat is created before.
-    ///
-    /// Sends the `MsgsChanged` event on success.
-    ///
-    /// Setting msg to None will prevent the device message with this label from being added in the future.
+    // for now only text messages, because we only used text messages in desktop thusfar
     async fn add_device_message(
         &self,
         account_id: u32,
         label: String,
-        msg: Option<MessageData>,
-    ) -> Result<Option<u32>> {
+        text: String,
+    ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
-        if let Some(msg) = msg {
-            let mut message = msg.create_message(&ctx).await?;
-            let message_id =
-                deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut message)).await?;
-            if !message_id.is_unset() {
-                return Ok(Some(message_id.to_u32()));
-            }
-        } else {
-            deltachat::chat::add_device_msg(&ctx, Some(&label), None).await?;
-        }
-        Ok(None)
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(text);
+        let message_id =
+            deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
+        Ok(message_id.to_u32())
     }
 
     ///  Mark all messages in a chat as _noticed_.
@@ -1161,16 +1138,6 @@ impl CommandApi {
         MsgId::new(message_id).get_info(&ctx).await
     }
 
-    /// Returns additional information for single message.
-    async fn get_message_info_object(
-        &self,
-        account_id: u32,
-        message_id: u32,
-    ) -> Result<MessageInfo> {
-        let ctx = self.get_context(account_id).await?;
-        MessageInfo::from_msg_id(&ctx, MsgId::new(message_id)).await
-    }
-
     /// Returns contacts that sent read receipts and the time of reading.
     async fn get_message_read_receipts(
         &self,
@@ -1426,19 +1393,6 @@ impl CommandApi {
     //                   chat
     // ---------------------------------------------
 
-    /// Returns the [`ChatId`] for the 1:1 chat with `contact_id` if it exists.
-    ///
-    /// If it does not exist, `None` is returned.
-    async fn get_chat_id_by_contact_id(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-    ) -> Result<Option<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let chat_id = ChatId::lookup_by_contact(&ctx, ContactId::new(contact_id)).await?;
-        Ok(chat_id.map(|id| id.to_u32()))
-    }
-
     /// Returns all message IDs of the given types in a chat.
     /// Typically used to show a gallery.
     ///
@@ -1802,9 +1756,6 @@ impl CommandApi {
         let mut msg = Message::new(Viewtype::Sticker);
         msg.set_file(&sticker_path, None);
 
-        // JSON-rpc does not need heuristics to turn [Viewtype::Sticker] into [Viewtype::Image]
-        msg.force_sticker();
-
         let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
         Ok(message_id.to_u32())
     }
@@ -1843,7 +1794,38 @@ impl CommandApi {
 
     async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
-        let mut message = data.create_message(&ctx).await?;
+        let mut message = Message::new(if let Some(viewtype) = data.viewtype {
+            viewtype.into()
+        } else if data.file.is_some() {
+            Viewtype::File
+        } else {
+            Viewtype::Text
+        });
+        message.set_text(data.text.unwrap_or_default());
+        if data.html.is_some() {
+            message.set_html(data.html);
+        }
+        if data.override_sender_name.is_some() {
+            message.set_override_sender_name(data.override_sender_name);
+        }
+        if let Some(file) = data.file {
+            message.set_file(file, None);
+        }
+        if let Some((latitude, longitude)) = data.location {
+            message.set_location(latitude, longitude);
+        }
+        if let Some(id) = data.quoted_message_id {
+            message
+                .set_quote(
+                    &ctx,
+                    Some(
+                        &Message::load_from_db(&ctx, MsgId::new(id))
+                            .await
+                            .context("message to quote could not be loaded")?,
+                    ),
+                )
+                .await?;
+        }
         let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
             .await?
             .to_u32();
@@ -2060,19 +2042,13 @@ impl CommandApi {
         text: Option<String>,
         file: Option<String>,
         quoted_message_id: Option<u32>,
-        view_type: Option<MessageViewtype>,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        let mut draft = Message::new(view_type.map_or_else(
-            || {
-                if file.is_some() {
-                    Viewtype::File
-                } else {
-                    Viewtype::Text
-                }
-            },
-            |v| v.into(),
-        ));
+        let mut draft = Message::new(if file.is_some() {
+            Viewtype::File
+        } else {
+            Viewtype::Text
+        });
         draft.set_text(text.unwrap_or_default());
         if let Some(file) = file {
             draft.set_file(file, None);
@@ -2092,23 +2068,6 @@ impl CommandApi {
 
         ChatId::new(chat_id).set_draft(&ctx, Some(&mut draft)).await
     }
-
-    // send the chat's current set draft
-    async fn misc_send_draft(&self, account_id: u32, chat_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        if let Some(draft) = ChatId::new(chat_id).get_draft(&ctx).await? {
-            let mut draft = draft;
-            let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut draft)
-                .await?
-                .to_u32();
-            Ok(msg_id)
-        } else {
-            Err(anyhow!(
-                "chat with id {} doesn't have draft message",
-                chat_id
-            ))
-        }
-    }
 }
 
 // Helper functions (to prevent code duplication)
@@ -2125,6 +2084,13 @@ async fn set_config(
             value,
         )
         .await?;
+
+        match key {
+            "sentbox_watch" | "mvbox_move" | "only_fetch_mvbox" => {
+                ctx.restart_io_if_running().await;
+            }
+            _ => {}
+        }
     }
     Ok(())
 }

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

@@ -18,17 +18,6 @@ use super::contact::ContactObject;
 pub struct FullChat {
     id: u32,
     name: String,
-
-    /// True if the chat is protected.
-    ///
-    /// UI should display a green checkmark
-    /// in the chat title,
-    /// in the chat profile title and
-    /// in the chatlist item
-    /// if chat protection is enabled.
-    /// UI should also display a green checkmark
-    /// in the contact profile
-    /// if 1:1 chat with this contact exists and is protected.
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
@@ -42,7 +31,6 @@ pub struct FullChat {
     fresh_message_counter: usize,
     // is_group - please check over chat.type in frontend instead
     is_contact_request: bool,
-    is_protection_broken: bool,
     is_device_chat: bool,
     self_in_group: bool,
     is_muted: bool,
@@ -85,7 +73,7 @@ impl FullChat {
         let can_send = chat.can_send(context).await?;
 
         let was_seen_recently = if chat.get_type() == Chattype::Single {
-            match contact_ids.first() {
+            match contact_ids.get(0) {
                 Some(contact) => Contact::get_by_id(context, *contact)
                     .await
                     .context("failed to load contact for was_seen_recently")?
@@ -112,7 +100,6 @@ impl FullChat {
             color,
             fresh_message_counter,
             is_contact_request: chat.is_contact_request(),
-            is_protection_broken: chat.is_protection_broken(),
             is_device_chat: chat.is_device_talk(),
             self_in_group: contact_ids.contains(&ContactId::SELF),
             is_muted: chat.is_muted(),
@@ -139,17 +126,6 @@ impl FullChat {
 pub struct BasicChat {
     id: u32,
     name: String,
-
-    /// True if the chat is protected.
-    ///
-    /// UI should display a green checkmark
-    /// in the chat title,
-    /// in the chat profile title and
-    /// in the chatlist item
-    /// if chat protection is enabled.
-    /// UI should also display a green checkmark
-    /// in the contact profile
-    /// if 1:1 chat with this contact exists and is protected.
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
@@ -158,7 +134,6 @@ pub struct BasicChat {
     is_self_talk: bool,
     color: String,
     is_contact_request: bool,
-    is_protection_broken: bool,
     is_device_chat: bool,
     is_muted: bool,
 }
@@ -185,7 +160,6 @@ impl BasicChat {
             is_self_talk: chat.is_self_talk(),
             color,
             is_contact_request: chat.is_contact_request(),
-            is_protection_broken: chat.is_protection_broken(),
             is_device_chat: chat.is_device_talk(),
             is_muted: chat.is_muted(),
         })

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

@@ -102,7 +102,7 @@ pub(crate) async fn get_chat_list_item_by_id(
     let self_in_group = chat_contacts.contains(&ContactId::SELF);
 
     let (dm_chat_contact, was_seen_recently) = if chat.get_type() == Chattype::Single {
-        let contact = chat_contacts.first();
+        let contact = chat_contacts.get(0);
         let was_seen_recently = match contact {
             Some(contact) => Contact::get_by_id(ctx, *contact)
                 .await

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

@@ -1,4 +1,5 @@
 use anyhow::Result;
+use deltachat::contact::VerifiedStatus;
 use deltachat::context::Context;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
@@ -18,36 +19,14 @@ pub struct ContactObject {
     profile_image: Option<String>, // BLOBS
     name_and_addr: String,
     is_blocked: bool,
-
-    /// True if the contact can be added to verified groups.
-    ///
-    /// If this is true
-    /// UI should display green checkmark after the contact name
-    /// in contact list items,
-    /// in chat member list items
-    /// and in profiles if no chat with the contact exist.
     is_verified: bool,
-
-    /// True if the contact profile title should have a green checkmark.
-    ///
-    /// This indicates whether 1:1 chat has a green checkmark
-    /// or will have a green checkmark if created.
-    is_profile_verified: bool,
-
-    /// The ID of the contact that verified this contact.
-    ///
-    /// If this is present,
-    /// display a green checkmark and "Introduced by ..."
-    /// string followed by the verifier contact name and address
-    /// in the contact profile.
+    /// the address that verified this contact
+    verifier_addr: Option<String>,
+    /// the id of the contact that verified this contact
     verifier_id: Option<u32>,
-
     /// the contact's last seen timestamp
     last_seen: i64,
     was_seen_recently: bool,
-
-    /// If the contact is a bot.
-    is_bot: bool,
 }
 
 impl ContactObject {
@@ -59,13 +38,19 @@ impl ContactObject {
             Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
             None => None,
         };
-        let is_verified = contact.is_verified(context).await?;
-        let is_profile_verified = contact.is_profile_verified(context).await?;
+        let is_verified = contact.is_verified(context).await? == VerifiedStatus::BidirectVerified;
 
-        let verifier_id = contact
-            .get_verifier_id(context)
-            .await?
-            .map(|contact_id| contact_id.to_u32());
+        let (verifier_addr, verifier_id) = if is_verified {
+            (
+                contact.get_verifier_addr(context).await?,
+                contact
+                    .get_verifier_id(context)
+                    .await?
+                    .map(|contact_id| contact_id.to_u32()),
+            )
+        } else {
+            (None, None)
+        };
 
         Ok(ContactObject {
             address: contact.get_addr().to_owned(),
@@ -79,11 +64,10 @@ impl ContactObject {
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
             is_verified,
-            is_profile_verified,
+            verifier_addr,
             verifier_id,
             last_seen: contact.last_seen(),
             was_seen_recently: contact.was_seen_recently(),
-            is_bot: contact.is_bot(),
         })
     }
 }

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

@@ -28,37 +28,55 @@ pub enum EventType {
     ///
     /// This event should *not* be reported to the end-user using a popup or something like
     /// that.
-    Info { msg: String },
+    Info {
+        msg: String,
+    },
 
     /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected { msg: String },
+    SmtpConnected {
+        msg: String,
+    },
 
     /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected { msg: String },
+    ImapConnected {
+        msg: String,
+    },
 
     /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent { msg: String },
+    SmtpMessageSent {
+        msg: String,
+    },
 
     /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted { msg: String },
+    ImapMessageDeleted {
+        msg: String,
+    },
 
     /// Emitted when an IMAP message has been moved
-    ImapMessageMoved { msg: String },
+    ImapMessageMoved {
+        msg: String,
+    },
 
     /// Emitted before going into IDLE on the Inbox folder.
     ImapInboxIdle,
 
     /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile { file: String },
+    NewBlobFile {
+        file: String,
+    },
 
     /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile { file: String },
+    DeletedBlobFile {
+        file: String,
+    },
 
     /// The library-user should write a warning string to the log.
     ///
     /// This event should *not* be reported to the end-user using a popup or something like
     /// that.
-    Warning { msg: String },
+    Warning {
+        msg: String,
+    },
 
     /// The library-user should report an error to the end-user.
     ///
@@ -70,14 +88,18 @@ pub enum EventType {
     /// it might be better to delay showing these events until the function has really
     /// failed (returned false). It should be sufficient to report only the *last* error
     /// in a messasge box then.
-    Error { msg: String },
+    Error {
+        msg: String,
+    },
 
     /// An action cannot be performed because the user is not in the group.
     /// Reported eg. after a call to
     /// setChatName(), setChatProfileImage(),
     /// addContactToChat(), removeContactFromChat(),
     /// and messages sending functions.
-    ErrorSelfNotInGroup { msg: String },
+    ErrorSelfNotInGroup {
+        msg: String,
+    },
 
     /// Messages or chats changed.  One or more messages or chats changed for various
     /// reasons in the database:
@@ -88,7 +110,10 @@ pub enum EventType {
     /// `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 {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// Reactions for the message changed.
     #[serde(rename_all = "camelCase")]
@@ -103,7 +128,10 @@ pub enum EventType {
     ///
     /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
     #[serde(rename_all = "camelCase")]
-    IncomingMsg { chat_id: u32, msg_id: u32 },
+    IncomingMsg {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// Downloading a bunch of messages just finished. This is an experimental
     /// event to allow the UI to only show one notification per message bunch,
@@ -111,31 +139,47 @@ pub enum EventType {
     ///
     /// msg_ids contains the message ids.
     #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch { msg_ids: Vec<u32> },
+    IncomingMsgBunch {
+        msg_ids: Vec<u32>,
+    },
 
     /// Messages were seen or noticed.
     /// chat id is always set.
     #[serde(rename_all = "camelCase")]
-    MsgsNoticed { chat_id: u32 },
+    MsgsNoticed {
+        chat_id: u32,
+    },
 
     /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
     /// DC_STATE_OUT_DELIVERED, see `Message.state`.
     #[serde(rename_all = "camelCase")]
-    MsgDelivered { chat_id: u32, msg_id: u32 },
+    MsgDelivered {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
     /// DC_STATE_OUT_FAILED, see `Message.state`.
     #[serde(rename_all = "camelCase")]
-    MsgFailed { chat_id: u32, msg_id: u32 },
+    MsgFailed {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
     /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
     #[serde(rename_all = "camelCase")]
-    MsgRead { chat_id: u32, msg_id: u32 },
+    MsgRead {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// A single message is deleted.
     #[serde(rename_all = "camelCase")]
-    MsgDeleted { chat_id: u32, msg_id: u32 },
+    MsgDeleted {
+        chat_id: u32,
+        msg_id: u32,
+    },
 
     /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
     /// Or the verify state of a chat has changed.
@@ -145,17 +189,24 @@ pub enum EventType {
     /// This event does not include ephemeral timer modification, which
     /// is a separate event.
     #[serde(rename_all = "camelCase")]
-    ChatModified { chat_id: u32 },
+    ChatModified {
+        chat_id: u32,
+    },
 
     /// Chat ephemeral timer changed.
     #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified { chat_id: u32, timer: u32 },
+    ChatEphemeralTimerModified {
+        chat_id: u32,
+        timer: u32,
+    },
 
     /// Contact(s) created, renamed, blocked or deleted.
     ///
     /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
     #[serde(rename_all = "camelCase")]
-    ContactsChanged { contact_id: Option<u32> },
+    ContactsChanged {
+        contact_id: Option<u32>,
+    },
 
     /// Location of one or more contact has changed.
     ///
@@ -163,7 +214,9 @@ pub enum EventType {
     ///     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: Option<u32>,
+    },
 
     /// Inform about the configuration progress started by configure().
     ConfigureProgress {
@@ -181,7 +234,9 @@ pub enum EventType {
     /// @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 {
+        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().
@@ -191,7 +246,9 @@ pub enum EventType {
     ///
     /// @param data2 0
     #[serde(rename_all = "camelCase")]
-    ImexFileWritten { path: String },
+    ImexFileWritten {
+        path: String,
+    },
 
     /// Progress information of a secure-join handshake from the view of the inviter
     /// (Alice, the person who shows the QR code).
@@ -206,7 +263,10 @@ pub enum EventType {
     ///     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 {
+        contact_id: u32,
+        progress: usize,
+    },
 
     /// Progress information of a secure-join handshake from the view of the joiner
     /// (Bob, the person who scans the QR code).
@@ -217,7 +277,10 @@ pub enum EventType {
     ///     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 {
+        contact_id: u32,
+        progress: usize,
+    },
 
     /// The connectivity to the server changed.
     /// This means that you should refresh the connectivity view
@@ -225,17 +288,8 @@ pub enum EventType {
     /// getConnectivityHtml() for details.
     ConnectivityChanged,
 
-    /// Deprecated by `ConfigSynced`.
     SelfavatarChanged,
 
-    /// A multi-device synced config value changed. Maybe the app needs to refresh smth. For
-    /// uniformity this is emitted on the source device too. The value isn't here, otherwise it
-    /// would be logged which might not be good for privacy.
-    ConfigSynced {
-        /// Configuration key.
-        key: String,
-    },
-
     #[serde(rename_all = "camelCase")]
     WebxdcStatusUpdate {
         msg_id: u32,
@@ -244,14 +298,9 @@ pub enum EventType {
 
     /// Inform that a message containing a webxdc instance has been deleted
     #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted { 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
-    /// that all events emitted during the background fetch were processed.
-    ///
-    /// This event is only emitted by the account manager
-    AccountsBackgroundFetchDone,
+    WebxdcInstanceDeleted {
+        msg_id: u32,
+    },
 }
 
 impl From<CoreEventType> for EventType {
@@ -347,9 +396,6 @@ impl From<CoreEventType> for EventType {
             },
             CoreEventType::ConnectivityChanged => ConnectivityChanged,
             CoreEventType::SelfavatarChanged => SelfavatarChanged,
-            CoreEventType::ConfigSynced { key } => ConfigSynced {
-                key: key.to_string(),
-            },
             CoreEventType::WebxdcStatusUpdate {
                 msg_id,
                 status_update_serial,
@@ -360,7 +406,6 @@ impl From<CoreEventType> for EventType {
             CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                 msg_id: msg_id.to_u32(),
             },
-            CoreEventType::AccountsBackgroundFetchDone => AccountsBackgroundFetchDone,
         }
     }
 }

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

@@ -345,7 +345,6 @@ pub enum SystemMessageType {
     SecurejoinMessage,
     LocationStreamingEnabled,
     LocationOnly,
-    InvalidUnencryptedMail,
 
     /// Chat ephemeral message timer is changed.
     EphemeralTimerChanged,
@@ -386,7 +385,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
             SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
             SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-            SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
         }
     }
 }
@@ -548,115 +546,9 @@ pub struct MessageData {
     pub quoted_message_id: Option<u32>,
 }
 
-impl MessageData {
-    pub(crate) async fn create_message(self, context: &Context) -> Result<Message> {
-        let mut message = Message::new(if let Some(viewtype) = self.viewtype {
-            viewtype.into()
-        } else if self.file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        message.set_text(self.text.unwrap_or_default());
-        if self.html.is_some() {
-            message.set_html(self.html);
-        }
-        if self.override_sender_name.is_some() {
-            message.set_override_sender_name(self.override_sender_name);
-        }
-        if let Some(file) = self.file {
-            message.set_file(file, None);
-        }
-        if let Some((latitude, longitude)) = self.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = self.quoted_message_id {
-            message
-                .set_quote(
-                    context,
-                    Some(
-                        &Message::load_from_db(context, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-        Ok(message)
-    }
-}
-
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageReadReceipt {
     pub contact_id: u32,
     pub timestamp: i64,
 }
-
-#[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>,
-    error: Option<String>,
-    rfc724_mid: String,
-    server_urls: Vec<String>,
-    hop_info: Option<String>,
-}
-
-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,
-            deltachat::ephemeral::Timer::Enabled { .. } => Some(message.get_ephemeral_timestamp()),
-        };
-
-        let server_urls =
-            MsgId::get_info_server_urls(context, message.rfc724_mid().to_owned()).await?;
-
-        let hop_info = msg_id.hop_info(context).await?;
-
-        Ok(Self {
-            rawtext,
-            ephemeral_timer,
-            ephemeral_timestamp,
-            error: message.error(),
-            rfc724_mid: message.rfc724_mid().to_owned(),
-            server_urls,
-            hop_info,
-        })
-    }
-}
-
-#[derive(
-    Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema,
-)]
-#[serde(rename_all = "camelCase", tag = "variant")]
-pub enum EphemeralTimer {
-    /// Timer is disabled.
-    Disabled,
-
-    /// Timer is enabled.
-    Enabled {
-        /// Timer duration in seconds.
-        ///
-        /// The value cannot be 0.
-        duration: u32,
-    },
-}
-
-impl From<deltachat::ephemeral::Timer> for EphemeralTimer {
-    fn from(value: deltachat::ephemeral::Timer) -> Self {
-        match value {
-            deltachat::ephemeral::Timer::Disabled => EphemeralTimer::Disabled,
-            deltachat::ephemeral::Timer::Enabled { duration } => {
-                EphemeralTimer::Enabled { duration }
-            }
-        }
-    }
-}

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

@@ -6,8 +6,6 @@ use typescript_type_def::TypeDef;
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct ProviderInfo {
-    /// Unique ID, corresponding to provider database filename.
-    pub id: String,
     pub before_login_hint: String,
     pub overview_page: String,
     pub status: u32, // in reality this is an enum, but for simplicity and because it gets converted into a number anyway, we use an u32 here.
@@ -16,7 +14,6 @@ pub struct ProviderInfo {
 impl ProviderInfo {
     pub fn from_dc_type(provider: Option<&Provider>) -> Option<Self> {
         provider.map(|p| ProviderInfo {
-            id: p.id.to_owned(),
             before_login_hint: p.before_login_hint.to_owned(),
             overview_page: p.overview_page.to_owned(),
             status: p.status.to_u32().unwrap(),

deltachat-jsonrpc/src/lib.rs

@@ -17,7 +17,7 @@ mod tests {
         let accounts = Accounts::new(tmp_dir, writable).await?;
         let api = CommandApi::new(accounts);
 
-        let (sender, receiver) = unbounded::<String>();
+        let (sender, mut receiver) = unbounded::<String>();
 
         let (client, mut rx) = RpcClient::new();
         let session = RpcSession::new(client, api);
@@ -36,17 +36,17 @@ mod tests {
             let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
             let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
             println!("{result:?}");
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
         {
             let request = r#"{"jsonrpc":"2.0","method":"get_all_account_ids","params":[],"id":2}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":[1]}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
+            let result = receiver.next().await;
             println!("{result:?}");
-            assert_eq!(result, response.to_owned());
+            assert_eq!(result, Some(response.to_owned()));
         }
 
         Ok(())
@@ -59,7 +59,7 @@ mod tests {
         let accounts = Accounts::new(tmp_dir, writable).await?;
         let api = CommandApi::new(accounts);
 
-        let (sender, receiver) = unbounded::<String>();
+        let (sender, mut receiver) = unbounded::<String>();
 
         let (client, mut rx) = RpcClient::new();
         let session = RpcSession::new(client, api);
@@ -78,15 +78,15 @@ mod tests {
             let request = r#"{"jsonrpc":"2.0","method":"add_account","params":[],"id":1}"#;
             let response = r#"{"jsonrpc":"2.0","id":1,"result":1}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
-            assert_eq!(result, response.to_owned());
+            let result = receiver.next().await;
+            assert_eq!(result, Some(response.to_owned()));
         }
         {
             let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
             session.handle_incoming(request).await;
-            let result = receiver.recv().await?;
-            assert_eq!(result, response.to_owned());
+            let result = receiver.next().await;
+            assert_eq!(result, Some(response.to_owned()));
         }
 
         Ok(())

deltachat-jsonrpc/src/webserver.rs

@@ -28,13 +28,15 @@ async fn main() -> Result<(), std::io::Error> {
         .layer(Extension(state.clone()));
 
     tokio::spawn(async move {
-        state.accounts.write().await.start_io().await;
+        state.accounts.read().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();
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
+        .await
+        .unwrap();
 
     Ok(())
 }

deltachat-jsonrpc/typescript/package.json

@@ -9,6 +9,7 @@
     "@types/chai": "^4.2.21",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^9.0.0",
+    "@types/node-fetch": "^2.5.7",
     "@types/ws": "^7.2.4",
     "c8": "^7.10.0",
     "chai": "^4.3.4",
@@ -16,6 +17,7 @@
     "esbuild": "^0.17.9",
     "http-server": "^14.1.1",
     "mocha": "^9.1.1",
+    "node-fetch": "^2.6.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.2",
     "typedoc": "^0.23.2",
@@ -53,5 +55,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.135.1"
+  "version": "1.124.1"
 }

deltachat-jsonrpc/typescript/test/basic.ts

@@ -79,9 +79,6 @@ describe("basic tests", () => {
       accountId = await dc.rpc.addAccount();
     });
     it("should block and unblock contact", async function () {
-      // Cannot send sync messages to self as we do not have a self address.
-      await dc.rpc.setConfig(accountId, "sync_msgs", "0");
-
       const contactId = await dc.rpc.createContact(
         accountId,
         "example@delta.chat",

deltachat-jsonrpc/typescript/test/online.ts

@@ -13,16 +13,16 @@ describe("online tests", function () {
 
   before(async function () {
     this.timeout(60000);
-    if (!process.env.CHATMAIL_DOMAIN) {
+    if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(
-          "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN environment variable!\n\n",
+          "CAN NOT RUN COVERAGE correctly: Missing DCC_NEW_TMP_EMAIL 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"
         );
         process.exit(1);
       }
       console.log(
-        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests"
+        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests"
       );
       this.skip();
     }
@@ -33,7 +33,7 @@ describe("online tests", function () {
       if (kind !== "Info") console.log(contextId, kind);
     });
 
-    account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
+    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account1 || !account1.email || !account1.password) {
       console.log(
         "We didn't got back an account from the api, skip integration tests"
@@ -41,7 +41,7 @@ describe("online tests", function () {
       this.skip();
     }
 
-    account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
+    account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account2 || !account2.email || !account2.password) {
       console.log(
         "We didn't got back an account2 from the api, skip integration tests"
@@ -148,7 +148,7 @@ describe("online tests", function () {
       waitForEvent(dc, "IncomingMsg", accountId1),
     ]);
     dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
-    // Check if answer arrives at A and if it is encrypted
+    // Check if answer arives at A and if it is encrypted
     await eventPromise2;
 
     const messageId = (

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -2,6 +2,7 @@ import { tmpdir } from "os";
 import { join, resolve } from "path";
 import { mkdtemp, rm } from "fs/promises";
 import { spawn, exec } from "child_process";
+import fetch from "node-fetch";
 import { Readable, Writable } from "node:stream";
 
 export type RpcServerHandle = {
@@ -56,14 +57,15 @@ export async function startServer(): Promise<RpcServerHandle> {
   };
 }
 
-export function createTempUser(chatmailDomain: String) {
-  const charset = "2345789acdefghjkmnpqrstuvwxyz";
-  let user = "ci-";
-  for (let i = 0; i < 6; i++) {
-    user += charset[Math.floor(Math.random() * charset.length)];
-  }
-  const email = user + "@" + chatmailDomain;
-  return { email: email, password: user + "$" + user };
+export async function createTempUser(url: string) {
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "cache-control": "no-cache",
+    },
+  });
+  if (!response.ok) throw new Error("Received invalid response");
+  return response.json();
 }
 
 function getTargetDir(): Promise<string> {

deltachat-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.135.1"
+version = "1.124.1"
 license = "MPL-2.0"
 edition = "2021"
 
@@ -9,10 +9,10 @@ ansi_term = "0.12.1"
 anyhow = "1"
 deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = "0.4.21"
+log = "0.4.20"
 pretty_env_logger = "0.5"
-rusqlite = "0.31"
-rustyline = "13"
+rusqlite = "0.29"
+rustyline = "12"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 
 [features]

deltachat-repl/src/cmdline.rs

@@ -284,8 +284,13 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
         let contact = Contact::get_by_id(context, *contact_id).await?;
         let name = contact.get_display_name();
         let addr = contact.get_addr();
-        let verified_str = if contact.is_verified(context).await? {
-            " √"
+        let verified_state = contact.is_verified(context).await?;
+        let verified_str = if VerifiedStatus::Unverified != verified_state {
+            if verified_state == VerifiedStatus::BidirectVerified {
+                " √√"
+            } else {
+                " √"
+            }
         } else {
             ""
         };

deltachat-repl/src/main.rs

@@ -9,6 +9,7 @@ extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
 use std::io::{self, Write};
+use std::path::Path;
 use std::process::Command;
 
 use ansi_term::Color;
@@ -19,7 +20,8 @@ use deltachat::context::*;
 use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::EventType;
+use deltachat::stock_str::StockStrings;
+use deltachat::{EventType, Events};
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
@@ -297,8 +299,8 @@ impl Highlighter for DcHelper {
         self.highlighter.highlight(line, pos)
     }
 
-    fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool {
-        self.highlighter.highlight_char(line, pos, forced)
+    fn highlight_char(&self, line: &str, pos: usize) -> bool {
+        self.highlighter.highlight_char(line, pos)
     }
 }
 
@@ -310,10 +312,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
-    let context = ContextBuilder::new(args[1].clone().into())
-        .with_id(1)
-        .open()
-        .await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
 
     let events = context.get_event_emitter();
     tokio::task::spawn(async move {
@@ -482,10 +481,7 @@ async fn handle_cmd(
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    pretty_env_logger::formatted_timed_builder()
-        .parse_default_env()
-        .filter_module("deltachat_repl", log::LevelFilter::Info)
-        .init();
+    let _ = pretty_env_logger::try_init();
 
     let args = std::env::args().collect();
     start(args).await?;

deltachat-rpc-client/README.md

@@ -25,7 +25,7 @@ $ pip install .
 ## Testing
 
 1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-2. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
+2. Run `PATH="../target/debug:$PATH" tox`.
 
 Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
 

deltachat-rpc-client/examples/echobot_no_hooks.py

@@ -40,13 +40,13 @@ def main():
 
         while True:
             event = account.wait_for_event()
-            if event["kind"] == EventType.INFO:
+            if event["type"] == EventType.INFO:
                 logging.info("%s", event["msg"])
-            elif event["kind"] == EventType.WARNING:
+            elif event["type"] == EventType.WARNING:
                 logging.warning("%s", event["msg"])
-            elif event["kind"] == EventType.ERROR:
+            elif event["type"] == EventType.ERROR:
                 logging.error("%s", event["msg"])
-            elif event["kind"] == EventType.INCOMING_MSG:
+            elif event["type"] == EventType.INCOMING_MSG:
                 logging.info("Got an incoming message")
                 process_messages()
 

deltachat-rpc-client/pyproject.toml

@@ -7,6 +7,7 @@ name = "deltachat-rpc-client"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
+    "Framework :: AsyncIO",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Operating System :: POSIX :: Linux",

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

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

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

@@ -0,0 +1,775 @@
+from dataclasses import dataclass
+from enum import Enum
+from typing import TypeAlias, Union, Optional, Tuple, Any
+
+
+class AccountEnum:
+    @dataclass(kw_only=True)
+    class Configured:
+        kind: str = "Configured"
+        addr: Optional[str]
+        color: str
+        display_name: Optional[str]
+        id: int
+        profile_image: Optional[str]
+
+    @dataclass(kw_only=True)
+    class Unconfigured:
+        kind: str = "Unconfigured"
+        id: int
+
+
+Account: TypeAlias = AccountEnum.Configured | AccountEnum.Unconfigured
+
+
+@dataclass(kw_only=True)
+class BasicChat:
+    archived: bool
+    chat_type: int
+    color: str
+    id: int
+    is_contact_request: bool
+    is_device_chat: bool
+    is_muted: bool
+    is_protected: bool
+    is_self_talk: bool
+    is_unpromoted: bool
+    name: str
+    profile_image: str
+
+
+class ChatListItemFetchResultEnum:
+    @dataclass(kw_only=True)
+    class ChatListItem:
+        kind: str = "ChatListItem"
+        avatar_path: Optional[str]
+        color: str
+        dm_chat_contact: Optional[int]
+        fresh_message_counter: int
+        id: int
+        is_archived: bool
+        is_broadcast: bool
+        is_contact_request: bool
+        is_device_talk: bool
+        is_group: bool
+        is_muted: bool
+        is_pinned: bool
+        is_protected: bool
+        is_self_in_group: bool
+        is_self_talk: bool
+        is_sending_location: bool
+        last_message_id: Optional[int]
+        last_message_type: Optional["Viewtype"]
+        last_updated: Optional[int]
+        name: str
+        summary_preview_image: Optional[str]
+        summary_status: int
+        summary_text1: str
+        summary_text2: str
+        was_seen_recently: bool
+
+    @dataclass(kw_only=True)
+    class ArchiveLink:
+        kind: str = "ArchiveLink"
+        fresh_message_counter: int
+
+    @dataclass(kw_only=True)
+    class Error:
+        kind: str = "Error"
+        error: str
+        id: int
+
+
+ChatListItemFetchResult: TypeAlias = (
+    ChatListItemFetchResultEnum.ChatListItem
+    | ChatListItemFetchResultEnum.ArchiveLink
+    | ChatListItemFetchResultEnum.Error
+)
+
+
+class ChatVisibility(Enum):
+    NORMAL = "Normal"
+    ARCHIVED = "Archived"
+    PINNED = "Pinned"
+
+
+@dataclass(kw_only=True)
+class Contact:
+    address: str
+    auth_name: str
+    color: str
+    display_name: str
+    id: int
+    is_blocked: bool
+    is_verified: bool
+    last_seen: int
+    name: str
+    name_and_addr: str
+    profile_image: str
+    status: str
+    verifier_addr: str
+    verifier_id: int
+    was_seen_recently: bool
+
+
+class DownloadState(Enum):
+    DONE = "Done"
+    AVAILABLE = "Available"
+    FAILURE = "Failure"
+    IN_PROGRESS = "InProgress"
+
+
+@dataclass(kw_only=True)
+class Event:
+    context_id: int
+    event: "EventType"
+
+
+class EventTypeEnum:
+    @dataclass(kw_only=True)
+    class Info:
+        kind: str = "Info"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class SmtpConnected:
+        kind: str = "SmtpConnected"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class ImapConnected:
+        kind: str = "ImapConnected"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class SmtpMessageSent:
+        kind: str = "SmtpMessageSent"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class ImapMessageDeleted:
+        kind: str = "ImapMessageDeleted"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class ImapMessageMoved:
+        kind: str = "ImapMessageMoved"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class ImapInboxIdle:
+        kind: str = "ImapInboxIdle"
+
+    @dataclass(kw_only=True)
+    class NewBlobFile:
+        kind: str = "NewBlobFile"
+        file: str
+
+    @dataclass(kw_only=True)
+    class DeletedBlobFile:
+        kind: str = "DeletedBlobFile"
+        file: str
+
+    @dataclass(kw_only=True)
+    class Warning:
+        kind: str = "Warning"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class Error:
+        kind: str = "Error"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class ErrorSelfNotInGroup:
+        kind: str = "ErrorSelfNotInGroup"
+        msg: str
+
+    @dataclass(kw_only=True)
+    class MsgsChanged:
+        kind: str = "MsgsChanged"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class ReactionsChanged:
+        kind: str = "ReactionsChanged"
+        chat_id: int
+        contact_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class IncomingMsg:
+        kind: str = "IncomingMsg"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class IncomingMsgBunch:
+        kind: str = "IncomingMsgBunch"
+        msg_ids: list[int]
+
+    @dataclass(kw_only=True)
+    class MsgsNoticed:
+        kind: str = "MsgsNoticed"
+        chat_id: int
+
+    @dataclass(kw_only=True)
+    class MsgDelivered:
+        kind: str = "MsgDelivered"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class MsgFailed:
+        kind: str = "MsgFailed"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class MsgRead:
+        kind: str = "MsgRead"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class MsgDeleted:
+        kind: str = "MsgDeleted"
+        chat_id: int
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class ChatModified:
+        kind: str = "ChatModified"
+        chat_id: int
+
+    @dataclass(kw_only=True)
+    class ChatEphemeralTimerModified:
+        kind: str = "ChatEphemeralTimerModified"
+        chat_id: int
+        timer: int
+
+    @dataclass(kw_only=True)
+    class ContactsChanged:
+        kind: str = "ContactsChanged"
+        contact_id: Optional[int]
+
+    @dataclass(kw_only=True)
+    class LocationChanged:
+        kind: str = "LocationChanged"
+        contact_id: Optional[int]
+
+    @dataclass(kw_only=True)
+    class ConfigureProgress:
+        kind: str = "ConfigureProgress"
+        comment: Optional[str]
+        progress: int
+
+    @dataclass(kw_only=True)
+    class ImexProgress:
+        kind: str = "ImexProgress"
+        progress: int
+
+    @dataclass(kw_only=True)
+    class ImexFileWritten:
+        kind: str = "ImexFileWritten"
+        path: str
+
+    @dataclass(kw_only=True)
+    class SecurejoinInviterProgress:
+        kind: str = "SecurejoinInviterProgress"
+        contact_id: int
+        progress: int
+
+    @dataclass(kw_only=True)
+    class SecurejoinJoinerProgress:
+        kind: str = "SecurejoinJoinerProgress"
+        contact_id: int
+        progress: int
+
+    @dataclass(kw_only=True)
+    class ConnectivityChanged:
+        kind: str = "ConnectivityChanged"
+
+    @dataclass(kw_only=True)
+    class SelfavatarChanged:
+        kind: str = "SelfavatarChanged"
+
+    @dataclass(kw_only=True)
+    class WebxdcStatusUpdate:
+        kind: str = "WebxdcStatusUpdate"
+        msg_id: int
+        status_update_serial: int
+
+    @dataclass(kw_only=True)
+    class WebxdcInstanceDeleted:
+        kind: str = "WebxdcInstanceDeleted"
+        msg_id: int
+
+
+EventType: TypeAlias = (
+    EventTypeEnum.Info
+    | EventTypeEnum.SmtpConnected
+    | EventTypeEnum.ImapConnected
+    | EventTypeEnum.SmtpMessageSent
+    | EventTypeEnum.ImapMessageDeleted
+    | EventTypeEnum.ImapMessageMoved
+    | EventTypeEnum.ImapInboxIdle
+    | EventTypeEnum.NewBlobFile
+    | EventTypeEnum.DeletedBlobFile
+    | EventTypeEnum.Warning
+    | EventTypeEnum.Error
+    | EventTypeEnum.ErrorSelfNotInGroup
+    | EventTypeEnum.MsgsChanged
+    | EventTypeEnum.ReactionsChanged
+    | EventTypeEnum.IncomingMsg
+    | EventTypeEnum.IncomingMsgBunch
+    | EventTypeEnum.MsgsNoticed
+    | EventTypeEnum.MsgDelivered
+    | EventTypeEnum.MsgFailed
+    | EventTypeEnum.MsgRead
+    | EventTypeEnum.MsgDeleted
+    | EventTypeEnum.ChatModified
+    | EventTypeEnum.ChatEphemeralTimerModified
+    | EventTypeEnum.ContactsChanged
+    | EventTypeEnum.LocationChanged
+    | EventTypeEnum.ConfigureProgress
+    | EventTypeEnum.ImexProgress
+    | EventTypeEnum.ImexFileWritten
+    | EventTypeEnum.SecurejoinInviterProgress
+    | EventTypeEnum.SecurejoinJoinerProgress
+    | EventTypeEnum.ConnectivityChanged
+    | EventTypeEnum.SelfavatarChanged
+    | EventTypeEnum.WebxdcStatusUpdate
+    | EventTypeEnum.WebxdcInstanceDeleted
+)
+
+
+@dataclass(kw_only=True)
+class FullChat:
+    archived: bool
+    can_send: bool
+    chat_type: int
+    color: str
+    contact_ids: list[int]
+    contacts: list["Contact"]
+    ephemeral_timer: int
+    fresh_message_counter: int
+    id: int
+    is_contact_request: bool
+    is_device_chat: bool
+    is_muted: bool
+    is_protected: bool
+    is_self_talk: bool
+    is_unpromoted: bool
+    mailing_list_address: str
+    name: str
+    profile_image: str
+    self_in_group: bool
+    was_seen_recently: bool
+
+
+@dataclass(kw_only=True)
+class HttpResponse:
+    blob: str
+    encoding: str
+    mimetype: str
+
+
+@dataclass(kw_only=True)
+class Location:
+    accuracy: float
+    chat_id: int
+    contact_id: int
+    is_independent: bool
+    latitude: float
+    location_id: int
+    longitude: float
+    marker: str
+    msg_id: int
+    timestamp: int
+
+
+@dataclass(kw_only=True)
+class Message:
+    chat_id: int
+    dimensions_height: int
+    dimensions_width: int
+    download_state: "DownloadState"
+    duration: int
+    error: str
+    file: str
+    file_bytes: int
+    file_mime: str
+    file_name: str
+    from_id: int
+    has_deviating_timestamp: bool
+    has_html: bool
+    has_location: bool
+    id: int
+    is_bot: bool
+    is_forwarded: bool
+    is_info: bool
+    is_setupmessage: bool
+    override_sender_name: str
+    parent_id: int
+    quote: Optional["MessageQuote"]
+    reactions: Optional["Reactions"]
+    received_timestamp: int
+    sender: "Contact"
+    setup_code_begin: str
+    show_padlock: bool
+    sort_timestamp: int
+    state: int
+    subject: str
+    system_message_type: "SystemMessageType"
+    text: str
+    timestamp: int
+    videochat_type: int
+    videochat_url: str
+    view_type: "Viewtype"
+    webxdc_info: Optional["WebxdcMessageInfo"]
+
+
+@dataclass(kw_only=True)
+class MessageData:
+    file: str
+    html: str
+    location: Tuple[float, float]
+    override_sender_name: str
+    quoted_message_id: int
+    text: str
+    viewtype: Optional["Viewtype"]
+
+
+class MessageListItemEnum:
+    @dataclass(kw_only=True)
+    class Message:
+        kind: str = "Message"
+        msg_id: int
+
+    @dataclass(kw_only=True)
+    class DayMarker:
+        kind: str = "DayMarker"
+        timestamp: int
+
+
+MessageListItem: TypeAlias = MessageListItemEnum.Message | MessageListItemEnum.DayMarker
+
+
+class MessageLoadResultEnum:
+    @dataclass(kw_only=True)
+    class Message:
+        kind: str = "Message"
+        chat_id: int
+        dimensions_height: int
+        dimensions_width: int
+        download_state: "DownloadState"
+        duration: int
+        error: Optional[str]
+        file: Optional[str]
+        file_bytes: int
+        file_mime: Optional[str]
+        file_name: Optional[str]
+        from_id: int
+        has_deviating_timestamp: bool
+        has_html: bool
+        has_location: bool
+        id: int
+        is_bot: bool
+        is_forwarded: bool
+        is_info: bool
+        is_setupmessage: bool
+        override_sender_name: Optional[str]
+        parent_id: Optional[int]
+        quote: Optional["MessageQuote"]
+        reactions: Optional["Reactions"]
+        received_timestamp: int
+        sender: "Contact"
+        setup_code_begin: Optional[str]
+        show_padlock: bool
+        sort_timestamp: int
+        state: int
+        subject: str
+        system_message_type: "SystemMessageType"
+        text: str
+        timestamp: int
+        videochat_type: Optional[int]
+        videochat_url: Optional[str]
+        view_type: "Viewtype"
+        webxdc_info: Optional["WebxdcMessageInfo"]
+
+    @dataclass(kw_only=True)
+    class LoadingError:
+        kind: str = "LoadingError"
+        error: str
+
+
+MessageLoadResult: TypeAlias = MessageLoadResultEnum.Message | MessageLoadResultEnum.LoadingError
+
+
+@dataclass(kw_only=True)
+class MessageNotificationInfo:
+    account_id: int
+    chat_id: int
+    chat_name: str
+    chat_profile_image: str
+    id: int
+    image: str
+    image_mime_type: str
+    summary_prefix: str
+    summary_text: str
+
+
+class MessageQuoteEnum:
+    @dataclass(kw_only=True)
+    class JustText:
+        kind: str = "JustText"
+        text: str
+
+    @dataclass(kw_only=True)
+    class WithMessage:
+        kind: str = "WithMessage"
+        author_display_color: str
+        author_display_name: str
+        image: Optional[str]
+        is_forwarded: bool
+        message_id: int
+        override_sender_name: Optional[str]
+        text: str
+        view_type: "Viewtype"
+
+
+MessageQuote: TypeAlias = MessageQuoteEnum.JustText | MessageQuoteEnum.WithMessage
+
+
+@dataclass(kw_only=True)
+class MessageReadReceipt:
+    contact_id: int
+    timestamp: int
+
+
+@dataclass(kw_only=True)
+class MessageSearchResult:
+    author_color: str
+    author_id: int
+    author_name: str
+    author_profile_image: str
+    chat_color: str
+    chat_name: str
+    chat_profile_image: str
+    chat_type: int
+    id: int
+    is_chat_archived: bool
+    is_chat_contact_request: bool
+    is_chat_protected: bool
+    message: str
+    timestamp: int
+
+
+class MuteDurationEnum:
+    @dataclass(kw_only=True)
+    class NotMuted:
+        kind: str = "NotMuted"
+
+    @dataclass(kw_only=True)
+    class Forever:
+        kind: str = "Forever"
+
+    @dataclass(kw_only=True)
+    class Until:
+        kind: str = "Until"
+        timestamp: int
+
+
+MuteDuration: TypeAlias = MuteDurationEnum.NotMuted | MuteDurationEnum.Forever | MuteDurationEnum.Until
+
+
+@dataclass(kw_only=True)
+class ProviderInfo:
+    before_login_hint: str
+    overview_page: str
+    status: int
+
+
+class QrEnum:
+    @dataclass(kw_only=True)
+    class AskVerifyContact:
+        kind: str = "AskVerifyContact"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class AskVerifyGroup:
+        kind: str = "AskVerifyGroup"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        grpid: str
+        grpname: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class FprOk:
+        kind: str = "FprOk"
+        contact_id: int
+
+    @dataclass(kw_only=True)
+    class FprMismatch:
+        kind: str = "FprMismatch"
+        contact_id: Optional[int]
+
+    @dataclass(kw_only=True)
+    class FprWithoutAddr:
+        kind: str = "FprWithoutAddr"
+        fingerprint: str
+
+    @dataclass(kw_only=True)
+    class Account:
+        kind: str = "Account"
+        domain: str
+
+    @dataclass(kw_only=True)
+    class Backup:
+        kind: str = "Backup"
+        ticket: str
+
+    @dataclass(kw_only=True)
+    class WebrtcInstance:
+        kind: str = "WebrtcInstance"
+        domain: str
+        instance_pattern: str
+
+    @dataclass(kw_only=True)
+    class Addr:
+        kind: str = "Addr"
+        contact_id: int
+        draft: Optional[str]
+
+    @dataclass(kw_only=True)
+    class Url:
+        kind: str = "Url"
+        url: str
+
+    @dataclass(kw_only=True)
+    class Text:
+        kind: str = "Text"
+        text: str
+
+    @dataclass(kw_only=True)
+    class WithdrawVerifyContact:
+        kind: str = "WithdrawVerifyContact"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class WithdrawVerifyGroup:
+        kind: str = "WithdrawVerifyGroup"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        grpid: str
+        grpname: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class ReviveVerifyContact:
+        kind: str = "ReviveVerifyContact"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class ReviveVerifyGroup:
+        kind: str = "ReviveVerifyGroup"
+        authcode: str
+        contact_id: int
+        fingerprint: str
+        grpid: str
+        grpname: str
+        invitenumber: str
+
+    @dataclass(kw_only=True)
+    class Login:
+        kind: str = "Login"
+        address: str
+
+
+Qr: TypeAlias = (
+    QrEnum.AskVerifyContact
+    | QrEnum.AskVerifyGroup
+    | QrEnum.FprOk
+    | QrEnum.FprMismatch
+    | QrEnum.FprWithoutAddr
+    | QrEnum.Account
+    | QrEnum.Backup
+    | QrEnum.WebrtcInstance
+    | QrEnum.Addr
+    | QrEnum.Url
+    | QrEnum.Text
+    | QrEnum.WithdrawVerifyContact
+    | QrEnum.WithdrawVerifyGroup
+    | QrEnum.ReviveVerifyContact
+    | QrEnum.ReviveVerifyGroup
+    | QrEnum.Login
+)
+
+
+@dataclass(kw_only=True)
+class Reaction:
+    count: int
+    emoji: str
+    is_from_self: bool
+
+
+@dataclass(kw_only=True)
+class Reactions:
+    reactions: list["Reaction"]
+    reactions_by_contact: dict[Any, list[str]]
+
+
+class SystemMessageType(Enum):
+    UNKNOWN = "Unknown"
+    GROUP_NAME_CHANGED = "GroupNameChanged"
+    GROUP_IMAGE_CHANGED = "GroupImageChanged"
+    MEMBER_ADDED_TO_GROUP = "MemberAddedToGroup"
+    MEMBER_REMOVED_FROM_GROUP = "MemberRemovedFromGroup"
+    AUTOCRYPT_SETUP_MESSAGE = "AutocryptSetupMessage"
+    SECUREJOIN_MESSAGE = "SecurejoinMessage"
+    LOCATION_STREAMING_ENABLED = "LocationStreamingEnabled"
+    LOCATION_ONLY = "LocationOnly"
+    CHAT_PROTECTION_ENABLED = "ChatProtectionEnabled"
+    CHAT_PROTECTION_DISABLED = "ChatProtectionDisabled"
+    WEBXDC_STATUS_UPDATE = "WebxdcStatusUpdate"
+    EPHEMERAL_TIMER_CHANGED = "EphemeralTimerChanged"
+    MULTI_DEVICE_SYNC = "MultiDeviceSync"
+    WEBXDC_INFO_MESSAGE = "WebxdcInfoMessage"
+
+
+class Viewtype(Enum):
+    UNKNOWN = "Unknown"
+    TEXT = "Text"
+    IMAGE = "Image"
+    GIF = "Gif"
+    STICKER = "Sticker"
+    AUDIO = "Audio"
+    VOICE = "Voice"
+    VIDEO = "Video"
+    FILE = "File"
+    VIDEOCHAT_INVITATION = "VideochatInvitation"
+    WEBXDC = "Webxdc"
+
+
+@dataclass(kw_only=True)
+class WebxdcMessageInfo:
+    document: str
+    icon: str
+    internet_access: bool
+    name: str
+    source_code_url: str
+    summary: str

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

@@ -4,7 +4,7 @@ from warnings import warn
 
 from ._utils import AttrDict
 from .chat import Chat
-from .const import ChatlistFlag, ContactFlag, EventType, SpecialContactId
+from .const import ChatlistFlag, ContactFlag, SpecialContactId
 from .contact import Contact
 from .message import Message
 
@@ -111,20 +111,6 @@ class Account:
         contacts = self._rpc.get_blocked_contacts(self.id)
         return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
 
-    def get_chat_by_contact(self, contact: Union[int, Contact]) -> Optional[Chat]:
-        """Return 1:1 chat for a contact if it exists."""
-        if isinstance(contact, Contact):
-            assert contact.account == self
-            contact_id = contact.id
-        elif isinstance(contact, int):
-            contact_id = contact
-        else:
-            raise ValueError(f"{contact!r} is not a contact")
-        chat_id = self._rpc.get_chat_id_by_contact_id(self.id, contact_id)
-        if chat_id:
-            return Chat(self, chat_id)
-        return None
-
     def get_contacts(
         self,
         query: Optional[str] = None,
@@ -218,7 +204,7 @@ class Account:
         The function returns immediately and the handshake runs in background, sending
         and receiving several messages.
         Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-        See https://securejoin.readthedocs.io/en/latest/new.html for protocol details.
+        See https://countermitm.readthedocs.io/en/latest/new.html for protocol details.
 
         :param qrdata: The text of the scanned QR code.
         """
@@ -264,25 +250,6 @@ class Account:
         next_msg_ids = self._rpc.wait_next_msgs(self.id)
         return [Message(self, msg_id) for msg_id in next_msg_ids]
 
-    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
-
-    def wait_for_securejoin_inviter_success(self):
-        while True:
-            event = self.wait_for_event()
-            if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
-                break
-
-    def wait_for_securejoin_joiner_success(self):
-        while True:
-            event = self.wait_for_event()
-            if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
-                break
-
     def get_fresh_messages_in_arrival_order(self) -> List[Message]:
         """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
         warn(
@@ -300,13 +267,3 @@ class Account:
     def import_backup(self, path, passphrase: str = "") -> None:
         """Import backup."""
         self._rpc.import_backup(self.id, str(path), passphrase)
-
-    def export_self_keys(self, path) -> None:
-        """Export keys."""
-        passphrase = ""  # Setting passphrase is currently not supported.
-        self._rpc.export_self_keys(self.id, str(path), passphrase)
-
-    def import_self_keys(self, path) -> None:
-        """Import keys."""
-        passphrase = ""  # Importing passphrase-protected keys is currently not supported.
-        self._rpc.import_self_keys(self.id, str(path), passphrase)

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

@@ -2,6 +2,7 @@ import calendar
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
 
+from ._generated_types import MuteDurationEnum
 from ._utils import AttrDict
 from .const import ChatVisibility, ViewType
 from .contact import Contact
@@ -54,14 +55,14 @@ class Chat:
         """
         if duration is not None:
             assert duration > 0, "Invalid duration"
-            dur: dict = {"kind": "Until", "duration": duration}
+            dur: dict = MuteDurationEnum.Until(duration=duration)
         else:
-            dur = {"kind": "Forever"}
+            dur = MuteDurationEnum.Forever()
         self._rpc.set_chat_mute_duration(self.account.id, self.id, dur)
 
     def unmute(self) -> None:
         """Unmute this chat."""
-        self._rpc.set_chat_mute_duration(self.account.id, self.id, {"kind": "NotMuted"})
+        self._rpc.set_chat_mute_duration(self.account.id, self.id, MuteDurationEnum.NotMuted())
 
     def pin(self) -> None:
         """Pin this chat."""
@@ -160,12 +161,11 @@ class Chat:
         text: Optional[str] = None,
         file: 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, quoted_msg)
 
     def remove_draft(self) -> None:
         """Remove draft message."""

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

@@ -1,9 +1,9 @@
 """Event loop implementations offering high level event handling/hooking."""
-
 import logging
 from typing import (
     TYPE_CHECKING,
     Callable,
+    Coroutine,
     Dict,
     Iterable,
     Optional,
@@ -92,7 +92,7 @@ class Client:
         """Process events forever."""
         self.run_until(lambda _: False)
 
-    def run_until(self, func: Callable[[AttrDict], bool]) -> AttrDict:
+    def run_until(self, func: Callable[[AttrDict], Union[bool, Coroutine]]) -> AttrDict:
         """Process events until the given callable evaluates to True.
 
         The callable should accept an AttrDict object representing the
@@ -196,7 +196,7 @@ class Client:
 
 
 class Bot(Client):
-    """Simple bot implementation that listens to events of a single account."""
+    """Simple bot implementation that listent to events of a single account."""
 
     def configure(self, email: str, password: str, **kwargs) -> None:
         kwargs.setdefault("bot", "1")

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

@@ -1,5 +1,4 @@
 """High-level classes for event processing and filtering."""
-
 import re
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Callable, Iterable, Iterator, Optional, Set, Tuple, Union

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

@@ -42,10 +42,6 @@ class Message:
             return AttrDict(reactions)
         return None
 
-    def get_sender_contact(self) -> Contact:
-        from_id = self.get_snapshot().from_id
-        return self.account.get_contact_by_id(from_id)
-
     def mark_seen(self) -> None:
         """Mark the message as seen."""
         self._rpc.markseen_msgs(self.account.id, [self.id])

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

@@ -1,5 +1,6 @@
+import json
 import os
-import random
+import urllib.request
 from typing import AsyncGenerator, List, Optional
 
 import pytest
@@ -9,11 +10,12 @@ 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}
+    url = os.getenv("DCC_NEW_TMP_EMAIL")
+    assert url, "Failed to get online account, DCC_NEW_TMP_EMAIL is not set"
+
+    request = urllib.request.Request(url, method="POST")
+    with urllib.request.urlopen(request, timeout=60) as f:
+        return json.load(f)
 
 
 class ACFactory:
@@ -21,9 +23,7 @@ class ACFactory:
         self.deltachat = deltachat
 
     def get_unconfigured_account(self) -> Account:
-        account = self.deltachat.add_account()
-        account.set_config("verified_one_on_one_chats", "1")
-        return account
+        return self.deltachat.add_account()
 
     def get_unconfigured_bot(self) -> Bot:
         return Bot(self.get_unconfigured_account())
@@ -61,16 +61,6 @@ class ACFactory:
     def get_online_accounts(self, num: int) -> List[Account]:
         return [self.get_online_account() for _ in range(num)]
 
-    def resetup_account(self, ac: Account) -> Account:
-        """Resetup account from scratch, losing the encryption key."""
-        ac.stop_io()
-        ac_clone = self.get_unconfigured_account()
-        for i in ["addr", "mail_pw"]:
-            ac_clone.set_config(i, ac.get_config(i))
-        ac.remove()
-        ac_clone.configure()
-        return ac_clone
-
     def send_message(
         self,
         to_account: Account,

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

@@ -1,4 +1,4 @@
-import itertools
+import dataclasses
 import json
 import logging
 import os
@@ -6,13 +6,20 @@ import subprocess
 import sys
 from queue import Queue
 from threading import Event, Thread
-from typing import Any, Dict, Iterator, Optional
+from typing import Any, Dict, Optional
 
 
 class JsonRpcError(Exception):
     pass
 
 
+class DataclassEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if dataclasses.is_dataclass(obj) and not isinstance(obj, type):
+            return dataclasses.asdict(obj)
+        return json.JSONEncoder.default(self, obj)
+
+
 class Rpc:
     def __init__(self, accounts_dir: Optional[str] = None, **kwargs):
         """The given arguments will be passed to subprocess.Popen()"""
@@ -24,7 +31,7 @@ class Rpc:
 
         self._kwargs = kwargs
         self.process: subprocess.Popen
-        self.id_iterator: Iterator[int]
+        self.id: int
         self.event_queues: Dict[int, Queue]
         # Map from request ID to `threading.Event`.
         self.request_events: Dict[int, Event]
@@ -55,7 +62,7 @@ class Rpc:
                 preexec_fn=os.setpgrp,  # noqa: PLW1509
                 **self._kwargs,
             )
-        self.id_iterator = itertools.count(start=1)
+        self.id = 0
         self.event_queues = {}
         self.request_events = {}
         self.request_results = {}
@@ -110,7 +117,7 @@ class Rpc:
                 request = self.request_queue.get()
                 if not request:
                     break
-                data = (json.dumps(request) + "\n").encode()
+                data = (json.dumps(request, cls=DataclassEncoder) + "\n").encode()
                 self.process.stdin.write(data)
                 self.process.stdin.flush()
 
@@ -132,9 +139,7 @@ class Rpc:
                 event = self.get_next_event()
                 account_id = event["contextId"]
                 queue = self.get_queue(account_id)
-                event = event["event"]
-                logging.debug("account_id=%d got an event %s", account_id, event)
-                queue.put(event)
+                queue.put(event["event"])
         except Exception:
             # Log an exception if the event loop dies.
             logging.exception("Exception in the event loop")
@@ -146,12 +151,14 @@ class Rpc:
 
     def __getattr__(self, attr: str):
         def method(*args) -> Any:
-            request_id = next(self.id_iterator)
+            self.id += 1
+            request_id = self.id
+
             request = {
                 "jsonrpc": "2.0",
                 "method": attr,
                 "params": args,
-                "id": request_id,
+                "id": self.id,
             }
             event = Event()
             self.request_events[request_id] = event

deltachat-rpc-client/tests/test_securejoin.py

@@ -1,581 +0,0 @@
-import logging
-
-import pytest
-from deltachat_rpc_client import Chat, SpecialContactId
-
-
-def test_qr_setup_contact(acfactory, tmp_path) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-
-    alice.wait_for_securejoin_inviter_success()
-
-    # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
-    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
-    assert alice_contact_bob_snapshot.is_verified
-
-    bob.wait_for_securejoin_joiner_success()
-
-    # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
-    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.
-    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 / "private-key-default.asc")
-
-    assert bob.get_config("key_id") == "2"
-    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert not bob_contact_alice_snapshot.is_verified
-
-
-@pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect):
-    alice, bob = acfactory.get_online_accounts(2)
-
-    logging.info("Alice creates a verified group")
-    alice_chat = alice.create_group("Verified group", protect=protect)
-    assert alice_chat.get_basic_snapshot().is_protected == protect
-
-    logging.info("Bob joins verified group")
-    qr_code, _svg = alice_chat.get_qr_code()
-    bob.secure_join(qr_code)
-
-    # Check that at least some of the handshake messages are deleted.
-    for ac in [alice, bob]:
-        while True:
-            event = ac.wait_for_event()
-            if event["kind"] == "ImapMessageDeleted":
-                break
-
-    alice.wait_for_securejoin_inviter_success()
-
-    # Test that Alice verified Bob's profile.
-    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
-    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
-    assert alice_contact_bob_snapshot.is_verified
-
-    bob.wait_for_securejoin_joiner_success()
-
-    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.chat.get_basic_snapshot().is_protected == protect
-
-    # Test that Bob verified Alice's profile.
-    bob_contact_alice = bob.get_contact_by_addr(alice.get_config("addr"))
-    bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
-    assert bob_contact_alice_snapshot.is_verified
-
-
-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_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.send_text("Hello!")
-
-    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello!"
-    bob_chat_alice = snapshot.chat
-    assert bob_chat_alice.get_basic_snapshot().is_contact_request
-
-    alice_chat = alice.create_group("Verified group", protect=True)
-    logging.info("Bob joins verified group")
-    qr_code, _svg = alice_chat.get_qr_code()
-    bob.secure_join(qr_code)
-    while True:
-        event = bob.wait_for_event()
-        if event["kind"] == "SecurejoinJoinerProgress" and event["progress"] == 1000:
-            break
-
-    # Chat stays being a contact request.
-    assert bob_chat_alice.get_basic_snapshot().is_contact_request
-
-
-def test_qr_readreceipt(acfactory) -> None:
-    alice, bob, charlie = acfactory.get_online_accounts(3)
-
-    logging.info("Bob and Charlie setup contact with Alice")
-    qr_code, _svg = alice.get_qr_code()
-
-    bob.secure_join(qr_code)
-    charlie.secure_join(qr_code)
-
-    for joiner in [bob, charlie]:
-        joiner.wait_for_securejoin_joiner_success()
-
-    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")
-
-    group.add_contact(alice_contact_bob)
-    group.add_contact(alice_contact_charlie)
-
-    # Promote a group.
-    group.send_message(text="Hello")
-
-    logging.info("Bob and Charlie receive a group")
-
-    bob_msg_id = bob.wait_for_incoming_msg_event().msg_id
-    bob_message = bob.get_message_by_id(bob_msg_id)
-    bob_snapshot = bob_message.get_snapshot()
-    assert bob_snapshot.text == "Hello"
-
-    # Charlie receives the same "Hello" message as Bob.
-    charlie.wait_for_incoming_msg_event()
-
-    logging.info("Bob sends a message to the group")
-
-    bob_out_message = bob_snapshot.chat.send_message(text="Hi from Bob!")
-
-    charlie_msg_id = charlie.wait_for_incoming_msg_event().msg_id
-    charlie_message = charlie.get_message_by_id(charlie_msg_id)
-    charlie_snapshot = charlie_message.get_snapshot()
-    assert charlie_snapshot.text == "Hi from Bob!"
-
-    bob_contact_charlie = bob.create_contact(charlie_addr, "Charlie")
-    assert not bob.get_chat_by_contact(bob_contact_charlie)
-
-    logging.info("Charlie reads Bob's message")
-    charlie_message.mark_seen()
-
-    while True:
-        event = bob.wait_for_event()
-        if event["kind"] == "MsgRead" and event["msg_id"] == bob_out_message.id:
-            break
-
-    # Receiving a read receipt from Charlie
-    # should not unblock hidden chat with Charlie for Bob.
-    assert not bob.get_chat_by_contact(bob_contact_charlie)
-
-
-def test_setup_contact_resetup(acfactory) -> None:
-    """Tests that setup contact works after Alice resets the device and changes the key."""
-    alice, bob = acfactory.get_online_accounts(2)
-
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-    alice = acfactory.resetup_account(alice)
-
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-
-def test_verified_group_recovery(acfactory) -> None:
-    """Tests verified group recovery by reverifying a member and sending a message in a group."""
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-
-    logging.info("ac1 creates verified group")
-    chat = ac1.create_group("Verified group", protect=True)
-    assert chat.get_basic_snapshot().is_protected
-
-    logging.info("ac2 joins verified group")
-    qr_code, _svg = chat.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    # ac1 has ac2 directly verified.
-    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
-    assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF
-
-    logging.info("ac3 joins verified group")
-    ac3_chat = ac3.secure_join(qr_code)
-    ac3.wait_for_securejoin_joiner_success()
-    ac3.wait_for_incoming_msg_event()  # Member added
-
-    logging.info("ac2 logs in on a new device")
-    ac2 = acfactory.resetup_account(ac2)
-
-    logging.info("ac2 reverifies with ac3")
-    qr_code, _svg = ac3.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    logging.info("ac3 sends a message to the group")
-    assert len(ac3_chat.get_contacts()) == 3
-    ac3_chat.send_text("Hi!")
-
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hi!"
-
-    msg_id = ac2.wait_for_incoming_msg_event().msg_id
-    message = ac2.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.text == "Hi!"
-
-    # ac1 contact is verified for ac2 because ac3 gossiped ac1 key in the "Hi!" message.
-    ac1_contact = ac2.get_contact_by_addr(ac1.get_config("addr"))
-    assert ac1_contact.get_snapshot().is_verified
-
-    # ac2 can write messages to the group.
-    snapshot.chat.send_text("Works again!")
-
-    snapshot = ac3.get_message_by_id(ac3.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Works again!"
-
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Works again!"
-
-    ac1_chat_messages = snapshot.chat.get_messages()
-    ac2_addr = ac2.get_config("addr")
-    assert ac1_chat_messages[-2].get_snapshot().text == f"Changed setup for {ac2_addr}"
-
-    # ac2 is now verified by ac3 for ac1
-    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
-    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id
-
-
-def test_verified_group_member_added_recovery(acfactory) -> None:
-    """Tests verified group recovery by reverifiying than removing and adding a member back."""
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-
-    logging.info("ac1 creates verified group")
-    chat = ac1.create_group("Verified group", protect=True)
-    assert chat.get_basic_snapshot().is_protected
-
-    logging.info("ac2 joins verified group")
-    qr_code, _svg = chat.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    # ac1 has ac2 directly verified.
-    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
-    assert ac1_contact_ac2.get_snapshot().verifier_id == SpecialContactId.SELF
-
-    logging.info("ac3 joins verified group")
-    ac3_chat = ac3.secure_join(qr_code)
-    ac3.wait_for_securejoin_joiner_success()
-    ac3.wait_for_incoming_msg_event()  # Member added
-
-    logging.info("ac2 logs in on a new device")
-    ac2 = acfactory.resetup_account(ac2)
-
-    logging.info("ac2 reverifies with ac3")
-    qr_code, _svg = ac3.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    logging.info("ac3 sends a message to the group")
-    assert len(ac3_chat.get_contacts()) == 3
-    ac3_chat.send_text("Hi!")
-
-    msg_id = ac2.wait_for_incoming_msg_event().msg_id
-    message = ac2.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    logging.info("Received message %s", snapshot.text)
-    assert snapshot.text == "Hi!"
-
-    ac1.wait_for_incoming_msg_event()  # Hi!
-
-    ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
-    ac3_chat.remove_contact(ac3_contact_ac2)
-    ac3_chat.add_contact(ac3_contact_ac2)
-
-    msg_id = ac2.wait_for_incoming_msg_event().msg_id
-    message = ac2.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert "removed" in snapshot.text
-
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert "removed" in snapshot.text
-
-    event = ac2.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    chat_id = event.chat_id
-    message = ac2.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    logging.info("ac2 got event message: %s", snapshot.text)
-    assert "added" in snapshot.text
-
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert "added" in snapshot.text
-
-    chat = Chat(ac2, chat_id)
-    chat.send_text("Works again!")
-
-    msg_id = ac3.wait_for_incoming_msg_event().msg_id
-    message = ac3.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.text == "Works again!"
-
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Works again!"
-
-    ac1_contact_ac2 = ac1.get_contact_by_addr(ac2.get_config("addr"))
-    ac1_contact_ac2_snapshot = ac1_contact_ac2.get_snapshot()
-    assert ac1_contact_ac2_snapshot.is_verified
-    assert ac1_contact_ac2_snapshot.verifier_id == ac1.get_contact_by_addr(ac3.get_config("addr")).id
-
-    # ac2 is now verified by ac3 for ac1
-    ac1_contact_ac3 = ac1.get_contact_by_addr(ac3.get_config("addr"))
-    assert ac1_contact_ac2.get_snapshot().verifier_id == ac1_contact_ac3.id
-
-
-def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
-    """Regression test for
-    issue <https://github.com/deltachat/deltachat-core-rust/issues/4894>.
-    """
-    ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)
-
-    logging.info("ac3: verify with ac2")
-    qr_code, _svg = ac2.get_qr_code()
-    ac3.secure_join(qr_code)
-    ac2.wait_for_securejoin_inviter_success()
-
-    # in order for ac2 to have pending bobstate with a verified group
-    # we first create a fully joined verified group, and then start
-    # joining a second time but interrupt it, to create pending bob state
-
-    logging.info("ac1: create verified group that ac2 fully joins")
-    ch1 = ac1.create_group("Group", protect=True)
-    qr_code, _svg = ch1.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac1.wait_for_securejoin_inviter_success()
-
-    # ensure ac1 can write and ac2 receives messages in verified chat
-    ch1.send_text("ac1 says hello")
-    while 1:
-        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-        if snapshot.text == "ac1 says hello":
-            assert snapshot.chat.get_basic_snapshot().is_protected
-            break
-
-    logging.info("ac1: let ac2 join again but shutoff ac1 in the middle of securejoin")
-    qr_code, _svg = ch1.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac1.remove()
-    logging.info("ac2 now has pending bobstate but ac1 is shutoff")
-
-    # we meanwhile expect ac3/ac2 verification started in the beginning to have completed
-    assert ac3.get_contact_by_addr(ac2.get_config("addr")).get_snapshot().is_verified
-    assert ac2.get_contact_by_addr(ac3.get_config("addr")).get_snapshot().is_verified
-
-    logging.info("ac3: create a verified group VG with ac2")
-    vg = ac3.create_group("ac3-created", protect=True)
-    vg.add_contact(ac3.get_contact_by_addr(ac2.get_config("addr")))
-
-    # ensure ac2 receives message in VG
-    vg.send_text("hello")
-    while 1:
-        msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-        if msg.text == "hello":
-            assert msg.chat.get_basic_snapshot().is_protected
-            break
-
-    logging.info("ac3: create a join-code for group VG and let ac4 join, check that ac2 got it")
-    qr_code, _svg = vg.get_qr_code()
-    ac4.secure_join(qr_code)
-    ac3.wait_for_securejoin_inviter_success()
-    while 1:
-        ev = ac2.wait_for_event()
-        if "added by unrelated SecureJoin" in str(ev):
-            return
-
-
-def test_qr_new_group_unblocked(acfactory):
-    """Regression test for a bug introduced in core v1.113.0.
-    ac2 scans a verified group QR code created by ac1.
-    This results in creation of a blocked 1:1 chat with ac1 on ac2,
-    but ac1 contact is not blocked on ac2.
-    Then ac1 creates a group, adds ac2 there and promotes it by sending a message.
-    ac2 should receive a message and create a contact request for the group.
-    Due to a bug previously ac2 created a blocked group.
-    """
-
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_chat = ac1.create_group("Group for joining", protect=True)
-    qr_code, _svg = ac1_chat.get_qr_code()
-    ac2.secure_join(qr_code)
-
-    ac1.wait_for_securejoin_inviter_success()
-
-    ac1_new_chat = ac1.create_group("Another group")
-    ac1_new_chat.add_contact(ac1.get_contact_by_addr(ac2.get_config("addr")))
-    # Receive "Member added" message.
-    ac2.wait_for_incoming_msg_event()
-
-    ac1_new_chat.send_text("Hello!")
-    ac2_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert ac2_msg.text == "Hello!"
-    assert ac2_msg.chat.get_basic_snapshot().is_contact_request
-
-
-def test_aeap_flow_verified(acfactory):
-    """Test that a new address is added to a contact when it changes its address."""
-    ac1, ac2, ac1new = acfactory.get_online_accounts(3)
-
-    logging.info("ac1: create verified-group QR, ac2 scans and joins")
-    chat = ac1.create_group("hello", protect=True)
-    assert chat.get_basic_snapshot().is_protected
-    qr_code, _svg = chat.get_qr_code()
-    logging.info("ac2: start QR-code based join-group protocol")
-    ac2.secure_join(qr_code)
-    ac1.wait_for_securejoin_inviter_success()
-
-    logging.info("sending first message")
-    msg_out = chat.send_text("old address").get_snapshot()
-
-    logging.info("receiving first message")
-    ac2.wait_for_incoming_msg_event()  # member added message
-    msg_in_1 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    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.stop_io()
-    ac1.configure()
-    ac1.start_io()
-
-    logging.info("sending second message")
-    msg_out = chat.send_text("changed address").get_snapshot()
-
-    logging.info("receiving second message")
-    msg_in_2 = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
-    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 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()
-    ]
-
-
-def test_gossip_verification(acfactory) -> None:
-    alice, bob, carol = acfactory.get_online_accounts(3)
-
-    # Bob verifies Alice.
-    qr_code, _svg = alice.get_qr_code()
-    bob.secure_join(qr_code)
-    bob.wait_for_securejoin_joiner_success()
-
-    # Bob verifies Carol.
-    qr_code, _svg = carol.get_qr_code()
-    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")
-
-    logging.info("Bob creates an Autocrypt group")
-    bob_group_chat = bob.create_group("Autocrypt Group")
-    assert not bob_group_chat.get_basic_snapshot().is_protected
-    bob_group_chat.add_contact(bob_contact_alice)
-    bob_group_chat.add_contact(bob_contact_carol)
-    bob_group_chat.send_message(text="Hello Autocrypt group")
-
-    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Autocrypt group"
-    assert snapshot.show_padlock
-
-    # Autocrypt group does not propagate verification.
-    carol_contact_alice_snapshot = carol_contact_alice.get_snapshot()
-    assert not carol_contact_alice_snapshot.is_verified
-
-    logging.info("Bob creates a Securejoin group")
-    bob_group_chat = bob.create_group("Securejoin Group", protect=True)
-    assert bob_group_chat.get_basic_snapshot().is_protected
-    bob_group_chat.add_contact(bob_contact_alice)
-    bob_group_chat.add_contact(bob_contact_carol)
-    bob_group_chat.send_message(text="Hello Securejoin group")
-
-    snapshot = carol.get_message_by_id(carol.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Securejoin group"
-    assert snapshot.show_padlock
-
-    # Securejoin propagates verification.
-    carol_contact_alice_snapshot = carol_contact_alice.get_snapshot()
-    assert carol_contact_alice_snapshot.is_verified
-
-
-def test_securejoin_after_contact_resetup(acfactory) -> None:
-    """
-    Regression test for a bug that prevented joining verified group with a QR code
-    if the group is already created and contains
-    a contact with inconsistent (Autocrypt and verified keys exist but don't match) key state.
-    """
-    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
-
-    # ac3 creates protected group with ac1.
-    ac3_chat = ac3.create_group("Verified group", protect=True)
-
-    # ac1 joins ac3 group.
-    ac3_qr_code, _svg = ac3_chat.get_qr_code()
-    ac1.secure_join(ac3_qr_code)
-    ac1.wait_for_securejoin_joiner_success()
-
-    # 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()
-    ac1_qr_code, _svg = snapshot.chat.get_qr_code()
-
-    # ac2 verifies ac1
-    qr_code, _svg = ac1.get_qr_code()
-    ac2.secure_join(qr_code)
-    ac2.wait_for_securejoin_joiner_success()
-
-    # ac1 is verified for ac2.
-    ac2_contact_ac1 = ac2.create_contact(ac1.get_config("addr"), "")
-    assert ac2_contact_ac1.get_snapshot().is_verified
-
-    # ac1 resetups the account.
-    ac1 = acfactory.resetup_account(ac1)
-
-    # ac1 sends a message to ac2.
-    ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
-    ac1_chat_ac2 = ac1_contact_ac2.create_chat()
-    ac1_chat_ac2.send_text("Hello!")
-
-    # ac2 receives a message.
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello!"
-
-    # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
-    assert not ac2_contact_ac1.get_snapshot().is_verified
-
-    # ac1 goes offline.
-    ac1.remove()
-
-    # Scanning a QR code results in creating an unprotected group with an inviter.
-    # In this case inviter is ac1 which has an inconsistent key state.
-    # Normally inviter becomes verified as a result of Securejoin protocol
-    # and then the group chat becomes verified when "Member added" is received,
-    # but in this case ac1 is offline and this Securejoin process will never finish.
-    logging.info("ac2 scans ac1 QR code, this is not expected to finish")
-    ac2.secure_join(ac1_qr_code)
-
-    logging.info("ac2 scans ac3 QR code")
-    ac2.secure_join(ac3_qr_code)
-
-    logging.info("ac2 waits for joiner success")
-    ac2.wait_for_securejoin_joiner_success()
-
-    # Wait for member added.
-    logging.info("ac2 waits for member added message")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.is_info
-    ac2_chat = snapshot.chat
-    assert ac2_chat.get_basic_snapshot().is_protected
-    assert len(ac2_chat.get_contacts()) == 3
-
-    # ac1 is still "not verified" for ac2 due to inconsistent state.
-    assert not ac2_contact_ac1.get_snapshot().is_verified

deltachat-rpc-client/tests/test_something.py

@@ -140,9 +140,12 @@ def test_chat(acfactory) -> None:
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
     assert snapshot.chat_id == chat_id
@@ -221,9 +224,12 @@ def test_message(acfactory) -> None:
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
 
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
@@ -325,7 +331,7 @@ def test_wait_next_messages(acfactory) -> None:
         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_addr, "Bob")
         alice_chat_bot = alice_contact_bot.create_chat()
         alice_chat_bot.send_text("Hello!")
 
@@ -335,7 +341,7 @@ def test_wait_next_messages(acfactory) -> None:
         assert snapshot.text == "Hello!"
 
 
-def test_import_export_backup(acfactory, tmp_path) -> None:
+def test_import_export(acfactory, tmp_path) -> None:
     alice = acfactory.new_configured_account()
     alice.export_backup(tmp_path)
 
@@ -346,96 +352,9 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
     assert alice2.manager.get_system_info()
 
 
-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.send_text("Hello Bob!")
-
-    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Bob!"
-
-    # Alice resetups account, but keeps the key.
-    alice_keys_path = tmp_path / "alice_keys"
-    alice_keys_path.mkdir()
-    alice.export_self_keys(alice_keys_path)
-    alice = acfactory.resetup_account(alice)
-    alice.import_self_keys(alice_keys_path)
-
-    snapshot.chat.accept()
-    snapshot.chat.send_text("Hello Alice!")
-    snapshot = alice.get_message_by_id(alice.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Hello Alice!"
-    assert snapshot.show_padlock
-
-
 def test_openrpc_command_line() -> None:
     """Test that "deltachat-rpc-server --openrpc" command returns an OpenRPC specification."""
     out = subprocess.run(["deltachat-rpc-server", "--openrpc"], capture_output=True, check=True).stdout
     openrpc = json.loads(out)
     assert "openrpc" in openrpc
     assert "methods" in openrpc
-
-
-def test_provider_info(rpc) -> None:
-    account_id = rpc.add_account()
-
-    provider_info = rpc.get_provider_info(account_id, "example.org")
-    assert provider_info["id"] == "example.com"
-
-    provider_info = rpc.get_provider_info(account_id, "uep7oiw4ahtaizuloith.org")
-    assert provider_info is None
-
-    # Test MX record resolution.
-    provider_info = rpc.get_provider_info(account_id, "github.com")
-    assert provider_info["id"] == "gmail"
-
-    # Disable MX record resolution.
-    rpc.set_config(account_id, "socks5_enabled", "1")
-    provider_info = rpc.get_provider_info(account_id, "github.com")
-    assert provider_info is 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")
-
-    # Bob creates chat manually so chat with Alice is accepted.
-    alice_chat_bob = alice_contact_bob.create_chat()
-
-    # Alice sends a message to Bob.
-    alice_chat_bob.send_text("Hello Bob!")
-    event = bob.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = bob.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-
-    # Bob sends a message to Alice.
-    bob_chat_alice = snapshot.chat
-    bob_chat_alice.accept()
-    bob_chat_alice.send_text("Hello Alice!")
-    event = alice.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = alice.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.show_padlock
-
-    # Alice reads Bob's message.
-    message.mark_seen()
-    while True:
-        event = bob.wait_for_event()
-        if event.kind == EventType.MSG_READ:
-            break
-
-    # Bob sends a message to Alice, it should also be encrypted.
-    bob_chat_alice.send_text("Hi Alice!")
-    event = alice.wait_for_incoming_msg_event()
-    msg_id = event.msg_id
-    message = alice.get_message_by_id(msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.show_padlock

deltachat-rpc-client/tests/test_webxdc.py

@@ -43,15 +43,3 @@ def test_webxdc(acfactory) -> None:
     assert status_updates == [
         {"payload": "Second update", "serial": 2, "max_serial": 2},
     ]
-
-
-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_chat_bob = alice_contact_bob.create_chat()
-    message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
-
-    for i in range(2000):
-        message.send_webxdc_status_update({"payload": str(i)}, "description")

deltachat-rpc-client/tox.ini

@@ -11,7 +11,7 @@ setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
     RUST_MIN_STACK=8388608
 passenv =
-    CHATMAIL_DOMAIN
+    DCC_NEW_TMP_EMAIL
 deps =
     pytest
     pytest-timeout
@@ -28,6 +28,4 @@ commands =
     ruff src/ examples/ tests/
 
 [pytest]
-timeout = 300
-log_cli = true
-log_level = debug
+timeout = 60

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.135.1"
+version = "1.124.1"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -15,11 +15,11 @@ deltachat = { path = "..", default-features = false }
 
 anyhow = "1"
 env_logger = { version = "0.10.0" }
-futures-lite = "2.2.0"
+futures-lite = "1.13.0"
 log = "0.4"
-serde_json = "1"
+serde_json = "1.0.105"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.33.0", features = ["io-std"] }
+tokio = { version = "1.32.0", features = ["io-std"] }
 tokio-util = "0.7.9"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 

deltachat-time/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "deltachat-time"
-version = "1.0.0"
-description = "Time-related tools"
-edition = "2021"
-license = "MPL-2.0"
-
-[dependencies]

deltachat-time/src/lib.rs

@@ -1,35 +0,0 @@
-#![allow(missing_docs)]
-
-use std::sync::RwLock;
-use std::time::{Duration, SystemTime};
-
-static SYSTEM_TIME_SHIFT: RwLock<Duration> = RwLock::new(Duration::new(0, 0));
-
-/// Fake struct for mocking `SystemTime::now()` for test purposes. You still need to use
-/// `SystemTime` as a struct representing a system time.
-pub struct SystemTimeTools();
-
-impl SystemTimeTools {
-    pub const UNIX_EPOCH: SystemTime = SystemTime::UNIX_EPOCH;
-
-    pub fn now() -> SystemTime {
-        return SystemTime::now() + *SYSTEM_TIME_SHIFT.read().unwrap();
-    }
-
-    /// Simulates a system clock forward adjustment by `duration`.
-    pub fn shift(duration: Duration) {
-        *SYSTEM_TIME_SHIFT.write().unwrap() += duration;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        SystemTimeTools::shift(Duration::from_secs(60));
-        let t = SystemTimeTools::now();
-        assert!(t > SystemTime::now());
-    }
-}

deny.toml

@@ -1,23 +1,8 @@
 [advisories]
+unmaintained = "allow"
 ignore = [
     "RUSTSEC-2020-0071",
     "RUSTSEC-2022-0093",
-
-    # 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.
-    # There is no fix at the time of writing this (2023-11-28).
-    # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
-    "RUSTSEC-2023-0071",
-
-    # Unmaintained ansi_term
-    "RUSTSEC-2021-0139",
-
-    # Unmaintained encoding
-    "RUSTSEC-2021-0153",
-
-    # Unmaintained safemem
-    "RUSTSEC-2023-0081",
 ]
 
 [bans]
@@ -26,7 +11,6 @@ ignore = [
 # when upgrading.
 # Please keep this list alphabetically sorted.
 skip = [
-     { name = "async-channel", version = "1.9.0" },
      { name = "base16ct", version = "0.1.1" },
      { name = "base64", version = "<0.21" },
      { name = "bitflags", version = "1.3.2" },
@@ -40,43 +24,38 @@ skip = [
      { name = "digest", version = "<0.10" },
      { name = "ed25519-dalek", version = "1.0.1" },
      { name = "ed25519", version = "1.5.3" },
-     { name = "event-listener", version = "2.5.3" },
+     { name = "fastrand", version = "1.9.0" },
      { name = "getrandom", version = "<0.2" },
-     { name = "h2", version = "0.3.22" },
-     { name = "http-body", version = "0.4.5" },
-     { name = "http", version = "0.2.11" },
-     { name = "hyper", version = "0.14.27" },
-     { name = "idna", version = "0.4.0" },
+     { name = "hashbrown", version = "<0.14.0" },
+     { name = "indexmap", version = "<2.0.0" },
      { name = "pem-rfc7468", version = "0.6.0" },
      { name = "pkcs8", version = "0.9.0" },
      { name = "quick-error", version = "<2.0" },
      { name = "rand_chacha", version = "<0.3" },
      { name = "rand_core", version = "<0.6" },
      { name = "rand", version = "<0.8" },
-     { name = "redox_syscall", version = "0.3.5" },
+     { name = "redox_syscall", version = "0.2.16" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
-     { name = "ring", version = "0.16.20" },
      { name = "sec1", version = "0.3.0" },
      { name = "sha2", version = "<0.10" },
      { name = "signature", version = "1.6.4" },
+     { name = "socket2", version = "0.4.9" },
      { name = "spin", version = "<0.9.6" },
      { name = "spki", version = "0.6.0" },
      { name = "syn", version = "1.0.109" },
      { name = "time", version = "<0.3" },
-     { name = "toml_edit", version = "0.21.1" },
-     { name = "untrusted", version = "0.7.1" },
      { name = "wasi", version = "<0.11" },
-     { name = "windows_aarch64_gnullvm", version = "<0.52" },
-     { name = "windows_aarch64_msvc", version = "<0.52" },
-     { name = "windows_i686_gnu", version = "<0.52" },
-     { name = "windows_i686_msvc", version = "<0.52" },
-     { name = "windows-sys", version = "<0.52" },
-     { name = "windows-targets", version = "<0.52" },
+     { name = "windows_aarch64_gnullvm", version = "<0.48" },
+     { name = "windows_aarch64_msvc", version = "<0.48" },
+     { name = "windows_i686_gnu", version = "<0.48" },
+     { name = "windows_i686_msvc", version = "<0.48" },
+     { name = "windows-sys", version = "<0.48" },
+     { name = "windows-targets", version = "<0.48" },
      { name = "windows", version = "0.32.0" },
-     { name = "windows_x86_64_gnullvm", version = "<0.52" },
-     { name = "windows_x86_64_gnu", version = "<0.52" },
-     { name = "windows_x86_64_msvc", version = "<0.52" },
+     { name = "windows_x86_64_gnullvm", version = "<0.48" },
+     { name = "windows_x86_64_gnu", version = "<0.48" },
+     { name = "windows_x86_64_msvc", version = "<0.48" },
 ]
 
 
@@ -108,4 +87,5 @@ license-files = [
 github = [
        "async-email",
        "deltachat",
+       "quinn-rs",
 ]

draft/aeap-mvp.md

@@ -57,7 +57,7 @@ Note that usually a mail is signed by a key that has a UID matching the from add
 ### Notes:
   
 - We treat protected and non-protected chats the same
-- We leave the aeap transition statement away since it seems not to be needed, makes things harder on the sending side, wastes some network traffic, and is worse for privacy (since more people know what old addresses you had).
+- We leave the aeap transition statement away since it seems not to be needed, makes things harder on the sending side, wastes some network traffic, and is worse for privacy (since more pepole know what old addresses you had).
 - As soon as we encrypt read receipts, sending a read receipt will be enough to tell a lot of people that you transitioned
 - AEAP will make the problem of inconsistent group state worse, both because it doesn't work if the message is unencrypted (even if the design allowed it, it would be problematic security-wise) and because some chat partners may have gotten the transition and some not. We should do something against this at some point in the future, like asking the user whether they want to add/remove the members to restore consistent group state.
 
@@ -108,7 +108,7 @@ The most obvious alternative would be to create a new contact with the new addre
 #### Upsides:
 - With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
 - (Also, less important: Slightly faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
-- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't waste that much development time.)
+- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.)
 
 [full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161)
   

flake.lock

@@ -1,163 +0,0 @@
-{
-  "nodes": {
-    "fenix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1707891749,
-        "narHash": "sha256-SeikNYElHgv8uVMbiA9/pU3Cce7ssIsiM8CnEiwd1Nc=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "3115aab064ef38cccd792c45429af8df43d6d277",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1698420672,
-        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nix-filter": {
-      "locked": {
-        "lastModified": 1705332318,
-        "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1707743206,
-        "narHash": "sha256-AehgH64b28yKobC/DAWYZWkJBxL/vP83vkY+ag2Hhy4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2d627a2a704708673e56346fcb13d25344b8eaf3",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "fenix": "fenix",
-        "flake-utils": "flake-utils",
-        "naersk": "naersk",
-        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_3"
-      }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1707849817,
-        "narHash": "sha256-If6T0MDErp3/z7DBlpG4bV46IPP+7BWSlgTI88cmbw0=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "a02a219773629686bd8ff123ca1aa995fa50d976",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,331 +0,0 @@
-{
-  description = "Delta Chat core";
-  inputs = {
-    fenix.url = "github:nix-community/fenix";
-    flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
-    nix-filter.url = "github:numtide/nix-filter";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  };
-  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        fenixPkgs = fenix.packages.${system};
-        naersk' = pkgs.callPackage naersk { };
-        manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
-        cargoLock = {
-          lockFile = ./Cargo.lock;
-          outputHashes = {
-            "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
-            "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
-            "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
-          };
-        };
-        mkRustPackage = packageName:
-          naersk'.buildPackage {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-          };
-        pkgsWin64 = pkgs.pkgsCross.mingwW64;
-        mkWin64RustPackage = packageName:
-          let
-            rustTarget = "x86_64-pc-windows-gnu";
-          in
-          let
-            toolchainWin = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naerskWin = pkgs.callPackage naersk {
-              cargo = toolchainWin;
-              rustc = toolchainWin;
-            };
-          in
-          naerskWin.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            depsBuildBuild = [
-              pkgsWin64.stdenv.cc
-              pkgsWin64.windows.pthreads
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            CC = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
-            LD = "${pkgsWin64.stdenv.cc}/bin/${pkgsWin64.stdenv.cc.targetPrefix}cc";
-          };
-
-        pkgsWin32 = pkgs.pkgsCross.mingw32;
-        mkWin32RustPackage = packageName:
-          let
-            rustTarget = "i686-pc-windows-gnu";
-          in
-          let
-            toolchainWin = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naerskWin = pkgs.callPackage naersk {
-              cargo = toolchainWin;
-              rustc = toolchainWin;
-            };
-
-            # Get rid of MCF Gthread library.
-            # See <https://github.com/NixOS/nixpkgs/issues/156343>
-            # and <https://discourse.nixos.org/t/statically-linked-mingw-binaries/38395>
-            # for details.
-            #
-            # Use DWARF-2 instead of SJLJ for exception handling.
-            winCC = pkgsWin32.buildPackages.wrapCC (
-              (pkgsWin32.buildPackages.gcc-unwrapped.override
-                ({
-                  threadsCross = {
-                    model = "win32";
-                    package = null;
-                  };
-                })).overrideAttrs (oldAttr: rec{
-                configureFlags = oldAttr.configureFlags ++ [
-                  "--disable-sjlj-exceptions --with-dwarf2"
-                ];
-              })
-            );
-            winStdenv = pkgsWin32.buildPackages.overrideCC pkgsWin32.stdenv winCC;
-          in
-          naerskWin.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            depsBuildBuild = [
-              winCC
-              pkgsWin32.windows.pthreads
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${winCC}/bin/${winCC.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            CC = "${winCC}/bin/${winCC.targetPrefix}cc";
-            LD = "${winCC}/bin/${winCC.targetPrefix}cc";
-          };
-
-        mkCrossRustPackage = rustTarget: crossTarget: packageName:
-          let
-            pkgsCross = import nixpkgs {
-              system = system;
-              crossSystem.config = crossTarget;
-            };
-          in
-          let
-            toolchain = fenixPkgs.combine [
-              fenixPkgs.stable.rustc
-              fenixPkgs.stable.cargo
-              fenixPkgs.targets.${rustTarget}.stable.rust-std
-            ];
-            naersk-lib = pkgs.callPackage naersk {
-              cargo = toolchain;
-              rustc = toolchain;
-            };
-          in
-          naersk-lib.buildPackage rec {
-            pname = packageName;
-            cargoBuildOptions = x: x ++ [ "--package" packageName ];
-            version = manifest.version;
-            strictDeps = true;
-            src = pkgs.lib.cleanSource ./.;
-            nativeBuildInputs = [
-              pkgs.perl # Needed to build vendored OpenSSL.
-            ];
-            auditable = false; # Avoid cargo-auditable failures.
-            doCheck = false; # Disable test as it requires network access.
-
-            CARGO_BUILD_TARGET = rustTarget;
-            TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-            CARGO_BUILD_RUSTFLAGS = [
-              "-C"
-              "linker=${TARGET_CC}"
-            ];
-
-            CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-            LD = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-          };
-
-        mk-aarch64-RustPackage = mkCrossRustPackage "aarch64-unknown-linux-musl" "aarch64-unknown-linux-musl";
-        mk-i686-RustPackage = mkCrossRustPackage "i686-unknown-linux-musl" "i686-unknown-linux-musl";
-        mk-x86_64-RustPackage = mkCrossRustPackage "x86_64-unknown-linux-musl" "x86_64-unknown-linux-musl";
-        mk-armv7l-RustPackage = mkCrossRustPackage "armv7-unknown-linux-musleabihf" "armv7l-unknown-linux-musleabihf";
-        mk-armv6l-RustPackage = mkCrossRustPackage "arm-unknown-linux-musleabihf" "armv6l-unknown-linux-musleabihf";
-      in
-      {
-        formatter = pkgs.nixpkgs-fmt;
-
-        packages = rec {
-          # Run with `nix run .#deltachat-repl foo.db`.
-          deltachat-repl = mkRustPackage "deltachat-repl";
-          deltachat-rpc-server = mkRustPackage "deltachat-rpc-server";
-
-          deltachat-repl-win64 = mkWin64RustPackage "deltachat-repl";
-          deltachat-rpc-server-win64 = mkWin64RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-win32 = mkWin32RustPackage "deltachat-repl";
-          deltachat-rpc-server-win32 = mkWin32RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-aarch64-linux = mk-aarch64-RustPackage "deltachat-repl";
-          deltachat-rpc-server-aarch64-linux = mk-aarch64-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-i686-linux = mk-i686-RustPackage "deltachat-repl";
-          deltachat-rpc-server-i686-linux = mk-i686-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-x86_64-linux = mk-x86_64-RustPackage "deltachat-repl";
-          deltachat-rpc-server-x86_64-linux = mk-x86_64-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-armv7l-linux = mk-armv7l-RustPackage "deltachat-repl";
-          deltachat-rpc-server-armv7l-linux = mk-armv7l-RustPackage "deltachat-rpc-server";
-
-          deltachat-repl-armv6l-linux = mk-armv6l-RustPackage "deltachat-repl";
-          deltachat-rpc-server-armv6l-linux = mk-armv6l-RustPackage "deltachat-rpc-server";
-
-          # Run `nix build .#docs` to get C docs generated in `./result/`.
-          docs =
-            pkgs.stdenv.mkDerivation {
-              pname = "docs";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./.;
-              nativeBuildInputs = [ pkgs.doxygen ];
-              buildPhase = ''scripts/run-doxygen.sh'';
-              installPhase = ''mkdir -p $out; cp -av deltachat-ffi/html deltachat-ffi/xml $out'';
-            };
-
-          libdeltachat =
-            pkgs.stdenv.mkDerivation rec {
-              pname = "libdeltachat";
-              version = manifest.version;
-              src = nix-filter.lib {
-                root = ./.;
-
-                # Include only necessary files
-                # to avoid rebuilds e.g. when README.md or flake.nix changes.
-                include = [
-                  ./benches
-                  ./assets
-                  ./Cargo.lock
-                  ./Cargo.toml
-                  ./CMakeLists.txt
-                  ./CONTRIBUTING.md
-                  ./deltachat_derive
-                  ./deltachat-ffi
-                  ./deltachat-jsonrpc
-                  ./deltachat-ratelimit
-                  ./deltachat-repl
-                  ./deltachat-rpc-client
-                  ./deltachat-time
-                  ./deltachat-rpc-server
-                  ./format-flowed
-                  ./release-date.in
-                  ./src
-                ];
-                exclude = [
-                  (nix-filter.lib.matchExt "nix")
-                  "flake.lock"
-                ];
-              };
-              cargoDeps = pkgs.rustPlatform.importCargoLock cargoLock;
-
-              nativeBuildInputs = [
-                pkgs.perl # Needed to build vendored OpenSSL.
-                pkgs.cmake
-                pkgs.rustPlatform.cargoSetupHook
-                pkgs.cargo
-              ];
-
-              postInstall = ''
-                substituteInPlace $out/include/deltachat.h \
-                  --replace __FILE__ '"${placeholder "out"}/include/deltachat.h"'
-              '';
-            };
-
-          deltachat-rpc-client =
-            pkgs.python3Packages.buildPythonPackage rec {
-              pname = "deltachat-rpc-client";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./deltachat-rpc-client;
-              format = "pyproject";
-              propagatedBuildInputs = [
-                pkgs.python3Packages.setuptools
-                pkgs.python3Packages.setuptools_scm
-              ];
-            };
-
-          deltachat-python =
-            pkgs.python3Packages.buildPythonPackage rec {
-              pname = "deltachat-python";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./python;
-              format = "pyproject";
-              buildInputs = [
-                libdeltachat
-              ];
-              nativeBuildInputs = [
-                pkgs.pkg-config
-              ];
-              propagatedBuildInputs = [
-                pkgs.python3Packages.setuptools
-                pkgs.python3Packages.setuptools_scm
-                pkgs.python3Packages.pkgconfig
-                pkgs.python3Packages.cffi
-                pkgs.python3Packages.imap-tools
-                pkgs.python3Packages.pluggy
-                pkgs.python3Packages.requests
-              ];
-            };
-          python-docs =
-            pkgs.stdenv.mkDerivation {
-              pname = "docs";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./.;
-              buildInputs = [
-                deltachat-python
-                deltachat-rpc-client
-                pkgs.python3Packages.breathe
-                pkgs.python3Packages.sphinx_rtd_theme
-              ];
-              nativeBuildInputs = [ pkgs.sphinx ];
-              buildPhase = ''sphinx-build -b html -a python/doc/ dist/html'';
-              installPhase = ''mkdir -p $out; cp -av dist/html $out'';
-            };
-        };
-      }
-    );
-}

node/README.md

@@ -40,7 +40,7 @@ npm install deltachat-node
 
 ## Dependencies
 
-- Nodejs >= `v18.0.0`
+- Nodejs >= `v16.0.0`
 - rustup (optional if you can't use the prebuilds)
 
 > On Windows, you may need to also install **Perl** to be able to compile deltachat-core.
@@ -113,8 +113,8 @@ Then, in the `deltachat-desktop` repository, run:
 deltachat doesn't support universal (fat) binaries (that contain builds for both cpu architectures) yet, until it does you can use the following workaround to get x86_64 builds:
 
 ```
-$ fnm install 19 --arch x64
-$ fnm use 19
+$ fnm install 17 --arch x64
+$ fnm use 17
 $ node -p process.arch
 # result should be x64
 $ rustup target add x86_64-apple-darwin
@@ -127,8 +127,8 @@ $ npm run test
 If your node and electron are already build for arm64 you can also try building for arm:
 
 ```
-$ fnm install 18 --arch arm64
-$ fnm use 18
+$ fnm install 16 --arch arm64
+$ fnm use 16
 $ node -p process.arch
 # result should be arm64
 $ npm_config_arch=arm64 npm run build
@@ -204,10 +204,10 @@ Running `npm test` ends with showing a code coverage report, which is produced b
 
 The coverage report from `nyc` in the console is rather limited. To get a more detailed coverage report you can run `npm run coverage-html-report`. This will produce a html report from the `nyc` data and display it in a browser on your local machine.
 
-To run the integration tests you need to set the `CHATMAIL_DOMAIN` environment variables. E.g.:
+To run the integration tests you need to set the `DCC_NEW_TMP_EMAIL` environment variables. E.g.:
 
 ```
-$ export CHATMAIL_DOMAIN=chat.example.org
+$ export DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=[token]
 $ npm run test
 ```
 

node/constants.js

@@ -28,12 +28,9 @@ module.exports = {
   DC_DOWNLOAD_DONE: 0,
   DC_DOWNLOAD_FAILURE: 20,
   DC_DOWNLOAD_IN_PROGRESS: 1000,
-  DC_DOWNLOAD_UNDECIPHERABLE: 30,
-  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE: 2200,
   DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
   DC_EVENT_CHAT_MODIFIED: 2020,
   DC_EVENT_CONFIGURE_PROGRESS: 2041,
-  DC_EVENT_CONFIG_SYNCED: 2111,
   DC_EVENT_CONNECTIVITY_CHANGED: 2100,
   DC_EVENT_CONTACTS_CHANGED: 2030,
   DC_EVENT_DELETED_BLOB_FILE: 151,
@@ -81,7 +78,6 @@ module.exports = {
   DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
   DC_INFO_GROUP_IMAGE_CHANGED: 3,
   DC_INFO_GROUP_NAME_CHANGED: 2,
-  DC_INFO_INVALID_UNENCRYPTED_MAIL: 13,
   DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
   DC_INFO_LOCATION_ONLY: 9,
   DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
@@ -228,13 +224,11 @@ module.exports = {
   DC_STR_GROUP_NAME_CHANGED_BY_YOU: 124,
   DC_STR_IMAGE: 9,
   DC_STR_INCOMING_MESSAGES: 103,
-  DC_STR_INVALID_UNENCRYPTED_MAIL: 174,
   DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
   DC_STR_LOCATION: 66,
   DC_STR_LOCATION_ENABLED_BY_OTHER: 137,
   DC_STR_LOCATION_ENABLED_BY_YOU: 136,
   DC_STR_MESSAGES: 114,
-  DC_STR_MESSAGE_ADD_MEMBER: 173,
   DC_STR_MSGACTIONBYME: 63,
   DC_STR_MSGACTIONBYUSER: 62,
   DC_STR_MSGADDMEMBER: 17,
@@ -245,7 +239,6 @@ module.exports = {
   DC_STR_MSGGRPNAME: 15,
   DC_STR_MSGLOCATIONDISABLED: 65,
   DC_STR_MSGLOCATIONENABLED: 64,
-  DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE: 172,
   DC_STR_NOMESSAGES: 1,
   DC_STR_NOT_CONNECTED: 121,
   DC_STR_NOT_SUPPORTED_BY_PROVIDER: 113,

node/events.js

@@ -34,8 +34,6 @@ module.exports = {
   2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2111: 'DC_EVENT_CONFIG_SYNCED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE'
+  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
 }

node/lib/constants.ts

@@ -28,12 +28,9 @@ export enum C {
   DC_DOWNLOAD_DONE = 0,
   DC_DOWNLOAD_FAILURE = 20,
   DC_DOWNLOAD_IN_PROGRESS = 1000,
-  DC_DOWNLOAD_UNDECIPHERABLE = 30,
-  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200,
   DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
   DC_EVENT_CHAT_MODIFIED = 2020,
   DC_EVENT_CONFIGURE_PROGRESS = 2041,
-  DC_EVENT_CONFIG_SYNCED = 2111,
   DC_EVENT_CONNECTIVITY_CHANGED = 2100,
   DC_EVENT_CONTACTS_CHANGED = 2030,
   DC_EVENT_DELETED_BLOB_FILE = 151,
@@ -81,7 +78,6 @@ export enum C {
   DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
   DC_INFO_GROUP_IMAGE_CHANGED = 3,
   DC_INFO_GROUP_NAME_CHANGED = 2,
-  DC_INFO_INVALID_UNENCRYPTED_MAIL = 13,
   DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
   DC_INFO_LOCATION_ONLY = 9,
   DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
@@ -228,13 +224,11 @@ export enum C {
   DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
   DC_STR_IMAGE = 9,
   DC_STR_INCOMING_MESSAGES = 103,
-  DC_STR_INVALID_UNENCRYPTED_MAIL = 174,
   DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
   DC_STR_LOCATION = 66,
   DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
   DC_STR_LOCATION_ENABLED_BY_YOU = 136,
   DC_STR_MESSAGES = 114,
-  DC_STR_MESSAGE_ADD_MEMBER = 173,
   DC_STR_MSGACTIONBYME = 63,
   DC_STR_MSGACTIONBYUSER = 62,
   DC_STR_MSGADDMEMBER = 17,
@@ -245,7 +239,6 @@ export enum C {
   DC_STR_MSGGRPNAME = 15,
   DC_STR_MSGLOCATIONDISABLED = 65,
   DC_STR_MSGLOCATIONENABLED = 64,
-  DC_STR_NEW_GROUP_SEND_FIRST_MESSAGE = 172,
   DC_STR_NOMESSAGES = 1,
   DC_STR_NOT_CONNECTED = 121,
   DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
@@ -324,8 +317,6 @@ export const EventId2EventName: { [key: number]: string } = {
   2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
   2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
   2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2111: 'DC_EVENT_CONFIG_SYNCED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
   2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
 }

node/lib/context.ts

@@ -36,7 +36,7 @@ export class Context extends EventEmitter {
     }
   }
 
-  /** Opens a standalone context (without an account manager)
+  /** Opens a stanalone context (without an account manager)
    * automatically starts the event handler */
   static open(cwd: string): Context {
     const dbFile = join(cwd, 'db.sqlite')

node/lib/deltachat.ts

@@ -178,7 +178,7 @@ export class AccountManager extends EventEmitter {
   static newTemporary() {
     let directory = null
     while (true) {
-      const randomString = Math.random().toString(36).substring(2, 5)
+      const randomString = Math.random().toString(36).substr(2, 5)
       directory = join(tmpdir(), 'deltachat-' + randomString)
       if (!existsSync(directory)) break
     }

node/test/test.js

@@ -1,28 +1,33 @@
 // @ts-check
-import { DeltaChat } from '../dist/index.js'
+import DeltaChat from '../dist'
 
 import { deepStrictEqual, strictEqual } from 'assert'
 import chai, { expect } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
-import { EventId2EventName, C } from '../dist/constants.js'
+import { EventId2EventName, C } from '../dist/constants'
 import { join } from 'path'
 import { statSync } from 'fs'
-import { Context } from '../dist/context.js'
-import {fileURLToPath} from 'url';
-
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
-
+import { Context } from '../dist/context'
+import fetch from 'node-fetch'
 chai.use(chaiAsPromised)
 chai.config.truncateThreshold = 0 // Do not truncate assertion errors.
 
-function createTempUser(chatmailDomain) {
-  const charset = "2345789acdefghjkmnpqrstuvwxyz";
-  let user = "ci-";
-  for (let i = 0; i < 6; i++) {
-    user += charset[Math.floor(Math.random() * charset.length)];
+async function createTempUser(url) {
+  async function postData(url = '') {
+    // Default options are marked with *
+    const response = await fetch(url, {
+      method: 'POST', // *GET, POST, PUT, DELETE, etc.
+      headers: {
+        'cache-control': 'no-cache',
+      },
+    })
+    if (!response.ok) {
+      throw new Error('request failed: ' + response.body.read())
+    }
+    return response.json() // parses JSON response into native JavaScript objects
   }
-  const email = user + "@" + chatmailDomain;
-  return { email: email, password: user + "$" + user };
+
+  return await postData(url)
 }
 
 describe('static tests', function () {
@@ -239,7 +244,7 @@ describe('Basic offline Tests', function () {
       'delete_device_after',
       'delete_server_after',
       'deltachat_core_version',
-      'displayname',
+      'display_name',
       'download_limit',
       'e2ee_enabled',
       'entered_account_settings',
@@ -250,7 +255,6 @@ describe('Basic offline Tests', function () {
       'journal_mode',
       'key_gen_type',
       'last_housekeeping',
-      'last_cant_decrypt_outgoing_msgs',
       'level',
       'mdns_enabled',
       'media_quality',
@@ -266,7 +270,7 @@ describe('Basic offline Tests', function () {
       'quota_exceeding',
       'scan_all_folders_debounce_secs',
       'selfavatar',
-      'sync_msgs',
+      'send_sync_msgs',
       'sentbox_watch',
       'show_emails',
       'socks5_enabled',
@@ -672,9 +676,9 @@ describe('Offline Tests with unconfigured account', function () {
 
     const lot = chatList.getSummary(0)
     strictEqual(lot.getId(), 0, 'lot has no id')
-    strictEqual(lot.getState(), C.DC_STATE_IN_NOTICED, 'correct state')
+    strictEqual(lot.getState(), C.DC_STATE_UNDEFINED, 'correct state')
 
-    const text = 'Others will only see this group after you sent a first message.'
+    const text = 'No messages.'
     context.createGroupChat('groupchat1111')
     chatList = context.getChatList(0, 'groupchat1111', null)
     strictEqual(
@@ -764,7 +768,14 @@ describe('Integration tests', function () {
   })
 
   this.beforeAll(async function () {
-    account = createTempUser(process.env.CHATMAIL_DOMAIN)
+    if (!process.env.DCC_NEW_TMP_EMAIL) {
+      console.log(
+        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests'
+      )
+      this.skip()
+    }
+
+    account = await createTempUser(process.env.DCC_NEW_TMP_EMAIL)
     if (!account || !account.email || !account.password) {
       console.log(
         "We didn't got back an account from the api, skip integration tests"

node/tsconfig.json

@@ -13,10 +13,10 @@
     },
     "exclude": ["node_modules", "deltachat-core-rust", "dist", "scripts"],
     "typedocOptions": {
+        "mode": "file",
         "out": "docs",
-        "excludePrivate": true,
+        "excludeNotExported": true,
         "defaultCategory": "index",
-        "includeVersion": true,
-        "entryPoints": ["lib/index.ts"]
+        "includeVersion": true
     }
 }

node/windows.md

@@ -6,7 +6,7 @@ E.g via <https://git-scm.com/download/win>
 
 ## install node
 
-Download and install `v18` from <https://nodejs.org/en/>
+Download and install `v16` from <https://nodejs.org/en/>
 
 ## install rust
 

package.json

@@ -2,24 +2,28 @@
   "dependencies": {
     "debug": "^4.1.1",
     "napi-macros": "^2.0.0",
-    "node-gyp-build": "^4.6.1"
+    "node-gyp-build": "^4.1.0"
   },
   "description": "node.js bindings for deltachat-core",
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^20.8.10",
-    "chai": "~4.3.10",
+    "@types/node": "^16.11.26",
+    "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
+    "esm": "^3.2.25",
+    "hallmark": "^2.0.0",
     "mocha": "^8.2.1",
-    "node-gyp": "^10.0.0",
-    "prebuildify": "^5.0.1",
-    "prebuildify-ci": "^1.0.5",
-    "prettier": "^3.0.3",
-    "typedoc": "^0.25.3",
-    "typescript": "^5.2.2"
+    "node-fetch": "^2.6.7",
+    "node-gyp": "^9.0.0",
+    "opn-cli": "^5.0.0",
+    "prebuildify": "^3.0.0",
+    "prebuildify-ci": "^1.0.4",
+    "prettier": "^2.0.5",
+    "typedoc": "^0.17.0",
+    "typescript": "^3.9.10"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "node/scripts/*",
@@ -45,15 +49,16 @@
     "build:core:rust": "node node/scripts/rebuild-core.js",
     "clean": "rm -rf node/dist node/build node/prebuilds node/node_modules ./target",
     "download-prebuilds": "prebuildify-ci download",
+    "hallmark": "hallmark --fix",
     "install": "node node/scripts/install.js",
     "install:prebuilds": "cd node && node-gyp-build \"npm run build:core\" \"npm run build:bindings:c:postinstall\"",
     "lint": "prettier --check \"node/lib/**/*.{ts,tsx}\"",
     "lint-fix": "prettier --write \"node/lib/**/*.{ts,tsx}\" \"node/test/**/*.js\"",
-    "prebuildify": "cd node && prebuildify -t 18.0.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
+    "prebuildify": "cd node && prebuildify -t 16.13.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
     "test": "npm run test:lint && npm run test:mocha",
     "test:lint": "npm run lint",
-    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.135.1"
+  "version": "1.124.1"
 }

python/README.rst

@@ -1,6 +1,6 @@
-============================
-CFFI Python Bindings
-============================
+=========================
+DeltaChat Python bindings
+=========================
 
 This package provides `Python bindings`_ to the `deltachat-core library`_
 which implements IMAP/SMTP/MIME/OpenPGP e-mail standards and offers
@@ -8,3 +8,157 @@ a low-level Chat/Contact/Message API to user interfaces and bots.
 
 .. _`deltachat-core library`: https://github.com/deltachat/deltachat-core-rust
 .. _`Python bindings`: https://py.delta.chat/
+
+Installing pre-built packages (Linux-only)
+==========================================
+
+If you have a Linux system you may install the ``deltachat`` binary "wheel" packages
+without any "build-from-source" steps.
+Otherwise you need to `compile the Delta Chat bindings yourself`__.
+
+__ sourceinstall_
+
+We recommend to first create a fresh Python virtual environment
+and activate it in your shell::
+
+    python -m venv env
+    source env/bin/activate
+
+Afterwards, invoking ``python`` or ``pip install`` only
+modifies files in your ``env`` directory and leaves
+your system installation alone.
+
+For Linux we build wheels for all releases and push them to a python package
+index. To install the latest release::
+
+    pip install deltachat
+
+To verify it worked::
+
+    python -c "import deltachat"
+
+Running tests
+=============
+
+Recommended way to run tests is using `scripts/run-python-test.sh`
+script provided in the core repository.
+
+This script compiles the library in debug mode and runs the tests using `tox`_.
+By default it will run all "offline" tests and skip all functional
+end-to-end tests that require accounts on real e-mail servers.
+
+.. _`tox`: https://tox.wiki
+.. _livetests:
+
+Running "live" tests with temporary accounts
+--------------------------------------------
+
+If you want to run live functional tests you can set ``DCC_NEW_TMP_EMAIL`` to a URL that creates e-mail accounts.  Most developers use https://testrun.org URLs created and managed by `mailadm <https://mailadm.readthedocs.io/>`_.
+
+Please feel free to contact us through a github issue or by e-mail and we'll send you a URL that you can then use for functional tests like this::
+
+    export DCC_NEW_TMP_EMAIL=<URL you got from us>
+
+With this account-creation setting, pytest runs create ephemeral e-mail accounts on the http://testrun.org server.
+These accounts are removed automatically as they expire.
+After setting the variable, either rerun `scripts/run-python-test.sh`
+or run offline and online tests with `tox` directly::
+
+    tox -e py
+
+Each test run creates new accounts.
+
+Developing the bindings
+-----------------------
+
+If you want to develop or debug the bindings,
+you can create a testing development environment using `tox`::
+
+    export DCC_RS_DEV="$PWD"
+    export DCC_RS_TARGET=debug
+    tox -c python --devenv env -e py
+    . env/bin/activate
+
+Inside this environment the bindings are installed
+in editable mode (as if installed with `python -m pip install -e`)
+together with the testing dependencies like `pytest` and its plugins.
+
+You can then edit the source code in the development tree
+and quickly run `pytest` manually without waiting  for `tox`
+to recreating the virtual environment each time.
+
+.. _sourceinstall:
+
+Installing bindings from source
+===============================
+
+Install Rust and Cargo first.
+The easiest is probably to use `rustup <https://rustup.rs/>`_.
+
+Bootstrap Rust and Cargo by using rustup::
+
+   curl https://sh.rustup.rs -sSf | sh
+
+Then clone the deltachat-core-rust repo::
+
+   git clone https://github.com/deltachat/deltachat-core-rust
+   cd deltachat-core-rust
+
+To install the Delta Chat Python bindings make sure you have Python3 installed.
+E.g. on Debian-based systems `apt install python3 python3-pip
+python3-venv` should give you a usable python installation.
+
+First, build the core library::
+
+   cargo build --release -p deltachat_ffi --features jsonrpc
+
+`jsonrpc` feature is required even if not used by the bindings
+because `deltachat.h` includes JSON-RPC functions unconditionally.
+
+Create the virtual environment and activate it:
+
+   python -m venv env
+   source env/bin/activate
+
+Build and install the bindings:
+
+   export DCC_RS_DEV="$PWD"
+   export DCC_RS_TARGET=release
+   python -m pip install ./python
+
+`DCC_RS_DEV` environment variable specifies the location of
+the core development tree. If this variable is not set,
+`libdeltachat` library and `deltachat.h` header are expected
+to be installed system-wide.
+
+When `DCC_RS_DEV` is set, `DCC_RS_TARGET` specifies
+the build profile name to look up the artifacts
+in the target directory.
+In this case setting it can be skipped because
+`DCC_RS_TARGET=release` is the default.
+
+Building manylinux based wheels
+===============================
+
+Building portable manylinux wheels which come with libdeltachat.so
+can be done with Docker_ or Podman_.
+
+.. _Docker: https://www.docker.com/
+.. _Podman: https://podman.io/
+
+If you want to build your own wheels, build container image first::
+
+   $ cd deltachat-core-rust # cd to deltachat-core-rust working tree
+   $ docker build -t deltachat/coredeps scripts/coredeps
+
+This will use the ``scripts/coredeps/Dockerfile`` to build
+container image called ``deltachat/coredeps``.  You can afterwards
+find it with::
+
+   $ docker images
+
+This docker image can be used to run tests and build Python wheels for all interpreters::
+
+    $ docker run -e DCC_NEW_TMP_EMAIL \
+       --rm -it -v $(pwd):/mnt -w /mnt \
+       deltachat/coredeps scripts/run_all.sh

python/doc/Makefile

@@ -0,0 +1,197 @@
+# Makefile for Sphinx documentation
+#
+
+VERSION       = $(shell python -c "import conf ; print(conf.version)")
+DOCZIP        = devpi-$(VERSION).doc.zip
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+RSYNCOPTS     = -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+
+export HOME=/tmp/home
+export TESTHOME=$(HOME)
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+# This variable is not auto generated as the order is important.
+USER_MAN_CHAPTERS = commands\
+                    user\
+                    indices\
+                    packages\
+#                 userman/index.rst\
+#                 userman/devpi_misc.rst\
+#                 userman/devpi_concepts.rst\
+
+
+#export DEVPI_CLIENTDIR=$(CURDIR)/.tmp_devpi_user_man/client
+#export DEVPI_SERVERDIR=$(CURDIR)/.tmp_devpi_user_man/server
+
+chapter = commands
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp \
+        epub latex latexpdf text man changes linkcheck doctest gettext install \
+        quickstart-releaseprocess quickstart-pypimirror quickstart-server regen \
+        prepare-quickstart\
+        regen.server-fresh regen.server-restart regen.server-clean\
+        regen.uman-all regen.uman
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo
+	@echo "User Manual Regen Targets"
+	@echo "  regen.uman        regenerates page. of the user manual chapeter e.g. regen.uman chapter=..."
+	@echo "  regen.uman-all    regenerates the user manual"
+	@echo "  regen.uman-clean  stop temp server and clean up directory"
+	@echo "  Chapter List: $(USER_MAN_CHAPTERS)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+version:
+	@echo "version $(VERSION)"
+
+doczip: html
+	python doczip.py $(DOCZIP) _build/html
+
+install: html
+	rsync -avz $(RSYNCOPTS) _build/html/ delta@py.delta.chat:build/master
+
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/devpi.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/devpi.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/devpi"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/devpi"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+

python/doc/_templates/globaltoc.html

@@ -0,0 +1,17 @@
+
+<div class="globaltoc">
+
+<ul>
+  <li><a href="{{ pathto('index') }}">index</a></li>
+  <li><a href="{{ pathto('install') }}">install</a></li>
+  <li><a href="{{ pathto('api') }}">high level API</a></li>
+  <li><a href="{{ pathto('lapi') }}">low level API</a></li>
+</ul>
+<b>external links:</b>
+<ul>
+  <li><a href="https://github.com/deltachat/deltachat-core-rust">github repository</a></li>
+  <li><a href="https://pypi.python.org/pypi/deltachat">pypi: deltachat</a></li>
+  <li><a href="https://web.libera.chat/#deltachat">#deltachat</a></li>
+</ul>
+
+</div>

python/doc/_templates/sidebarintro.html

@@ -0,0 +1 @@
+<h3>deltachat {{release}}</h3>

python/doc/api.rst

@@ -1,4 +1,5 @@
-High Level API Reference
+
+high level API reference
 ========================
 
 - :class:`deltachat.Account` (your main entry point, creates the
@@ -7,14 +8,28 @@ High Level API Reference
 - :class:`deltachat.Chat`
 - :class:`deltachat.Message`
 
+Account
+-------
+
 .. autoclass:: deltachat.Account
-   :members:
+    :members:
+
+
+Contact
+-------
 
 .. autoclass:: deltachat.Contact
-   :members:
+    :members:
+
+Chat
+----
 
 .. autoclass:: deltachat.Chat
-   :members:
+    :members:
+
+Message
+-------
 
 .. autoclass:: deltachat.Message
-   :members:
+    :members:
+

python/doc/cffi/install.rst

@@ -1,80 +0,0 @@
-Install
-=======
-
-Installing pre-built packages (Linux-only)
-------------------------------------------
-
-If you have a Linux system you may install the ``deltachat`` binary "wheel" packages
-without any "build-from-source" steps.
-Otherwise you need to `compile the Delta Chat bindings yourself`__.
-
-__ sourceinstall_
-
-We recommend to first create a fresh Python virtual environment
-and activate it in your shell::
-
-    python -m venv env
-    source env/bin/activate
-
-Afterwards, invoking ``python`` or ``pip install`` only
-modifies files in your ``env`` directory and leaves
-your system installation alone.
-
-For Linux we build wheels for all releases and push them to a python package
-index. To install the latest release::
-
-    pip install deltachat
-
-To verify it worked::
-
-    python -c "import deltachat"
-
-.. _sourceinstall:
-
-Installing bindings from source
--------------------------------
-
-Install Rust and Cargo first.
-The easiest is probably to use `rustup <https://rustup.rs/>`_.
-
-Bootstrap Rust and Cargo by using rustup::
-
-   curl https://sh.rustup.rs -sSf | sh
-
-Then clone the deltachat-core-rust repo::
-
-   git clone https://github.com/deltachat/deltachat-core-rust
-   cd deltachat-core-rust
-
-To install the Delta Chat Python bindings make sure you have Python3 installed.
-E.g. on Debian-based systems `apt install python3 python3-pip
-python3-venv` should give you a usable python installation.
-
-First, build the core library::
-
-   cargo build --release -p deltachat_ffi --features jsonrpc
-
-`jsonrpc` feature is required even if not used by the bindings
-because `deltachat.h` includes JSON-RPC functions unconditionally.
-
-Create the virtual environment and activate it::
-
-   python -m venv env
-   source env/bin/activate
-
-Build and install the bindings::
-
-   export DCC_RS_DEV="$PWD"
-   export DCC_RS_TARGET=release
-   python -m pip install ./python
-
-`DCC_RS_DEV` environment variable specifies the location of
-the core development tree. If this variable is not set,
-`libdeltachat` library and `deltachat.h` header are expected
-to be installed system-wide.
-
-When `DCC_RS_DEV` is set, `DCC_RS_TARGET` specifies
-the build profile name to look up the artifacts
-in the target directory.
-In this case setting it can be skipped because
-`DCC_RS_TARGET=release` is the default.

python/doc/cffi/intro.rst

@@ -1,11 +0,0 @@
-Introduction
-============
-
-CFFI bindings are available via the `deltachat <https://pypi.org/project/deltachat/>`_ Python package.
-The package contains both the Python bindings and the Delta Chat core.
-It is provided only for Linux.
-
-The ``deltachat`` Python package provides two layers of bindings for the
-core Rust-library of the https://delta.chat messaging ecosystem:
-low-level CFFI bindings to the C interface of the Delta Chat core
-and high-level Python bindings built on top of CFFI bindings.

python/doc/cffi/manylinux.rst

@@ -1,25 +0,0 @@
-Building Manylinux-Based Wheels
-===============================
-
-Building portable manylinux wheels which come with libdeltachat.so
-can be done with Docker_ or Podman_.
-
-.. _Docker: https://www.docker.com/
-.. _Podman: https://podman.io/
-
-If you want to build your own wheels, build container image first::
-
-   $ cd deltachat-core-rust # cd to deltachat-core-rust working tree
-   $ docker build -t deltachat/coredeps scripts/coredeps
-
-This will use the ``scripts/coredeps/Dockerfile`` to build
-container image called ``deltachat/coredeps``.  You can afterwards
-find it with::
-
-   $ docker images
-
-This docker image can be used to run tests and build Python wheels for all interpreters::
-
-    $ docker run -e CHATMAIL_DOMAIN \
-       --rm -it -v $(pwd):/mnt -w /mnt \
-       deltachat/coredeps scripts/run_all.sh

python/doc/cffi/tests.rst

@@ -1,49 +0,0 @@
-Running Tests
-=============
-
-Recommended way to run tests is using `scripts/run-python-test.sh`
-script provided in the core repository.
-
-This script compiles the library in debug mode and runs the tests using `tox`_.
-By default it will run all "offline" tests and skip all functional
-end-to-end tests that require accounts on real email servers.
-
-.. _`tox`: https://tox.wiki
-.. _livetests:
-
-Running "Live" Tests With Temporary Accounts
---------------------------------------------
-
-If you want to run live functional tests
-you can set ``CHATMAIL_DOMAIN`` to a domain of the email server
-that creates email accounts like this::
-
-    export CHATMAIL_DOMAIN=nine.testrun.org
-
-With this account-creation setting, pytest runs create ephemeral email accounts on the server.
-These accounts have the pattern `ci-{6 characters}@{CHATMAIL_DOMAIN}`.
-After setting the variable, either rerun `scripts/run-python-test.sh`
-or run offline and online tests with `tox` directly::
-
-    tox -e py
-
-Each test run creates new accounts.
-
-Developing the Bindings
------------------------
-
-If you want to develop or debug the bindings,
-you can create a testing development environment using `tox`::
-
-    export DCC_RS_DEV="$PWD"
-    export DCC_RS_TARGET=debug
-    tox -c python --devenv env -e py
-    . env/bin/activate
-
-Inside this environment the bindings are installed
-in editable mode (as if installed with `python -m pip install -e`)
-together with the testing dependencies like `pytest` and its plugins.
-
-You can then edit the source code in the development tree
-and quickly run `pytest` manually without waiting  for `tox`
-to recreating the virtual environment each time.

python/doc/changelog.rst

@@ -0,0 +1,4 @@
+Changelog for deltachat-core's Python bindings
+==============================================
+
+.. include:: ../CHANGELOG

python/doc/conf.py

@@ -1,94 +1,138 @@
-from pathlib import Path
+# -*- coding: utf-8 -*-
+#
+# devpi documentation build configuration file, created by
+# sphinx-quickstart on Mon Jun  3 16:11:22 2013.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 from deltachat import __version__ as release
-
 version = ".".join(release.split(".")[:2])
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.autosummary",
-    "sphinx.ext.viewcode",
-    "breathe",
-    "sphinx_rtd_theme",
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    #'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.viewcode',
+    'breathe',
+    #'sphinx.ext.githubpages',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = '.rst'
 
 # The encoding of source files.
-# source_encoding = 'utf-8-sig'
+#source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = "index"
+master_doc = 'index'
 
 # General information about the project.
-project = "Delta Chat"
-copyright = "2023, Delta Chat contributors"
-author = "Delta Chat contributors"
+project = u'deltachat'
+copyright = u'2020, holger krekel and contributors'
 
 
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-# today = ''
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
+#today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["sketch", "_build", "attic", "Thumbs.db", ".DS_Store"]
+exclude_patterns = ['sketch', '_build', "attic"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
+#default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
+#add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-# add_module_names = True
+#add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-# show_authors = False
+#show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+#modindex_common_prefix = []
 
 
 # -- breathe options ------
 
-breathe_projects = {"deltachat": Path("../../docs/xml/")}
+breathe_projects = {
+    "deltachat": "../../docs/xml/"
+}
 
 breathe_default_project = "deltachat"
 
 # -- Options for HTML output ---------------------------------------------------
 
-html_theme = "sphinx_rtd_theme"
+sys.path.append(os.path.abspath('_themes'))
+html_theme_path = ['_themes']
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+# html_theme = 'flask'
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    'logo': '_static/delta-chat.svg',
+    'font_size': "1.1em",
+    'caption_font_size': "0.9em",
+    'code_font_size': "1.1em",
+
+
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = ["_themes"]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-# html_title = None
+#html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
+#html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -97,34 +141,51 @@ html_logo = "_static/delta-chat.svg"
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "_static/favicon.ico"
+html_favicon = '_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# html_use_smartypants = True
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+html_sidebars = {
+    'index': [
+        'sidebarintro.html',
+        'globaltoc.html',
+        'searchbox.html'
+    ],
+    '**': [
+        'sidebarintro.html',
+        'globaltoc.html',
+        'relations.html',
+        'searchbox.html'
+    ]
+}
+
 
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-# html_additional_pages = {}
+#html_additional_pages = {}
 
 # If false, no module index is generated.
-# html_domain_indices = True
+#html_domain_indices = True
 
 # If false, no index is generated.
-# html_use_index = True
+#html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-# html_split_index = False
+#html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
@@ -133,65 +194,71 @@ html_show_sourcelink = False
 html_show_sphinx = False
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
+#html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-html_use_opensearch = "https://doc.devpi.net"
+html_use_opensearch = 'https://doc.devpi.net'
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
+#html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "deltachat-python"
+htmlhelp_basename = 'deltachat-python'
 
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '12pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+'pointsize': '12pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "devpi.tex", "deltachat documentation", "holger krekel", "manual"),
+  ('index', 'devpi.tex', u'deltachat documentation',
+   u'holger krekel', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-# latex_logo = None
+#latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-# latex_use_parts = False
+#latex_use_parts = False
 
 # If true, show page references after internal links.
-# latex_show_pagerefs = False
+#latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-# latex_show_urls = False
+#latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-# latex_appendices = []
+#latex_appendices = []
 
 # If false, no module index is generated.
-# latex_domain_indices = True
+#latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "deltachat", "deltachat documentation", ["holger krekel"], 1)]
+man_pages = [
+    ('index', 'deltachat', u'deltachat documentation',
+     [u'holger krekel'], 1)
+]
 
 # If true, show URL addresses after external links.
-# man_show_urls = False
+#man_show_urls = False
 
 
 # -- Options for Texinfo output ------------------------------------------------
@@ -200,38 +267,30 @@ man_pages = [("index", "deltachat", "deltachat documentation", ["holger krekel"]
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (
-        "index",
-        "devpi",
-        "devpi Documentation",
-        "holger krekel",
-        "devpi",
-        "One line description of project.",
-        "Miscellaneous",
-    ),
+  ('index', 'devpi', u'devpi Documentation',
+   u'holger krekel', 'devpi', 'One line description of project.',
+   'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
+#texinfo_appendices = []
 
 # If false, no module index is generated.
-# texinfo_domain_indices = True
+#texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+#texinfo_show_urls = 'footnote'
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"http://docs.python.org/": None}
+intersphinx_mapping = {'http://docs.python.org/': None}
 
 # autodoc options
 autodoc_member_order = "bysource"
-
-
 # always document __init__ functions
 def skip(app, what, name, obj, skip, options):
     return skip
 
-
 def setup(app):
     app.connect("autodoc-skip-member", skip)
+

python/doc/examples.rst

@@ -1,10 +1,11 @@
-Examples
+
+examples
 ========
 
 Once you have :doc:`installed deltachat bindings <install>`
 you need email/password credentials for an IMAP/SMTP account.
 Delta Chat developers and the CI system use a special URL to create
-temporary email accounts on `testrun.org <https://testrun.org/>`_ for testing.
+temporary e-mail accounts on [testrun.org](https://testrun.org) for testing.
 
 Receiving a Chat message from the command line
 ----------------------------------------------
@@ -15,11 +16,11 @@ Here is a simple bot that:
 
 - terminates the bot if the message `/quit` is sent
 
-.. include:: ../../examples/echo_and_quit.py
+.. include:: ../examples/echo_and_quit.py
     :literal:
 
 With this file in your working directory you can run the bot
-by specifying a database path, an email address and password of
+by specifying a database path, an e-mail address and password of
 a SMTP-IMAP account::
 
     $ cd examples
@@ -39,11 +40,11 @@ Here is a simple bot that:
 
 - tracks member additions and removals for all chat groups
 
-.. include:: ../../examples/group_tracking.py
+.. include:: ../examples/group_tracking.py
     :literal:
 
 With this file in your working directory you can run the bot
-by specifying a database path, an email address and password of
+by specifying a database path, an e-mail address and password of
 a SMTP-IMAP account::
 
     python group_tracking.py --email ADDRESS --password PASSWORD /tmp/db

python/doc/index.rst

@@ -1,44 +1,41 @@
-Delta Chat Python bindings, new and old
-=======
+deltachat python bindings
+=========================
 
-`Delta Chat <https://delta.chat/>`_ provides two kinds of Python bindings
-to the `Rust Core <https://github.com/deltachat/deltachat-core-rust>`_:
-JSON-RPC bindings and CFFI bindings.
-When starting a new project it is recommended to use JSON-RPC bindings,
-which are used in the Delta Chat Desktop app through generated Typescript-bindings. 
-The Python JSON-RPC bindings are maintained by Delta Chat core developers. 
-Most existing bot projects and many tests in Delta Chat's own core library
-still use the CFFI-bindings, and it is going to be maintained certainly also in 2024. 
-New APIs might however only appear in the JSON-RPC bindings, 
-as the CFFI bindings are increasingly in maintenance-only mode. 
+The ``deltachat`` Python package provides two layers of bindings for the
+core Rust-library of the https://delta.chat messaging ecosystem:
+
+- :doc:`api` is a high level interface to deltachat-core.
+
+- :doc:`plugins` is a brief introduction into implementing plugin hooks.
+
+- :doc:`lapi` is a lowlevel CFFI-binding to the `Rust Core
+  <https://github.com/deltachat/deltachat-core-rust>`_.
+
+
+
+getting started
+---------------
 
 .. toctree::
    :maxdepth: 2
-   :caption: JSON-RPC Bindings
 
-   jsonrpc/intro
-   jsonrpc/install
-   jsonrpc/examples
-   jsonrpc/reference
-   jsonrpc/develop
+   install
+   examples
 
 .. toctree::
-   :maxdepth: 2
-   :caption: CFFI Bindings
+   :hidden:
 
-   cffi/intro
-   cffi/install
-   cffi/examples
-   cffi/manylinux
-   cffi/tests
-   cffi/api
-   cffi/lapi
-   cffi/plugins
+   links
+   changelog
+   api
+   lapi
+   plugins
+
+..
+    Indices and tables
+    ==================
+
+    * :ref:`genindex`
+    * :ref:`modindex`
+    * :ref:`search`
 
-.. _`deltachat`: https://delta.chat
-.. _`deltachat-core repo`: https://github.com/deltachat
-.. _pip: http://pypi.org/project/pip/
-.. _virtualenv: http://pypi.org/project/virtualenv/
-.. _merlinux: http://merlinux.eu
-.. _pypi: http://pypi.org/
-.. _`issue-tracker`: https://github.com/deltachat/deltachat-core-rust

python/doc/install.rst

@@ -0,0 +1,2 @@
+
+.. include:: ../README.rst

python/doc/jsonrpc/develop.rst

@@ -1,68 +0,0 @@
-===========
-Development
-===========
-
-To develop JSON-RPC bindings,
-clone the `deltachat-core-rust <https://github.com/deltachat/deltachat-core-rust/>`_ repository::
-
-   git clone https://github.com/deltachat/deltachat-core-rust.git
-
-Testing
-=======
-
-To run online tests, set ``CHATMAIL_DOMAIN``
-to a domain of the email server
-that can be used to create testing accounts::
-
-    export CHATMAIL_DOMAIN=nine.testrun.org
-
-Then run ``scripts/run-rpc-test.sh``
-to build debug version of ``deltachat-rpc-server``
-and run ``deltachat-rpc-client`` tests
-in a separate virtual environment managed by `tox <https://tox.wiki/>`_.
-
-Development Environment
-=======================
-
-Creating a new virtual environment
-to run the tests each time
-as ``scripts/run-rpc-test.sh`` does is slow
-if you are changing the tests or the code
-and want to rerun the tests each time.
-
-If you are developing the tests,
-it is better to create a persistent virtual environment.
-You can do this by running ``scripts/make-rpc-testenv.sh``.
-This creates a virtual environment ``venv`` which you can then enter with::
-
-   . venv/bin/activate
-
-Then you can run the tests with
-
-::
-
-    pytest deltachat-rpc-client/tests/
-
-Refer to `pytest documentation <https://docs.pytest.org/>` for details.
-
-If make the changes to Delta Chat core
-or Python bindings, you can rebuild the environment by rerunning
-``scripts/make-rpc-testenv.sh``.
-It is ok to rebuild the activated environment this way,
-you do not need to deactivate or reactivate the environment each time.
-
-Using REPL
-==========
-
-Once you have a development environment,
-you can quickly test things in REPL::
-
-   $ python
-   >>> from deltachat_rpc_client import *
-   >>> rpc = Rpc()
-   >>> rpc.start()
-   >>> dc = DeltaChat(rpc)
-   >>> system_info = dc.get_system_info()
-   >>> system_info["level"]
-   'awesome'
-   >>> rpc.close()

python/doc/jsonrpc/examples.rst

@@ -1,19 +0,0 @@
-Examples
-========
-
-Echo bot
---------
-.. include:: ../../../deltachat-rpc-client/examples/echobot_no_hooks.py
-    :literal:
-
-Echo bot with hooks
--------------------
-.. include:: ../../../deltachat-rpc-client/examples/echobot.py
-    :literal:
-
-Advanced echo bot
------------------
-
-.. include:: ../../../deltachat-rpc-client/examples/echobot_advanced.py
-    :literal:
-

python/doc/jsonrpc/install.rst

@@ -1,36 +0,0 @@
-Install
-=======
-
-To use JSON-RPC bindings for Delta Chat core you will need
-a ``deltachat-rpc-server`` binary which provides Delta Chat core API over JSON-RPC
-and a ``deltachat-rpc-client`` Python package which is a JSON-RPC client that starts ``deltachat-rpc-server`` process and uses JSON-RPC API.
-
-`Create a virtual environment <https://docs.python.org/3/library/venv.html>`__ if you
-don’t have one already and activate it::
-
-   $ python -m venv venv
-   $ . venv/bin/activate
-
-Install ``deltachat-rpc-server``
---------------------------------
-
-To get ``deltachat-rpc-server`` binary you have three options:
-
-1. Install ``deltachat-rpc-server`` from PyPI using ``pip install deltachat-rpc-server``.
-2. Build and install ``deltachat-rpc-server`` from source with ``cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server``.
-3. Download prebuilt release from https://github.com/deltachat/deltachat-core-rust/releases and install it into ``PATH``.
-
-Check that ``deltachat-rpc-server`` is installed and can run::
-
-   $ deltachat-rpc-server --version
-   1.131.4
-
-Then install ``deltachat-rpc-client`` with ``pip install deltachat-rpc-client``.
-
-Install ``deltachat-rpc-client``
---------------------------------
-
-To get ``deltachat-rpc-client`` Python library you can:
-
-1. Install ``deltachat-rpc-client`` from PyPI using ``pip install deltachat-rpc-client``.
-2. Install ``deltachat-rpc-client`` from source with ``pip install git+https://github.com/deltachat/deltachat-core-rust.git@main#subdirectory=deltachat-rpc-client``.

python/doc/jsonrpc/intro.rst

@@ -1,8 +0,0 @@
-Introduction
-============
-
-JSON-RPC bindings are available via the `deltachat-rpc-client <https://pypi.org/project/deltachat-rpc-client/>`_ Python package.
-This package provides only the Python bindings and requires ``deltachat-rpc-server`` binary to be installed.
-`deltachat-rpc-server <https://pypi.org/project/deltachat-rpc-server/>`_ package provides ``deltachat-rpc-server`` binary for Linux, Windows, macOS and Android.
-
-RPC client connects to standalone Delta Chat RPC server ``deltachat-rpc-server`` and provides Python interface to it.

python/doc/jsonrpc/reference.rst

@@ -1,5 +0,0 @@
-API Reference
-=============
-
-.. automodule:: deltachat_rpc_client
-   :members:

python/doc/lapi.rst

@@ -1,7 +1,8 @@
-Low Level API Reference
-=======================
 
-For full doxygen-generated C-docs, defines and functions please checkout
+low level API reference
+===================================
+
+for full doxygen-generated C-docs, defines and functions please checkout
 
 https://c.delta.chat
 

python/doc/links.rst

@@ -0,0 +1,11 @@
+
+links
+================================
+
+.. _`deltachat`: https://delta.chat
+.. _`deltachat-core repo`: https://github.com/deltachat
+.. _pip: http://pypi.org/project/pip/
+.. _virtualenv: http://pypi.org/project/virtualenv/
+.. _merlinux: http://merlinux.eu
+.. _pypi: http://pypi.org/
+.. _`issue-tracker`: https://github.com/deltachat/deltachat-core

python/doc/make.bat

@@ -0,0 +1,190 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\devpi.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\devpi.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+:end

python/src/deltachat/account.py

@@ -1,5 +1,6 @@
 """Account class implementation."""
 
+
 import os
 from array import array
 from contextlib import contextmanager
@@ -375,6 +376,22 @@ class Account:
         dc_array = ffi.gc(lib.dc_get_fresh_msgs(self._dc_context), lib.dc_array_unref)
         return (x for x in iter_array(dc_array, lambda x: Message.from_db(self, x)) if x is not None)
 
+    def _wait_next_message_ids(self) -> List[int]:
+        """Return IDs of all next messages from all chats."""
+        dc_array = ffi.gc(lib.dc_wait_next_msgs(self._dc_context), lib.dc_array_unref)
+        return [lib.dc_array_get_id(dc_array, i) for i in range(lib.dc_array_get_cnt(dc_array))]
+
+    def wait_next_incoming_message(self) -> Message:
+        """Waits until the next incoming message
+        with ID higher than given is received and returns it."""
+        while True:
+            message_ids = self._wait_next_message_ids()
+            for msg_id in message_ids:
+                message = Message.from_db(self, msg_id)
+                if message and not message.is_from_self() and not message.is_from_device():
+                    self.set_config("last_msg_id", str(msg_id))
+                    return message
+
     def create_chat(self, obj) -> Chat:
         """Create a 1:1 chat with Account, Contact or e-mail address."""
         return self.create_contact(obj).create_chat()
@@ -461,16 +478,6 @@ class Account:
         msg_ids = [msg.id for msg in messages]
         lib.dc_forward_msgs(self._dc_context, msg_ids, len(msg_ids), chat.id)
 
-    def resend_messages(self, messages: List[Message]) -> None:
-        """Resend list of messages.
-
-        :param messages: list of :class:`deltachat.message.Message` object.
-        :returns: None
-        """
-        msg_ids = [msg.id for msg in messages]
-        if lib.dc_resend_msgs(self._dc_context, msg_ids, len(msg_ids)) != 1:
-            raise ValueError(f"could not resend messages {msg_ids}")
-
     def delete_messages(self, messages: List[Message]) -> None:
         """delete messages (local and remote).
 
@@ -564,11 +571,11 @@ class Account:
         return ScannedQRCode(lot)
 
     def qr_setup_contact(self, qr):
-        """setup contact and return a `Chat` instance after contact is established.
-
-        This function triggers a network protocol in the background between
-        the emitter of the QR code and this account.
+        """setup contact and return a Chat after contact is established.
 
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
+        is returned.
         :param qr: valid "setup contact" QR code (all other QR codes will result in an exception)
         """
         assert self.check_qr(qr).is_ask_verifycontact()
@@ -578,11 +585,11 @@ class Account:
         return Chat(self, chat_id)
 
     def qr_join_chat(self, qr):
-        """return a `Chat` instance for which the securejoin network
-        protocol has been started.
+        """join a chat group through a QR code.
 
-        This function triggers a network protocol in the background between
-        the emitter of the QR code and this account.
+        Note that this function may block for a long time as messages are exchanged
+        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
+        is returned which is the chat that we just joined.
 
         :param qr: valid "join-group" QR code (all other QR codes will result in an exception)
         """
@@ -610,18 +617,18 @@ class Account:
     # meta API for start/stop and event based processing
     #
 
-    def run_account(self, addr=None, password=None, account_plugins=None, show_ffi=False, displayname=None):
+    def run_account(self, addr=None, password=None, account_plugins=None, show_ffi=False):
+        from .events import FFIEventLogger
+
         """get the account running, configure it if necessary. add plugins if provided.
 
         :param addr: the email address of the account
         :param password: the password of the account
         :param account_plugins: a list of plugins to add
         :param show_ffi: show low level ffi events
-        :param displayname: the display name of the account
         """
-        from .events import FFIEventLogger
-
         if show_ffi:
+            self.set_config("displayname", "bot")
             log = FFIEventLogger(self)
             self.add_account_plugin(log)
 
@@ -637,8 +644,6 @@ class Account:
             configtracker = self.configure()
             configtracker.wait_finish()
 
-        if displayname:
-            self.set_config("displayname", displayname)
         # start IO threads and configure if necessary
         self.start_io()