fix speed issues with ORDER BY clause

.cargo/config.toml

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

.gitattributes

@@ -2,17 +2,9 @@
 # ensures this even if the user has not set core.autocrlf.
 *  text=auto
 
-# Checkout JavaScript files with LF line endings
-# to prevent `prettier` from reporting errors on Windows.
-*.js eol=lf
-*.jsx eol=lf
-*.ts eol=lf
-*.tsx eol=lf
-*.json eol=lf
-
 # This directory contains email messages verbatim, and changing CRLF to
 # LF will corrupt them.
-test-data/** text=false
+test-data/* text=false
 
 # binary files should be detected by git, however, to be sure, you can add them here explicitly
 *.png  binary

.github/dependabot.yml

@@ -3,14 +3,7 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "daily"
     commit-message:
-      prefix: "chore(cargo)"
-    open-pull-requests-limit: 50
-
-  # Keep GitHub Actions up to date.
-  # <https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot>
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
+      prefix: "cargo"
+    open-pull-requests-limit: 10

.github/mergeable.yml

@@ -0,0 +1,26 @@
+version: 2
+mergeable:
+  - when: pull_request.*
+    name: "Changelog check"
+    validate:
+      - do: or
+        validate:
+        - do: description
+          must_include:
+            regex: '#skip-changelog'
+        - do: and
+          validate:
+            - do: dependent
+              changed:
+                file: 'src/**'
+                required: ['CHANGELOG.md']
+            - do: dependent
+              changed:
+                file: 'deltachat-ffi/**'
+                required: ['CHANGELOG.md']
+    fail:
+      - do: checks
+        status: 'action_required' 
+        payload:
+          title: Changlog might need an update
+          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."

.github/workflows/ci.yml

@@ -1,74 +1,51 @@
-# GitHub Actions workflow to
-# lint Rust and Python code
-# and run Rust tests, Python tests and async Python tests.
-
 name: Rust CI
 
-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   pull_request:
   push:
     branches:
-      - main
-
-permissions: {}
+      - master
+      - staging
+      - trying
 
 env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
-  lint_rust:
-    name: Lint Rust
+
+  fmt:
+    name: Rustfmt
     runs-on: ubuntu-latest
-    env:
-      RUSTUP_TOOLCHAIN: 1.84.1
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
         with:
-          show-progress: false
-          persist-credentials: false
-      - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: rustup component add rustfmt
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-      - name: Run rustfmt
-        run: cargo fmt --all -- --check
-      - name: Run clippy
-        run: scripts/clippy.sh
-      - name: Check with all features
-        run: cargo check --workspace --all-targets --all-features
-      - name: Check with only default features
-        run: cargo check --all-targets
+        uses: swatinem/rust-cache@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
 
-  cargo_deny:
-    name: cargo deny
+  run_clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
         with:
-          show-progress: false
-          persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@v2
+            toolchain: stable
+            components: clippy
+            override: true
+      - name: Cache rust cargo artifacts
+        uses: swatinem/rust-cache@v1
+      - uses: actions-rs/clippy-check@v1
         with:
-          arguments: --all-features --workspace
-          command: check
-          command-arguments: "-Dwarnings"
-
-  provider_database:
-    name: Check provider database
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Check provider database
-        run: scripts/update-provider-database.sh
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --tests --examples
 
   docs:
     name: Rust doc comments
@@ -76,246 +53,91 @@ jobs:
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - name: Install rust stable toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          show-progress: false
-          persist-credentials: false
+          toolchain: stable
+          profile: minimal
+          components: rust-docs
+          override: true
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
+        uses: swatinem/rust-cache@v1
       - name: Rustdoc
-        run: cargo doc --document-private-items --no-deps
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --document-private-items --no-deps
 
-  rust_tests:
-    name: Rust tests
+  build_and_test:
+    name: Build and test
     strategy:
       matrix:
         include:
+          # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.84.1
+            rust: 1.59.0
+            python: 3.9
           - os: windows-latest
-            rust: 1.84.1
-          - os: macos-latest
-            rust: 1.84.1
+            rust: 1.59.0
+            python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.81.0
-          - os: ubuntu-latest
-            rust: 1.81.0
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
-      - run: rustup override set ${{ matrix.rust }}
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Install nextest
-        uses: taiki-e/install-action@v2
-        with:
-          tool: nextest
-
-      - name: Tests
-        env:
-          RUST_BACKTRACE: 1
-        run: cargo nextest run --workspace
-
-      - name: Doc-Tests
-        env:
-          RUST_BACKTRACE: 1
-        run: cargo test --workspace --doc
-
-      - name: Test cargo vendor
-        run: cargo vendor
-
-  c_library:
-    name: Build C library
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Build C library
-        run: cargo build -p deltachat_ffi
-
-      - name: Upload C library
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-libdeltachat.a
-          path: target/debug/libdeltachat.a
-          retention-days: 1
-
-  rpc_server:
-    name: Build deltachat-rpc-server
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-
-      - name: Build deltachat-rpc-server
-        run: cargo build -p deltachat-rpc-server
-
-      - name: Upload deltachat-rpc-server
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-deltachat-rpc-server
-          path: ${{ matrix.os == 'windows-latest' && 'target/debug/deltachat-rpc-server.exe' || '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
-          persist-credentials: false
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Lint Python bindings
-        working-directory: python
-        run: tox -e lint
-
-      - name: Lint deltachat-rpc-client
-        working-directory: deltachat-rpc-client
-        run: tox -e lint
-
-  cffi_python_tests:
-    name: CFFI Python tests
-    needs: ["c_library", "python_lint"]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # Currently used Rust version.
-          - os: ubuntu-latest
-            python: 3.13
-          - os: macos-latest
-            python: 3.13
-
-          # PyPy tests
-          - os: ubuntu-latest
-            python: pypy3.10
-          - os: macos-latest
-            python: pypy3.10
-
-          # Minimum Supported Python Version = 3.8
+          # Minimum Supported Rust Version = 1.56.0
+          #
+          # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
-          # built. Test it with minimum supported Rust version.
+          # built.
           - os: ubuntu-latest
-            python: 3.8
-
+            rust: 1.56.0
+            python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
+    - uses: actions/checkout@master
 
-      - name: Download libdeltachat.a
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.os }}-libdeltachat.a
-          path: target/debug
+    - name: Install ${{ matrix.rust }}
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        override: true
 
-      - name: Install python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python }}
+    - name: Cache rust cargo artifacts
+      uses: swatinem/rust-cache@v1
 
-      - name: Install tox
-        run: pip install tox
+    - name: check
+      uses: actions-rs/cargo@v1
+      with:
+        command: check
+        args: --all --bins --examples --tests --features repl --benches
 
-      - name: Run python tests
-        env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e mypy,doc,py
+    - name: tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
 
-  rpc_python_tests:
-    name: JSON-RPC Python tests
-    needs: ["python_lint", "rpc_server"]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            python: 3.13
-          - os: macos-latest
-            python: 3.13
-          - os: windows-latest
-            python: 3.13
+    - name: install python
+      if: ${{ matrix.python }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
 
-          # PyPy tests
-          - os: ubuntu-latest
-            python: pypy3.10
-          - os: macos-latest
-            python: pypy3.10
+    - name: install tox
+      if: ${{ matrix.python }}
+      run: pip install tox
 
-          # Minimum Supported Python Version = 3.8
-          - os: ubuntu-latest
-            python: 3.8
+    - name: build C library
+      if: ${{ matrix.python }}
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: -p deltachat_ffi
 
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Install python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Download deltachat-rpc-server
-        uses: actions/download-artifact@v4
-        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: ${{ vars.CHATMAIL_DOMAIN }}
-        working-directory: deltachat-rpc-client
-        run: tox -e py
+    - name: run python tests
+      if: ${{ matrix.python }}
+      env:
+        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+        DCC_RS_TARGET: debug
+        DCC_RS_DEV: ${{ github.workspace }}
+      working-directory: python
+      run: tox -e lint,mypy,doc,py3

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

@@ -1,416 +0,0 @@
-# GitHub Actions workflow
-# to build `deltachat-rpc-server` binaries
-# and upload them to the release.
-#
-# The workflow is automatically triggered on releases.
-# It can also be triggered manually
-# to produce binary artifacts for testing.
-
-name: Build deltachat-rpc-server binaries
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-permissions: {}
-
-jobs:
-  # Build a version statically linked against musl libc
-  # to avoid problems with glibc version incompatibility.
-  build_linux:
-    name: Linux
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [aarch64, armv7l, armv6l, i686, x86_64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-linux
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-linux
-          path: result/bin/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_windows:
-    name: Windows
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [win32, win64]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}
-          path: result/bin/deltachat-rpc-server.exe
-          if-no-files-found: error
-
-  build_macos:
-    name: macOS
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x86_64, aarch64]
-
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - name: Setup rust target
-        run: rustup target add ${{ matrix.arch }}-apple-darwin
-
-      - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.arch }}-apple-darwin --features vendored
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-macos
-          path: target/${{ matrix.arch }}-apple-darwin/release/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_android:
-    name: Android
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [arm64-v8a, armeabi-v7a]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - name: Build deltachat-rpc-server binaries
-        run: nix build .#deltachat-rpc-server-${{ matrix.arch }}-android
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-${{ matrix.arch }}-android
-          path: result/bin/deltachat-rpc-server
-          if-no-files-found: error
-
-  publish:
-    name: Build wheels and upload binaries to the release
-    needs: ["build_linux", "build_windows", "build_macos"]
-    environment:
-      name: pypi
-      url: https://pypi.org/p/deltachat-rpc-server
-    permissions:
-      id-token: write
-      contents: write
-    runs-on: "ubuntu-latest"
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - 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: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android
-          path: deltachat-rpc-server-arm64-v8a-android.d
-
-      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: Create bin/ directory
-        run: |
-          mkdir -p bin
-          mv deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-aarch64-linux
-          mv deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-armv7l-linux
-          mv deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-armv6l-linux
-          mv deltachat-rpc-server-i686-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-i686-linux
-          mv deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server bin/deltachat-rpc-server-x86_64-linux
-          mv deltachat-rpc-server-win32.d/deltachat-rpc-server.exe bin/deltachat-rpc-server-win32.exe
-          mv deltachat-rpc-server-win64.d/deltachat-rpc-server.exe bin/deltachat-rpc-server-win64.exe
-          mv deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server bin/deltachat-rpc-server-x86_64-macos
-          mv deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server bin/deltachat-rpc-server-aarch64-macos
-          mv deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-arm64-v8a-android
-          mv deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-armeabi-v7a-android
-
-      - name: List binaries
-        run: ls -l bin/
-
-      # 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: |
-          mkdir -p dist
-          nix build .#deltachat-rpc-server-x86_64-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armv7l-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armv6l-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-aarch64-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-i686-linux-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-win64-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-win32-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-source
-          cp result/*.tar.gz dist/
-          python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos
-          python3 scripts/wheel-rpc-server.py aarch64-darwin bin/deltachat-rpc-server-aarch64-macos
-          mv *.whl dist/
-
-      - name: List artifacts
-        run: ls -l dist/
-
-      - name: Upload binaries to the GitHub release
-        if: github.event_name == 'release'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          REF_NAME: ${{ github.ref_name }}
-        run: |
-          gh release upload "$REF_NAME" \
-            --repo ${{ github.repository }} \
-            bin/* dist/*
-
-      - name: Publish deltachat-rpc-client to PyPI
-        if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-  publish_npm_package:
-    name: Build & Publish npm prebuilds and deltachat-rpc-server
-    needs: ["build_linux", "build_windows", "build_macos"]
-    runs-on: "ubuntu-latest"
-    permissions:
-      id-token: write
-
-      # Needed to publish the binaries to the release.
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - 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: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android
-          path: deltachat-rpc-server-arm64-v8a-android.d
-
-      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: make npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        run: |
-          cd deltachat-rpc-server/npm-package
-
-          python --version
-
-          python scripts/pack_binary_for_platform.py aarch64-unknown-linux-musl     ../../deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-unknown-linux-musleabihf ../../deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py arm-unknown-linux-musleabihf   ../../deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py i686-unknown-linux-musl        ../../deltachat-rpc-server-i686-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py x86_64-unknown-linux-musl      ../../deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py i686-pc-windows-gnu            ../../deltachat-rpc-server-win32.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-pc-windows-gnu          ../../deltachat-rpc-server-win64.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-apple-darwin            ../../deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-apple-darwin           ../../deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-linux-android          ../../deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-linux-androideabi        ../../deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server
-
-          ls -lah platform_package
-
-          for platform in ./platform_package/*; do npm pack "$platform"; done
-          npm pack    
-          ls -lah
-
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-npm-package
-          path: deltachat-rpc-server/npm-package/*.tgz
-          if-no-files-found: error
-
-      - name: Upload npm packets to the GitHub release
-        if: github.event_name == 'release'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          REF_NAME: ${{ github.ref_name }}
-        run: |
-          gh release upload "$REF_NAME" \
-            --repo ${{ github.repository }} \
-            deltachat-rpc-server/npm-package/*.tgz
-
-      # Configure Node.js for publishing.
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Publish npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        if: github.event_name == 'release'
-        working-directory: deltachat-rpc-server/npm-package
-        run: |
-          ls -lah platform_package
-          for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/dependabot.yml

@@ -1,24 +0,0 @@
-# GitHub Actions workflow
-# to automatically approve PRs made by Dependabot.
-
-name: Dependabot auto-approve
-on: pull_request
-
-permissions:
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v2.3.0
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Approve a PR
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

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

@@ -1,41 +0,0 @@
-name: "Publish @deltachat/jsonrpc-client"
-on:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-permissions: {}
-
-jobs:
-  pack-module:
-    name: "Publish @deltachat/jsonrpc-client"
-    runs-on: ubuntu-20.04
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Install dependencies without running scripts
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm install --ignore-scripts
-
-      - name: Package
-        working-directory: deltachat-jsonrpc/typescript
-        run: |
-          npm run build
-          npm pack .
-
-      - name: Publish
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm publish --provenance deltachat-jsonrpc-client-* --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/jsonrpc.yml

@@ -1,42 +0,0 @@
-name: JSON-RPC API Test
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-permissions: {}
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MIN_STACK: "8388608"
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - name: Add Rust cache
-        uses: Swatinem/rust-cache@v2
-      - name: npm install
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm install
-      - name: Build TypeScript, run Rust tests, generate bindings
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm run build
-      - name: Run integration tests
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm run test
-        env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
-      - name: Run linter
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm run prettier:check

.github/workflows/nix.yml

@@ -1,108 +0,0 @@
-name: Test Nix flake
-
-on:
-  pull_request:
-    paths:
-      - flake.nix
-      - flake.lock
-  push:
-    paths:
-      - flake.nix
-      - flake.lock
-    branches:
-      - main
-
-permissions: {}
-
-jobs:
-  format:
-    name: check flake formatting
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix fmt
-
-      # Check that formatting does not change anything.
-      - run: git diff --exit-code
-
-  build:
-    name: nix build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          # Ensure `nix develop` will work.
-          - devShells.x86_64-linux.default
-
-          - deltachat-python
-          - deltachat-repl
-          - deltachat-repl-aarch64-linux
-          - deltachat-repl-arm64-v8a-android
-          - deltachat-repl-armeabi-v7a-android
-          - deltachat-repl-armv6l-linux
-          - deltachat-repl-armv7l-linux
-          - deltachat-repl-i686-linux
-          - deltachat-repl-win32
-          - deltachat-repl-win64
-          - deltachat-repl-x86_64-linux
-          - deltachat-rpc-client
-          - deltachat-rpc-server
-          - deltachat-rpc-server-aarch64-linux
-          - deltachat-rpc-server-aarch64-linux-wheel
-          - deltachat-rpc-server-arm64-v8a-android
-          - deltachat-rpc-server-arm64-v8a-android-wheel
-          - deltachat-rpc-server-armeabi-v7a-android
-          - deltachat-rpc-server-armeabi-v7a-android-wheel
-          - deltachat-rpc-server-armv6l-linux
-          - deltachat-rpc-server-armv6l-linux-wheel
-          - deltachat-rpc-server-armv7l-linux
-          - deltachat-rpc-server-armv7l-linux-wheel
-          - deltachat-rpc-server-i686-linux
-          - deltachat-rpc-server-i686-linux-wheel
-          - deltachat-rpc-server-source
-          - deltachat-rpc-server-win32
-          - deltachat-rpc-server-win32-wheel
-          - deltachat-rpc-server-win64
-          - deltachat-rpc-server-win64-wheel
-          - deltachat-rpc-server-x86_64-linux
-          - deltachat-rpc-server-x86_64-linux-wheel
-          - docs
-          - libdeltachat
-          - python-docs
-
-          # Fails to build
-          #- deltachat-repl-x86_64-android
-          #- deltachat-repl-x86-android
-          #- deltachat-rpc-server-x86_64-android
-          #- deltachat-rpc-server-x86-android
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix build .#${{ matrix.installable }}
-
-  build-macos:
-    name: nix build on macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        installable:
-          - deltachat-rpc-server-aarch64-darwin
-
-          # Fails to bulid
-          # - deltachat-rpc-server-x86_64-darwin
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix build .#${{ matrix.installable }}

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

@@ -1,50 +0,0 @@
-name: Publish deltachat-rpc-client to PyPI
-
-on:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-permissions: {}
-
-jobs:
-  build:
-    name: Build distribution
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Install pypa/build
-        run: python3 -m pip install build
-      - name: Build a binary wheel and a source tarball
-        working-directory: deltachat-rpc-client
-        run: python3 -m build
-      - name: Store the distribution packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-package-distributions
-          path: deltachat-rpc-client/dist/
-
-  publish-to-pypi:
-    name: Publish Python distribution to PyPI
-    if: github.event_name == 'release'
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/deltachat-rpc-client
-    permissions:
-      id-token: write
-
-    steps:
-      - name: Download all the dists
-        uses: actions/download-artifact@v4
-        with:
-          name: python-package-distributions
-          path: dist/
-      - name: Publish deltachat-rpc-client to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/repl.yml

@@ -1,5 +1,4 @@
-# Manually triggered GitHub Actions workflow
-# to build a Windows repl.exe which users can
+# Manually triggered action to build a Windows repl.exe which users can
 # download to debug complex bugs.
 
 name: Build Windows REPL .exe
@@ -7,22 +6,27 @@ name: Build Windows REPL .exe
 on:
   workflow_dispatch:
 
-permissions: {}
-
 jobs:
   build_repl:
     name: Build REPL example
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Build
-        run: nix build .#deltachat-repl-win64
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: repl.exe
-          path: "result/bin/deltachat-repl.exe"
+    - uses: actions/checkout@master
+
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: 1.50.0
+        override: true
+
+    - name: build
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: --example repl --features repl,vendored
+
+    - name: Upload binary
+      uses: actions/upload-artifact@v2
+      with:
+        name: repl.exe
+        path: 'target/debug/examples/repl.exe'

.github/workflows/upload-docs.yml

@@ -1,95 +1,28 @@
-name: Build & deploy documentation on rs.delta.chat, c.delta.chat, and py.delta.chat
+name: Build & Deploy Documentation on rs.delta.chat
 
 on:
   push:
     branches:
-      - main
-      - build_jsonrpc_docs_ci
-
-permissions: {}
+      - master
+      - docs-gh-action
 
 jobs:
-  build-rs:
+  build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Build the documentation with cargo
-        run: |
-          cargo doc --package deltachat --no-deps --document-private-items
-      - name: Upload to rs.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 }}@rs.delta.chat:/var/www/html/rs/"
+    - uses: actions/checkout@v1
+    - uses: actions-rs/toolchain@v1
+    - name: Build the documentation with cargo
+      run: |
+        cargo doc --package deltachat --no-deps
+    - name: Upload to rs.delta.chat
+      uses: up9cloud/action-rsync@v1.3
+      env:
+        USER: ${{ secrets.USERNAME }}
+        KEY: ${{ secrets.KEY }}
+        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
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-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
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - uses: DeterminateSystems/nix-installer-action@main
-      - name: Build C documentation
-        run: nix build .#docs
-      - name: Upload to c.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"
-
-  build-ts:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./deltachat-jsonrpc/typescript
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-      - name: npm install
-        run: npm install
-      - name: npm run build
-        run: npm run build
-      - name: Run docs script
-        run: npm run docs
-      - name: Upload to js.jsonrpc.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/deltachat-jsonrpc/typescript/docs/ "${{ secrets.USERNAME }}@js.jsonrpc.delta.chat:/var/www/html/js-jsonrpc/"

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

@@ -1,31 +1,28 @@
-# GitHub Actions workflow
-# to build `deltachat_ffi` crate documentation
-# and upload it to <https://cffi.delta.chat/>
-
 name: Build & Deploy Documentation on cffi.delta.chat
 
 on:
   push:
     branches:
-      - main
-
-permissions: {}
+      - master
+      - docs-gh-action
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          persist-credentials: false
-      - name: Build the documentation with cargo
-        run: |
-          cargo doc --package deltachat_ffi --no-deps
-      - 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: actions/checkout@v1
+    - uses: actions-rs/toolchain@v1
+    - name: Build the documentation with cargo
+      run: |
+        cargo doc --package deltachat_ffi --no-deps
+    - name: Upload to cffi.delta.chat
+      uses: up9cloud/action-rsync@v1.3
+      env:
+        USER: ${{ secrets.USERNAME }}
+        KEY: ${{ secrets.KEY }}
+        HOST: "delta.chat"
+        SOURCE: "target/doc"
+        TARGET: "/var/www/html/cffi/"
+

.github/workflows/zizmor-scan.yml

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

.gitignore

@@ -1,9 +1,6 @@
-target/
+/target
 **/*.rs.bk
 /build
-/dist
-/fuzz/fuzz_targets/corpus/
-/fuzz/fuzz_targets/crashes/
 
 # ignore vi temporaries
 *~
@@ -15,15 +12,12 @@ include
 *.db
 *.db-blobs
 
-.tox
 python/.eggs
+python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so
 python/.venv/
-python/venv/
-venv/
-env/
 
 python/liveconfig*
 
@@ -35,21 +29,3 @@ deltachat-ffi/xml
 
 coverage/
 .DS_Store
-.vscode
-python/accounts.txt
-python/all-testaccounts.txt
-tmp/
-
-# from deltachat-node
-node_modules/
-node/build/
-node/dist/
-node/prebuilds/
-node/.nyc_output/
-
-# Nix symlink.
-result
-
-# direnv
-.envrc
-.direnv

.npmignore

@@ -1,56 +0,0 @@
-.circleci/
-.gitmodules
-node/.nyc_output/
-.travis.yml
-appveyor.yml
-node/build/
-node/README.md
-rustfmt.toml
-spec.md
-test-data/
-build2/
-node_modules
-.git
-.idea/
-.pytest_cache
-CMakeLists.txt
-README.md
-contrib/
-node/ci_scripts/
-coverage/
-node/.circleci
-node/appveyor.yml
-ci/
-ci_scripts/
-python/
-target
-proptest-regressions
-deltachat-ffi/Doxyfile
-scripts
-webxdc.md
-standards.md
-draft/
-node/examples/
-# deltachat-core-rust/assets # don't exclude assets, otherwise it won't build
-node/images/
-node/test/
-node/windows.md
-node/*.tar.gz
-node/old_docs.md
-.vscode/
-.github/
-node/.prettierrc.yml
-
-deltachat-jsonrpc/TODO.md
-deltachat-jsonrpc/README.MD
-deltachat-jsonrpc/.gitignore
-deltachat-jsonrpc/typescript/.gitignore
-deltachat-jsonrpc/typescript/.prettierignore
-deltachat-jsonrpc/typescript/accounts/
-deltachat-jsonrpc/typescript/index.html
-deltachat-jsonrpc/typescript/node-demo.js
-deltachat-jsonrpc/typescript/report_api_coverage.mjs
-deltachat-jsonrpc/typescript/test
-deltachat-jsonrpc/typescript/example.ts
-
-.DS_Store

.npmrc

@@ -1 +0,0 @@
-package-lock=false

CMakeLists.txt

@@ -4,30 +4,26 @@ include(GNUInstallDirs)
 
 find_program(CARGO cargo)
 
-if(APPLE)
-       set(DYNAMIC_EXT "dylib")
-elseif(UNIX)
-       set(DYNAMIC_EXT "so")
-else()
-       set(DYNAMIC_EXT "dll")
-endif()
-
-if(DEFINED ENV{CARGO_BUILD_TARGET})
-    set(ARCH_DIR "$ENV{CARGO_BUILD_TARGET}")
-else()
-    set(ARCH_DIR "./")
-endif()
-
 add_custom_command(
 	OUTPUT
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
-	"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
+	"target/release/libdeltachat.a"
+	"target/release/libdeltachat.so"
+	"target/release/pkgconfig/deltachat.pc"
         COMMAND
         PREFIX=${CMAKE_INSTALL_PREFIX}
         LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
         INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release
+        ${CARGO} build --release --no-default-features
+
+	# Build in `deltachat-ffi` directory instead of using
+	# `--package deltachat_ffi` to avoid feature resolver version
+	# "1" bug which makes `--no-default-features` affect only
+	# `deltachat`, but not `deltachat-ffi` package.
+	#
+	# We can't enable version "2" resolver [1] because it is not
+	# stable yet on rust 1.50.0.
+	#
+	# [1] https://doc.rust-lang.org/nightly/cargo/reference/features.html#resolver-version-2-command-line-flags
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )
 
@@ -35,12 +31,12 @@ add_custom_target(
 	lib_deltachat
 	ALL
 	DEPENDS
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
-	"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
-	"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
+	"target/release/libdeltachat.a"
+	"target/release/libdeltachat.so"
+	"target/release/pkgconfig/deltachat.pc"
 )
 
 install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

CONTRIBUTING.md

@@ -1,122 +0,0 @@
-# Contributing to Delta Chat
-
-## Bug reports
-
-If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
-If the bug you found is specific to
-[Android](https://github.com/deltachat/deltachat-android/issues),
-[iOS](https://github.com/deltachat/deltachat-ios/issues) or
-[Desktop](https://github.com/deltachat/deltachat-desktop/issues),
-report it to the corresponding repository.
-
-## Feature proposals
-
-If you have a feature request, create a new topic on the [forum](https://support.delta.chat/).
-
-## Code contributions
-
-If you want to contribute a code, follow this guide.
-
-1. **Select an issue to work on.**
-
-   If you have an write access to the repository, assign the issue to yourself.
-   Otherwise state in the comment that you are going to work on the issue
-   to avoid duplicate work.
-
-   If the issue does not exist yet, create it first.
-
-2. **Write the code.**
-
-   Follow the [coding conventions](STYLE.md) when writing the code.
-
-3. **Commit the code.**
-
-   If you have write access to the repository,
-   push a branch named `<username>/<feature>`
-   so it is clear who is responsible for the branch,
-   and open a PR proposing to merge the change.
-   Otherwise fork the repository and create a branch in your fork.
-
-   Commit messages follow the [Conventional Commits] notation.
-   We use [git-cliff] to generate the changelog from commit messages before the release.
-
-   With **`git cliff --unreleased`**, you can check how the changelog entry for your commit will look.
-
-   The following prefix types are used:
-   - `feat`: Features, e.g. "feat: Pause IO for BackupProvider". If you are unsure what's the category of your commit, you can often just use `feat`.
-   - `fix`: Bug fixes, e.g. "fix: delete `smtp` rows when message sending is cancelled"
-   - `api`: API changes, e.g. "api(rust): add `get_msg_read_receipts(context, msg_id)`"
-   - `refactor`: Refactorings, e.g. "refactor: iterate over `msg_ids` without `.iter()`"
-   - `perf`: Performance improvements, e.g. "perf: improve SQLite performance with `PRAGMA synchronous=normal`"
-   - `test`: Test changes and improvements to the testing framework.
-   - `build`: Build system and tool configuration changes, e.g. "build(git-cliff): put "ci" commits into "CI" section of changelog"
-   - `ci`: CI configuration changes, e.g. "ci: limit artifact retention time for `libdeltachat.a` to 1 day"
-   - `docs`: Documentation changes, e.g. "docs: add contributing guidelines"
-   - `chore`: miscellaneous tasks, e.g. "chore: add `.DS_Store` to `.gitignore`"
-
-   Release preparation commits are marked as "chore(release): prepare for X.Y.Z"
-   as described in [releasing guide](RELEASE.md).
-
-   Use a `!` to mark breaking changes, e.g. "api!: Remove `dc_chat_can_send`".
-
-   Alternatively, breaking changes can go into the commit description, e.g.:
-
-   ```
-   fix: Fix race condition and db corruption when a message was received during backup
-
-   BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
-   ```
-
-4. [**Open a Pull Request**](https://github.com/chatmail/core/pulls).
-
-   Refer to the corresponding issue.
-
-   If you intend to squash merge the PR from the web interface,
-   make sure the PR title follows the conventional commits notation
-   as it will end up being a commit title.
-   Otherwise make sure each commit title follows the conventional commit notation.
-
-5. **Make sure all CI checks succeed.**
-
-   CI runs the tests and checks code formatting.
-
-   While it is running, self-review your PR to make sure all the changes you expect are there
-   and there are no accidentally committed unrelated changes and files.
-
-   Push the necessary fixup commits or force-push to your branch if needed.
-
-6. **Ask for review.**
-
-   Use built-in GitHub feature to request a review from suggested reviewers.
-
-   If you do not have write access to the repository, ask for review in the comments.
-
-7. **Merge the PR.**
-
-   Once a PR has an approval and passes CI, it can be merged.
-
-   PRs from a branch created in the main repository,
-   i.e. authored by those who have write access, are merged by their authors.
-
-   This is to ensure that PRs are merged as intended by the author,
-   e.g. as a squash merge, by rebasing from the web interface or manually from the command line.
-
-   If you have multiple changes in one PR, do a rebase merge.
-   Otherwise, you should usually do a squash merge.
-
-   If PR author does not have write access to the repository,
-   maintainers who reviewed the PR can merge it.
-
-   If you do not have access to the repository and created a PR from a fork,
-   ask the maintainers to merge the PR and say how it should be merged.
-
-## Other ways to contribute
-
-For other ways to contribute, refer to the [website](https://delta.chat/en/contribute).
-
-You can find the list of good first issues
-and a link to this guide
-on the contributing page: <https://github.com/chatmail/core/contribute>
-
-[Conventional Commits]: https://www.conventionalcommits.org/
-[git-cliff]: https://git-cliff.org/

Cargo.toml

@@ -1,142 +1,109 @@
 [package]
 name = "deltachat"
-version = "1.157.3"
+version = "1.76.0"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.81"
-repository = "https://github.com/chatmail/core"
+rust-version = "1.56"
 
 [profile.dev]
 debug = 0
-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.
-# This does not apply to crates in the workspace.
-# <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
-[profile.dev.package."*"]
-opt-level = "z"
 
 [profile.release]
 lto = true
-panic = 'abort'
-opt-level = "z"
-codegen-units = 1
-strip = true
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
-deltachat-time = { path = "./deltachat-time" }
-deltachat-contact-tools = { workspace = true }
-format-flowed = { path = "./format-flowed" }
-ratelimit = { path = "./deltachat-ratelimit" }
 
-anyhow = { workspace = true }
-async-broadcast = "0.7.2"
-async-channel = { workspace = true }
-async-imap = { version = "0.10.3", default-features = false, features = ["runtime-tokio", "compress"] }
-async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
-async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
-base64 = { workspace = true }
-brotli = { version = "7", default-features=false, features = ["std"] }
-bytes = "1"
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-data-encoding = "2.7.0"
+ansi_term = { version = "0.12.1", optional = true }
+anyhow = "1"
+async-imap = { git = "https://github.com/async-email/async-imap" }
+async-native-tls = { version = "0.3" }
+async-smtp = { git = "https://github.com/async-email/async-smtp", branch="master", features = ["socks5"] }
+async-std-resolver = "0.21"
+async-std = { version = "1" }
+async-tar = { version = "0.4", default-features=false }
+async-trait = "0.1"
+backtrace = "0.3"
+base64 = "0.13"
+bitflags = "1.3"
+chrono = "0.4"
+dirs = { version = "4", optional=true }
+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.10"
-fd-lock = "4"
-futures-lite = { workspace = true }
-futures = { workspace = true }
+futures = "0.3"
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.5"
-http-body-util = "0.1.2"
-humansize = "2"
-hyper = "1"
-hyper-util = "0.1.10"
-image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.33", default-features = false, features = ["net"] }
-iroh = { version = "0.33", default-features = false }
-kamadak-exif = "0.6.1"
-libc = { workspace = true }
-mail-builder = { version = "0.4.2", default-features = false }
-mailparse = { workspace = true }
-mime = "0.3.17"
-num_cpus = "1.16"
-num-derive = "0.4"
-num-traits = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = "0.12"
-percent-encoding = "2.3"
-pgp = { version = "0.15.0", default-features = false }
-pin-project = "1"
-qrcodegen = "1.7.0"
-quick-xml = "0.37"
-quoted_printable = "0.5"
-rand = { workspace = true }
-regex = { workspace = true }
-rusqlite = { workspace = true, features = ["sqlcipher"] }
+image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+kamadak-exif = "0.5"
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
+libc = "0.2"
+log = {version = "0.4.16", optional = true }
+mailparse = "0.13"
+native-tls = "0.2"
+num_cpus = "1.13"
+num-derive = "0.3"
+num-traits = "0.2"
+once_cell = "1.10.0"
+percent-encoding = "2.0"
+pgp = { version = "0.7", default-features = false }
+pretty_env_logger = { version = "0.4", optional = true }
+quick-xml = "0.22"
+r2d2 = "0.8"
+r2d2_sqlite = "0.20"
+rand = "0.7"
+regex = "1.5"
+rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.11.0"
-rustls = { version = "0.23.22", default-features = false }
-sanitize-filename = { workspace = true }
-serde_json = { workspace = true }
-serde_urlencoded = "0.7.1"
-serde = { workspace = true, features = ["derive"] }
+rustyline = { version = "9", optional = true }
+sanitize-filename = "0.3"
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
-smallvec = "1.14.0"
-strum = "0.27"
-strum_macros = "0.27"
-tagger = "4.3.4"
-textwrap = "0.16.1"
-thiserror = { workspace = true }
-tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.2", default-features = false }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = { workspace = true }
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-toml = "0.8"
+smallvec = "1"
+stop-token = "0.7"
+strum = "0.24"
+strum_macros = "0.24"
+surf = { version = "2.3", default-features = false, features = ["h1-client"] }
+thiserror = "1"
+toml = "0.5"
 url = "2"
-uuid = { version = "1", features = ["serde", "v4"] }
-webpki-roots = "0.26.8"
-blake3 = "1.6.1"
+uuid = { version = "0.8", features = ["serde", "v4"] }
+fast-socks5 = "0.4"
+humansize = "1"
+qrcodegen = "1.7.0"
+tagger = "4.3.3"
+textwrap = "0.15.0"
+zip = { version = "0.6.0", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
-criterion = { version = "0.5.1", features = ["async_tokio"] }
-futures-lite = { workspace = true }
-log = { workspace = true }
-nu-ansi-term = { workspace = true }
-pretty_assertions = "1.4.1"
+ansi_term = "0.12.0"
+async-std = { version = "1", features = ["unstable", "attributes"] }
+criterion = { version = "0.3.4", features = ["async_std"] }
+futures-lite = "1.12"
+log = "0.4"
+pretty_env_logger = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = { workspace = true }
-testdir = "0.9.3"
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tempfile = "3"
 
 [workspace]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc",
-  "deltachat-rpc-server",
-  "deltachat-ratelimit",
-  "deltachat-repl",
-  "deltachat-time",
-  "format-flowed",
-  "deltachat-contact-tools",
-  "fuzz",
 ]
 
+[[example]]
+name = "simple"
+path = "examples/simple.rs"
+required-features = ["repl"]
+
+[[example]]
+name = "repl"
+path = "examples/repl/main.rs"
+required-features = ["repl"]
+
+
 [[bench]]
 name = "create_account"
 harness = false
@@ -151,60 +118,15 @@ harness = false
 
 [[bench]]
 name = "receive_emails"
-required-features = ["internals"]
 harness = false
 
 [[bench]]
 name = "get_chat_msgs"
 harness = false
 
-[[bench]]
-name = "marknoticed_chat"
-harness = false
-
-[[bench]]
-name = "get_chatlist"
-harness = false
-
-[[bench]]
-name = "send_events"
-harness = false
-
-[workspace.dependencies]
-anyhow = "1"
-async-channel = "2.3.1"
-base64 = "0.22"
-chrono = { version = "0.4.40", default-features = false }
-deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
-deltachat = { path = ".", default-features = false }
-futures = "0.3.31"
-futures-lite = "2.6.0"
-libc = "0.2"
-log = "0.4"
-mailparse = "0.16.1"
-nu-ansi-term = "0.46"
-num-traits = "0.2"
-once_cell = "1.20.2"
-rand = "0.8"
-regex = "1.10"
-rusqlite = "0.32"
-sanitize-filename = "0.5"
-serde = "1.0"
-serde_json = "1"
-tempfile = "3.14.0"
-thiserror = "2"
-tokio = "1"
-tokio-util = "0.7.13"
-tracing-subscriber = "0.3"
-yerpc = "0.6.2"
-
 [features]
 default = ["vendored"]
 internals = []
-vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl"
-]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs"]
+vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored", "rusqlite/bundled-sqlcipher-vendored-openssl"]
+nightly = ["pgp/nightly"]

LICENSE

@@ -361,7 +361,7 @@ Exhibit A - Source Code Form License Notice
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE

README.md

@@ -1,19 +1,8 @@
-<p align="center">
-  <img alt="Delta Chat Logo" height="200px" src="https://raw.githubusercontent.com/deltachat/deltachat-pages/master/assets/blog/rust-delta.png">
-</p>
+# Delta Chat Rust
 
-<p align="center">
-  <a href="https://github.com/chatmail/core/actions/workflows/ci.yml">
-    <img alt="Rust CI" src="https://github.com/chatmail/core/actions/workflows/ci.yml/badge.svg">
-  </a>
-  <a href="https://deps.rs/repo/github/chatmail/core">
-    <img alt="dependency status" src="https://deps.rs/repo/github/chatmail/core/status.svg">
-  </a>
-</p>
+> Deltachat-core written in Rust 
 
-<p align="center">
-The core library for Delta Chat, written in Rust
-</p>
+[![Rust CI](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml)
 
 ## Installing Rust and Cargo
 
@@ -30,19 +19,10 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ cargo run --locked -p deltachat-repl -- ~/deltachat-db
+$ RUST_LOG=repl=info cargo run --example repl --features repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
-Optionally, install `deltachat-repl` binary with
-```
-$ cargo install --locked --path deltachat-repl/
-```
-and run as
-```
-$ deltachat-repl ~/deltachat-db
-```
-
 Configure your account (if not already configured):
 
 ```
@@ -104,7 +84,7 @@ For more commands type:
 ## Installing libdeltachat system wide
 
 ```
-$ git clone https://github.com/chatmail/core.git
+$ git clone https://github.com/deltachat/deltachat-core-rust.git
 $ cd deltachat-core-rust
 $ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
 $ cmake --build build
@@ -122,9 +102,12 @@ $ cargo build -p deltachat_ffi --release
 
 ## Debugging environment variables 
 
+- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
+  printed
+
 - `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=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.
 
 ### Expensive tests
@@ -135,53 +118,20 @@ use the `--ignored` argument to the test binary (not to cargo itself):
 $ cargo test -- --ignored
 ```
 
-### Fuzzing
-
-Install [`cargo-bolero`](https://github.com/camshaft/bolero) with
-```sh
-$ cargo install cargo-bolero@0.8.0
-```
-
-Run fuzzing tests with
-```sh
-$ cd fuzz
-$ cargo bolero test fuzz_mailparse --release=false -s NONE
-```
-
-Corpus is created at `fuzz/fuzz_targets/corpus`,
-you can add initial inputs there.
-For `fuzz_mailparse` target corpus can be populated with
-`../test-data/message/*.eml`.
-
-To run with AFL instead of libFuzzer:
-```sh
-$ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
-```
-
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
-
-## Update Provider Data
-
-To add the updates from the
-[provider-db](https://github.com/deltachat/provider-db) to the core, run:
-
-```
-./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
-```
+- `nightly`: Enable nightly only performance and security related features.
 
 ## Language bindings and frontend projects
 
 Language bindings are available for:
 
 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
-- **JS**: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\]
+- **Node.js** \[[📂 source](https://github.com/deltachat/deltachat-node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go**
-  - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]
-  - over cffi[^1]: \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
-- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 
 The following "frontend" projects make use of the Rust-library
@@ -192,7 +142,4 @@ or its language bindings:
 - [Desktop](https://github.com/deltachat/deltachat-desktop)
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
-- [Ubuntu Touch](https://codeberg.org/lk108/deltatouch)
 - several **Bots**
-
-[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.

RELEASE.md

@@ -1,21 +0,0 @@
-# Releasing a new version of DeltaChat core
-
-For example, to release version 1.116.0 of the core, do the following steps.
-
-1. Resolve all [blocker issues](https://github.com/chatmail/core/labels/blocker).
-
-2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
-
-3. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/chatmail/core/compare/v1.115.2...v1.116.0`
-
-4. Update the version by running `scripts/set_core_version.py 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.
-
-6. Tag the release: `git tag --annotate v1.116.0`.
-
-7. Push the release tag: `git push origin v1.116.0`.
-
-8. Create a GitHub release: `gh release create v1.116.0 --notes ''`.

STYLE.md

@@ -1,98 +0,0 @@
-# Coding conventions
-
-We format the code using `rustfmt`. Run `cargo fmt` prior to committing the code.
-Run `scripts/clippy.sh` to check the code for common mistakes with [Clippy].
-
-[Clippy]: https://doc.rust-lang.org/clippy/
-
-## SQL
-
-Multi-line SQL statements should be formatted using string literals,
-for example
-```
-    sql.execute(
-        "CREATE TABLE messages (
-id INTEGER PRIMARY KEY AUTOINCREMENT,
-text TEXT DEFAULT '' NOT NULL -- message text
-) STRICT",
-    )
-    .await?;
-```
-
-Do not use macros like [`concat!`](https://doc.rust-lang.org/std/macro.concat.html)
-or [`indoc!](https://docs.rs/indoc).
-Do not escape newlines like this:
-```
-    sql.execute(
-        "CREATE TABLE messages ( \
-id INTEGER PRIMARY KEY AUTOINCREMENT, \
-text TEXT DEFAULT '' NOT NULL \
-) STRICT",
-    )
-    .await?;
-```
-Escaping newlines
-is prone to errors like this if space before backslash is missing:
-```
-"SELECT foo\
- FROM bar"
-```
-Literal above results in `SELECT fooFROM bar` string.
-This style also does not allow using `--` comments.
-
----
-
-Declare new SQL tables with [`STRICT`](https://sqlite.org/stricttables.html) keyword
-to make SQLite check column types.
-
-Declare primary keys with [`AUTOINCREMENT`](https://www.sqlite.org/autoinc.html) keyword.
-This avoids reuse of the row IDs and can avoid dangerous bugs
-like forwarding wrong message because the message was deleted
-and another message took its row ID.
-
-Declare all new columns as `NOT NULL`
-and set the `DEFAULT` value if it is optional so the column can be skipped in `INSERT` statements.
-Dealing with `NULL` values both in SQL and in Rust is tricky and we try to avoid it.
-If column is already declared without `NOT NULL`, use `IFNULL` function to provide default value when selecting it.
-Use `HAVING COUNT(*) > 0` clause
-to [prevent aggregate functions such as `MIN` and `MAX` from returning `NULL`](https://stackoverflow.com/questions/66527856/aggregate-functions-max-etc-return-null-instead-of-no-rows).
-
-Don't delete unused columns too early, but maybe after several months/releases, unused columns are
-still used by older versions, so deleting them breaks downgrading the core or importing a backup in
-an older version. Also don't change the column type, consider adding a new column with another name
-instead. Finally, never change column semantics, this is especially dangerous because the `STRICT`
-keyword doesn't help here.
-
-## Errors
-
-Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
-When using [`Context`](https://docs.rs/anyhow/latest/anyhow/trait.Context.html),
-capitalize it but do not add a full stop as the contexts will be separated by `:`.
-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.
-Log messages should be capitalized and have a full stop in the end. For example:
-```
-info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
-```
-
-Format anyhow errors with `{:#}` to print all the contexts like this:
-```
-error!(context, "Failed to set selfavatar timestamp: {err:#}.");
-```

assets/icon-archive.svg

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

assets/qr_overlay_delta.svg-part

@@ -1,12 +0,0 @@
-<path
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   d="m 24.015419,1.2870249 c -12.549421,0 -22.7283936,10.1789711 -22.7283936,22.7283931 0,12.549422 10.1789726,22.728395 22.7283936,22.728395 14.337742,-0.342877 9.614352,-4.702705 23.697556,0.969161 -7.545453,-13.001555 -1.082973,-13.32964 -0.969161,-23.697556 0,-12.549422 -10.178973,-22.7283931 -22.728395,-22.7283931 z" />
-<path
-   style="fill:#000000;fill-opacity:1;stroke:none"
-   d="M 23.982249,5.3106163 C 13.645822,5.4364005 5.2618355,13.92999 5.2618355,24.275753 c 0,10.345764 8.3839865,18.635301 18.7204135,18.509516 9.827724,-0.03951 7.516769,-5.489695 18.380082,-0.443187 -5.950849,-9.296115 0.201753,-10.533667 0.340336,-18.521947 0,-10.345766 -8.383989,-18.6353031 -18.720418,-18.5095187 z" />
-<g
-    style="fill:#ffffff"
-    transform="scale(1.1342891,0.88160947)">
-  <path
-     d="m 21.360141,23.513382 q -1.218487,-1.364705 -3.387392,-3.265543 -2.388233,-2.095797 -3.216804,-3.289913 -0.828571,-1.218486 -0.828571,-2.6563 0,-2.144536 1.998318,-3.363022 1.998317,-1.2428565 5.215121,-1.2428565 3.216804,0 5.605037,1.0966375 2.412603,1.096638 2.412603,3.021846 0,0.92605 -0.584873,1.535293 -0.584874,0.609243 -1.364705,0.609243 -1.121008,0 -2.631931,-1.681511 -1.535292,-1.705881 -2.60756,-2.388233 -1.047898,-0.706722 -2.461343,-0.706722 -1.803359,0 -2.973106,0.804201 -1.145377,0.804201 -1.145377,2.047057 0,1.169747 0.950419,2.193275 0.950419,1.023529 4.898315,3.728568 4.215963,2.899998 5.946213,4.532769 1.75462,1.632772 2.851258,3.972265 1.096638,2.339494 1.096638,4.947055 0,4.581508 -3.241174,8.090749 -3.216804,3.484871 -7.530245,3.484871 -3.923526,0 -6.628566,-2.802519 -2.705039,-2.802518 -2.705039,-7.481506 0,-4.508399 2.973106,-7.530245 2.997477,-3.021846 7.359658,-3.655459 z m 1.072268,1.121008 q -6.994112,1.145377 -6.994112,9.601672 0,4.36218 1.730251,6.774783 1.75462,2.412603 4.069744,2.412603 2.412603,0 3.972265,-2.315124 1.559663,-2.339493 1.559663,-6.311759 0,-5.751255 -4.337811,-10.162175 z" />
-</g>

benches/contacts.rs

@@ -1,21 +1,17 @@
-#![recursion_limit = "256"]
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::Events;
 use tempfile::tempdir;
 
 async fn address_book_benchmark(n: u32, read_count: u32) {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     let book = (0..n)
-        .map(|i| format!("Name {i}\naddr{i}@example.org\n"))
+        .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
         .collect::<Vec<String>>()
         .join("");
 
@@ -28,16 +24,12 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
 }
 
 fn criterion_benchmark(c: &mut Criterion) {
-    let rt = tokio::runtime::Runtime::new().unwrap();
-
     c.bench_function("create 500 contacts", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(500), black_box(0)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(500), black_box(0)).await }))
     });
 
     c.bench_function("create 100 contacts and read it 1000 times", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(100), black_box(1000)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(100), black_box(1000)).await }))
     });
 }
 

benches/create_account.rs

@@ -1,16 +1,14 @@
-#![recursion_limit = "256"]
-use std::path::PathBuf;
-
+use async_std::path::PathBuf;
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
 use tempfile::tempdir;
 
 async fn create_accounts(n: u32) {
     let dir = tempdir().unwrap();
-    let p: PathBuf = dir.path().join("accounts");
+    let p: PathBuf = dir.path().join("accounts").into();
 
-    let writable = true;
-    let mut accounts = Accounts::new(p.clone(), writable).await.unwrap();
+    let mut accounts = Accounts::new(p.clone()).await.unwrap();
 
     for expected_id in 2..n {
         let id = accounts.add_account().await.unwrap();
@@ -20,8 +18,7 @@ async fn create_accounts(n: u32) {
 
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("create 1 account", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        b.to_async(&rt).iter(|| create_accounts(black_box(1)))
+        b.iter(|| block_on(async { create_accounts(black_box(1)).await }))
     });
 }
 

benches/get_chat_msgs.rs

@@ -1,21 +1,18 @@
-#![recursion_limit = "256"]
-use std::path::Path;
+use async_std::path::Path;
 
+use criterion::async_executor::AsyncStdExecutor;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::Events;
 
 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
     let id = 100;
-    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     for c in chats.iter().take(10) {
-        black_box(chat::get_chat_msgs(&context, *c).await.ok());
+        black_box(chat::get_chat_msgs(&context, *c, 0, None).await.ok());
     }
 }
 
@@ -23,23 +20,17 @@ fn criterion_benchmark(c: &mut Criterion) {
     // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
     // messages, such as your primary account.
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
-        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
-                .await
-                .unwrap();
+        let chats: Vec<_> = async_std::task::block_on(async {
+            let context = Context::new((&path).into(), 100).await.unwrap();
             let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
             let len = chatlist.len();
             (0..len).map(|i| chatlist.get_chat_id(i).unwrap()).collect()
         });
 
-        c.bench_function("chat::get_chat_msgs (load messages from 10 chats)", |b| {
-            b.to_async(&rt)
-                .iter(|| get_chat_msgs_benchmark(black_box(path.as_ref()), black_box(&chats)))
+        c.bench_function("Load all chats", |b| {
+            b.to_async(AsyncStdExecutor)
+                .iter(|| get_chat_msgs_benchmark(black_box(&path.as_ref()), black_box(&chats)))
         });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
     }
 }
 

benches/get_chatlist.rs

@@ -1,34 +0,0 @@
-#![recursion_limit = "256"]
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::chatlist::Chatlist;
-use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::Events;
-
-async fn get_chat_list_benchmark(context: &Context) {
-    Chatlist::try_load(context, 0, None, None).await.unwrap();
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
-    // messages, such as your primary account.
-    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(async {
-            Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
-                .await
-                .unwrap()
-        });
-        c.bench_function("chatlist:try_load (Get Chatlist)", |b| {
-            b.to_async(&rt)
-                .iter(|| get_chat_list_benchmark(black_box(&context)))
-        });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/marknoticed_chat.rs

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

benches/receive_emails.rs

@@ -1,29 +1,28 @@
-#![recursion_limit = "256"]
-use std::path::PathBuf;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use async_std::{path::PathBuf, task::block_on};
+use criterion::{
+    async_executor::AsyncStdExecutor, black_box, criterion_group, criterion_main, BatchSize,
+    Criterion,
+};
 use deltachat::{
     config::Config,
     context::Context,
+    dc_receive_imf::dc_receive_imf,
     imex::{imex, ImexMode},
-    receive_imf::receive_imf,
-    stock_str::StockStrings,
-    Events,
 };
 use tempfile::tempdir;
 
-async fn recv_all_emails(context: Context, iteration: u32) -> Context {
+async fn recv_all_emails(context: Context) -> Context {
     for i in 0..100 {
         let imf_raw = format!(
             "Subject: Benchmark
-Message-ID: Mr.{iteration}.{i}@testrun.org
+Message-ID: Mr.OssSYnOFkhR.{i}@testrun.org
 Date: Sat, 07 Dec 2019 19:00:27 +0000
 To: alice@example.com
 From: sender@testrun.org
 Chat-Version: 1.0
 Chat-Disposition-Notification-To: sender@testrun.org
 Chat-User-Avatar: 0
-In-Reply-To: Mr.{iteration}.{i_dec}@testrun.org
+In-Reply-To: Mr.OssSYnOFkhR.{i_dec}@testrun.org
 MIME-Version: 1.0
 
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
@@ -32,57 +31,7 @@ Hello {i}",
             i = i,
             i_dec = i - 1,
         );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-    }
-    context
-}
-
-/// Receive 100 emails that remove charlie@example.com and add
-/// him back
-async fn recv_groupmembership_emails(context: Context, iteration: u32) -> Context {
-    for i in 0..50 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.{iteration}.ADD.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.{iteration}.REMOVE.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.{iteration}.REMOVE.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.{iteration}.ADD.{i}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}"
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
+        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), "INBOX", false)
             .await
             .unwrap();
     }
@@ -93,17 +42,15 @@ async fn create_context() -> Context {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(dbfile.as_path(), id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     let backup: PathBuf = std::env::current_dir()
         .unwrap()
-        .join("delta-chat-backup.tar");
-
-    if backup.exists() {
+        .join("delta-chat-backup.tar")
+        .into();
+    if backup.exists().await {
         println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, backup.as_path(), None)
+        imex(&context, ImexMode::ImportBackup, &backup, None)
             .await
             .unwrap();
     }
@@ -124,34 +71,12 @@ async fn create_context() -> Context {
 fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("Receive messages");
     group.bench_function("Receive 100 simple text msgs", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(create_context());
-        let mut i = 0;
-
-        b.to_async(&rt).iter(|| {
-            let ctx = context.clone();
-            i += 1;
-            async move {
-                recv_all_emails(black_box(ctx), i).await;
-            }
-        });
+        b.to_async(AsyncStdExecutor).iter_batched(
+            || block_on(create_context()),
+            |context| recv_all_emails(black_box(context)),
+            BatchSize::LargeInput,
+        );
     });
-    group.bench_function(
-        "Receive 100 Chat-Group-Member-{Added|Removed} messages",
-        |b| {
-            let rt = tokio::runtime::Runtime::new().unwrap();
-            let context = rt.block_on(create_context());
-            let mut i = 0;
-
-            b.to_async(&rt).iter(|| {
-                let ctx = context.clone();
-                i += 1;
-                async move {
-                    recv_groupmembership_emails(black_box(ctx), i).await;
-                }
-            });
-        },
-    );
     group.finish();
 }
 

benches/search_msgs.rs

@@ -1,16 +1,12 @@
-#![recursion_limit = "256"]
-use std::path::Path;
-
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::Events;
+use std::path::Path;
 
-async fn search_benchmark(dbfile: impl AsRef<Path>) {
+async fn search_benchmark(path: impl AsRef<Path>) {
+    let dbfile = path.as_ref();
     let id = 100;
-    let context = Context::new(dbfile.as_ref(), id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile.into(), id).await.unwrap();
 
     for _ in 0..10u32 {
         context.search_msgs(None, "hello").await.unwrap();
@@ -21,13 +17,9 @@ fn criterion_benchmark(c: &mut Criterion) {
     // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
     // messages, such as your primary account.
     if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
         c.bench_function("search hello", |b| {
-            b.to_async(&rt).iter(|| search_benchmark(black_box(&path)))
+            b.iter(|| block_on(async { search_benchmark(black_box(&path)).await }))
         });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
     }
 }
 

benches/send_events.rs

@@ -1,48 +0,0 @@
-#![recursion_limit = "256"]
-use criterion::{criterion_group, criterion_main, Criterion};
-
-use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
-use deltachat::{info, Event, EventType, Events};
-use tempfile::tempdir;
-
-async fn send_events_benchmark(context: &Context) {
-    let emitter = context.get_event_emitter();
-    for _i in 0..1_000_000 {
-        info!(context, "interesting event...");
-    }
-    info!(context, "DONE");
-
-    loop {
-        match emitter.recv().await.unwrap() {
-            Event {
-                typ: EventType::Info(info),
-                ..
-            } if info.contains("DONE") => {
-                break;
-            }
-            _ => {}
-        }
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let rt = tokio::runtime::Runtime::new().unwrap();
-
-    let context = rt.block_on(async {
-        Context::new(&dbfile, 100, Events::new(), StockStrings::new())
-            .await
-            .expect("failed to create context")
-    });
-    let executor = tokio::runtime::Runtime::new().unwrap();
-
-    c.bench_function("Sending 1.000.000 events", |b| {
-        b.to_async(&executor)
-            .iter(|| send_events_benchmark(&context))
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

cliff.toml

@@ -1,93 +0,0 @@
-# configuration file for git-cliff
-# see https://git-cliff.org/docs/configuration/
-
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = false
-# process each line of a commit as an individual commit
-split_commits = false
-# regex for preprocessing the commit messages
-commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/chatmail/core/pull/${2}))"}, # replace pull request / issue numbers
-]
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^feat", group = "Features / Changes"},
-    { message = "^fix", group = "Fixes"},
-    { message = "^api", group = "API-Changes" },
-    { message = "^refactor", group = "Refactor"},
-    { message = "^perf", group = "Performance"},
-    { message = "^test", group = "Tests"},
-    { message = "^style", group = "Styling"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { message = "^build", group = "Build system"},
-    { message = "^docs", group = "Documentation"},
-    { message = "^ci", group = "CI"},
-    { message = ".*", group = "Other"},
-#    { body = ".*security", group = "Security"},
-]
-# protect breaking changes from being skipped due to matching a skipping commit_parser
-protect_breaking_commits = true
-# filter out the commits that are not matched by commit parsers
-filter_commits = true
-# glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
-# regex for skipping tags
-#skip_tags = "v0.1.0-beta.1"
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags topologically
-topo_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "oldest"
-# limit the number of commits included in the changelog.
-# limit_commits = 42
-
-
-[changelog]
-# changelog header
-header = """
-# Changelog\n
-"""
-# template for the changelog body
-# https://keats.github.io/tera/docs/#templates
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}\
-    ## [unreleased]
-{% endif %}\
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits %}
-        - {% if commit.breaking %}[**breaking**] {% endif %}\
-	{% if commit.scope %}{{ commit.scope }}: {% endif %}\
-	{{ commit.message | upper_first }}.\
-	{% if commit.footers is defined %}\
-	  {% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
-	    {% raw %}  {% endraw %}- {{ footer.value }}\
-	  {% endif %}{% endfor %}\
-	{% endif%}\
-    {% endfor %}
-{% endfor %}\n
-"""
-# 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/chatmail/core\
-                    /compare/{{ release.previous.version }}..{{ release.version }}
-        {% endif -%}
-    {% else -%}
-        [unreleased]: https://github.com/chatmail/core\
-            /compare/{{ release.previous.version }}..HEAD
-    {% endif -%}
-{% endfor %}
-"""

contrib/proxy.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# Examples:
+#
+# Original server that doesn't use SSL:
+# ./proxy.py 8080 imap.nauta.cu 143
+# ./proxy.py 8081 smtp.nauta.cu 25
+#
+# Original server that uses SSL:
+# ./proxy.py 8080 testrun.org 993 --ssl
+# ./proxy.py 8081 testrun.org 465 --ssl
+
+from datetime import datetime
+import argparse
+import selectors
+import ssl
+import socket
+import socketserver
+
+
+class Proxy(socketserver.ThreadingTCPServer):
+    allow_reuse_address = True
+
+    def __init__(self, proxy_host, proxy_port, real_host, real_port, use_ssl):
+        self.real_host = real_host
+        self.real_port = real_port
+        self.use_ssl = use_ssl
+        super().__init__((proxy_host, proxy_port), RequestHandler)
+
+
+class RequestHandler(socketserver.BaseRequestHandler):
+
+    def handle(self):
+        print('{} - {} CONNECTED.'.format(datetime.now(), self.client_address))
+
+        total = 0
+        real_server = (self.server.real_host, self.server.real_port)
+        with socket.create_connection(real_server) as sock:
+            if self.server.use_ssl:
+                context = ssl.create_default_context()
+                sock = context.wrap_socket(
+                    sock, server_hostname=real_server[0])
+
+            forward = {self.request: sock, sock: self.request}
+
+            sel = selectors.DefaultSelector()
+            sel.register(self.request, selectors.EVENT_READ,
+                         self.client_address)
+            sel.register(sock, selectors.EVENT_READ, real_server)
+
+            active = True
+            while active:
+                events = sel.select()
+                for key, mask in events:
+                    print('\n{} - {} wrote:'.format(datetime.now(), key.data))
+                    data = key.fileobj.recv(1024)
+                    received = len(data)
+                    total += received
+                    print(data)
+                    print('{} Bytes\nTotal: {} Bytes'.format(received, total))
+                    if data:
+                        forward[key.fileobj].sendall(data)
+                    else:
+                        print('\nCLOSING CONNECTION.\n\n')
+                        forward[key.fileobj].close()
+                        key.fileobj.close()
+                        active = False
+
+
+if __name__ == '__main__':
+    p = argparse.ArgumentParser(description='Simple Python Proxy')
+    p.add_argument(
+        "proxy_port", help="the port where the proxy will listen", type=int)
+    p.add_argument('host', help="the real host")
+    p.add_argument('port', help="the port of the real host", type=int)
+    p.add_argument("--ssl", help="use ssl to connect to the real host",
+                   action="store_true")
+    args = p.parse_args()
+
+    with Proxy('', args.proxy_port, args.host, args.port, args.ssl) as proxy:
+        proxy.serve_forever()

deltachat-contact-tools/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "deltachat-contact-tools"
-version = "0.0.0" # No semver-stable versioning
-edition = "2021"
-description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
-license = "MPL-2.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = { workspace = true }
-once_cell = { workspace = true }
-regex = { workspace = true }
-rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
-
-[dev-dependencies]
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.

deltachat-contact-tools/src/lib.rs

@@ -1,834 +0,0 @@
-//! Contact-related tools, like parsing vcards and sanitizing name and address
-
-#![forbid(unsafe_code)]
-#![warn(
-    unused,
-    clippy::correctness,
-    missing_debug_implementations,
-    missing_docs,
-    clippy::all,
-    clippy::wildcard_imports,
-    clippy::needless_borrow,
-    clippy::cast_lossless,
-    clippy::unused_async,
-    clippy::explicit_iter_loop,
-    clippy::explicit_into_iter_loop,
-    clippy::cloned_instead_of_copied
-)]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
-#![allow(
-    clippy::match_bool,
-    clippy::mixed_read_write_in_expression,
-    clippy::bool_assert_comparison,
-    clippy::manual_split_once,
-    clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    clippy::manual_range_contains
-)]
-
-use std::fmt;
-use std::ops::Deref;
-
-use anyhow::bail;
-use anyhow::Context as _;
-use anyhow::Result;
-use chrono::{DateTime, NaiveDateTime};
-use once_cell::sync::Lazy;
-use regex::Regex;
-
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
-    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
-    pub authname: String,
-    /// The contact's public PGP key in Base64, vcard property `key`
-    pub key: Option<String>,
-    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
-    pub profile_image: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<i64>,
-}
-
-impl VcardContact {
-    /// Returns the contact's display name.
-    pub fn display_name(&self) -> &str {
-        match self.authname.is_empty() {
-            false => &self.authname,
-            true => &self.addr,
-        }
-    }
-}
-
-/// Returns a vCard containing given contacts.
-///
-/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
-pub fn make_vcard(contacts: &[VcardContact]) -> String {
-    fn format_timestamp(c: &VcardContact) -> Option<String> {
-        let timestamp = *c.timestamp.as_ref().ok()?;
-        let datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        let addr = &c.addr;
-        let display_name = c.display_name();
-        res += &format!(
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:{addr}\r\n\
-             FN:{display_name}\r\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64,{key}\r\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\r\n");
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\r\n");
-        }
-        res += "END:VCARD\r\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
-    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
-        let start_of_s = s.get(..prefix.len())?;
-
-        if start_of_s.eq_ignore_ascii_case(prefix) {
-            s.get(prefix.len()..)
-        } else {
-            None
-        }
-    }
-    fn vcard_property<'a>(s: &'a str, property: &str) -> Option<&'a str> {
-        let remainder = remove_prefix(s, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
-        let (params, value) = remainder.split_once(':')?;
-        // In the example from above, `params` is now `;TYPE=work`
-        // and `value` is now `alice@example.com`
-
-        if params
-            .chars()
-            .next()
-            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
-            .is_some()
-        {
-            // `s` started with `property`, but the next character after it was not punctuation,
-            // so this line's property is actually something else
-            return None;
-        }
-        Some(value)
-    }
-    fn parse_datetime(datetime: &str) -> Result<i64> {
-        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
-        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
-        // ISO.8601, but fails to parse any of the examples given.
-        // So, instead just parse using a format string.
-
-        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
-        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
-            Ok(datetime) => datetime.timestamp(),
-            // Parses 19961022T140000.
-            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
-                Ok(datetime) => datetime
-                    .and_local_timezone(chrono::offset::Local)
-                    .single()
-                    .context("Could not apply local timezone to parsed date and time")?
-                    .timestamp(),
-                Err(_) => return Err(e.into()),
-            },
-        };
-        Ok(timestamp)
-    }
-
-    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\r?\n[\t ]").unwrap());
-    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
-
-    let mut lines = unfolded_lines.lines().peekable();
-    let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
-
-        let mut display_name = None;
-        let mut addr = None;
-        let mut key = None;
-        let mut photo = None;
-        let mut datetime = None;
-
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
-            if let Some(email) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some(name) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
-                .or_else(|| remove_prefix(line, "KEY;PREF=1:data:application/pgp-keys;base64,"))
-            {
-                key.get_or_insert(k);
-            } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=b;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=BASE64:"))
-                .or_else(|| remove_prefix(line, "PHOTO:data:image/jpeg;base64,"))
-            {
-                photo.get_or_insert(p);
-            } else if let Some(rev) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                let (authname, addr) =
-                    sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
-
-                contacts.push(VcardContact {
-                    authname,
-                    addr,
-                    key: key.map(|s| s.to_string()),
-                    profile_image: photo.map(|s| s.to_string()),
-                    timestamp: datetime
-                        .context("No timestamp in vcard")
-                        .and_then(parse_datetime),
-                });
-                break;
-            }
-        }
-    }
-
-    contacts
-}
-
-/// Valid contact address.
-#[derive(Debug, Clone)]
-pub struct ContactAddress(String);
-
-impl Deref for ContactAddress {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<str> for ContactAddress {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl fmt::Display for ContactAddress {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl ContactAddress {
-    /// Constructs a new contact address from string,
-    /// normalizing and validating it.
-    pub fn new(s: &str) -> Result<Self> {
-        let addr = addr_normalize(s);
-        if !may_be_valid_addr(&addr) {
-            bail!("invalid address {:?}", s);
-        }
-        Ok(Self(addr.to_string()))
-    }
-}
-
-/// Allow converting [`ContactAddress`] to an SQLite type.
-impl rusqlite::types::ToSql for ContactAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
-        let val = rusqlite::types::Value::Text(self.0.to_string());
-        let out = rusqlite::types::ToSqlOutput::Owned(val);
-        Ok(out)
-    }
-}
-
-/// Takes a name and an address and sanitizes them:
-/// - Extracts a name from the addr if the addr is in form "Alice <alice@example.org>"
-/// - Removes special characters from the name, see [`sanitize_name()`]
-/// - Removes the name if it is equal to the address by setting it to ""
-pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
-    static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
-    let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
-        (
-            if name.is_empty() {
-                captures.get(1).map_or("", |m| m.as_str())
-            } else {
-                name
-            },
-            captures
-                .get(2)
-                .map_or("".to_string(), |m| m.as_str().to_string()),
-        )
-    } else {
-        (name, addr.to_string())
-    };
-    let mut name = sanitize_name(name);
-
-    // If the 'display name' is just the address, remove it:
-    // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
-    // If the display name is empty, DC will just show the address when it needs a display name.
-    if name == addr {
-        name = "".to_string();
-    }
-
-    (name, addr)
-}
-
-/// Sanitizes a name.
-///
-/// - Removes newlines and trims the string
-/// - Removes quotes (come from some bad MUA implementations)
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_name(name: &str) -> String {
-    let name = sanitize_single_line(name);
-
-    match name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => name
-            .get(1..name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().to_string()),
-        _ => name.to_string(),
-    }
-}
-
-/// Sanitizes user input
-///
-/// - Removes newlines and trims the string
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_single_line(input: &str) -> String {
-    sanitize_bidi_characters(input.replace(['\n', '\r'], " ").trim())
-}
-
-const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-const ISOLATE_CHARACTERS: [char; 3] = ['\u{2066}', '\u{2067}', '\u{2068}'];
-const POP_ISOLATE_CHARACTER: char = '\u{2069}';
-/// Some control unicode characters can influence whether adjacent text is shown from
-/// left to right or from right to left.
-///
-/// Since user input is not supposed to influence how adjacent text looks,
-/// this function removes some of these characters.
-///
-/// Also see https://github.com/deltachat/deltachat-core-rust/issues/3479.
-pub fn sanitize_bidi_characters(input_str: &str) -> String {
-    // RTLO_CHARACTERS are apparently rarely used in practice.
-    // They can impact all following text, so, better remove them all:
-    let input_str = input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "");
-
-    // If the ISOLATE characters are not ended with a POP DIRECTIONAL ISOLATE character,
-    // we regard the input as potentially malicious and simply remove all ISOLATE characters.
-    // See https://en.wikipedia.org/wiki/Bidirectional_text#Unicode_bidi_support
-    // and https://www.w3.org/International/questions/qa-bidi-unicode-controls.en
-    // for an explanation about ISOLATE characters.
-    fn isolate_characters_are_valid(input_str: &str) -> bool {
-        let mut isolate_character_nesting: i32 = 0;
-        for char in input_str.chars() {
-            if ISOLATE_CHARACTERS.contains(&char) {
-                isolate_character_nesting += 1;
-            } else if char == POP_ISOLATE_CHARACTER {
-                isolate_character_nesting -= 1;
-            }
-
-            // According to Wikipedia, 125 levels are allowed:
-            // https://en.wikipedia.org/wiki/Unicode_control_characters
-            // (although, in practice, we could also significantly lower this number)
-            if isolate_character_nesting < 0 || isolate_character_nesting > 125 {
-                return false;
-            }
-        }
-        isolate_character_nesting == 0
-    }
-
-    if isolate_characters_are_valid(&input_str) {
-        input_str
-    } else {
-        input_str.replace(
-            |char| ISOLATE_CHARACTERS.contains(&char) || POP_ISOLATE_CHARACTER == char,
-            "",
-        )
-    }
-}
-
-/// Returns false if addr is an invalid address, otherwise true.
-pub fn may_be_valid_addr(addr: &str) -> bool {
-    let res = EmailAddress::new(addr);
-    res.is_ok()
-}
-
-/// Returns address lowercased,
-/// with whitespace trimmed and `mailto:` prefix removed.
-pub fn addr_normalize(addr: &str) -> String {
-    let norm = addr.trim().to_lowercase();
-
-    if norm.starts_with("mailto:") {
-        norm.get(7..).unwrap_or(&norm).to_string()
-    } else {
-        norm
-    }
-}
-
-/// Compares two email addresses, normalizing them beforehand.
-pub fn addr_cmp(addr1: &str, addr2: &str) -> bool {
-    let norm1 = addr_normalize(addr1);
-    let norm2 = addr_normalize(addr2);
-
-    norm1 == norm2
-}
-
-///
-/// Represents an email address, right now just the `name@domain` portion.
-///
-/// # Example
-///
-/// ```
-/// use deltachat_contact_tools::EmailAddress;
-/// let email = match EmailAddress::new("someone@example.com") {
-///     Ok(addr) => addr,
-///     Err(e) => panic!("Error parsing address, error was {}", e),
-/// };
-/// assert_eq!(&email.local, "someone");
-/// assert_eq!(&email.domain, "example.com");
-/// assert_eq!(email.to_string(), "someone@example.com");
-/// ```
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct EmailAddress {
-    /// Local part of the email address.
-    pub local: String,
-
-    /// Email address domain.
-    pub domain: String,
-}
-
-impl fmt::Display for EmailAddress {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}@{}", self.local, self.domain)
-    }
-}
-
-impl EmailAddress {
-    /// Performs a dead-simple parse of an email address.
-    pub fn new(input: &str) -> Result<EmailAddress> {
-        if input.is_empty() {
-            bail!("empty string is not valid");
-        }
-        let parts: Vec<&str> = input.rsplitn(2, '@').collect();
-
-        if input
-            .chars()
-            .any(|c| c.is_whitespace() || c == '<' || c == '>')
-        {
-            bail!("Email {:?} must not contain whitespaces, '>' or '<'", input);
-        }
-
-        match &parts[..] {
-            [domain, local] => {
-                if local.is_empty() {
-                    bail!("empty string is not valid for local part in {:?}", input);
-                }
-                if domain.is_empty() {
-                    bail!("missing domain after '@' in {:?}", input);
-                }
-                if domain.ends_with('.') {
-                    bail!("Domain {domain:?} should not contain the dot in the end");
-                }
-                Ok(EmailAddress {
-                    local: (*local).to_string(),
-                    domain: (*domain).to_string(),
-                })
-            }
-            _ => bail!("Email {:?} must contain '@' character", input),
-        }
-    }
-}
-
-impl rusqlite::types::ToSql for EmailAddress {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
-        let val = rusqlite::types::Value::Text(self.to_string());
-        let out = rusqlite::types::ToSqlOutput::Owned(val);
-        Ok(out)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::TimeZone;
-
-    use super::*;
-
-    #[test]
-    fn test_vcard_thunderbird() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:'Alice Mueller'
-EMAIL;PREF=1:alice.mueller@posteo.de
-UID:a8083264-ca47-4be7-98a8-8ec3db1447ca
-END:VCARD
-BEGIN:VCARD
-VERSION:4.0
-FN:'bobzzz@freenet.de'
-EMAIL;PREF=1:bobzzz@freenet.de
-UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
-END:VCARD
-",
-        );
-
-        assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-        assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-        assert!(contacts[0].timestamp.is_err());
-
-        assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-        assert_eq!(contacts[1].authname, "".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-        assert!(contacts[1].timestamp.is_err());
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_simple_example() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN:Alice Wonderland
-N:Wonderland;Alice;;;Ms.
-GENDER:W
-EMAIL;TYPE=work:alice@example.com
-KEY;TYPE=PGP;ENCODING=b:[base64-data]
-REV:20240418T184242Z
-
-END:VCARD",
-        );
-
-        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-        assert_eq!(contacts[0].profile_image, None);
-        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-        assert_eq!(contacts.len(), 1);
-    }
-
-    #[test]
-    fn test_vcard_with_trailing_newline() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD\r
-VERSION:4.0\r
-FN:Alice Wonderland\r
-N:Wonderland;Alice;;;Ms.\r
-GENDER:W\r
-EMAIL;TYPE=work:alice@example.com\r
-KEY;TYPE=PGP;ENCODING=b:[base64-data]\r
-REV:20240418T184242Z\r
-END:VCARD\r
-\r",
-        );
-
-        assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-        assert_eq!(contacts[0].profile_image, None);
-        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
-
-        assert_eq!(contacts.len(), 1);
-    }
-
-    #[test]
-    fn test_make_and_parse_vcard() {
-        let contacts = [
-            VcardContact {
-                addr: "alice@example.org".to_string(),
-                authname: "Alice Wonderland".to_string(),
-                key: Some("[base64-data]".to_string()),
-                profile_image: Some("image in Base64".to_string()),
-                timestamp: Ok(1713465762),
-            },
-            VcardContact {
-                addr: "bob@example.com".to_string(),
-                authname: "".to_string(),
-                key: None,
-                profile_image: None,
-                timestamp: Ok(0),
-            },
-        ];
-        let items = [
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:alice@example.org\r\n\
-             FN:Alice Wonderland\r\n\
-             KEY:data:application/pgp-keys;base64,[base64-data]\r\n\
-             PHOTO:data:image/jpeg;base64,image in Base64\r\n\
-             REV:20240418T184242Z\r\n\
-             END:VCARD\r\n",
-            "BEGIN:VCARD\r\n\
-             VERSION:4.0\r\n\
-             EMAIL:bob@example.com\r\n\
-             FN:bob@example.com\r\n\
-             REV:19700101T000000Z\r\n\
-             END:VCARD\r\n",
-        ];
-        let mut expected = "".to_string();
-        for len in 0..=contacts.len() {
-            let contacts = &contacts[0..len];
-            let vcard = make_vcard(contacts);
-            if len > 0 {
-                expected += items[len - 1];
-            }
-            assert_eq!(vcard, expected);
-            let parsed = parse_vcard(&vcard);
-            assert_eq!(parsed.len(), contacts.len());
-            for i in 0..parsed.len() {
-                assert_eq!(parsed[i].addr, contacts[i].addr);
-                assert_eq!(parsed[i].authname, contacts[i].authname);
-                assert_eq!(parsed[i].key, contacts[i].key);
-                assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
-                assert_eq!(
-                    parsed[i].timestamp.as_ref().unwrap(),
-                    contacts[i].timestamp.as_ref().unwrap()
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn test_contact_address() -> Result<()> {
-        let alice_addr = "alice@example.org";
-        let contact_address = ContactAddress::new(alice_addr)?;
-        assert_eq!(contact_address.as_ref(), alice_addr);
-
-        let invalid_addr = "<> foobar";
-        assert!(ContactAddress::new(invalid_addr).is_err());
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_emailaddress_parse() {
-        assert_eq!(EmailAddress::new("").is_ok(), false);
-        assert_eq!(
-            EmailAddress::new("user@domain.tld").unwrap(),
-            EmailAddress {
-                local: "user".into(),
-                domain: "domain.tld".into(),
-            }
-        );
-        assert_eq!(
-            EmailAddress::new("user@localhost").unwrap(),
-            EmailAddress {
-                local: "user".into(),
-                domain: "localhost".into()
-            }
-        );
-        assert_eq!(EmailAddress::new("uuu").is_ok(), false);
-        assert_eq!(EmailAddress::new("dd.tt").is_ok(), false);
-        assert!(EmailAddress::new("tt.dd@uu").is_ok());
-        assert!(EmailAddress::new("u@d").is_ok());
-        assert!(EmailAddress::new("u@d.").is_err());
-        assert!(EmailAddress::new("u@d.t").is_ok());
-        assert_eq!(
-            EmailAddress::new("u@d.tt").unwrap(),
-            EmailAddress {
-                local: "u".into(),
-                domain: "d.tt".into(),
-            }
-        );
-        assert!(EmailAddress::new("u@tt").is_ok());
-        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
-    }
-
-    #[test]
-    fn test_vcard_android() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-TEL;CELL:+1-234-567-890
-EMAIL;HOME:bob@example.org
-END:VCARD
-BEGIN:VCARD
-VERSION:2.1
-N:;Alice;;;
-FN:Alice
-EMAIL;HOME:alice@example.org
-END:VCARD
-",
-        );
-
-        assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-
-        assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[1].authname, "Alice".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-
-        assert_eq!(contacts.len(), 2);
-    }
-
-    #[test]
-    fn test_vcard_local_datetime() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-        );
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(
-            *contacts[0].timestamp.as_ref().unwrap(),
-            chrono::offset::Local
-                .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
-                .unwrap()
-                .timestamp()
-        );
-    }
-
-    #[test]
-    fn test_vcard_with_base64_avatar() {
-        // This is not an actual base64-encoded avatar, it's just to test the parsing.
-        // This one is Android-like.
-        let vcard0 = "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-EMAIL;HOME:bob@example.org
-PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
- AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
- L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
-
-END:VCARD
-";
-        // This one is DOS-like.
-        let vcard1 = vcard0.replace('\n', "\r\n");
-        for vcard in [vcard0, vcard1.as_str()] {
-            let contacts = parse_vcard(vcard);
-            assert_eq!(contacts.len(), 1);
-            assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-            assert_eq!(contacts[0].authname, "Bob".to_string());
-            assert_eq!(contacts[0].key, None);
-            assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
-        }
-    }
-
-    #[test]
-    fn test_protonmail_vcard() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-        );
-
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(&contacts[0].addr, "alice@example.org");
-        assert_eq!(&contacts[0].authname, "Alice Wonderland");
-        assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-        assert!(contacts[0].timestamp.is_err());
-        assert_eq!(contacts[0].profile_image, None);
-    }
-
-    #[test]
-    fn test_sanitize_name() {
-        assert_eq!(&sanitize_name(" hello world   "), "hello world");
-        assert_eq!(&sanitize_name("<"), "<");
-        assert_eq!(&sanitize_name(">"), ">");
-        assert_eq!(&sanitize_name("'"), "'");
-        assert_eq!(&sanitize_name("\""), "\"");
-    }
-
-    #[test]
-    fn test_sanitize_single_line() {
-        assert_eq!(sanitize_single_line("Hi\naiae "), "Hi aiae");
-        assert_eq!(sanitize_single_line("\r\nahte\n\r"), "ahte");
-    }
-
-    #[test]
-    fn test_sanitize_bidi_characters() {
-        // Legit inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat\u{2069}"),
-            "Tes\u{2067}ting Delta Chat\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"),
-            "Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"),
-            "Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"
-        );
-
-        // Potentially-malicious inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{202C}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Testing Delta Chat\u{2069}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2069}ting Delta Chat\u{2067}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2068}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-    }
-}

deltachat-ffi/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "deltachat_ffi"
-version = "1.157.3"
+version = "1.76.0"
 description = "Deltachat FFI"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 readme = "README.md"
 license = "MPL-2.0"
@@ -14,20 +15,18 @@ name = "deltachat"
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
-deltachat = { workspace = true, default-features = false }
-deltachat-jsonrpc = { workspace = true }
-libc = { workspace = true }
-human-panic = { version = "2", default-features = false }
-num-traits = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
-thiserror = { workspace = true }
-rand = { workspace = true }
-once_cell = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose"] }
+deltachat = { path = "../", default-features = false }
+libc = "0.2"
+human-panic = "1"
+num-traits = "0.2"
+serde_json = "1.0"
+async-std = "1"
+anyhow = "1"
+thiserror = "1"
+rand = "0.7"
 
 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
+vendored = ["deltachat/vendored"]
+nightly = ["deltachat/nightly"]
 

deltachat-ffi/Doxyfile

@@ -846,7 +846,7 @@ EXCLUDE_PATTERNS       =
 # exclude all test directories use the pattern */test/*
 
 ######################################################
-EXCLUDE_SYMBOLS        = dc_aheader_t dc_apeerstate_t dc_e2ee_helper_t dc_imap_t dc_job*_t dc_key_t dc_loginparam_t dc_mime*_t
+EXCLUDE_SYMBOLS        = dc_aheader_t dc_apeerstate_t dc_e2ee_helper_t dc_imap_t dc_job*_t dc_key_t dc_keyring_t dc_loginparam_t dc_mime*_t
 EXCLUDE_SYMBOLS       += dc_saxparser_t dc_simplify_t dc_smtp_t dc_sqlite3_t dc_strbuilder_t dc_param_t dc_hash_t dc_hashelem_t
 EXCLUDE_SYMBOLS       += _dc_* jsmn*
 ######################################################

deltachat-ffi/Doxyfile.css

@@ -1,24 +1,14 @@
 
-:root {
-	--accent: hsl(0 0% 85%);
-}
-
-@media (prefers-color-scheme: dark) {
-	:root {
-		--accent: hsl(0 0% 25%);
-	}
-}
-
 /* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
 div.fragment {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	border: 0;
 	padding: 1em;
 	border-radius: 6px;
 }
 
 code {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	padding-left: .5em;
 	padding-right: .5em;
 	border-radius: 6px;

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/build.rs

@@ -1,3 +1,4 @@
+use std::io::Write;
 use std::path::PathBuf;
 use std::{env, fs};
 
@@ -27,9 +28,8 @@ fn main() {
     );
 
     fs::create_dir_all(target_path.join("pkgconfig")).unwrap();
-    fs::write(
-        target_path.join("pkgconfig").join("deltachat.pc"),
-        pkg_config.as_bytes(),
-    )
-    .unwrap();
+    fs::File::create(target_path.join("pkgconfig").join("deltachat.pc"))
+        .unwrap()
+        .write_all(pkg_config.as_bytes())
+        .unwrap();
 }

deltachat-ffi/src/dc_array.rs

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

deltachat-ffi/src/lot.rs

@@ -1,12 +1,10 @@
 //! # Legacy generic return values for C API.
 
-use std::borrow::Cow;
-
-use anyhow::Error;
-
 use crate::message::MessageState;
 use crate::qr::Qr;
 use crate::summary::{Summary, SummaryPrefix};
+use anyhow::Error;
+use std::borrow::Cow;
 
 /// An object containing a set of values.
 /// The meaning of the values is defined by the function returning the object.
@@ -14,8 +12,6 @@ use crate::summary::{Summary, SummaryPrefix};
 /// eg. by chatlist.get_summary() or dc_msg_get_summary().
 ///
 /// *Lot* is used in the meaning *heap* here.
-// The QR code grew too large.  So be it.
-#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum Lot {
     Summary(Summary),
@@ -24,45 +20,46 @@ pub enum Lot {
 }
 
 #[repr(u8)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Meaning {
-    #[default]
     None = 0,
     Text1Draft = 1,
     Text1Username = 2,
     Text1Self = 3,
 }
 
+impl Default for Meaning {
+    fn default() -> Self {
+        Meaning::None
+    }
+}
+
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<str>> {
+    pub fn get_text1(&self) -> Option<&str> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
-                Some(SummaryPrefix::Draft(text)) => Some(Cow::Borrowed(text)),
-                Some(SummaryPrefix::Username(username)) => Some(Cow::Borrowed(username)),
-                Some(SummaryPrefix::Me(text)) => Some(Cow::Borrowed(text)),
+                Some(SummaryPrefix::Draft(text)) => Some(text),
+                Some(SummaryPrefix::Username(username)) => Some(username),
+                Some(SummaryPrefix::Me(text)) => Some(text),
             },
             Self::Qr(qr) => match qr {
                 Qr::AskVerifyContact { .. } => None,
-                Qr::AskVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::AskVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::FprOk { .. } => None,
                 Qr::FprMismatch { .. } => None,
-                Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
-                Qr::Account { domain } => Some(Cow::Borrowed(domain)),
-                Qr::Backup2 { .. } => None,
-                Qr::BackupTooNew { .. } => None,
-                Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
-                Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
-                Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
-                Qr::Url { url } => Some(Cow::Borrowed(url)),
-                Qr::Text { text } => Some(Cow::Borrowed(text)),
+                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
+                Qr::Account { domain } => Some(domain),
+                Qr::WebrtcInstance { domain, .. } => Some(domain),
+                Qr::Addr { .. } => None,
+                Qr::Url { url } => Some(url),
+                Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
-                Qr::WithdrawVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
-                Qr::ReviveVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
-                Qr::Login { address, .. } => Some(Cow::Borrowed(address)),
+                Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
             },
-            Self::Error(err) => Some(Cow::Borrowed(err)),
+            Self::Error(err) => Some(err),
         }
     }
 
@@ -82,13 +79,7 @@ impl Lot {
                 Some(SummaryPrefix::Username(_username)) => Meaning::Text1Username,
                 Some(SummaryPrefix::Me(_text)) => Meaning::Text1Self,
             },
-            Self::Qr(qr) => match qr {
-                Qr::Addr {
-                    draft: Some(_draft),
-                    ..
-                } => Meaning::Text1Draft,
-                _ => Meaning::None,
-            },
+            Self::Qr(_qr) => Meaning::None,
             Self::Error(_err) => Meaning::None,
         }
     }
@@ -103,10 +94,7 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
-                Qr::Backup2 { .. } => LotState::QrBackup2,
-                Qr::BackupTooNew { .. } => LotState::QrBackupTooNew,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
-                Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
                 Qr::Text { .. } => LotState::QrText,
@@ -114,7 +102,6 @@ impl Lot {
                 Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
                 Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                 Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-                Qr::Login { .. } => LotState::QrLogin,
             },
             Self::Error(_err) => LotState::QrError,
         }
@@ -130,18 +117,14 @@ impl Lot {
                 Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
-                Qr::Backup2 { .. } => Default::default(),
-                Qr::BackupTooNew { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Proxy { .. } => Default::default(),
-                Qr::Addr { contact_id, .. } => contact_id.to_u32(),
+                Qr::Addr { contact_id } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
                 Qr::Text { .. } => Default::default(),
                 Qr::WithdrawVerifyContact { contact_id, .. } => contact_id.to_u32(),
                 Qr::WithdrawVerifyGroup { .. } => Default::default(),
                 Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
                 Qr::ReviveVerifyGroup { .. } => Default::default(),
-                Qr::Login { .. } => Default::default(),
             },
             Self::Error(_) => Default::default(),
         }
@@ -157,9 +140,9 @@ impl Lot {
 }
 
 #[repr(u32)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LotState {
-    #[default]
+    // Default
     Undefined = 0,
 
     // Qr States
@@ -181,16 +164,9 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    QrBackup2 = 252,
-
-    QrBackupTooNew = 255,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 
-    /// text1=address, text2=protocol
-    QrProxy = 271,
-
     /// id=contact
     QrAddr = 320,
 
@@ -213,9 +189,6 @@ pub enum LotState {
     /// text1=groupname
     QrReviveVerifyGroup = 512,
 
-    /// text1=email_address
-    QrLogin = 520,
-
     // Message States
     MsgInFresh = 10,
     MsgInNoticed = 13,
@@ -228,6 +201,12 @@ pub enum LotState {
     MsgOutMdnRcvd = 28,
 }
 
+impl Default for LotState {
+    fn default() -> Self {
+        LotState::Undefined
+    }
+}
+
 impl From<MessageState> for LotState {
     fn from(s: MessageState) -> Self {
         use MessageState::*;

deltachat-ffi/src/string.rs

@@ -55,7 +55,7 @@ pub(crate) enum CStringError {
 /// # Example
 ///
 /// ```
-/// use deltachat::tools::{dc_strdup, OsStrExt};
+/// use deltachat::dc_tools::{dc_strdup, OsStrExt};
 /// let path = std::path::Path::new("/some/path");
 /// let path_c = path.to_c_string().unwrap();
 /// unsafe {
@@ -287,9 +287,8 @@ fn as_path_unicode<'a>(s: *const libc::c_char) -> &'a std::path::Path {
 
 #[cfg(test)]
 mod tests {
-    use libc::{free, strcmp};
-
     use super::*;
+    use libc::{free, strcmp};
 
     #[test]
     fn test_os_str_to_c_string_cwd() {

deltachat-jsonrpc/.gitignore

@@ -1,4 +0,0 @@
-openrpc/openrpc.json
-accounts/
-
-.cargo

deltachat-jsonrpc/Cargo.toml

@@ -1,34 +0,0 @@
-[package]
-name = "deltachat-jsonrpc"
-version = "1.157.3"
-description = "DeltaChat JSON-RPC API"
-edition = "2021"
-license = "MPL-2.0"
-repository = "https://github.com/chatmail/core"
-
-[dependencies]
-anyhow = { workspace = true }
-deltachat = { workspace = true }
-deltachat-contact-tools = { workspace = true }
-num-traits = { workspace = true }
-schemars = "0.8.22"
-serde = { workspace = true, features = ["derive"] }
-tempfile = { workspace = true }
-log = { workspace = true }
-async-channel = { workspace = true }
-futures = { workspace = true }
-serde_json = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
-typescript-type-def = { version = "0.5.13", features = ["json_value"] }
-tokio = { workspace = true }
-sanitize-filename = { workspace = true }
-walkdir = "2.5.0"
-base64 = { workspace = true }
-
-[dev-dependencies]
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
-
-
-[features]
-default = ["vendored"]
-vendored = ["deltachat/vendored"]

deltachat-jsonrpc/README.md

@@ -1,71 +0,0 @@
-# deltachat-jsonrpc
-
-This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) interface to DeltaChat.
-
-The JSON-RPC API is exposed in two fashions:
-
-* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
-
-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.
-
-## Usage
-
-#### Using the TypeScript/JavaScript client
-
-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 
-
-To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
-```sh
-cd typescript
-npm install
-npm run build
-```
-
-The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
-
-A script is included to build autogenerated documentation, which includes all RPC methods:
-```sh
-cd typescript
-npm run docs
-```
-Then open the [`typescript/docs`](typescript/docs) folder in a web browser.
-
-## Development
-
-#### Running the example app
-
-### Testing
-
-The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
-
-#### Rust tests
-
-To run the Rust test, use this command:
-
-```
-cargo test
-```
-
-#### TypeScript tests
-
-```
-cd typescript
-npm run test
-```
-
-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, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
-
-```
-CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
-```
-
-#### Test Coverage
-
-Running `npm run test` will report test coverage. For the coverage to be accurate the online tests need to be run.
-
-> If you are offline and want to see the coverage results anyway (even though they are inaccurate), you can bypass the errors of the online tests by setting the `COVERAGE_OFFLINE=1` environment variable.
-
-A summary of the coverage will be reported in the terminal after the test run. Open `coverage/index.html` in a web browser for a detailed report.

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

@@ -1,50 +0,0 @@
-use anyhow::Result;
-use deltachat::config::Config;
-use deltachat::contact::{Contact, ContactId};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-pub enum Account {
-    #[serde(rename_all = "camelCase")]
-    Configured {
-        id: u32,
-        display_name: Option<String>,
-        addr: Option<String>,
-        // size: u32,
-        profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
-        color: String,
-        /// Optional tag as "Work", "Family".
-        /// Meant to help profile owner to differ between profiles with similar names.
-        private_tag: Option<String>,
-    },
-    #[serde(rename_all = "camelCase")]
-    Unconfigured { id: u32 },
-}
-
-impl Account {
-    pub async fn from_context(ctx: &deltachat::context::Context, id: u32) -> Result<Self> {
-        if ctx.is_configured().await? {
-            let display_name = ctx.get_config(Config::Displayname).await?;
-            let addr = ctx.get_config(Config::Addr).await?;
-            let profile_image = ctx.get_config(Config::Selfavatar).await?;
-            let color = color_int_to_hex_string(
-                Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
-            );
-            let private_tag = ctx.get_config(Config::PrivateTag).await?;
-            Ok(Account::Configured {
-                id,
-                display_name,
-                addr,
-                profile_image,
-                color,
-                private_tag,
-            })
-        } else {
-            Ok(Account::Unconfigured { id })
-        }
-    }
-}

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

@@ -1,166 +0,0 @@
-use anyhow::{Context as _, Result};
-
-use deltachat::context::Context;
-use deltachat::message::Message;
-use deltachat::message::MsgId;
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::message::DownloadState;
-use super::message::MessageViewtype;
-use super::message::SystemMessageType;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-pub enum BasicMessageLoadResult {
-    Message(BasicMessageObject),
-    LoadingError { error: String },
-}
-
-/// Message that only has basic properties that doen't require additional db calls
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "BasicMessage", rename_all = "camelCase")]
-pub struct BasicMessageObject {
-    id: u32,
-    chat_id: u32,
-    from_id: u32,
-
-    text: String,
-
-    is_edited: bool,
-
-    /// Check if a message has a POI location bound to it.
-    /// These locations are also returned by `get_locations` method.
-    /// The UI may decide to display a special icon beside such messages.
-    has_location: bool,
-    has_html: bool,
-    view_type: MessageViewtype,
-    state: u32,
-
-    /// An error text, if there is one.
-    error: Option<String>,
-
-    timestamp: i64,
-    sort_timestamp: i64,
-    received_timestamp: i64,
-    has_deviating_timestamp: bool,
-
-    // summary - use/create another function if you need it
-    subject: String,
-    show_padlock: bool,
-    is_setupmessage: bool,
-    is_info: bool,
-    is_forwarded: bool,
-
-    /// True if the message was sent by a bot.
-    is_bot: bool,
-
-    /// when is_info is true this describes what type of system message it is
-    system_message_type: SystemMessageType,
-
-    duration: i32,
-    dimensions_height: i32,
-    dimensions_width: i32,
-
-    videochat_type: Option<u32>,
-    videochat_url: Option<String>,
-
-    override_sender_name: Option<String>,
-
-    setup_code_begin: Option<String>,
-
-    file: Option<String>,
-    file_mime: Option<String>,
-    file_name: Option<String>,
-
-    webxdc_href: Option<String>,
-
-    download_state: DownloadState,
-
-    original_msg_id: Option<u32>,
-
-    saved_message_id: Option<u32>,
-}
-
-impl BasicMessageObject {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Option<Self>> {
-        let Some(message) = Message::load_from_db_optional(context, msg_id).await? else {
-            return Ok(None);
-        };
-
-        let override_sender_name = message.get_override_sender_name();
-
-        let download_state = message.download_state().into();
-
-        let message_object = Self {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            from_id: message.get_from_id().to_u32(),
-            text: message.get_text(),
-            is_edited: message.is_edited(),
-            has_location: message.has_location(),
-            has_html: message.has_html(),
-            view_type: message.get_viewtype().into(),
-            state: message
-                .get_state()
-                .to_u32()
-                .context("state conversion to number failed")?,
-            error: message.error(),
-
-            timestamp: message.get_timestamp(),
-            sort_timestamp: message.get_sort_timestamp(),
-            received_timestamp: message.get_received_timestamp(),
-            has_deviating_timestamp: message.has_deviating_timestamp(),
-
-            subject: message.get_subject().to_owned(),
-            show_padlock: message.get_showpadlock(),
-            is_setupmessage: message.is_setupmessage(),
-            is_info: message.is_info(),
-            is_forwarded: message.is_forwarded(),
-            is_bot: message.is_bot(),
-            system_message_type: message.get_info_type().into(),
-
-            duration: message.get_duration(),
-            dimensions_height: message.get_height(),
-            dimensions_width: message.get_width(),
-
-            videochat_type: match message.get_videochat_type() {
-                Some(vct) => Some(
-                    vct.to_u32()
-                        .context("videochat type conversion to number failed")?,
-                ),
-                None => None,
-            },
-            videochat_url: message.get_videochat_url(),
-
-            override_sender_name,
-
-            setup_code_begin: message.get_setupcodebegin(context).await,
-
-            file: match message.get_file(context) {
-                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                None => None,
-            }, //BLOBS
-            file_mime: message.get_filemime(),
-            file_name: message.get_filename(),
-
-            // On a WebxdcInfoMessage this might include a hash holding
-            // information about a specific position or state in a webxdc app
-            webxdc_href: message.get_webxdc_href(),
-
-            download_state,
-
-            original_msg_id: message
-                .get_original_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-
-            saved_message_id: message
-                .get_saved_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-        };
-        Ok(Some(message_object))
-    }
-}

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

@@ -1,247 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use anyhow::{bail, Context as _, Result};
-use deltachat::chat::{self, get_chat_contacts, get_past_chat_contacts, ChatVisibility};
-use deltachat::chat::{Chat, ChatId};
-use deltachat::constants::Chattype;
-use deltachat::contact::{Contact, ContactId};
-use deltachat::context::Context;
-use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-use super::contact::ContactObject;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-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,
-    pinned: bool,
-    // subtitle  - will be moved to frontend because it uses translation functions
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    contacts: Vec<ContactObject>,
-    contact_ids: Vec<u32>,
-
-    /// Contact IDs of the past chat members.
-    past_contact_ids: Vec<u32>,
-
-    color: String,
-    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,
-    ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
-    can_send: bool,
-    was_seen_recently: bool,
-    mailing_list_address: Option<String>,
-}
-
-impl FullChat {
-    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
-        let rust_chat_id = ChatId::new(chat_id);
-        let chat = Chat::load_from_db(context, rust_chat_id).await?;
-
-        let contact_ids = get_chat_contacts(context, rust_chat_id).await?;
-        let past_contact_ids = get_past_chat_contacts(context, rust_chat_id).await?;
-
-        let mut contacts = Vec::with_capacity(contact_ids.len());
-
-        for contact_id in &contact_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    context,
-                    Contact::get_by_id(context, *contact_id)
-                        .await
-                        .context("failed to load contact")?,
-                )
-                .await?,
-            )
-        }
-
-        let profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        let color = color_int_to_hex_string(chat.get_color(context).await?);
-        let fresh_message_counter = rust_chat_id.get_fresh_msg_cnt(context).await?;
-        let ephemeral_timer = rust_chat_id.get_ephemeral_timer(context).await?.to_u32();
-
-        let can_send = chat.can_send(context).await?;
-
-        let was_seen_recently = if chat.get_type() == Chattype::Single {
-            match contact_ids.first() {
-                Some(contact) => Contact::get_by_id(context, *contact)
-                    .await
-                    .context("failed to load contact for was_seen_recently")?
-                    .was_seen_recently(),
-                None => false,
-            }
-        } else {
-            false
-        };
-
-        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
-
-        Ok(FullChat {
-            id: chat_id,
-            name: chat.name.clone(),
-            is_protected: chat.is_protected(),
-            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
-            is_unpromoted: chat.is_unpromoted(),
-            is_self_talk: chat.is_self_talk(),
-            contacts,
-            contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
-            past_contact_ids: past_contact_ids.iter().map(|id| id.to_u32()).collect(),
-            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(),
-            ephemeral_timer,
-            can_send,
-            was_seen_recently,
-            mailing_list_address,
-        })
-    }
-}
-
-/// cheaper version of fullchat, omits:
-/// - contacts
-/// - contact_ids
-/// - fresh_message_counter
-/// - ephemeral_timer
-/// - self_in_group
-/// - was_seen_recently
-/// - can_send
-///
-/// used when you only need the basic metadata of a chat like type, name, profile picture
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-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,
-    pinned: bool,
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    color: String,
-    is_contact_request: bool,
-    is_protection_broken: bool,
-    is_device_chat: bool,
-    is_muted: bool,
-}
-
-impl BasicChat {
-    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
-        let rust_chat_id = ChatId::new(chat_id);
-        let chat = Chat::load_from_db(context, rust_chat_id).await?;
-
-        let profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-        let color = color_int_to_hex_string(chat.get_color(context).await?);
-
-        Ok(BasicChat {
-            id: chat_id,
-            name: chat.name.clone(),
-            is_protected: chat.is_protected(),
-            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
-            is_unpromoted: chat.is_unpromoted(),
-            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(),
-        })
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-pub enum MuteDuration {
-    NotMuted,
-    Forever,
-    Until { duration: i64 },
-}
-
-impl MuteDuration {
-    pub fn try_into_core_type(self) -> Result<chat::MuteDuration> {
-        match self {
-            MuteDuration::NotMuted => Ok(chat::MuteDuration::NotMuted),
-            MuteDuration::Forever => Ok(chat::MuteDuration::Forever),
-            MuteDuration::Until { duration } => {
-                if duration <= 0 {
-                    bail!("failed to read mute duration")
-                }
-
-                Ok(SystemTime::now()
-                    .checked_add(Duration::from_secs(duration as u64))
-                    .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
-            }
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "ChatVisibility")]
-pub enum JSONRPCChatVisibility {
-    Normal,
-    Archived,
-    Pinned,
-}
-
-impl JSONRPCChatVisibility {
-    pub fn into_core_type(self) -> ChatVisibility {
-        match self {
-            JSONRPCChatVisibility::Normal => ChatVisibility::Normal,
-            JSONRPCChatVisibility::Archived => ChatVisibility::Archived,
-            JSONRPCChatVisibility::Pinned => ChatVisibility::Pinned,
-        }
-    }
-}

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

@@ -1,156 +0,0 @@
-use anyhow::{Context, Result};
-use deltachat::chat::{Chat, ChatId};
-use deltachat::chatlist::get_last_message_for_chat;
-use deltachat::constants::*;
-use deltachat::contact::{Contact, ContactId};
-use deltachat::{
-    chat::{get_chat_contacts, ChatVisibility},
-    chatlist::Chatlist,
-};
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-use super::message::MessageViewtype;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-pub enum ChatListItemFetchResult {
-    #[serde(rename_all = "camelCase")]
-    ChatListItem {
-        id: u32,
-        name: String,
-        avatar_path: Option<String>,
-        color: String,
-        last_updated: Option<i64>,
-        summary_text1: String,
-        summary_text2: String,
-        summary_status: u32,
-        /// showing preview if last chat message is image
-        summary_preview_image: Option<String>,
-        is_protected: bool,
-        is_group: bool,
-        fresh_message_counter: usize,
-        is_self_talk: bool,
-        is_device_talk: bool,
-        is_sending_location: bool,
-        is_self_in_group: bool,
-        is_archived: bool,
-        is_pinned: bool,
-        is_muted: bool,
-        is_contact_request: bool,
-        /// true when chat is a broadcastlist
-        is_broadcast: bool,
-        /// contact id if this is a dm chat (for view profile entry in context menu)
-        dm_chat_contact: Option<u32>,
-        was_seen_recently: bool,
-        last_message_type: Option<MessageViewtype>,
-        last_message_id: Option<u32>,
-    },
-    #[serde(rename_all = "camelCase")]
-    ArchiveLink { fresh_message_counter: usize },
-    #[serde(rename_all = "camelCase")]
-    Error { id: u32, error: String },
-}
-
-pub(crate) async fn get_chat_list_item_by_id(
-    ctx: &deltachat::context::Context,
-    entry: u32,
-) -> Result<ChatListItemFetchResult> {
-    let chat_id = ChatId::new(entry);
-    let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
-
-    if chat_id.is_archived_link() {
-        return Ok(ChatListItemFetchResult::ArchiveLink {
-            fresh_message_counter,
-        });
-    }
-
-    let last_msgid = get_last_message_for_chat(ctx, chat_id).await?;
-
-    let chat = Chat::load_from_db(ctx, chat_id).await.context("chat")?;
-    let summary = Chatlist::get_summary2(ctx, chat_id, last_msgid, Some(&chat))
-        .await
-        .context("summary")?;
-
-    let summary_text1 = summary.prefix.map_or_else(String::new, |s| s.to_string());
-    let summary_text2 = summary.text.to_owned();
-
-    let summary_preview_image = summary.thumbnail_path;
-
-    let visibility = chat.get_visibility();
-
-    let avatar_path = chat
-        .get_profile_image(ctx)
-        .await?
-        .map(|path| path.to_str().unwrap_or("invalid/path").to_owned());
-
-    let (last_updated, message_type) = match last_msgid {
-        Some(id) => {
-            if let Some(last_message) =
-                deltachat::message::Message::load_from_db_optional(ctx, id).await?
-            {
-                (
-                    Some(last_message.get_timestamp() * 1000),
-                    Some(last_message.get_viewtype().into()),
-                )
-            } else {
-                // Message may be deleted by the time we try to load it.
-                (None, None)
-            }
-        }
-        None => (None, None),
-    };
-
-    let chat_contacts = get_chat_contacts(ctx, chat_id).await?;
-
-    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 was_seen_recently = match contact {
-            Some(contact) => Contact::get_by_id(ctx, *contact)
-                .await
-                .context("contact")?
-                .was_seen_recently(),
-            None => false,
-        };
-        (
-            contact.map(|contact_id| contact_id.to_u32()),
-            was_seen_recently,
-        )
-    } else {
-        (None, false)
-    };
-
-    let color = color_int_to_hex_string(chat.get_color(ctx).await?);
-
-    Ok(ChatListItemFetchResult::ChatListItem {
-        id: chat_id.to_u32(),
-        name: chat.get_name().to_owned(),
-        avatar_path,
-        color,
-        last_updated,
-        summary_text1,
-        summary_text2,
-        summary_status: summary.state.to_u32().expect("impossible"), // idea and a function to transform the constant to strings? or return string enum
-        summary_preview_image,
-        is_protected: chat.is_protected(),
-        is_group: chat.get_type() == Chattype::Group,
-        fresh_message_counter,
-        is_self_talk: chat.is_self_talk(),
-        is_device_talk: chat.is_device_talk(),
-        is_self_in_group: self_in_group,
-        is_sending_location: chat.is_sending_locations(),
-        is_archived: visibility == ChatVisibility::Archived,
-        is_pinned: visibility == ChatVisibility::Pinned,
-        is_muted: chat.is_muted(),
-        is_contact_request: chat.is_contact_request(),
-        is_broadcast: chat.get_type() == Chattype::Broadcast,
-        dm_chat_contact,
-        was_seen_recently,
-        last_message_type: message_type,
-        last_message_id: last_msgid.map(|id| id.to_u32()),
-    })
-}

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

@@ -1,124 +0,0 @@
-use anyhow::Result;
-use deltachat::color;
-use deltachat::context::Context;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Contact", rename_all = "camelCase")]
-pub struct ContactObject {
-    address: String,
-    color: String,
-    auth_name: String,
-    status: String,
-    display_name: String,
-    id: u32,
-    name: String,
-    profile_image: Option<String>, // BLOBS
-    name_and_addr: String,
-    is_blocked: bool,
-    e2ee_avail: 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.
-    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 {
-    pub async fn try_from_dc_contact(
-        context: &Context,
-        contact: deltachat::contact::Contact,
-    ) -> Result<Self> {
-        let profile_image = match contact.get_profile_image(context).await? {
-            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 verifier_id = contact
-            .get_verifier_id(context)
-            .await?
-            .map(|contact_id| contact_id.to_u32());
-
-        Ok(ContactObject {
-            address: contact.get_addr().to_owned(),
-            color: color_int_to_hex_string(contact.get_color()),
-            auth_name: contact.get_authname().to_owned(),
-            status: contact.get_status().to_owned(),
-            display_name: contact.get_display_name().to_owned(),
-            id: contact.id.to_u32(),
-            name: contact.get_name().to_owned(),
-            profile_image, //BLOBS
-            name_and_addr: contact.get_name_n_addr(),
-            is_blocked: contact.is_blocked(),
-            e2ee_avail: contact.e2ee_avail(context).await?,
-            is_verified,
-            is_profile_verified,
-            verifier_id,
-            last_seen: contact.last_seen(),
-            was_seen_recently: contact.was_seen_recently(),
-            is_bot: contact.is_bot(),
-        })
-    }
-}
-
-#[derive(Clone, Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct VcardContact {
-    /// Email address.
-    addr: String,
-    /// The contact's name, or the email address if no name was given.
-    display_name: String,
-    /// Public PGP key in Base64.
-    key: Option<String>,
-    /// Profile image in Base64.
-    profile_image: Option<String>,
-    /// Contact color as hex string.
-    color: String,
-    /// Last update timestamp.
-    timestamp: Option<i64>,
-}
-
-impl From<deltachat_contact_tools::VcardContact> for VcardContact {
-    fn from(vc: deltachat_contact_tools::VcardContact) -> Self {
-        let display_name = vc.display_name().to_string();
-        let color = color::str_to_color(&vc.addr.to_lowercase());
-        Self {
-            addr: vc.addr,
-            display_name,
-            key: vc.key,
-            profile_image: vc.profile_image,
-            color: color_int_to_hex_string(color),
-            timestamp: vc.timestamp.ok(),
-        }
-    }
-}

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

@@ -1,575 +0,0 @@
-use deltachat::{Event as CoreEvent, EventType as CoreEventType};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct Event {
-    /// Event payload.
-    event: EventType,
-
-    /// Account ID.
-    context_id: u32,
-}
-
-impl From<CoreEvent> for Event {
-    fn from(event: CoreEvent) -> Self {
-        Event {
-            event: event.typ.into(),
-            context_id: event.id,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-pub enum EventType {
-    /// The library-user may write an informational string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Info { msg: String },
-
-    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected { msg: String },
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected { msg: String },
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent { msg: String },
-
-    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted { msg: String },
-
-    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved { msg: String },
-
-    /// Emitted before going into IDLE on the Inbox folder.
-    ImapInboxIdle,
-
-    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile { file: String },
-
-    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile { file: String },
-
-    /// The library-user should write a warning string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Warning { msg: String },
-
-    /// The library-user should report an error to the end-user.
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a message box then.
-    Error { msg: String },
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// setChatName(), setChatProfileImage(),
-    /// addContactToChat(), removeContactFromChat(),
-    /// and messages sending functions.
-    ErrorSelfNotInGroup { msg: String },
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    #[serde(rename_all = "camelCase")]
-    MsgsChanged {
-        /// Set if only a single chat is affected by the changes, otherwise 0.
-        chat_id: u32,
-
-        /// Set if only a single message is affected by the changes, otherwise 0.
-        msg_id: u32,
-    },
-
-    /// Reactions for the message changed.
-    #[serde(rename_all = "camelCase")]
-    ReactionsChanged {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: u32,
-
-        /// ID of the contact whose reaction set is changed.
-        contact_id: u32,
-    },
-
-    /// A reaction to one's own sent message received.
-    /// Typically, the UI will show a notification for that.
-    ///
-    /// In addition to this event, ReactionsChanged is emitted.
-    #[serde(rename_all = "camelCase")]
-    IncomingReaction {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the contact whose reaction set is changed.
-        contact_id: u32,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: u32,
-
-        /// The reaction.
-        reaction: String,
-    },
-
-    /// Incoming webxdc info or summary update, should be notified.
-    #[serde(rename_all = "camelCase")]
-    IncomingWebxdcNotify {
-        /// ID of the chat.
-        chat_id: u32,
-
-        /// ID of the contact sending.
-        contact_id: u32,
-
-        /// ID of the added info message or webxdc instance in case of summary change.
-        msg_id: u32,
-
-        /// Text to notify.
-        text: String,
-
-        /// Link assigned to this notification, if any.
-        href: Option<String>,
-    },
-
-    /// There is a fresh message. Typically, the user will show a notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event sent together with this event.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsg {
-        /// ID of the chat where the message is assigned.
-        chat_id: u32,
-
-        /// ID of the message.
-        msg_id: u32,
-    },
-
-    /// Downloading a bunch of messages just finished. This is an
-    /// event to allow the UI to only show one notification per message bunch,
-    /// instead of cluttering the user with many notifications.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch,
-
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[serde(rename_all = "camelCase")]
-    MsgsNoticed { chat_id: u32 },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgDelivered {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that was successfully sent.
-        msg_id: u32,
-    },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgFailed {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that could not be sent.
-        msg_id: u32,
-    },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgRead {
-        /// ID of the chat which the message belongs to.
-        chat_id: u32,
-
-        /// ID of the message that was read.
-        msg_id: u32,
-    },
-
-    /// A single message was deleted.
-    ///
-    /// This event means that the message will no longer appear in the messagelist.
-    /// UI should remove the message from the messagelist
-    /// in response to this event if the message is currently displayed.
-    ///
-    /// The message may have been explicitly deleted by the user or expired.
-    /// Internally the message may have been removed from the database,
-    /// moved to the trash chat or hidden.
-    ///
-    /// This event does not indicate the message
-    /// deletion from the server.
-    #[serde(rename_all = "camelCase")]
-    MsgDeleted {
-        /// ID of the chat where the message was prior to deletion.
-        /// Never 0.
-        chat_id: u32,
-
-        /// ID of the deleted message. Never 0.
-        msg_id: u32,
-    },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See setChatName(), setChatProfileImage(), addContactToChat()
-    /// and removeContactFromChat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
-    #[serde(rename_all = "camelCase")]
-    ChatModified { chat_id: u32 },
-
-    /// Chat ephemeral timer changed.
-    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        /// Chat ID.
-        chat_id: u32,
-
-        /// New ephemeral timer value.
-        timer: u32,
-    },
-
-    /// Chat deleted.
-    ChatDeleted {
-        /// Chat ID.
-        chat_id: u32,
-    },
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    #[serde(rename_all = "camelCase")]
-    ContactsChanged {
-        /// If set, this is the contact_id of an added contact that should be selected.
-        contact_id: Option<u32>,
-    },
-
-    /// Location of one or more contact has changed.
-    #[serde(rename_all = "camelCase")]
-    LocationChanged {
-        /// contact_id of the contact for which the location has changed.
-        /// If the locations of several contacts have been changed,
-        /// this parameter is set to `None`.
-        contact_id: Option<u32>,
-    },
-
-    /// Inform about the configuration progress started by configure().
-    ConfigureProgress {
-        /// Progress.
-        ///
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-
-        /// Progress comment or error, something to display to the user.
-        comment: Option<String>,
-    },
-
-    /// Inform about the import/export progress started by imex().
-    ///
-    #[serde(rename_all = "camelCase")]
-    ImexProgress {
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-    },
-
-    /// A file has been exported. A file has been written by imex().
-    /// This event may be sent multiple times by a single call to imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexFileWritten { path: String },
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by getChatSecurejoinQrCodeSvg().
-    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress {
-        /// ID of the contact that wants to join.
-        contact_id: u32,
-
-        /// Progress as:
-        /// 300=vg-/vc-request received, typically shown as "bob@addr joins".
-        /// 600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-        /// 800=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
-        /// 1000=Protocol finished for this contact.
-        progress: usize,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while secureJoin(), which
-    /// may take some time, is executed.
-    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress {
-        /// ID of the inviting contact.
-        contact_id: u32,
-
-        /// Progress as:
-        /// 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-        /// (Bob has verified alice and waits until Alice does the same for him)
-        /// 1000=vg-member-added/vc-contact-confirm received
-        progress: usize,
-    },
-
-    /// The connectivity to the server changed.
-    /// This means that you should refresh the connectivity view
-    /// and possibly the connectivtiy HTML; see getConnectivity() and
-    /// 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 {
-        /// Message ID.
-        msg_id: u32,
-
-        /// Status update ID.
-        status_update_serial: u32,
-    },
-
-    /// Data received over an ephemeral peer channel.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeData {
-        /// Message ID.
-        msg_id: u32,
-
-        /// Realtime data.
-        data: Vec<u8>,
-    },
-
-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeAdvertisementReceived {
-        /// Message ID of the webxdc instance.
-        msg_id: u32,
-    },
-
-    /// Inform that a message containing a webxdc instance has been deleted
-    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted {
-        /// ID of the deleted message.
-        msg_id: u32,
-    },
-
-    /// Tells that the Background fetch was completed (or timed out).
-    /// This event acts as a marker, when you reach this event you can be sure
-    /// that all events emitted during the background fetch were processed.
-    ///
-    /// This event is only emitted by the account manager
-    AccountsBackgroundFetchDone,
-    /// Inform that set of chats or the order of the chats in the chatlist has changed.
-    ///
-    /// Sometimes this is emitted together with `UIChatlistItemChanged`.
-    ChatlistChanged,
-
-    /// Inform that a single chat list item changed and needs to be rerendered.
-    /// If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache.
-    #[serde(rename_all = "camelCase")]
-    ChatlistItemChanged {
-        /// ID of the changed chat
-        chat_id: Option<u32>,
-    },
-
-    /// Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
-    ///
-    /// This event is only emitted by the account manager
-    AccountsChanged,
-
-    /// Inform that an account property that might be shown in the account list changed, namely:
-    /// - is_configured (see is_configured())
-    /// - displayname
-    /// - selfavatar
-    /// - private_tag
-    ///
-    /// This event is emitted from the account whose property changed.
-    AccountsItemChanged,
-
-    /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow {
-        /// Number of events skipped.
-        n: u64,
-    },
-}
-
-impl From<CoreEventType> for EventType {
-    fn from(event: CoreEventType) -> Self {
-        use EventType::*;
-        match event {
-            CoreEventType::Info(msg) => Info { msg },
-            CoreEventType::SmtpConnected(msg) => SmtpConnected { msg },
-            CoreEventType::ImapConnected(msg) => ImapConnected { msg },
-            CoreEventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
-            CoreEventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
-            CoreEventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            CoreEventType::ImapInboxIdle => ImapInboxIdle,
-            CoreEventType::NewBlobFile(file) => NewBlobFile { file },
-            CoreEventType::DeletedBlobFile(file) => DeletedBlobFile { file },
-            CoreEventType::Warning(msg) => Warning { msg },
-            CoreEventType::Error(msg) => Error { msg },
-            CoreEventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
-            CoreEventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => ReactionsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-            },
-            CoreEventType::IncomingReaction {
-                chat_id,
-                contact_id,
-                msg_id,
-                reaction,
-            } => IncomingReaction {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                reaction: reaction.as_str().to_string(),
-            },
-            CoreEventType::IncomingWebxdcNotify {
-                chat_id,
-                contact_id,
-                msg_id,
-                text,
-                href,
-            } => IncomingWebxdcNotify {
-                chat_id: chat_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                text,
-                href,
-            },
-            CoreEventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::IncomingMsgBunch => IncomingMsgBunch,
-            CoreEventType::MsgsNoticed(chat_id) => MsgsNoticed {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgFailed { chat_id, msg_id } => MsgFailed {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgRead { chat_id, msg_id } => MsgRead {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::MsgDeleted { chat_id, msg_id } => MsgDeleted {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::ChatModified(chat_id) => ChatModified {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::ChatEphemeralTimerModified { chat_id, timer } => {
-                ChatEphemeralTimerModified {
-                    chat_id: chat_id.to_u32(),
-                    timer: timer.to_u32(),
-                }
-            }
-            CoreEventType::ChatDeleted { chat_id } => ChatDeleted {
-                chat_id: chat_id.to_u32(),
-            },
-            CoreEventType::ContactsChanged(contact) => ContactsChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            CoreEventType::LocationChanged(contact) => LocationChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            CoreEventType::ConfigureProgress { progress, comment } => {
-                ConfigureProgress { progress, comment }
-            }
-            CoreEventType::ImexProgress(progress) => ImexProgress { progress },
-            CoreEventType::ImexFileWritten(path) => ImexFileWritten {
-                path: path.to_str().unwrap_or_default().to_owned(),
-            },
-            CoreEventType::SecurejoinInviterProgress {
-                contact_id,
-                progress,
-            } => SecurejoinInviterProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            CoreEventType::SecurejoinJoinerProgress {
-                contact_id,
-                progress,
-            } => SecurejoinJoinerProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            CoreEventType::ConnectivityChanged => ConnectivityChanged,
-            CoreEventType::SelfavatarChanged => SelfavatarChanged,
-            CoreEventType::ConfigSynced { key } => ConfigSynced {
-                key: key.to_string(),
-            },
-            CoreEventType::WebxdcStatusUpdate {
-                msg_id,
-                status_update_serial,
-            } => WebxdcStatusUpdate {
-                msg_id: msg_id.to_u32(),
-                status_update_serial: status_update_serial.to_u32(),
-            },
-            CoreEventType::WebxdcRealtimeData { msg_id, data } => WebxdcRealtimeData {
-                msg_id: msg_id.to_u32(),
-                data,
-            },
-            CoreEventType::WebxdcRealtimeAdvertisementReceived { msg_id } => {
-                WebxdcRealtimeAdvertisementReceived {
-                    msg_id: msg_id.to_u32(),
-                }
-            }
-            CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
-                msg_id: msg_id.to_u32(),
-            },
-            CoreEventType::AccountsBackgroundFetchDone => AccountsBackgroundFetchDone,
-            CoreEventType::ChatlistItemChanged { chat_id } => ChatlistItemChanged {
-                chat_id: chat_id.map(|id| id.to_u32()),
-            },
-            CoreEventType::ChatlistChanged => ChatlistChanged,
-            CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
-            CoreEventType::AccountsChanged => AccountsChanged,
-            CoreEventType::AccountsItemChanged => AccountsItemChanged,
-            #[allow(unreachable_patterns)]
-            #[cfg(test)]
-            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-use deltachat::net::HttpResponse as CoreHttpResponse;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-pub struct HttpResponse {
-    /// base64-encoded response body.
-    blob: String,
-
-    /// MIME type, e.g. "text/plain" or "text/html".
-    mimetype: Option<String>,
-
-    /// Encoding, e.g. "utf-8".
-    encoding: Option<String>,
-}
-
-impl From<CoreHttpResponse> for HttpResponse {
-    fn from(response: CoreHttpResponse) -> Self {
-        use base64::{engine::general_purpose, Engine as _};
-        let blob = general_purpose::STANDARD_NO_PAD.encode(response.blob);
-        let mimetype = response.mimetype;
-        let encoding = response.encoding;
-        HttpResponse {
-            blob,
-            mimetype,
-            encoding,
-        }
-    }
-}

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

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

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

@@ -1,179 +0,0 @@
-use anyhow::Result;
-use deltachat::login_param as dc;
-use serde::Deserialize;
-use serde::Serialize;
-use yerpc::TypeDef;
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct EnteredServerLoginParam {
-    /// Server hostname or IP address.
-    pub server: String,
-
-    /// Server port.
-    ///
-    /// 0 if not specified.
-    pub port: u16,
-
-    /// Socket security.
-    pub security: Socket,
-
-    /// Username.
-    ///
-    /// Empty string if not specified.
-    pub user: String,
-
-    /// Password.
-    pub password: String,
-}
-
-impl From<dc::EnteredServerLoginParam> for EnteredServerLoginParam {
-    fn from(param: dc::EnteredServerLoginParam) -> Self {
-        Self {
-            server: param.server,
-            port: param.port,
-            security: param.security.into(),
-            user: param.user,
-            password: param.password,
-        }
-    }
-}
-
-impl From<EnteredServerLoginParam> for dc::EnteredServerLoginParam {
-    fn from(param: EnteredServerLoginParam) -> Self {
-        Self {
-            server: param.server,
-            port: param.port,
-            security: param.security.into(),
-            user: param.user,
-            password: param.password,
-        }
-    }
-}
-
-/// Login parameters entered by the user.
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct EnteredLoginParam {
-    /// Email address.
-    pub addr: String,
-
-    /// IMAP settings.
-    pub imap: EnteredServerLoginParam,
-
-    /// SMTP settings.
-    pub smtp: EnteredServerLoginParam,
-
-    /// TLS options: whether to allow invalid certificates and/or
-    /// invalid hostnames
-    pub certificate_checks: EnteredCertificateChecks,
-
-    /// If true, login via OAUTH2 (not recommended anymore)
-    pub oauth2: bool,
-}
-
-impl From<dc::EnteredLoginParam> for EnteredLoginParam {
-    fn from(param: dc::EnteredLoginParam) -> Self {
-        Self {
-            addr: param.addr,
-            imap: param.imap.into(),
-            smtp: param.smtp.into(),
-            certificate_checks: param.certificate_checks.into(),
-            oauth2: param.oauth2,
-        }
-    }
-}
-
-impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
-    type Error = anyhow::Error;
-
-    fn try_from(param: EnteredLoginParam) -> Result<Self> {
-        Ok(Self {
-            addr: param.addr,
-            imap: param.imap.into(),
-            smtp: param.smtp.into(),
-            certificate_checks: param.certificate_checks.into(),
-            oauth2: param.oauth2,
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub enum Socket {
-    /// Unspecified socket security, select automatically.
-    Automatic,
-
-    /// TLS connection.
-    Ssl,
-
-    /// STARTTLS connection.
-    Starttls,
-
-    /// No TLS, plaintext connection.
-    Plain,
-}
-
-impl From<dc::Socket> for Socket {
-    fn from(value: dc::Socket) -> Self {
-        match value {
-            dc::Socket::Automatic => Self::Automatic,
-            dc::Socket::Ssl => Self::Ssl,
-            dc::Socket::Starttls => Self::Starttls,
-            dc::Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-impl From<Socket> for dc::Socket {
-    fn from(value: Socket) -> Self {
-        match value {
-            Socket::Automatic => Self::Automatic,
-            Socket::Ssl => Self::Ssl,
-            Socket::Starttls => Self::Starttls,
-            Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub enum EnteredCertificateChecks {
-    /// `Automatic` means that provider database setting should be taken.
-    /// If there is no provider database setting for certificate checks,
-    /// check certificates strictly.
-    Automatic,
-
-    /// Ensure that TLS certificate is valid for the server hostname.
-    Strict,
-
-    /// Accept certificates that are expired, self-signed
-    /// or otherwise not valid for the server hostname.
-    AcceptInvalidCertificates,
-}
-
-impl From<dc::EnteredCertificateChecks> for EnteredCertificateChecks {
-    fn from(value: dc::EnteredCertificateChecks) -> Self {
-        match value {
-            dc::EnteredCertificateChecks::Automatic => Self::Automatic,
-            dc::EnteredCertificateChecks::Strict => Self::Strict,
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates => {
-                Self::AcceptInvalidCertificates
-            }
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates2 => {
-                Self::AcceptInvalidCertificates
-            }
-        }
-    }
-}
-
-impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
-    fn from(value: EnteredCertificateChecks) -> Self {
-        match value {
-            EnteredCertificateChecks::Automatic => Self::Automatic,
-            EnteredCertificateChecks::Strict => Self::Strict,
-            EnteredCertificateChecks::AcceptInvalidCertificates => Self::AcceptInvalidCertificates,
-        }
-    }
-}

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

@@ -1,739 +0,0 @@
-use std::path::Path;
-
-use crate::api::VcardContact;
-use anyhow::{Context as _, Result};
-use deltachat::chat::Chat;
-use deltachat::chat::ChatItem;
-use deltachat::chat::ChatVisibility;
-use deltachat::contact::Contact;
-use deltachat::context::Context;
-use deltachat::download;
-use deltachat::message::Message;
-use deltachat::message::MsgId;
-use deltachat::message::Viewtype;
-use deltachat::reaction::get_msg_reactions;
-use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-use super::contact::ContactObject;
-use super::reactions::JSONRPCReactions;
-use super::webxdc::WebxdcMessageInfo;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-pub enum MessageLoadResult {
-    Message(MessageObject),
-    LoadingError { error: String },
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Message", rename_all = "camelCase")]
-pub struct MessageObject {
-    id: u32,
-    chat_id: u32,
-    from_id: u32,
-    quote: Option<MessageQuote>,
-    parent_id: Option<u32>,
-
-    text: String,
-
-    is_edited: bool,
-
-    /// Check if a message has a POI location bound to it.
-    /// These locations are also returned by `get_locations` method.
-    /// The UI may decide to display a special icon beside such messages.
-    has_location: bool,
-    has_html: bool,
-    view_type: MessageViewtype,
-    state: u32,
-
-    /// An error text, if there is one.
-    error: Option<String>,
-
-    timestamp: i64,
-    sort_timestamp: i64,
-    received_timestamp: i64,
-    has_deviating_timestamp: bool,
-
-    // summary - use/create another function if you need it
-    subject: String,
-    show_padlock: bool,
-    is_setupmessage: bool,
-    is_info: bool,
-    is_forwarded: bool,
-
-    /// True if the message was sent by a bot.
-    is_bot: bool,
-
-    /// when is_info is true this describes what type of system message it is
-    system_message_type: SystemMessageType,
-
-    duration: i32,
-    dimensions_height: i32,
-    dimensions_width: i32,
-
-    videochat_type: Option<u32>,
-    videochat_url: Option<String>,
-
-    override_sender_name: Option<String>,
-    sender: ContactObject,
-
-    setup_code_begin: Option<String>,
-
-    file: Option<String>,
-    file_mime: Option<String>,
-    file_bytes: u64,
-    file_name: Option<String>,
-
-    webxdc_info: Option<WebxdcMessageInfo>,
-
-    webxdc_href: Option<String>,
-
-    download_state: DownloadState,
-
-    original_msg_id: Option<u32>,
-
-    saved_message_id: Option<u32>,
-
-    reactions: Option<JSONRPCReactions>,
-
-    vcard_contact: Option<VcardContact>,
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(tag = "kind")]
-enum MessageQuote {
-    JustText {
-        text: String,
-    },
-    #[serde(rename_all = "camelCase")]
-    WithMessage {
-        text: String,
-        message_id: u32,
-        /// The quoted message does not always belong
-        /// to the same chat, e.g. when "Reply Privately" is used.
-        chat_id: u32,
-        author_display_name: String,
-        author_display_color: String,
-        override_sender_name: Option<String>,
-        image: Option<String>,
-        is_forwarded: bool,
-        view_type: MessageViewtype,
-    },
-}
-
-impl MessageObject {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Option<Self>> {
-        let Some(message) = Message::load_from_db_optional(context, msg_id).await? else {
-            return Ok(None);
-        };
-
-        let sender_contact = Contact::get_by_id(context, message.get_from_id())
-            .await
-            .context("failed to load sender contact")?;
-        let sender = ContactObject::try_from_dc_contact(context, sender_contact)
-            .await
-            .context("failed to load sender contact object")?;
-        let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
-        let override_sender_name = message.get_override_sender_name();
-
-        let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
-            Some(WebxdcMessageInfo::get_for_message(context, msg_id).await?)
-        } else {
-            None
-        };
-
-        let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
-
-        let download_state = message.download_state().into();
-
-        let quote = if let Some(quoted_text) = message.quoted_text() {
-            match message.quoted_message(context).await? {
-                Some(quote) => {
-                    let quote_author = Contact::get_by_id(context, quote.get_from_id())
-                        .await
-                        .context("failed to load quote author contact")?;
-                    Some(MessageQuote::WithMessage {
-                        text: quoted_text,
-                        message_id: quote.get_id().to_u32(),
-                        chat_id: quote.get_chat_id().to_u32(),
-                        author_display_name: quote_author.get_display_name().to_owned(),
-                        author_display_color: color_int_to_hex_string(quote_author.get_color()),
-                        override_sender_name: quote.get_override_sender_name(),
-                        image: if quote.get_viewtype() == Viewtype::Image
-                            || quote.get_viewtype() == Viewtype::Gif
-                            || quote.get_viewtype() == Viewtype::Sticker
-                        {
-                            match quote.get_file(context) {
-                                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                                None => None,
-                            }
-                        } else {
-                            None
-                        },
-                        is_forwarded: quote.is_forwarded(),
-                        view_type: quote.get_viewtype().into(),
-                    })
-                }
-                None => Some(MessageQuote::JustText { text: quoted_text }),
-            }
-        } else {
-            None
-        };
-
-        let reactions = get_msg_reactions(context, msg_id)
-            .await
-            .context("failed to load message reactions")?;
-        let reactions = if reactions.is_empty() {
-            None
-        } else {
-            Some(reactions.into())
-        };
-
-        let vcard_contacts: Vec<VcardContact> = message
-            .vcard_contacts(context)
-            .await?
-            .into_iter()
-            .map(Into::into)
-            .collect();
-
-        let message_object = MessageObject {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            from_id: message.get_from_id().to_u32(),
-            quote,
-            parent_id,
-            text: message.get_text(),
-            is_edited: message.is_edited(),
-            has_location: message.has_location(),
-            has_html: message.has_html(),
-            view_type: message.get_viewtype().into(),
-            state: message
-                .get_state()
-                .to_u32()
-                .context("state conversion to number failed")?,
-            error: message.error(),
-
-            timestamp: message.get_timestamp(),
-            sort_timestamp: message.get_sort_timestamp(),
-            received_timestamp: message.get_received_timestamp(),
-            has_deviating_timestamp: message.has_deviating_timestamp(),
-
-            subject: message.get_subject().to_owned(),
-            show_padlock: message.get_showpadlock(),
-            is_setupmessage: message.is_setupmessage(),
-            is_info: message.is_info(),
-            is_forwarded: message.is_forwarded(),
-            is_bot: message.is_bot(),
-            system_message_type: message.get_info_type().into(),
-
-            duration: message.get_duration(),
-            dimensions_height: message.get_height(),
-            dimensions_width: message.get_width(),
-
-            videochat_type: match message.get_videochat_type() {
-                Some(vct) => Some(
-                    vct.to_u32()
-                        .context("videochat type conversion to number failed")?,
-                ),
-                None => None,
-            },
-            videochat_url: message.get_videochat_url(),
-
-            override_sender_name,
-            sender,
-
-            setup_code_begin: message.get_setupcodebegin(context).await,
-
-            file: match message.get_file(context) {
-                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-                None => None,
-            }, //BLOBS
-            file_mime: message.get_filemime(),
-            file_bytes,
-            file_name: message.get_filename(),
-            webxdc_info,
-
-            // On a WebxdcInfoMessage this might include a hash holding
-            // information about a specific position or state in a webxdc app
-            webxdc_href: message.get_webxdc_href(),
-
-            download_state,
-
-            original_msg_id: message
-                .get_original_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-
-            saved_message_id: message
-                .get_saved_msg_id(context)
-                .await?
-                .map(|id| id.to_u32()),
-
-            reactions,
-
-            vcard_contact: vcard_contacts.first().cloned(),
-        };
-        Ok(Some(message_object))
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Viewtype")]
-pub enum MessageViewtype {
-    Unknown,
-
-    /// Text message.
-    Text,
-
-    /// Image message.
-    /// If the image is an animated GIF, the type `Viewtype.Gif` should be used.
-    Image,
-
-    /// Animated GIF message.
-    Gif,
-
-    /// Message containing a sticker, similar to image.
-    /// NB: When sending, the message viewtype may be changed to `Image` by some heuristics like
-    /// checking for transparent pixels. Use `Message::force_sticker()` to disable them.
-    ///
-    /// If possible, the ui should display the image without borders in a transparent way.
-    /// A click on a sticker will offer to install the sticker set in some future.
-    Sticker,
-
-    /// Message containing an Audio file.
-    Audio,
-
-    /// A voice message that was directly recorded by the user.
-    /// For all other audio messages, the type `Viewtype.Audio` should be used.
-    Voice,
-
-    /// Video messages.
-    Video,
-
-    /// Message containing any file, eg. a PDF.
-    File,
-
-    /// Message is an invitation to a videochat.
-    VideochatInvitation,
-
-    /// Message is an webxdc instance.
-    Webxdc,
-
-    /// Message containing shared contacts represented as a vCard (virtual contact file)
-    /// with email addresses and possibly other fields.
-    /// Use `parse_vcard()` to retrieve them.
-    Vcard,
-}
-
-impl From<Viewtype> for MessageViewtype {
-    fn from(viewtype: Viewtype) -> Self {
-        match viewtype {
-            Viewtype::Unknown => MessageViewtype::Unknown,
-            Viewtype::Text => MessageViewtype::Text,
-            Viewtype::Image => MessageViewtype::Image,
-            Viewtype::Gif => MessageViewtype::Gif,
-            Viewtype::Sticker => MessageViewtype::Sticker,
-            Viewtype::Audio => MessageViewtype::Audio,
-            Viewtype::Voice => MessageViewtype::Voice,
-            Viewtype::Video => MessageViewtype::Video,
-            Viewtype::File => MessageViewtype::File,
-            Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
-            Viewtype::Webxdc => MessageViewtype::Webxdc,
-            Viewtype::Vcard => MessageViewtype::Vcard,
-        }
-    }
-}
-
-impl From<MessageViewtype> for Viewtype {
-    fn from(viewtype: MessageViewtype) -> Self {
-        match viewtype {
-            MessageViewtype::Unknown => Viewtype::Unknown,
-            MessageViewtype::Text => Viewtype::Text,
-            MessageViewtype::Image => Viewtype::Image,
-            MessageViewtype::Gif => Viewtype::Gif,
-            MessageViewtype::Sticker => Viewtype::Sticker,
-            MessageViewtype::Audio => Viewtype::Audio,
-            MessageViewtype::Voice => Viewtype::Voice,
-            MessageViewtype::Video => Viewtype::Video,
-            MessageViewtype::File => Viewtype::File,
-            MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
-            MessageViewtype::Webxdc => Viewtype::Webxdc,
-            MessageViewtype::Vcard => Viewtype::Vcard,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-pub enum DownloadState {
-    Done,
-    Available,
-    Failure,
-    Undecipherable,
-    InProgress,
-}
-
-impl From<download::DownloadState> for DownloadState {
-    fn from(state: download::DownloadState) -> Self {
-        match state {
-            download::DownloadState::Done => DownloadState::Done,
-            download::DownloadState::Available => DownloadState::Available,
-            download::DownloadState::Failure => DownloadState::Failure,
-            download::DownloadState::Undecipherable => DownloadState::Undecipherable,
-            download::DownloadState::InProgress => DownloadState::InProgress,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-pub enum SystemMessageType {
-    Unknown,
-    GroupNameChanged,
-    GroupImageChanged,
-    MemberAddedToGroup,
-    MemberRemovedFromGroup,
-    AutocryptSetupMessage,
-    SecurejoinMessage,
-    LocationStreamingEnabled,
-    LocationOnly,
-    InvalidUnencryptedMail,
-
-    /// 1:1 chats info message telling that SecureJoin has started and the user should wait for it
-    /// to complete.
-    SecurejoinWait,
-
-    /// 1:1 chats info message telling that SecureJoin is still running, but the user may already
-    /// send messages.
-    SecurejoinWaitTimeout,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged,
-
-    // Chat protection state changed
-    ChatProtectionEnabled,
-    ChatProtectionDisabled,
-
-    /// Self-sent-message that contains only json used for multi-device-sync;
-    /// if possible, we attach that to other messages as for locations.
-    MultiDeviceSync,
-
-    // Sync message that contains a json payload
-    // sent to the other webxdc instances
-    // These messages are not shown in the chat.
-    WebxdcStatusUpdate,
-
-    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
-    WebxdcInfoMessage,
-
-    /// This message contains a users iroh node address.
-    IrohNodeAddr,
-}
-
-impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
-    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
-        use deltachat::mimeparser::SystemMessage;
-        match system_message_type {
-            SystemMessage::Unknown => SystemMessageType::Unknown,
-            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
-            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
-            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
-            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
-            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
-            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
-            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
-            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
-            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
-            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
-            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
-            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
-            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-            SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
-            SystemMessage::IrohNodeAddr => SystemMessageType::IrohNodeAddr,
-            SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
-            SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    id: u32,
-    chat_id: u32,
-    account_id: u32,
-
-    image: Option<String>,
-    image_mime_type: Option<String>,
-
-    chat_name: String,
-    chat_profile_image: Option<String>,
-
-    /// also known as summary_text1
-    summary_prefix: Option<String>,
-    /// also known as summary_text2
-    summary_text: String,
-}
-
-impl MessageNotificationInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-
-        let image = if matches!(
-            message.get_viewtype(),
-            Viewtype::Image | Viewtype::Gif | Viewtype::Sticker
-        ) {
-            message
-                .get_file(context)
-                .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        let chat_profile_image = chat
-            .get_profile_image(context)
-            .await?
-            .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-            .unwrap_or_default();
-
-        let summary = message.get_summary(context, Some(&chat)).await?;
-
-        Ok(MessageNotificationInfo {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            account_id: context.get_id(),
-            image,
-            image_mime_type: message.get_filemime(),
-            chat_name: chat.name,
-            chat_profile_image,
-            summary_prefix: summary.prefix.map(|s| s.to_string()),
-            summary_text: summary.text,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageSearchResult {
-    id: u32,
-    author_profile_image: Option<String>,
-    /// if sender name if overridden it will show it as ~alias
-    author_name: String,
-    author_color: String,
-    author_id: u32,
-    chat_id: u32,
-    chat_profile_image: Option<String>,
-    chat_color: String,
-    chat_name: String,
-    chat_type: u32,
-    is_chat_protected: bool,
-    is_chat_contact_request: bool,
-    is_chat_archived: bool,
-    message: String,
-    timestamp: i64,
-}
-
-impl MessageSearchResult {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::get_by_id(context, message.get_from_id()).await?;
-
-        let profile_image = match sender.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-        let chat_profile_image = match chat.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        let author_name = if let Some(name) = message.get_override_sender_name() {
-            format!("~{name}")
-        } else {
-            sender.get_display_name().to_owned()
-        };
-        let chat_color = color_int_to_hex_string(chat.get_color(context).await?);
-
-        Ok(Self {
-            id: msg_id.to_u32(),
-            author_profile_image: profile_image,
-            author_name,
-            author_color: color_int_to_hex_string(sender.get_color()),
-            author_id: sender.id.to_u32(),
-            chat_id: chat.id.to_u32(),
-            chat_name: chat.get_name().to_owned(),
-            chat_color,
-            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
-            chat_profile_image,
-            is_chat_protected: chat.is_protected(),
-            is_chat_contact_request: chat.is_contact_request(),
-            is_chat_archived: chat.get_visibility() == ChatVisibility::Archived,
-            message: message.get_text(),
-            timestamp: message.get_timestamp(),
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
-pub enum JSONRPCMessageListItem {
-    Message {
-        msg_id: u32,
-    },
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers, in unix milliseconds
-        timestamp: i64,
-    },
-}
-
-impl From<ChatItem> for JSONRPCMessageListItem {
-    fn from(item: ChatItem) -> Self {
-        match item {
-            ChatItem::Message { msg_id } => JSONRPCMessageListItem::Message {
-                msg_id: msg_id.to_u32(),
-            },
-            ChatItem::DayMarker { timestamp } => JSONRPCMessageListItem::DayMarker { timestamp },
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageData {
-    pub text: Option<String>,
-    pub html: Option<String>,
-    pub viewtype: Option<MessageViewtype>,
-    pub file: Option<String>,
-    pub filename: Option<String>,
-    pub location: Option<(f64, f64)>,
-    pub override_sender_name: Option<String>,
-    /// Quoted message id. Takes preference over `quoted_text` (see below).
-    pub quoted_message_id: Option<u32>,
-    pub quoted_text: Option<String>,
-}
-
-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_and_deduplicate(
-                context,
-                Path::new(&file),
-                self.filename.as_deref(),
-                None,
-            )?;
-        }
-        if let Some((latitude, longitude)) = self.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = self.quoted_message_id {
-            let quoted_message = Message::load_from_db(context, MsgId::new(id))
-                .await
-                .context("Failed to load quoted message")?;
-            message
-                .set_quote(context, Some(&quoted_message))
-                .await
-                .context("Failed to set quote")?;
-        } else if let Some(text) = self.quoted_text {
-            let protect = false;
-            message.set_quote_text(Some((text, protect)));
-        }
-        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: 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 = "kind")]
-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/mod.rs

@@ -1,26 +0,0 @@
-pub mod account;
-pub mod basic_message;
-pub mod chat;
-pub mod chat_list;
-pub mod contact;
-pub mod events;
-pub mod http;
-pub mod location;
-pub mod login_param;
-pub mod message;
-pub mod provider_info;
-pub mod qr;
-pub mod reactions;
-pub mod webxdc;
-
-pub fn color_int_to_hex_string(color: u32) -> String {
-    format!("{color:#08x}").replace("0x", "#")
-}
-
-fn maybe_empty_string_to_option(string: String) -> Option<String> {
-    if string.is_empty() {
-        None
-    } else {
-        Some(string)
-    }
-}

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

@@ -1,25 +0,0 @@
-use deltachat::provider::Provider;
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-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.
-}
-
-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/api/types/qr.rs

@@ -1,313 +0,0 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "kind")]
-pub enum QrObject {
-    /// Ask the user whether to verify the contact.
-    ///
-    /// If the user agrees, pass this QR code to [`crate::securejoin::join_securejoin`].
-    AskVerifyContact {
-        /// ID of the contact.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// Ask the user whether to join the group.
-    AskVerifyGroup {
-        /// Group name.
-        grpname: String,
-        /// Group ID.
-        grpid: String,
-        /// ID of the contact.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// Contact fingerprint is verified.
-    ///
-    /// Ask the user if they want to start chatting.
-    FprOk {
-        /// Contact ID.
-        contact_id: u32,
-    },
-    /// Scanned fingerprint does not match the last seen fingerprint.
-    FprMismatch {
-        /// Contact ID.
-        contact_id: Option<u32>,
-    },
-    /// The scanned QR code contains a fingerprint but no e-mail address.
-    FprWithoutAddr {
-        /// Key fingerprint.
-        fingerprint: String,
-    },
-    /// Ask the user if they want to create an account on the given domain.
-    Account {
-        /// Server domain name.
-        domain: String,
-    },
-    /// Provides a backup that can be retrieved using iroh-net based backup transfer protocol.
-    Backup2 {
-        /// Authentication token.
-        auth_token: String,
-        /// Iroh node address.
-        node_addr: String,
-    },
-    BackupTooNew {},
-    /// Ask the user if they want to use the given service for video chats.
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    /// Ask the user if they want to use the given proxy.
-    ///
-    /// Note that HTTP(S) URLs without a path
-    /// and query parameters are treated as HTTP(S) proxy URL.
-    /// UI may want to still offer to open the URL
-    /// in the browser if QR code contents
-    /// starts with `http://` or `https://`
-    /// and the QR code was not scanned from
-    /// the proxy configuration screen.
-    Proxy {
-        /// Proxy URL.
-        ///
-        /// This is the URL that is going to be added.
-        url: String,
-        /// Host extracted from the URL to display in the UI.
-        host: String,
-        /// Port extracted from the URL to display in the UI.
-        port: u16,
-    },
-    /// Contact address is scanned.
-    ///
-    /// Optionally, a draft message could be provided.
-    /// Ask the user if they want to start chatting.
-    Addr {
-        /// Contact ID.
-        contact_id: u32,
-        /// Draft message.
-        draft: Option<String>,
-    },
-    /// URL scanned.
-    ///
-    /// Ask the user if they want to open a browser or copy the URL to clipboard.
-    Url {
-        url: String,
-    },
-    /// Text scanned.
-    ///
-    /// Ask the user if they want to copy the text to clipboard.
-    Text {
-        text: String,
-    },
-    /// Ask the user if they want to withdraw their own QR code.
-    WithdrawVerifyContact {
-        /// Contact ID.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// Ask the user if they want to withdraw their own group invite QR code.
-    WithdrawVerifyGroup {
-        /// Group name.
-        grpname: String,
-        /// Group ID.
-        grpid: String,
-        /// Contact ID.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// Ask the user if they want to revive their own QR code.
-    ReviveVerifyContact {
-        /// Contact ID.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// Ask the user if they want to revive their own group invite QR code.
-    ReviveVerifyGroup {
-        /// Contact ID.
-        grpname: String,
-        /// Group ID.
-        grpid: String,
-        /// Contact ID.
-        contact_id: u32,
-        /// Fingerprint of the contact key as scanned from the QR code.
-        fingerprint: String,
-        /// Invite number.
-        invitenumber: String,
-        /// Authentication code.
-        authcode: String,
-    },
-    /// `dclogin:` scheme parameters.
-    ///
-    /// Ask the user if they want to login with the email address.
-    Login {
-        address: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::Backup2 {
-                ref node_addr,
-                auth_token,
-            } => QrObject::Backup2 {
-                node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
-                auth_token,
-            },
-            Qr::BackupTooNew {} => QrObject::BackupTooNew {},
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Proxy { url, host, port } => QrObject::Proxy { url, host, port },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}

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

@@ -1,72 +0,0 @@
-use std::collections::BTreeMap;
-
-use deltachat::contact::ContactId;
-use deltachat::reaction::Reactions;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-/// A single reaction emoji.
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Reaction", rename_all = "camelCase")]
-pub struct JSONRPCReaction {
-    /// Emoji.
-    emoji: String,
-
-    /// Emoji frequency.
-    count: usize,
-
-    /// True if we reacted with this emoji.
-    is_from_self: bool,
-}
-
-/// Structure representing all reactions to a particular message.
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "Reactions", rename_all = "camelCase")]
-pub struct JSONRPCReactions {
-    /// Map from a contact to it's reaction to message.
-    reactions_by_contact: BTreeMap<u32, Vec<String>>,
-    /// Unique reactions and their count, sorted in descending order.
-    reactions: Vec<JSONRPCReaction>,
-}
-
-impl From<Reactions> for JSONRPCReactions {
-    fn from(reactions: Reactions) -> Self {
-        let mut reactions_by_contact: BTreeMap<u32, Vec<String>> = BTreeMap::new();
-
-        for contact_id in reactions.contacts() {
-            let reaction = reactions.get(contact_id);
-            if reaction.is_empty() {
-                continue;
-            }
-            let emojis: Vec<String> = reaction
-                .emojis()
-                .into_iter()
-                .map(|emoji| emoji.to_owned())
-                .collect();
-            reactions_by_contact.insert(contact_id.to_u32(), emojis.clone());
-        }
-
-        let self_reactions = reactions_by_contact.get(&ContactId::SELF.to_u32());
-
-        let mut reactions_v = Vec::new();
-        for (emoji, count) in reactions.emoji_sorted_by_frequency() {
-            let is_from_self = if let Some(self_reactions) = self_reactions {
-                self_reactions.contains(&emoji)
-            } else {
-                false
-            };
-
-            let reaction = JSONRPCReaction {
-                emoji,
-                count,
-                is_from_self,
-            };
-            reactions_v.push(reaction)
-        }
-
-        JSONRPCReactions {
-            reactions_by_contact,
-            reactions: reactions_v,
-        }
-    }
-}

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

@@ -1,79 +0,0 @@
-use deltachat::{
-    context::Context,
-    message::{Message, MsgId},
-    webxdc::WebxdcInfo,
-};
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::maybe_empty_string_to_option;
-
-#[derive(Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "WebxdcMessageInfo", rename_all = "camelCase")]
-pub struct WebxdcMessageInfo {
-    /// The name of the app.
-    ///
-    /// Defaults to the filename if not set in the manifest.
-    name: String,
-    /// App icon file name.
-    /// Defaults to an standard icon if nothing is set in the manifest.
-    ///
-    /// To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
-    ///
-    /// App icons should should be square,
-    /// the implementations will add round corners etc. as needed.
-    icon: String,
-    /// if the Webxdc represents a document, then this is the name of the document
-    document: Option<String>,
-    /// short string describing the state of the app,
-    /// sth. as "2 votes", "Highscore: 123",
-    /// can be changed by the apps
-    summary: Option<String>,
-    /// URL where the source code of the Webxdc and other information can be found;
-    /// defaults to an empty string.
-    /// Implementations may offer an menu or a button to open this URL.
-    source_code_url: Option<String>,
-    /// True if full internet access should be granted to the app.
-    internet_access: bool,
-    /// Address to be used for `window.webxdc.selfAddr` in JS land.
-    self_addr: String,
-    /// Milliseconds to wait before calling `sendUpdate()` again since the last call.
-    /// Should be exposed to `window.sendUpdateInterval` in JS land.
-    send_update_interval: usize,
-    /// Maximum number of bytes accepted for a serialized update object.
-    /// Should be exposed to `window.sendUpdateMaxSize` in JS land.
-    send_update_max_size: usize,
-}
-
-impl WebxdcMessageInfo {
-    pub async fn get_for_message(
-        context: &Context,
-        instance_message_id: MsgId,
-    ) -> anyhow::Result<Self> {
-        let message = Message::load_from_db(context, instance_message_id).await?;
-        let WebxdcInfo {
-            name,
-            icon,
-            document,
-            summary,
-            source_code_url,
-            request_integration: _,
-            internet_access,
-            self_addr,
-            send_update_interval,
-            send_update_max_size,
-        } = message.get_webxdc_info(context).await?;
-
-        Ok(Self {
-            name,
-            icon,
-            document: maybe_empty_string_to_option(document),
-            summary: maybe_empty_string_to_option(summary),
-            source_code_url: maybe_empty_string_to_option(source_code_url),
-            internet_access,
-            self_addr,
-            send_update_interval,
-            send_update_max_size,
-        })
-    }
-}

deltachat-jsonrpc/src/lib.rs

@@ -1,97 +0,0 @@
-#![recursion_limit = "256"]
-#![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
-#![cfg_attr(not(test), forbid(clippy::string_slice))]
-pub mod api;
-pub use yerpc;
-
-#[cfg(test)]
-mod tests {
-    use async_channel::unbounded;
-    use futures::StreamExt;
-    use tempfile::TempDir;
-    use yerpc::{RpcClient, RpcSession};
-
-    use super::api::{Accounts, CommandApi};
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
-        let tmp_dir = TempDir::new().unwrap().path().into();
-        let writable = true;
-        let accounts = Accounts::new(tmp_dir, writable).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, receiver) = unbounded::<String>();
-
-        let (client, mut rx) = RpcClient::new();
-        let session = RpcSession::new(client, api);
-        tokio::spawn({
-            async move {
-                while let Some(message) = rx.next().await {
-                    let message = serde_json::to_string(&message)?;
-                    sender.send(message).await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        {
-            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?;
-            println!("{result:?}");
-            assert_eq!(result, 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?;
-            println!("{result:?}");
-            assert_eq!(result, response.to_owned());
-        }
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_batch_set_config() -> anyhow::Result<()> {
-        let tmp_dir = TempDir::new().unwrap().path().into();
-        let writable = true;
-        let accounts = Accounts::new(tmp_dir, writable).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, receiver) = unbounded::<String>();
-
-        let (client, mut rx) = RpcClient::new();
-        let session = RpcSession::new(client, api);
-        tokio::spawn({
-            async move {
-                while let Some(message) = rx.next().await {
-                    let message = serde_json::to_string(&message)?;
-                    sender.send(message).await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        {
-            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 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":""}]}"#;
-            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());
-        }
-
-        Ok(())
-    }
-}

deltachat-jsonrpc/typescript/.gitignore

@@ -1,9 +0,0 @@
-node_modules
-dist
-test_dist
-coverage
-yarn.lock
-package-lock.json
-docs
-accounts
-generated

deltachat-jsonrpc/typescript/.npmignore

@@ -1,12 +0,0 @@
-node_modules
-accounts
-docs
-coverage
-yarn*
-package-lock.json
-.prettierignore
-example.html
-report_api_coverage.mjs
-scripts
-dist/example
-dist/test

deltachat-jsonrpc/typescript/.prettierignore

@@ -1,3 +0,0 @@
-coverage
-dist
-generated

deltachat-jsonrpc/typescript/deltachat.ts

@@ -1 +0,0 @@
-export * from "./src/lib.js";

deltachat-jsonrpc/typescript/package.json

@@ -1,58 +0,0 @@
-{
-  "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
-  "dependencies": {
-    "@deltachat/tiny-emitter": "3.0.0",
-    "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.6.2"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.0.0",
-    "@types/ws": "^7.2.4",
-    "c8": "^7.10.0",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.17.9",
-    "http-server": "^14.1.1",
-    "mocha": "^9.1.1",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
-    "typedoc": "^0.23.2",
-    "typescript": "^4.5.5",
-    "ws": "^8.5.0"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs",
-      "types": "./dist/deltachat.d.ts"
-    }
-  },
-  "license": "MPL-2.0",
-  "main": "dist/deltachat.js",
-  "name": "@deltachat/jsonrpc-client",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chatmail/core.git"
-  },
-  "scripts": {
-    "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
-    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
-    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
-    "build:tsc": "tsc",
-    "docs": "typedoc --out docs deltachat.ts",
-    "extract-constants": "node ./scripts/generate-constants.js",
-    "generate-bindings": "cargo test",
-    "prettier:check": "prettier --check .",
-    "prettier:fix": "prettier --write .",
-    "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
-    "test:report-coverage": "node report_api_coverage.mjs",
-    "test:run": "mocha dist/test",
-    "test:run-coverage": "COVERAGE=1 NODE_OPTIONS=--enable-source-maps c8 --include 'dist/*' -r text -r html -r json mocha dist/test"
-  },
-  "type": "module",
-  "types": "dist/deltachat.d.ts",
-  "version": "1.157.3"
-}

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -1,28 +0,0 @@
-import { readFileSync } from "fs";
-// only checks for the coverage of the api functions in bindings.ts for now
-const generatedFile = "typescript/generated/client.ts";
-const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
-const jsonCoverage =
-  json[Object.keys(json).find((k) => k.includes(generatedFile))];
-const fnMap = Object.keys(jsonCoverage.fnMap).map(
-  (key) => jsonCoverage.fnMap[key]
-);
-const htmlCoverage = readFileSync(
-  "./coverage/" + generatedFile + ".html",
-  "utf8"
-);
-const uncoveredLines = htmlCoverage
-  .split("\n")
-  .filter((line) => line.includes(`"function not covered"`));
-const uncoveredFunctions = uncoveredLines.map(
-  (line) => />([\w_]+)\(/.exec(line)[1]
-);
-console.log(
-  "\nUncovered api functions:\n" +
-    uncoveredFunctions
-      .map((uF) => fnMap.find(({ name }) => name === uF))
-      .map(
-        ({ name, line }) => `.${name.padEnd(40)}  (${generatedFile}:${line})`
-      )
-      .join("\n")
-);

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

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

deltachat-jsonrpc/typescript/src/client.ts

@@ -1,106 +0,0 @@
-import * as T from "../generated/types.js";
-import { EventType } from "../generated/types.js";
-import * as RPC from "../generated/jsonrpc.js";
-import { RawClient } from "../generated/client.js";
-import { BaseTransport, Request } from "yerpc";
-import { TinyEmitter } from "@deltachat/tiny-emitter";
-
-type Events = { ALL: (accountId: number, event: EventType) => void } & {
-  [Property in EventType["kind"]]: (
-    accountId: number,
-    event: Extract<EventType, { kind: Property }>
-  ) => void;
-};
-
-type ContextEvents = { ALL: (event: EventType) => void } & {
-  [Property in EventType["kind"]]: (
-    event: Extract<EventType, { kind: Property }>
-  ) => void;
-};
-
-export type DcEvent = EventType;
-export type DcEventType<T extends EventType["kind"]> = Extract<
-  EventType,
-  { kind: T }
->;
-
-export class BaseDeltaChat<
-  Transport extends BaseTransport<any>
-> extends TinyEmitter<Events> {
-  rpc: RawClient;
-  account?: T.Account;
-  private contextEmitters: { [key: number]: TinyEmitter<ContextEvents> } = {};
-
-  //@ts-ignore
-  private eventTask: Promise<void>;
-
-  constructor(public transport: Transport, startEventLoop: boolean) {
-    super();
-    this.rpc = new RawClient(this.transport);
-    if (startEventLoop) {
-      this.eventTask = this.eventLoop();
-    }
-  }
-
-  async eventLoop(): Promise<void> {
-    while (true) {
-      const event = await this.rpc.getNextEvent();
-      //@ts-ignore
-      this.emit(event.event.kind, event.contextId, event.event);
-      this.emit("ALL", event.contextId, event.event);
-
-      if (this.contextEmitters[event.contextId]) {
-        this.contextEmitters[event.contextId].emit(
-          event.event.kind,
-          //@ts-ignore
-          event.event as any
-        );
-        this.contextEmitters[event.contextId].emit("ALL", event.event as any);
-      }
-    }
-  }
-
-  async listAccounts(): Promise<T.Account[]> {
-    return await this.rpc.getAllAccounts();
-  }
-
-  getContextEvents(account_id: number) {
-    if (this.contextEmitters[account_id]) {
-      return this.contextEmitters[account_id];
-    } else {
-      this.contextEmitters[account_id] = new TinyEmitter();
-      return this.contextEmitters[account_id];
-    }
-  }
-}
-
-export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
-  close() {}
-  constructor(input: any, output: any, startEventLoop: boolean) {
-    const transport = new StdioTransport(input, output);
-    super(transport, startEventLoop);
-  }
-}
-
-export class StdioTransport extends BaseTransport {
-  constructor(public input: any, public output: any) {
-    super();
-
-    var buffer = "";
-    this.output.on("data", (data: any) => {
-      buffer += data.toString();
-      while (buffer.includes("\n")) {
-        const n = buffer.indexOf("\n");
-        const line = buffer.substring(0, n);
-        const message = JSON.parse(line);
-        this._onmessage(message);
-        buffer = buffer.substring(n + 1);
-      }
-    });
-  }
-
-  _send(message: any): void {
-    const serialized = JSON.stringify(message);
-    this.input.write(serialized + "\n");
-  }
-}

deltachat-jsonrpc/typescript/src/lib.ts

@@ -1,6 +0,0 @@
-export * as RPC from "../generated/jsonrpc.js";
-export * as T from "../generated/types.js";
-export { RawClient } from "../generated/client.js";
-export * from "./client.js";
-export * as yerpc from "yerpc";
-export { C } from "../generated/constants.js";

deltachat-jsonrpc/typescript/test/basic.ts

@@ -1,161 +0,0 @@
-import { strictEqual } from "assert";
-import chai, { assert, expect } from "chai";
-import chaiAsPromised from "chai-as-promised";
-chai.use(chaiAsPromised);
-import { StdioDeltaChat as DeltaChat } from "../deltachat.js";
-
-import { RpcServerHandle, startServer } from "./test_base.js";
-
-describe("basic tests", () => {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
-
-  before(async () => {
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout, true);
-    // dc.on("ALL", (event) => {
-    //console.log("event", event);
-    // });
-  });
-
-  after(async () => {
-    dc && dc.close();
-    await serverHandle.close();
-  });
-
-  it("check email address validity", async () => {
-    const validAddresses = [
-      "email@example.com",
-      "36aa165ae3406424e0c61af17700f397cad3fe8ab83d682d0bddf3338a5dd52e@yggmail@yggmail",
-    ];
-    const invalidAddresses = ["email@", "example.com", "emai221"];
-
-    expect(
-      await Promise.all(
-        validAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
-    ).to.not.contain(false);
-
-    expect(
-      await Promise.all(
-        invalidAddresses.map((email) => dc.rpc.checkEmailValidity(email))
-      )
-    ).to.not.contain(true);
-  });
-
-  it("system info", async () => {
-    const systemInfo = await dc.rpc.getSystemInfo();
-    expect(systemInfo).to.contain.keys([
-      "arch",
-      "num_cpus",
-      "deltachat_core_version",
-      "sqlite_version",
-    ]);
-  });
-
-  describe("account management", () => {
-    it("should create account", async () => {
-      const res = await dc.rpc.addAccount();
-      assert((await dc.rpc.getAllAccountIds()).length === 1);
-    });
-
-    it("should remove the account again", async () => {
-      await dc.rpc.removeAccount((await dc.rpc.getAllAccountIds())[0]);
-      assert((await dc.rpc.getAllAccountIds()).length === 0);
-    });
-
-    it("should create multiple accounts", async () => {
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      await dc.rpc.addAccount();
-      assert((await dc.rpc.getAllAccountIds()).length === 4);
-    });
-  });
-
-  describe("contact management", function () {
-    let accountId: number;
-    before(async () => {
-      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",
-        null
-      );
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
-        .false;
-      await dc.rpc.blockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
-        .true;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(1);
-      await dc.rpc.unblockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
-        .false;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(0);
-    });
-  });
-
-  describe("configuration", function () {
-    let accountId: number;
-    before(async () => {
-      accountId = await dc.rpc.addAccount();
-    });
-
-    it("set and retrieve", async function () {
-      await dc.rpc.setConfig(accountId, "addr", "valid@email");
-      assert((await dc.rpc.getConfig(accountId, "addr")) == "valid@email");
-    });
-    it("set invalid key should throw", async function () {
-      await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to
-        .be.eventually.rejected;
-    });
-    it("get invalid key should throw", async function () {
-      await expect(dc.rpc.getConfig(accountId, "invalid_key")).to.be.eventually
-        .rejected;
-    });
-    it("set and retrieve ui.*", async function () {
-      await dc.rpc.setConfig(accountId, "ui.chat_bg", "color:red");
-      assert((await dc.rpc.getConfig(accountId, "ui.chat_bg")) == "color:red");
-    });
-    it("set and retrieve (batch)", async function () {
-      const config = { addr: "valid@email", mail_pw: "1234" };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
-      expect(retrieved).to.deep.equal(config);
-    });
-    it("set and retrieve ui.* (batch)", async function () {
-      const config = {
-        "ui.chat_bg": "color:green",
-        "ui.enter_key_sends": "true",
-      };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
-      expect(retrieved).to.deep.equal(config);
-    });
-    it("set and retrieve mixed(ui and core) (batch)", async function () {
-      const config = {
-        "ui.chat_bg": "color:yellow",
-        "ui.enter_key_sends": "false",
-        addr: "valid2@email",
-        mail_pw: "123456",
-      };
-      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
-      expect(retrieved).to.deep.equal(config);
-    });
-  });
-});

deltachat-jsonrpc/typescript/test/online.ts

@@ -1,191 +0,0 @@
-import { assert, expect } from "chai";
-import { StdioDeltaChat as DeltaChat, DcEvent } from "../deltachat.js";
-import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
-
-const EVENT_TIMEOUT = 20000;
-
-describe("online tests", function () {
-  let serverHandle: RpcServerHandle;
-  let dc: DeltaChat;
-  let account1: { email: string; password: string };
-  let account2: { email: string; password: string };
-  let accountId1: number, accountId2: number;
-
-  before(async function () {
-    this.timeout(60000);
-    if (!process.env.CHATMAIL_DOMAIN) {
-      if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
-        console.error(
-          "CAN NOT RUN COVERAGE correctly: Missing CHATMAIL_DOMAIN environment variable!\n\n",
-          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
-        );
-        process.exit(1);
-      }
-      console.log(
-        "Missing CHATMAIL_DOMAIN environment variable!, skip integration tests"
-      );
-      this.skip();
-    }
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout, true);
-
-    dc.on("ALL", (contextId, { kind }) => {
-      if (kind !== "Info") console.log(contextId, kind);
-    });
-
-    account1 = createTempUser(process.env.CHATMAIL_DOMAIN);
-    if (!account1 || !account1.email || !account1.password) {
-      console.log(
-        "We didn't got back an account from the api, skip integration tests"
-      );
-      this.skip();
-    }
-
-    account2 = createTempUser(process.env.CHATMAIL_DOMAIN);
-    if (!account2 || !account2.email || !account2.password) {
-      console.log(
-        "We didn't got back an account2 from the api, skip integration tests"
-      );
-      this.skip();
-    }
-  });
-
-  after(async () => {
-    dc && dc.close();
-    serverHandle && (await serverHandle.close());
-  });
-
-  let accountsConfigured = false;
-
-  it("configure test accounts", async function () {
-    this.timeout(40000);
-
-    accountId1 = await dc.rpc.addAccount();
-    await dc.rpc.setConfig(accountId1, "addr", account1.email);
-    await dc.rpc.setConfig(accountId1, "mail_pw", account1.password);
-    await dc.rpc.configure(accountId1);
-
-    accountId2 = await dc.rpc.addAccount();
-    await dc.rpc.batchSetConfig(accountId2, {
-      addr: account2.email,
-      mail_pw: account2.password,
-    });
-    await dc.rpc.configure(accountId2);
-    accountsConfigured = true;
-  });
-
-  it("send and receive text message", async function () {
-    if (!accountsConfigured) {
-      this.skip();
-    }
-    this.timeout(15000);
-
-    const contactId = await dc.rpc.createContact(
-      accountId1,
-      account2.email,
-      null
-    );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
-
-    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
-    const { chatId: chatIdOnAccountB } = await eventPromise;
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
-      accountId2,
-      chatIdOnAccountB,
-      false,
-      false
-    );
-
-    expect(messageList).have.length(1);
-    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
-    expect(message.text).equal("Hello");
-  });
-
-  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
-    if (!accountsConfigured) {
-      this.skip();
-    }
-    this.timeout(10000);
-
-    // send message from A to B
-    const contactId = await dc.rpc.createContact(
-      accountId1,
-      account2.email,
-      null
-    );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
-    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
-    // wait for message from A
-    console.log("wait for message from A");
-
-    const event = await eventPromise;
-    const { chatId: chatIdOnAccountB } = event;
-
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
-      accountId2,
-      chatIdOnAccountB,
-      false,
-      false
-    );
-    const message = await dc.rpc.getMessage(
-      accountId2,
-      messageList.reverse()[0]
-    );
-    expect(message.text).equal("Hello2");
-    // Send message back from B to A
-    const eventPromise2 = waitForEvent(dc, "IncomingMsg", accountId1);
-    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
-    // Check if answer arrives at A and if it is encrypted
-    await eventPromise2;
-
-    const messageId = (
-      await dc.rpc.getMessageIds(accountId1, chatId, false, false)
-    ).reverse()[0];
-    const message2 = await dc.rpc.getMessage(accountId1, messageId);
-    expect(message2.text).equal("super secret message");
-    expect(message2.showPadlock).equal(true);
-  });
-
-  it("get provider info for example.com", async () => {
-    const acc = await dc.rpc.addAccount();
-    const info = await dc.rpc.getProviderInfo(acc, "example.com");
-    expect(info).to.be.not.null;
-    expect(info?.overviewPage).to.equal(
-      "https://providers.delta.chat/example-com"
-    );
-    expect(info?.status).to.equal(3);
-  });
-
-  it("get provider info - domain and email should give same result", async () => {
-    const acc = await dc.rpc.addAccount();
-    const info_domain = await dc.rpc.getProviderInfo(acc, "example.com");
-    const info_email = await dc.rpc.getProviderInfo(acc, "hi@example.com");
-    expect(info_email).to.deep.equal(info_domain);
-  });
-});
-
-async function waitForEvent<T extends DcEvent["kind"]>(
-  dc: DeltaChat,
-  eventType: T,
-  accountId: number,
-  timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { kind: T }>> {
-  return new Promise((resolve, reject) => {
-    const rejectTimeout = setTimeout(
-      () => reject(new Error("Timeout reached before event came in")),
-      timeout
-    );
-    const callback = (contextId: number, event: DcEvent) => {
-      if (contextId == accountId) {
-        dc.off(eventType, callback);
-        clearTimeout(rejectTimeout);
-        resolve(event as any);
-      }
-    };
-    dc.on(eventType, callback);
-  });
-}

deltachat-jsonrpc/typescript/test/test_base.ts

@@ -1,89 +0,0 @@
-import { tmpdir } from "os";
-import { join, resolve } from "path";
-import { mkdtemp, rm } from "fs/promises";
-import { spawn, exec } from "child_process";
-import { Readable, Writable } from "node:stream";
-
-export type RpcServerHandle = {
-  stdin: Writable;
-  stdout: Readable;
-  close: () => Promise<void>;
-};
-
-export async function startServer(): Promise<RpcServerHandle> {
-  const tmpDir = await mkdtemp(join(tmpdir(), "deltachat-jsonrpc-test"));
-
-  const pathToServerBinary = resolve(
-    join(await getTargetDir(), "debug/deltachat-rpc-server")
-  );
-
-  const server = spawn(pathToServerBinary, {
-    cwd: tmpDir,
-    env: {
-      RUST_LOG: process.env.RUST_LOG || "info",
-      RUST_MIN_STACK: "8388608",
-    },
-  });
-
-  server.on("error", (err) => {
-    throw new Error(
-      "Failed to start server executable " +
-        pathToServerBinary +
-        ", make sure you built it first."
-    );
-  });
-  let shouldClose = false;
-
-  server.on("exit", () => {
-    if (shouldClose) {
-      return;
-    }
-    throw new Error("Server quit");
-  });
-
-  server.stderr.pipe(process.stderr);
-
-  return {
-    stdin: server.stdin,
-    stdout: server.stdout,
-    close: async () => {
-      shouldClose = true;
-      if (!server.kill()) {
-        console.log("server termination failed");
-      }
-      await rm(tmpDir, { recursive: true });
-    },
-  };
-}
-
-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 };
-}
-
-function getTargetDir(): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      "cargo metadata --no-deps --format-version 1",
-      (error, stdout, _stderr) => {
-        if (error) {
-          console.log("error", error);
-          reject(error);
-        } else {
-          try {
-            const json = JSON.parse(stdout);
-            resolve(json.target_directory);
-          } catch (error) {
-            console.log("json error", error);
-            reject(error);
-          }
-        }
-      }
-    );
-  });
-}

deltachat-jsonrpc/typescript/tsconfig.json

@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "alwaysStrict": true,
-    "strict": true,
-    "sourceMap": true,
-    "strictNullChecks": true,
-    "rootDir": ".",
-    "outDir": "dist",
-    "lib": ["ES2017", "dom"],
-    "target": "ES2017",
-    "module": "es2020",
-    "declaration": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "isolatedModules": true
-  },
-  "include": ["*.ts", "test/*.ts"],
-  "compileOnSave": false
-}

deltachat-ratelimit/Cargo.toml

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

deltachat-ratelimit/src/lib.rs

@@ -1,140 +0,0 @@
-//! # Rate limiting module.
-//!
-//! This module contains implementation of token bucket policy.
-//! Its primary use is preventing Delta Chat from sending too many messages, especially automatic,
-//! such as read receipts.
-
-use std::time::{Duration, SystemTime};
-
-#[derive(Debug)]
-pub struct Ratelimit {
-    /// Time of the last update.
-    last_update: SystemTime,
-
-    /// Number of messages sent within the time window ending at `last_update`.
-    current_value: f64,
-
-    /// Time window size.
-    window: Duration,
-
-    /// Number of messages allowed to send within the time window.
-    quota: f64,
-}
-
-impl Ratelimit {
-    /// Returns a new rate limiter with the given constraints.
-    ///
-    /// Rate limiter will allow to send no more than `quota` messages within duration `window`.
-    pub fn new(window: Duration, quota: f64) -> Self {
-        Self::new_at(window, quota, SystemTime::now())
-    }
-
-    /// Returns a new rate limiter with given current time for testing purposes.
-    fn new_at(window: Duration, quota: f64, now: SystemTime) -> Self {
-        Self {
-            last_update: now,
-            current_value: 0.0,
-            window,
-            quota,
-        }
-    }
-
-    /// Returns current number of sent messages.
-    fn current_value_at(&self, now: SystemTime) -> f64 {
-        let rate: f64 = self.quota / self.window.as_secs_f64();
-        let elapsed = now
-            .duration_since(self.last_update)
-            .unwrap_or(Duration::ZERO)
-            .as_secs_f64();
-        f64::max(0.0, self.current_value - rate * elapsed)
-    }
-
-    /// Returns true if it is allowed to send a message.
-    fn can_send_at(&self, now: SystemTime) -> bool {
-        self.current_value_at(now) + 1.0 <= self.quota
-    }
-
-    /// Returns true if can send another message now.
-    ///
-    /// This method takes mutable reference
-    pub fn can_send(&self) -> bool {
-        self.can_send_at(SystemTime::now())
-    }
-
-    fn send_at(&mut self, now: SystemTime) {
-        self.current_value = f64::min(self.quota, self.current_value_at(now) + 1.0);
-        self.last_update = now;
-    }
-
-    /// Increases current usage value.
-    ///
-    /// It is possible to send message even if over quota, e.g. if the message sending is initiated
-    /// by the user and should not be rate limited. However, sending messages when over quota
-    /// further postpones the time when it will be allowed to send low priority messages.
-    pub fn send(&mut self) {
-        self.send_at(SystemTime::now())
-    }
-
-    fn until_can_send_at(&self, now: SystemTime) -> Duration {
-        let current_value = self.current_value_at(now);
-        if current_value + 1.0 <= self.quota {
-            Duration::ZERO
-        } else {
-            let requirement = current_value + 1.0 - self.quota;
-            let rate = self.quota / self.window.as_secs_f64();
-            Duration::from_secs_f64(requirement / rate)
-        }
-    }
-
-    /// Calculates the time until `can_send` will return `true`.
-    pub fn until_can_send(&self) -> Duration {
-        self.until_can_send_at(SystemTime::now())
-    }
-
-    /// Returns minimum possible update interval in milliseconds.
-    pub fn update_interval(&self) -> usize {
-        (self.window.as_millis() as f64 / self.quota) as usize
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_ratelimit() {
-        let now = SystemTime::now();
-
-        let mut ratelimit = Ratelimit::new_at(Duration::new(60, 0), 3.0, now);
-        assert!(ratelimit.can_send_at(now));
-        assert_eq!(ratelimit.update_interval(), 20_000);
-
-        // Send burst of 3 messages.
-        ratelimit.send_at(now);
-        assert!(ratelimit.can_send_at(now));
-        ratelimit.send_at(now);
-        assert!(ratelimit.can_send_at(now));
-        ratelimit.send_at(now);
-
-        // Can't send more messages now.
-        assert!(!ratelimit.can_send_at(now));
-
-        // Can send one more message 20 seconds later.
-        assert_eq!(ratelimit.until_can_send_at(now), Duration::from_secs(20));
-        let now = now + Duration::from_secs(20);
-        assert!(ratelimit.can_send_at(now));
-        ratelimit.send_at(now);
-        assert!(!ratelimit.can_send_at(now));
-
-        // Send one more message anyway, over quota.
-        ratelimit.send_at(now);
-
-        // Always can send another message after 20 seconds,
-        // leaky bucket never overflows.
-        let now = now + Duration::from_secs(20);
-        assert!(ratelimit.can_send_at(now));
-
-        // Test that we don't panic if time appears to move backwards
-        assert!(!ratelimit.can_send_at(now - Duration::from_secs(20)));
-    }
-}

deltachat-repl/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "deltachat-repl"
-version = "1.157.3"
-license = "MPL-2.0"
-edition = "2021"
-repository = "https://github.com/chatmail/core"
-
-[dependencies]
-anyhow = { workspace = true }
-deltachat = { workspace = true, features = ["internals"]}
-dirs = "6"
-log = { workspace = true }
-nu-ansi-term = { workspace = true }
-qr2term = "0.3.3"
-rusqlite = { workspace = true }
-rustyline = "15"
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
-[features]
-default = ["vendored"]
-vendored = ["deltachat/vendored"]

deltachat-rpc-client/LICENSE

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

deltachat-rpc-client/README.md

@@ -1,51 +0,0 @@
-# Delta Chat RPC python client
-
-RPC client connects to standalone Delta Chat RPC server `deltachat-rpc-server`
-and provides asynchronous interface to it.
-
-## Getting started
-
-To use Delta Chat RPC client, first build a `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`
-or download a prebuilt release.
-Install it anywhere in your `PATH`.
-
-[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 env
-$ . env/bin/activate
-```
-
-Install `deltachat-rpc-client` from source:
-```
-$ cd deltachat-rpc-client
-$ pip install .
-```
-
-## Testing
-
-1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
-2. Install tox `pip install -U tox`
-3. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
-
-Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.
-
-## Using in REPL
-
-Setup a development environment:
-```
-$ tox --devenv env
-$ . env/bin/activate
-```
-
-```
-$ 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()
-```

deltachat-rpc-client/examples/echobot.py

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

deltachat-rpc-client/examples/echobot_advanced.py

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

deltachat-rpc-client/examples/echobot_no_hooks.py

@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-"""
-Example echo bot without using hooks
-"""
-
-import logging
-import sys
-
-from deltachat_rpc_client import DeltaChat, EventType, Rpc, SpecialContactId
-
-
-def main():
-    with Rpc() as rpc:
-        deltachat = DeltaChat(rpc)
-        system_info = deltachat.get_system_info()
-        logging.info("Running deltachat core %s", system_info["deltachat_core_version"])
-
-        accounts = deltachat.get_all_accounts()
-        account = accounts[0] if accounts else deltachat.add_account()
-
-        account.set_config("bot", "1")
-        if not account.is_configured():
-            logging.info("Account is not configured, configuring")
-            account.set_config("addr", sys.argv[1])
-            account.set_config("mail_pw", sys.argv[2])
-            account.configure()
-            logging.info("Configured")
-        else:
-            logging.info("Account is already configured")
-            deltachat.start_io()
-
-        def process_messages():
-            for message in account.get_next_messages():
-                snapshot = message.get_snapshot()
-                if snapshot.from_id != SpecialContactId.SELF and not snapshot.is_bot and not snapshot.is_info:
-                    snapshot.chat.send_text(snapshot.text)
-                snapshot.message.mark_seen()
-
-        # Process old messages.
-        process_messages()
-
-        while True:
-            event = account.wait_for_event()
-            if event["kind"] == EventType.INFO:
-                logging.info("%s", event["msg"])
-            elif event["kind"] == EventType.WARNING:
-                logging.warning("%s", event["msg"])
-            elif event["kind"] == EventType.ERROR:
-                logging.error("%s", event["msg"])
-            elif event["kind"] == EventType.INCOMING_MSG:
-                logging.info("Got an incoming message")
-                process_messages()
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
-    main()

deltachat-rpc-client/pyproject.toml

@@ -1,72 +0,0 @@
-[build-system]
-requires = ["setuptools>=45"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "deltachat-rpc-client"
-version = "1.157.3"
-description = "Python client for Delta Chat core JSON-RPC interface"
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-    "Operating System :: POSIX :: Linux",
-    "Operating System :: MacOS :: MacOS X",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Topic :: Communications :: Chat",
-    "Topic :: Communications :: Email"
-]
-readme = "README.md"
-requires-python = ">=3.8"
-
-[tool.setuptools.package-data]
-deltachat_rpc_client = [
-    "py.typed"
-]
-
-[project.entry-points.pytest11]
-"deltachat_rpc_client.pytestplugin" = "deltachat_rpc_client.pytestplugin"
-
-[tool.black]
-line-length = 120
-
-[tool.ruff]
-lint.select = [
-  "E", "W", # pycodestyle
-  "F", # Pyflakes
-  "N", # pep8-naming
-  "I", # isort
-
-  "ARG", # flake8-unused-arguments
-  "B", # flake8-bugbear
-  "C4", # flake8-comprehensions
-  "COM", # flake8-commas
-  "DTZ", # flake8-datetimez
-  "ICN", # flake8-import-conventions
-  "ISC", # flake8-implicit-str-concat
-  "PIE", # flake8-pie
-  "PT", # flake8-pytest-style
-  "RET", # flake8-return
-  "SIM", # flake8-simplify
-  "TCH", # flake8-type-checking
-  "TID", # flake8-tidy-imports
-  "YTT", # flake8-2020
-
-  "ERA", # eradicate
-
-  "PLC", # Pylint Convention
-  "PLE", # Pylint Error
-  "PLW", # Pylint Warning
-
-  "RUF006" # asyncio-dangling-task
-]
-line-length = 120
-
-[tool.isort]
-profile = "black"

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

@@ -1,27 +0,0 @@
-"""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
-from .client import Bot, Client
-from .const import EventType, SpecialContactId
-from .contact import Contact
-from .deltachat import DeltaChat
-from .message import Message
-from .rpc import Rpc
-
-__all__ = [
-    "Account",
-    "AttrDict",
-    "Bot",
-    "Chat",
-    "Client",
-    "Contact",
-    "DeltaChat",
-    "EventType",
-    "Message",
-    "SpecialContactId",
-    "Rpc",
-    "run_bot_cli",
-    "run_client_cli",
-]

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

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

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

@@ -1,396 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional, Union
-from warnings import warn
-
-from ._utils import AttrDict, futuremethod
-from .chat import Chat
-from .const import ChatlistFlag, ContactFlag, EventType, SpecialContactId
-from .contact import Contact
-from .message import Message
-
-if TYPE_CHECKING:
-    from .deltachat import DeltaChat
-    from .rpc import Rpc
-
-
-@dataclass
-class Account:
-    """Delta Chat account."""
-
-    manager: "DeltaChat"
-    id: int
-
-    @property
-    def _rpc(self) -> "Rpc":
-        return self.manager.rpc
-
-    def wait_for_event(self, event_type=None) -> AttrDict:
-        """Wait until the next event and return it."""
-        while True:
-            next_event = AttrDict(self._rpc.wait_for_event(self.id))
-            if event_type is None or next_event.kind == event_type:
-                return next_event
-
-    def clear_all_events(self):
-        """Removes all queued-up events for a given account. Useful for tests."""
-        self._rpc.clear_all_events(self.id)
-
-    def remove(self) -> None:
-        """Remove the account."""
-        self._rpc.remove_account(self.id)
-
-    def clone(self) -> "Account":
-        """Clone given account.
-        This uses backup-transfer via iroh, i.e. the 'Add second device' feature."""
-        future = self._rpc.provide_backup.future(self.id)
-        qr = self._rpc.get_backup_qr(self.id)
-        new_account = self.manager.add_account()
-        new_account._rpc.get_backup(new_account.id, qr)
-        future()
-        return new_account
-
-    def start_io(self) -> None:
-        """Start the account I/O."""
-        self._rpc.start_io(self.id)
-
-    def stop_io(self) -> None:
-        """Stop the account I/O."""
-        self._rpc.stop_io(self.id)
-
-    def get_info(self) -> AttrDict:
-        """Return dictionary of this account configuration parameters."""
-        return AttrDict(self._rpc.get_info(self.id))
-
-    def get_size(self) -> int:
-        """Get the combined filesize of an account in bytes."""
-        return self._rpc.get_account_file_size(self.id)
-
-    def is_configured(self) -> bool:
-        """Return True if this account is configured."""
-        return self._rpc.is_configured(self.id)
-
-    def set_config(self, key: str, value: Optional[str] = None) -> None:
-        """Set configuration value."""
-        self._rpc.set_config(self.id, key, value)
-
-    def get_config(self, key: str) -> Optional[str]:
-        """Get configuration value."""
-        return self._rpc.get_config(self.id, key)
-
-    def update_config(self, **kwargs) -> None:
-        """update config values."""
-        for key, value in kwargs.items():
-            self.set_config(key, value)
-
-    def set_avatar(self, img_path: Optional[str] = None) -> None:
-        """Set self avatar.
-
-        Passing None will discard the currently set avatar.
-        """
-        self.set_config("selfavatar", img_path)
-
-    def get_avatar(self) -> Optional[str]:
-        """Get self avatar."""
-        return self.get_config("selfavatar")
-
-    def check_qr(self, qr):
-        """Parse QR code contents.
-
-        This function takes the raw text scanned
-        and checks what can be done with it."""
-        return self._rpc.check_qr(self.id, qr)
-
-    def set_config_from_qr(self, qr: str):
-        self._rpc.set_config_from_qr(self.id, qr)
-
-    @futuremethod
-    def configure(self):
-        """Configure an account."""
-        yield self._rpc.configure.future(self.id)
-
-    def bring_online(self):
-        """Start I/O and wait until IMAP becomes IDLE."""
-        self.start_io()
-        self.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
-        """Create a new Contact or return an existing one.
-
-        Calling this method will always result in the same
-        underlying contact id.  If there already is a Contact
-        with that e-mail address, it is unblocked and its display
-        name is updated if specified.
-
-        :param obj: email-address or contact id.
-        :param name: (optional) display name for this contact.
-        """
-        if isinstance(obj, int):
-            obj = Contact(self, obj)
-        if isinstance(obj, Contact):
-            obj = obj.get_snapshot().address
-        return Contact(self, self._rpc.create_contact(self.id, obj, name))
-
-    def make_vcard(self, contacts: list[Contact]) -> str:
-        """Create vCard with the given contacts."""
-        assert all(contact.account == self for contact in contacts)
-        contact_ids = [contact.id for contact in contacts]
-        return self._rpc.make_vcard(self.id, contact_ids)
-
-    def import_vcard(self, vcard: str) -> list[Contact]:
-        """Import vCard.
-
-        Return created or modified contacts in the order they appear in vCard."""
-        contact_ids = self._rpc.import_vcard_contents(self.id, vcard)
-        return [Contact(self, contact_id) for contact_id in contact_ids]
-
-    def create_chat(self, account: "Account") -> Chat:
-        vcard = account.self_contact.make_vcard()
-        [contact] = self.import_vcard(vcard)
-        return contact.create_chat()
-
-    def get_device_chat(self) -> Chat:
-        """Return device chat."""
-        return self.device_contact.create_chat()
-
-    def get_contact_by_id(self, contact_id: int) -> Contact:
-        """Return Contact instance for the given contact ID."""
-        return Contact(self, contact_id)
-
-    def get_contact_by_addr(self, address: str) -> Optional[Contact]:
-        """Check if an e-mail address belongs to a known and unblocked contact."""
-        contact_id = self._rpc.lookup_contact_id_by_addr(self.id, address)
-        return contact_id and Contact(self, contact_id)
-
-    def get_blocked_contacts(self) -> list[AttrDict]:
-        """Return a list with snapshots of all blocked contacts."""
-        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,
-        with_self: bool = False,
-        verified_only: bool = False,
-        snapshot: bool = False,
-    ) -> Union[list[Contact], list[AttrDict]]:
-        """Get a filtered list of contacts.
-
-        :param query: if a string is specified, only return contacts
-                      whose name or e-mail matches query.
-        :param with_self: if True the self-contact is also included if it matches the query.
-        :param only_verified: if True only return verified contacts.
-        :param snapshot: If True return a list of contact snapshots instead of Contact instances.
-        """
-        flags = 0
-        if verified_only:
-            flags |= ContactFlag.VERIFIED_ONLY
-        if with_self:
-            flags |= ContactFlag.ADD_SELF
-
-        if snapshot:
-            contacts = self._rpc.get_contacts(self.id, flags, query)
-            return [AttrDict(contact=Contact(self, contact["id"]), **contact) for contact in contacts]
-        contacts = self._rpc.get_contact_ids(self.id, flags, query)
-        return [Contact(self, contact_id) for contact_id in contacts]
-
-    @property
-    def self_contact(self) -> Contact:
-        """This account's identity as a Contact."""
-        return Contact(self, SpecialContactId.SELF)
-
-    @property
-    def device_contact(self) -> Chat:
-        """This account's device contact."""
-        return Contact(self, SpecialContactId.DEVICE)
-
-    def get_chatlist(
-        self,
-        query: Optional[str] = None,
-        contact: Optional[Contact] = None,
-        archived_only: bool = False,
-        for_forwarding: bool = False,
-        no_specials: bool = False,
-        alldone_hint: bool = False,
-        snapshot: bool = False,
-    ) -> Union[list[Chat], list[AttrDict]]:
-        """Return list of chats.
-
-        :param query: if a string is specified only chats matching this query are returned.
-        :param contact: if a contact is specified only chats including this contact are returned.
-        :param archived_only: if True only archived chats are returned.
-        :param for_forwarding: if True the chat list is sorted with "Saved messages" at the top
-                               and without "Device chat" and contact requests.
-        :param no_specials: if True archive link is not added to the list.
-        :param alldone_hint: if True the "all done hint" special chat will be added to the list
-                             as needed.
-        :param snapshot: If True return a list of chat snapshots instead of Chat instances.
-        """
-        flags = 0
-        if archived_only:
-            flags |= ChatlistFlag.ARCHIVED_ONLY
-        if for_forwarding:
-            flags |= ChatlistFlag.FOR_FORWARDING
-        if no_specials:
-            flags |= ChatlistFlag.NO_SPECIALS
-        if alldone_hint:
-            flags |= ChatlistFlag.ADD_ALLDONE_HINT
-
-        entries = self._rpc.get_chatlist_entries(self.id, flags, query, contact and contact.id)
-        if not snapshot:
-            return [Chat(self, entry) for entry in entries]
-
-        items = self._rpc.get_chatlist_items_by_entries(self.id, entries)
-        chats = []
-        for item in items.values():
-            item["chat"] = Chat(self, item["id"])
-            chats.append(AttrDict(item))
-        return chats
-
-    def create_group(self, name: str, protect: bool = False) -> Chat:
-        """Create a new group chat.
-
-        After creation, the group has only self-contact as member and is in unpromoted state.
-        """
-        return Chat(self, self._rpc.create_group_chat(self.id, name, protect))
-
-    def get_chat_by_id(self, chat_id: int) -> Chat:
-        """Return the Chat instance with the given ID."""
-        return Chat(self, chat_id)
-
-    def secure_join(self, qrdata: str) -> Chat:
-        """Continue a Setup-Contact or Verified-Group-Invite protocol started on
-        another device.
-
-        The function returns immediately and the handshake runs in background, sending
-        and receiving several messages.
-        Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-        See https://securejoin.delta.chat/ for protocol details.
-
-        :param qrdata: The text of the scanned QR code.
-        """
-        return Chat(self, self._rpc.secure_join(self.id, qrdata))
-
-    def get_qr_code(self) -> str:
-        """Get Setup-Contact QR Code text.
-
-        This data needs to be transferred to another Delta Chat account
-        in a second channel, typically used by mobiles with QRcode-show + scan UX.
-        """
-        return self._rpc.get_chat_securejoin_qr_code(self.id, None)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
-        """Get Setup-Contact QR code text and SVG."""
-        return self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
-
-    def get_message_by_id(self, msg_id: int) -> Message:
-        """Return the Message instance with the given ID."""
-        return Message(self, msg_id)
-
-    def mark_seen_messages(self, messages: list[Message]) -> None:
-        """Mark the given set of messages as seen."""
-        self._rpc.markseen_msgs(self.id, [msg.id for msg in messages])
-
-    def delete_messages(self, messages: list[Message]) -> None:
-        """Delete messages (local and remote)."""
-        self._rpc.delete_messages(self.id, [msg.id for msg in messages])
-
-    def get_fresh_messages(self) -> list[Message]:
-        """Return the list of fresh messages, newest messages first.
-
-        This call is intended for displaying notifications.
-        If you are writing a bot, use `get_fresh_messages_in_arrival_order()` instead,
-        to process oldest messages first.
-        """
-        fresh_msg_ids = self._rpc.get_fresh_msgs(self.id)
-        return [Message(self, msg_id) for msg_id in fresh_msg_ids]
-
-    def get_next_messages(self) -> list[Message]:
-        """Return a list of next messages."""
-        next_msg_ids = self._rpc.get_next_msgs(self.id)
-        return [Message(self, msg_id) for msg_id in next_msg_ids]
-
-    def wait_next_messages(self) -> list[Message]:
-        """Wait for new messages and return a list of them."""
-        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."""
-        return self.wait_for_event(EventType.INCOMING_MSG)
-
-    def wait_for_msgs_changed_event(self):
-        """Wait for messages changed event and return it."""
-        return self.wait_for_event(EventType.MSGS_CHANGED)
-
-    def wait_for_msgs_noticed_event(self):
-        """Wait for messages noticed event and return it."""
-        return self.wait_for_event(EventType.MSGS_NOTICED)
-
-    def wait_for_incoming_msg(self):
-        """Wait for incoming message and return it.
-
-        Consumes all events before the next incoming message event."""
-        return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)
-
-    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 wait_for_reactions_changed(self):
-        return self.wait_for_event(EventType.REACTIONS_CHANGED)
-
-    def get_fresh_messages_in_arrival_order(self) -> list[Message]:
-        """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""
-        warn(
-            "get_fresh_messages_in_arrival_order is deprecated, use get_next_messages instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        fresh_msg_ids = sorted(self._rpc.get_fresh_msgs(self.id))
-        return [Message(self, msg_id) for msg_id in fresh_msg_ids]
-
-    def export_backup(self, path, passphrase: str = "") -> None:
-        """Export backup."""
-        self._rpc.export_backup(self.id, str(path), passphrase)
-
-    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)
-
-    def initiate_autocrypt_key_transfer(self) -> None:
-        """Send Autocrypt Setup Message."""
-        return self._rpc.initiate_autocrypt_key_transfer(self.id)